moving the list generation to a seperate method

[enigma2.git] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 71c038369c31140d2f9ad22d48205ca342421d5b..ca77e56f962eb11f3fc87d0fab1405386de9b375 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -24,11 +24,24 @@ class Harddisk:
        def getIndex(self):
                return self.index
 
+       def bus(self):
+               ret = ""
+
+               if self.index & 2:
+                       ret = "External (CF) - "
+               else:
+                       ret = "Internal - "
+               
+               if self.index & 1:
+                       return ret + "Slave"
+               else:
+                       return ret + "Master"
+
        def capacity(self):
                procfile = tryOpen(self.prochdx + "capacity")
                
                if procfile == "":
-                       return -1
+                       return ""
 
                line = procfile.readline()
                procfile.close()
@@ -36,10 +49,12 @@ class Harddisk:
                try:
                        cap = int(line)
                except:
-                       return -1
+                       return ""
                
-               return cap      
-                                               
+               cap = cap / 1000 * 512 / 1000
+               
+               return "%d.%03d GB" % (cap/1024, cap%1024)
+                                                               
        def model(self):
                procfile = tryOpen(self.prochdx + "model")
                
@@ -88,7 +103,8 @@ class Harddisk:
 
        def unmount(self):
                cmd = "/bin/umount " + self.devidex + "part*"
-               os.system(cmd)
+               res = os.system(cmd)
+               return (res >> 8)
 
        def createPartition(self):
                cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
@@ -108,9 +124,11 @@ class Harddisk:
                return (res >> 8)
 
        def createMovieFolder(self):
-               res = os.system("mkdir /hdd/movie")
+               res = os.system("mkdir /hdd/movies")
                return (res >> 8)
                
+       errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
+
        def initialize(self):
                self.unmount()
 
@@ -154,31 +172,24 @@ class HarddiskManager:
                        if hddNum > 8:
                                break
 
+       def HDDCount(self):
+               cnt = 0
+               for hd in self.hdd:
+                       cnt = cnt + 1
+               return cnt      
+
        def HDDList(self):
                list = [ ]
                for hd in self.hdd:
-                       cap = hd.capacity() / 1000 * 512 / 1000
-                       print cap
                        hdd = hd.model() + " (" 
-                       if hd.index & 1:
-                               hdd += "slave"
-                       else:   
-                               hdd += "master"
-                       if cap > 0:
-                               hdd += ", %d.%03d GB" % (cap/1024, cap%1024)
+                       hdd += hd.bus()
+                       cap = hd.capacity()     
+                       if cap != "":
+                               hdd += ", " + cap
                        hdd += ")"
-
-                       print hdd
-                       
-#                      if hd.index == 0:
-#                              if hd.initialize() == 0:
-#                                      print "hdd status ok"
-#                              else:
-#                                      print "hdd status ok"
-
                        list.append((hdd, hd))
-               return list
 
+               return list
 
 harddiskmanager = HarddiskManager()