fsck_mainmenu by Moritz Venn

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 8253544..3e72122 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -107,7 +107,20 @@ class Harddisk:
                return numPart
 
        def unmount(self):
                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)
 
                res = system(cmd)
                return (res >> 8)
 


@@ -135,7 +148,14 @@ class Harddisk:
                        return -1
                return 0
 
                        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()
 
        def initialize(self):
                self.unmount()


@@ -154,7 +174,26 @@ class Harddisk:
                        return -4
                
                return 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")
 
 def existHDD(num):
        mediafile = tryOpen(num2prochdx(num) + "media")
 

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index a6e14cb..1578fae 100644 (file)
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -13,24 +13,47 @@ class HarddiskWait(Screen):
                result = self.hdd.initialize()
                self.close(result)
 
                result = self.hdd.initialize()
                self.close(result)
 

-       def __init__(self, session, hdd):
+       def doCheck(self):
+               self.timer.stop()
+               result = self.hdd.check()
+               self.close(result)
+
+       def __init__(self, session, hdd, type):

                Screen.__init__(self, session)
                self.hdd = hdd
                Screen.__init__(self, session)
                self.hdd = hdd

-               self["wait"] = Label(_("Initializing Harddisk..."));

                self.timer = eTimer()
                self.timer = eTimer()

-               self.timer.timeout.get().append(self.doInit)
+               if type == HarddiskSetup.HARDDISK_INITIALIZE:
+                       text = _("Initializing Harddisk...")
+                       self.timer.timeout.get().append(self.doInit)
+               else:
+                       text = _("Checking Filesystem...")
+                       self.timer.timeout.get().append(self.doCheck)
+               self["wait"] = Label(text)

                self.timer.start(100)
 
 class HarddiskSetup(Screen):
                self.timer.start(100)
 
 class HarddiskSetup(Screen):

-       def __init__(self, session, hdd):
+       HARDDISK_INITIALIZE = 1
+       HARDDISK_CHECK = 2
+
+       def __init__(self, session, hdd, type = None):

                Screen.__init__(self, session)
                self.hdd = hdd
                Screen.__init__(self, session)
                self.hdd = hdd

-               
+
+               if type not in [self.HARDDISK_INITIALIZE, self.HARDDISK_CHECK]:
+                       self.type = self.HARDDISK_INITIALIZE
+               else:
+                       self.type = type
+

                self["model"] = Label(_("Model: ") + hdd.model())
                self["capacity"] = Label(_("Capacity: ") + hdd.capacity())
                self["bus"] = Label(_("Bus: ") + hdd.bus())
                self["initialize"] = Pixmap()
                self["model"] = Label(_("Model: ") + hdd.model())
                self["capacity"] = Label(_("Capacity: ") + hdd.capacity())
                self["bus"] = Label(_("Bus: ") + hdd.bus())
                self["initialize"] = Pixmap()

-               self["initializetext"] = Label(_("Initialize"))
+
+               if self.type == self.HARDDISK_INITIALIZE:
+                       text = _("Initialize")
+               else:
+                       text = _("Check")
+               self["initializetext"] = Label(text)

 
                self["actions"] = ActionMap(["OkCancelActions"],
                {
 
                self["actions"] = ActionMap(["OkCancelActions"],
                {


@@ -40,26 +63,34 @@ class HarddiskSetup(Screen):
                
                self["shortcuts"] = ActionMap(["ShortcutActions"],
                {
                
                self["shortcuts"] = ActionMap(["ShortcutActions"],
                {

-                       "red": self.hddInitialize
+                       "red": self.hddQuestion

                })
 
        def hddReady(self, result):
                print "Result: " + str(result)
                if (result != 0):
                })
 
        def hddReady(self, result):
                print "Result: " + str(result)
                if (result != 0):

-                       self.session.open(MessageBox, _("Unable to initialize harddisk.\nPlease refer to the user manual.\nError: ") + str(self.hdd.errorList[0 - result]), MessageBox.TYPE_ERROR)
+                       if self.type == self.HARDDISK_INITIALIZE:
+                               message = _("Unable to initialize harddisk.\nError: ")
+                       else:
+                               message = _("Unable to complete filesystem check.\nError: ")
+                       self.session.open(MessageBox, message + str(self.hdd.errorList[0 - result]), MessageBox.TYPE_ERROR)

                else:
                        self.close()
 
                else:
                        self.close()
 

-       def hddInitialize(self):
-               self.session.openWithCallback(self.hddInitConfirmed, MessageBox, _("Do you really want to initialize the harddisk?\nAll data on the disk will be lost!"))
+       def hddQuestion(self):
+               if self.type == self.HARDDISK_INITIALIZE:
+                       message = _("Do you really want to initialize the harddisk?\nAll data on the disk will be lost!")
+               else:
+                       message = _("Do you really want to check the filesystem?\nThis could take lots of time!")
+               self.session.openWithCallback(self.hddConfirmed, MessageBox, message)

 
 

-       def hddInitConfirmed(self, confirmed):
+       def hddConfirmed(self, confirmed):

                if not confirmed:
                        return
 
                if not confirmed:
                        return
 

-               print "this will start the initialize now!"
-               self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)
-                       
+               print "this will start either the initialize or the fsck now!"
+               self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd, self.type)
+

 class HarddiskSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 class HarddiskSelection(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)


@@ -80,4 +111,15 @@ class HarddiskSelection(Screen):
        def okbuttonClick(self):
                selection = self["hddlist"].getCurrent()
                if selection[1] != 0:
        def okbuttonClick(self):
                selection = self["hddlist"].getCurrent()
                if selection[1] != 0:

-                       self.session.open(HarddiskSetup, selection[1])
+                       self.session.open(HarddiskSetup, selection[1], HarddiskSetup.HARDDISK_INITIALIZE)
+
+# This is actually just HarddiskSelection but with correct type
+class HarddiskFsckSelection(HarddiskSelection):
+       def __init__(self, session):
+               HarddiskSelection.__init__(self, session)
+               self.skinName = "HarddiskSelection"
+
+       def okbuttonClick(self):
+               selection = self["hddlist"].getCurrent()
+               if selection[1] != 0:
+                       self.session.open(HarddiskSetup, selection[1], HarddiskSetup.HARDDISK_CHECK)