From 27b90c35dc2785c78e2196069e8b0933b5281767 Mon Sep 17 00:00:00 2001 From: David Date: Mon, 21 May 2012 00:08:07 +0200 Subject: [PATCH] working display for monitor/disk.py, working monitor/disk.py, starting new branch for heavy testing --- monitor/disk_display.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/monitor/disk_display.py b/monitor/disk_display.py index ace0596..dd06a0b 100755 --- a/monitor/disk_display.py +++ b/monitor/disk_display.py @@ -21,17 +21,16 @@ def blocks2bytes(blocks, blocksize): if __name__ == "__main__": diskmoninstance = disk.diskmon() for partition in diskmoninstance.partitions: - print "Device:\t\t" + str(partition["device"]) + \ - "\nUUID:\t\t" + str(partition["uuid"]) + print "Device:\t\t" + str(partition["device"]) + print "UUID:\t\t" + str(partition["uuid"]) if partition.has_key("mountpoint"): totalbytes = blocks2bytes(partition["total blocks"], partition["blocksize"]) totalhuman = bytes2human(totalbytes) freebytes = blocks2bytes(partition["free blocks"], partition["blocksize"]) freehuman = bytes2human(freebytes) - percent = 100.00 * freebytes / totalbytes print "Mountpoint:\t" + str(partition["mountpoint"]) + \ "\nFilesystem:\t" + str(partition["filesystem"]) + \ - "\nUsage:\t\t%.2f%s/%.2f%s(%i)\n" %(freehuman[0], freehuman[1], totalhuman[0], totalhuman[1], percent) + "\nUsage:\t\t%.2f%s/%.2f%s\n" %(freehuman[0], freehuman[1], totalhuman[0], totalhuman[1]) else: print "\n"