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 f060c37..3e72122 100644 (file)
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,6 +1,9 @@
-import os
+from os import system, listdir, statvfs, popen, makedirs
 
-from Tools.Directories import *
+from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.CList import CList
+
+from SystemInfo import SystemInfo
 
 def tryOpen(filename):
        try:
@@ -16,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)
@@ -82,7 +85,7 @@ class Harddisk:
                        if line.startswith(self.devidex):
                                parts = line.strip().split(" ")
                                try:
-                                       stat = os.statvfs(parts[1])
+                                       stat = statvfs(parts[1])
                                except OSError:
                                        continue
                                free = stat.f_bfree/1000 * stat.f_bsize/1000
@@ -92,7 +95,7 @@ class Harddisk:
 
        def numPartitions(self):
                try:
-                       idedir = os.listdir(self.devidex)
+                       idedir = listdir(self.devidex)
                except OSError:
                        return -1
                numPart = -1
@@ -104,32 +107,55 @@ class Harddisk:
                return numPart
 
        def unmount(self):
-               cmd = "/bin/umount " + self.devidex + "part*"
-               res = os.system(cmd)
+               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)
 
        def createPartition(self):
                cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
-               sfdisk = os.popen(cmd, "w")
+               sfdisk = popen(cmd, "w")
                sfdisk.write("0,\n;\n;\n;\ny\n")
                sfdisk.close()
                return 0
 
        def mkfs(self):
                cmd = "/sbin/mkfs.ext3 -T largefile -m0 " + self.devidex + "part1"
-               res = os.system(cmd)
+               res = system(cmd)
                return (res >> 8)
 
        def mount(self):
-               cmd = "/bin/mount -t ext3 " + self.devidex + "part1 /hdd"
-               res = os.system(cmd)
+               cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
+               res = system(cmd)
                return (res >> 8)
 
        def createMovieFolder(self):
-               res = os.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()
@@ -143,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")
 
@@ -163,12 +209,13 @@ def existHDD(num):
        return -1
 
 class Partition:
-       def __init__(self, mountpoint, description = ""):
+       def __init__(self, mountpoint, description = "", force_mounted = False):
                self.mountpoint = mountpoint
                self.description = description
+               self.force_mounted = force_mounted
 
        def stat(self):
-               return os.statvfs(self.mountpoint)
+               return statvfs(self.mountpoint)
 
        def free(self):
                try:
@@ -186,6 +233,9 @@ class Partition:
 
        def mounted(self):
                # THANK YOU PYTHON FOR STRIPPING AWAY f_fsid.
+               # TODO: can os.path.ismount be used?
+               if self.force_mounted:
+                       return True
                procfile = tryOpen("/proc/mounts")
                for n in procfile.readlines():
                        if n.split(' ')[1] == self.mountpoint:
@@ -199,11 +249,15 @@ class HarddiskManager:
                
                self.partitions = [ ]
                
+               self.on_partition_list_change = CList()
+               
                for hddNum in range(8):
                        if existHDD(hddNum):
                                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
@@ -223,6 +277,21 @@ class HarddiskManager:
                for x in p:
                        self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
 
+       def getAutofsMountpoint(self, device):
+               return "/autofs/%s/" % (device)
+
+       def addHotplugPartition(self, device, description):
+               p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True)
+               self.partitions.append(p)
+               self.on_partition_list_change("add", p)
+
+       def removeHotplugPartition(self, device):
+               mountpoint = self.getAutofsMountpoint(device)
+               for x in self.partitions[:]:
+                       if x.mountpoint == mountpoint:
+                               self.partitions.remove(x)
+                               self.on_partition_list_change("remove", x)
+
        def HDDCount(self):
                return len(self.hdd)