fsck_mainmenu by Moritz Venn

[vuplus_dvbapp] / lib / python / Components / Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 79c0d6f..3e72122 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,8 +1,10 @@
-from os import system, listdir, statvfs, popen
+from os import system, listdir, statvfs, popen, makedirs
 
 from Tools.Directories import SCOPE_HDD, resolveFilename
 from Tools.CList import CList
 
+from SystemInfo import SystemInfo
+
 def tryOpen(filename):
        try:
                procFile = open(filename)
@@ -17,8 +19,8 @@ class Harddisk:
        def __init__(self, index):
                self.index = index
 
-               host = self.index / 4
-               bus = (self.index & 2)
+               host = (self.index & 2) >> 1
+               bus = 0
                target = (self.index & 1)
 
                self.prochdx = num2prochdx(index)
@@ -105,7 +107,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)
 
@@ -122,15 +137,25 @@ class Harddisk:
                return (res >> 8)
 
        def mount(self):
-               cmd = "/bin/mount -t ext3 " + self.devidex + "part1 /hdd"
+               cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
                res = system(cmd)
                return (res >> 8)
 
        def createMovieFolder(self):
-               res = system("mkdir " + resolveFilename(SCOPE_HDD))
+               try:
+                       makedirs(resolveFilename(SCOPE_HDD))
+               except OSError:
+                       return -1
+               return 0
+
+       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"), _("Unmount failed")]
+
+       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()
@@ -144,11 +169,31 @@ class Harddisk:
                if self.mount() != 0:
                        return -3
 
-               if self.createMovieFolder() != 0:
+               #only create a movie folder on the internal hdd
+               if not self.index & 2 and self.createMovieFolder() != 0:
                        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")
 
@@ -211,6 +256,8 @@ class HarddiskManager:
                                hdd = Harddisk(hddNum)
                                self.hdd.append(hdd)
 
+               SystemInfo["Harddisc"] = len(self.hdd) > 0
+
                # currently, this is just an enumeration of what's possible,
                # this probably has to be changed to support automount stuff.
                # still, if stuff is mounted into the correct mountpoints by