From 6b262dfbfa1e34adfbe882c5a4a6a03e9298570c Mon Sep 17 00:00:00 2001
From: David <david@socialnerds.org>
Date: Sun, 20 May 2012 15:33:10 +0200
Subject: [PATCH] cleaned code in diskmon

---
 disk_mon.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/disk_mon.py b/disk_mon.py
index aa528e5..580b853 100755
--- a/disk_mon.py
+++ b/disk_mon.py
@@ -11,17 +11,8 @@ import os
 class diskmon(object):
     """collect information about local partitions"""
 
-    #constructor
     def __init__(self):
-        pass
-
-#    def get_part(self):
-#        uuids = os.listdir("/dev/disk/by-uuid")
-#        for uuid in uuids:
-#            part = []
-#            part.append("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:])
-#            part.append(uuid)
-#            yield part
+        self.gather()
 
     def gather(self):
         """gather the actual information"""
@@ -29,34 +20,23 @@ class diskmon(object):
         self.partitions = [] #information about all partitions (list of lists)
         uuids = os.listdir("/dev/disk/by-uuid") #folder contains symlinks to the actual disk devices 
         for uuid in uuids: #write /dev/names as keys and uuids as values in the dictionary
-            #part = []
             part = {}
-            #part.append("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:])
-            #part.append(uuid)
             part["device"] = str("/dev/" + os.readlink("/dev/disk/by-uuid/" + uuid)[6:])
             part["uuid"] = uuid
  
-        #for part in self.get_part(): 
-
             #getting mountpoint for partition from mtab
             mtab = open("/etc/mtab", "r")
             #for line in
             for line in mtab:
                 if part["device"] in line:
-                    #part.append(line.split()[1])
-                    #part.append(line.split()[2])
                     part["mountpoint"] = line.split()[1]
                     part["filesystem"] = line.split()[2]
                     #getting block infos
                     if os.path.ismount(part["mountpoint"]):
                         fs = os.statvfs(part["mountpoint"])
-                        #part.append(fs.f_bsize) #blocksize
-                        #part.append(fs.f_blocks) #total blocks
-                        #part.append(fs.f_bavail) #free blocks
                         part["blocksize"] = fs.f_bsize #blocksize
                         part["total blocks"] = fs.f_blocks #total blocks
                         part["free blocks"] = fs.f_bavail #free blocks
-                       
                         break
 
             mtab.close()
@@ -67,7 +47,6 @@ class diskmon(object):
 #output
 if __name__ == "__main__":
     diskmoninstance = diskmon()
-    diskmoninstance.gather()
     for partition in diskmoninstance.partitions:
         print "device:\t\t" + str(partition["device"]) + "\nuuid:\t\t" + str(partition["uuid"])
         if partition.has_key("mountpoint"):