1
0
mirror of https://github.com/HorlogeSkynet/archey4 synced 2025-04-12 12:00:19 +02:00

Optimizes disk usage computing + Renames main's variable

This commit is contained in:
HorlogeSkynet 2017-05-03 07:43:05 +02:00
parent bf967319fb
commit e51155fde2

18
archey

@ -384,17 +384,15 @@ class RAM:
class Disk:
def __init__(self):
p1 = Popen(['df', '-Tlh', '-B', 'GB', '--total', '-t', 'ext4', '-t', 'ext3', '-t', 'ext2', '-t', 'reiserfs', '-t', 'jfs', '-t', 'ntfs', '-t', 'fat32', '-t', 'btrfs', '-t', 'fuseblk', '-t', 'xfs', '-t', 'simfs', '-t', 'tmpfs', '-t', 'zfs'], stdout=PIPE).communicate()[0].decode('utf-8')
total = p1.splitlines()[-1]
used = re.sub(',', '.', total.split()[3])
size = re.sub(',', '.', total.split()[2])
usedpercent = float(total.split()[5][:-1])
total = re.sub(',', '.', p1.splitlines()[-1]).split()
usedpercent = float(total[5][:-1])
if usedpercent <= 33:
disk = '%s%s %s/ %s' % (colorDict['Sensors'][1], used, colorDict['Clear'][0], size)
disk = '%s%s %s/ %s' % (colorDict['Sensors'][1], total[3], colorDict['Clear'][0], total[2])
elif usedpercent > 33 and usedpercent < 67:
disk = '%s%s %s/ %s' % (colorDict['Sensors'][2], used, colorDict['Clear'][0], size)
disk = '%s%s %s/ %s' % (colorDict['Sensors'][2], total[3], colorDict['Clear'][0], total[2])
else:
disk = '%s%s %s/ %s' % (colorDict['Sensors'][0], used, colorDict['Clear'][0], size)
disk = '%s%s %s/ %s' % (colorDict['Sensors'][0], total[3], colorDict['Clear'][0], total[2])
self.value = disk
@ -421,7 +419,7 @@ classes = OrderedDict([
if __name__ == '__main__':
out = Output()
output = Output()
for key in classes.keys():
out.append(key, classes[key]().value)
out.output()
output.append(key, classes[key]().value)
output.output()