X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b5eaeb4432e0b881f3348a8abd2cb1c5f6b082ce..da1955116b7e8b8c203e27c7e5994537219a0632:/lib/python/Components/Harddisk.py diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 6283f51c..3e72122e 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -1,4 +1,9 @@ -import os +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: @@ -14,18 +19,34 @@ 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) self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target) + 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() @@ -33,13 +54,15 @@ class Harddisk: try: cap = int(line) except: - return -1 + return "" + + cap = cap / 1000 * 512 / 1000 - return cap - + return "%d.%03d GB" % (cap/1024, cap%1024) + def model(self): procfile = tryOpen(self.prochdx + "model") - + if procfile == "": return "" @@ -62,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 @@ -72,7 +95,7 @@ class Harddisk: def numPartitions(self): try: - idedir = os.listdir(self.devidex) + idedir = listdir(self.devidex) except OSError: return -1 numPart = -1 @@ -84,30 +107,56 @@ class Harddisk: return numPart def unmount(self): - cmd = "/bin/umount " + self.devidex + "part*" - 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 /hdd/movie") + 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"), _("Fsck failed"), _("Please Reboot"), _("Filesystem contains uncorrectable errors"), _("Unmount failed")] + def initialize(self): self.unmount() @@ -120,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") @@ -139,38 +208,107 @@ def existHDD(num): return -1 +class Partition: + def __init__(self, mountpoint, description = "", force_mounted = False): + self.mountpoint = mountpoint + self.description = description + self.force_mounted = force_mounted + + def stat(self): + return statvfs(self.mountpoint) + + def free(self): + try: + s = self.stat() + return s.f_bavail * s.f_bsize + except OSError: + return None + + def total(self): + try: + s = self.stat() + return s.f_blocks * s.f_bsize + except OSError: + return None + + 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: + return True + return False + class HarddiskManager: def __init__(self): hddNum = 0 self.hdd = [ ] - while 1: - if existHDD(hddNum) == 1: - self.hdd.append(Harddisk(hddNum)) - hddNum += 1 - - if hddNum > 8: - break + 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 + # external tools, everything is fine (until somebody inserts + # a second usb stick.) + p = [ + ("/media/hdd", _("Harddisk")), + ("/media/card", _("Card")), + ("/media/cf", _("Compact Flash")), + ("/media/mmc1", _("MMC Card")), + ("/media/net", _("Network Mount")), + ("/media/ram", _("Ram Disk")), + ("/media/usb", _("USB Stick")), + ("/", _("Internal Flash")) + ] + + 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) + def HDDList(self): list = [ ] for hd in self.hdd: - cap = hd.capacity() / 1000 * 512 / 1000 hdd = hd.model() + " (" - if hd.index & 1: - hdd += "slave" - else: - hdd += "master" - if cap > 0: - hdd += ", %d,%d 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 + + def getMountedPartitions(self): + return [x for x in self.partitions if x.mounted()] + +harddiskmanager = HarddiskManager()