handle case of empty text

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

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 82535447c50545eb4e8274343f2ef7c9ac093106..74736a081872e6136c6902b3656d3eebd821a910 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -42,24 +42,29 @@ class Harddisk:
                else:
                        return ret + "Master"
 
-       def capacity(self):
+       def diskSize(self):
                procfile = tryOpen(self.prochdx + "capacity")
-               
+
                if procfile == "":
-                       return ""
+                       return 0
 
                line = procfile.readline()
                procfile.close()
-               
+
                try:
                        cap = int(line)
                except:
+                       return 0
+
+               return cap / 1000 * 512 / 1000
+
+       def capacity(self):
+               cap = self.diskSize()
+               if cap == 0:
                        return ""
                
-               cap = cap / 1000 * 512 / 1000
-               
                return "%d.%03d GB" % (cap/1024, cap%1024)
-                                                               
+
        def model(self):
                procfile = tryOpen(self.prochdx + "model")
 
@@ -107,7 +112,20 @@ class Harddisk:
                return numPart
 
        def unmount(self):
-               cmd = "/bin/umount " + self.devidex + "part*"
+               procfile = tryOpen("/proc/mounts")
+
+               if procfile == "":
+                       return -1
+
+               cmd = "/bin/umount"
+
+               for line in procfile:
+                       if line.startswith(self.devidex):
+                               parts = line.split()
+                               cmd = ' '.join([cmd, parts[1]])
+
+               procfile.close()
+
                res = system(cmd)
                return (res >> 8)
 
@@ -119,7 +137,10 @@ class Harddisk:
                return 0
 
        def mkfs(self):
-               cmd = "/sbin/mkfs.ext3 -T largefile -m0 " + self.devidex + "part1"
+               cmd = "/sbin/mkfs.ext3 "
+               if self.diskSize() > 4 * 1024:
+                       cmd += "-T largefile "
+               cmd += "-m0 " + self.devidex + "part1"
                res = system(cmd)
                return (res >> 8)
 
@@ -135,7 +156,14 @@ class Harddisk:
                        return -1
                return 0
 
-       errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
+       def fsck(self):
+               # We autocorrect any failures
+               # TODO: we could check if the fs is actually ext3
+               cmd = "/sbin/fsck.ext3 -f -p " + self.devidex + "part1"
+               res = system(cmd)
+               return (res >> 8)
+
+       errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Fsck failed"), _("Please Reboot"), _("Filesystem contains uncorrectable errors"), _("Unmount failed")]
 
        def initialize(self):
                self.unmount()
@@ -154,26 +182,46 @@ class Harddisk:
                        return -4
                
                return 0
-               
+
+       def check(self):
+               self.unmount()
+
+               res = self.fsck()
+               if res & 2 == 2:
+                       return -6
+
+               if res & 4 == 4:
+                       return -7
+
+               if res != 0 and res != 1:
+                       # A sum containing 1 will also include a failure
+                       return -5
+
+               if self.mount() != 0:
+                       return -3
+
+               return 0
+
 def existHDD(num):
        mediafile = tryOpen(num2prochdx(num) + "media")
 
        if mediafile == "":
-               return -1
+               return False
 
        line = mediafile.readline()
        mediafile.close()
-       
+
        if line.startswith("disk"):
-               return 1
-       
-       return -1
+               return True
+
+       return False
 
 class Partition:
        def __init__(self, mountpoint, description = "", force_mounted = False):
                self.mountpoint = mountpoint
                self.description = description
                self.force_mounted = force_mounted
+               self.is_hotplug = force_mounted # so far; this might change.
 
        def stat(self):
                return statvfs(self.mountpoint)
@@ -269,7 +317,7 @@ class HarddiskManager:
 
                return list
 
-       def getMountedPartitions(self):
-               return [x for x in self.partitions if x.mounted()]
+       def getMountedPartitions(self, onlyhotplug = False):
+               return [x for x in self.partitions if (x.is_hotplug or not onlyhotplug) and x.mounted()]
 
 harddiskmanager = HarddiskManager()