X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ed40f6f85c9c07c3c1224ae20601082c0309a631..c900a62b068cf1f583b8936aa0dae18c9683b461:/lib/python/Components/Harddisk.py diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index fee1ed74..dfc262d8 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -1,6 +1,7 @@ -from os import system - +from os import system, listdir, statvfs, popen, makedirs, readlink, stat, major, minor from Tools.Directories import SCOPE_HDD, resolveFilename +from Tools.CList import CList +from SystemInfo import SystemInfo def tryOpen(filename): try: @@ -9,64 +10,74 @@ def tryOpen(filename): return "" return procFile -def num2prochdx(num): - return "/proc/ide/hd" + ("a","b","c","d","e","f","g","h","i")[num] + "/" - class Harddisk: - def __init__(self, index): - self.index = index - - host = self.index / 4 - bus = (self.index & 2) - target = (self.index & 1) - - self.prochdx = num2prochdx(index) - self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target) + def __init__(self, device): + self.device = device + procfile = tryOpen("/sys/block/"+self.device+"/dev") + tmp = procfile.readline().split(':') + s_major = int(tmp[0]) + s_minor = int(tmp[1]) + for disc in listdir("/dev/discs"): + path = readlink('/dev/discs/'+disc) + devidex = '/dev'+path[2:]+'/' + disc = devidex+'disc' + ret = stat(disc).st_rdev + if s_major == major(ret) and s_minor == minor(ret): + self.devidex = devidex + print "new Harddisk", device, self.devidex + break - def getIndex(self): - return self.index + def __lt__(self, ob): + return self.device < ob.device def bus(self): - ret = "" - - if self.index & 2: - ret = "External (CF) - " - else: - ret = "Internal - " - - if self.index & 1: - return ret + "Slave" + ide_cf = self.device.find("hd") == 0 and self.devidex.find("host0") == -1 # 7025 specific + internal = self.device.find("hd") == 0 and self.devidex + if ide_cf: + ret = "External (CF)" + elif internal: + ret = "Internal" else: - return ret + "Master" + ret = "External" + return ret - def capacity(self): - procfile = tryOpen(self.prochdx + "capacity") - + def diskSize(self): + procfile = tryOpen("/sys/block/"+self.device+"/size") if procfile == "": - return "" - + return 0 line = procfile.readline() procfile.close() - try: cap = int(line) except: - return "" - - cap = cap / 1000 * 512 / 1000 - - return "%d.%03d GB" % (cap/1024, cap%1024) - - def model(self): - procfile = tryOpen(self.prochdx + "model") + return 0; + return cap / 1000 * 512 / 1000 - if procfile == "": + def capacity(self): + cap = self.diskSize() + if cap == 0: return "" + return "%d.%03d GB" % (cap/1024, cap%1024) - line = procfile.readline() - procfile.close() - - return line.strip() + def model(self): + if self.device.find("hd") == 0: + procfile = tryOpen("/proc/ide/"+self.device+"/model") + if procfile == "": + return "" + line = procfile.readline() + procfile.close() + return line.strip() + elif self.device.find("sd") == 0: + procfile = tryOpen("/sys/block/"+self.device+"/device/vendor") + if procfile == "": + return "" + vendor = procfile.readline().strip() + procfile.close() + procfile = tryOpen("/sys/block/"+self.device+"/device/model") + model = procfile.readline().strip() + return vendor+'('+model+')' + else: + assert False, "no hdX or sdX" def free(self): procfile = tryOpen("/proc/mounts") @@ -82,17 +93,17 @@ 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 break procfile.close() - return free + return free def numPartitions(self): try: - idedir = os.listdir(self.devidex) + idedir = listdir(self.devidex) except OSError: return -1 numPart = -1 @@ -104,32 +115,58 @@ 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) 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" + cmd = "/sbin/mkfs.ext3 " + if self.diskSize() > 4 * 1024: + cmd += "-T largefile " + cmd += "-m0 " + self.devidex + "part1" res = system(cmd) 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() @@ -145,30 +182,43 @@ class Harddisk: if self.createMovieFolder() != 0: return -4 - + return 0 - -def existHDD(num): - mediafile = tryOpen(num2prochdx(num) + "media") - if mediafile == "": - return -1 + 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 - line = mediafile.readline() - mediafile.close() + if self.mount() != 0: + return -3 + + return 0 - if line.startswith("disk"): - return 1 + def getDeviceDir(self): + return self.devidex - return -1 + def getDeviceName(self): + return self.getDeviceDir() + "disc" 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 + self.is_hotplug = force_mounted # so far; this might change. def stat(self): - return os.statvfs(self.mountpoint) + return statvfs(self.mountpoint) def free(self): try: @@ -186,6 +236,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: @@ -194,16 +247,14 @@ class Partition: class HarddiskManager: def __init__(self): - hddNum = 0 self.hdd = [ ] self.partitions = [ ] - for hddNum in range(8): - if existHDD(hddNum): - hdd = Harddisk(hddNum) - self.hdd.append(hdd) - + self.on_partition_list_change = CList() + + self.enumerateBlockDevices() + # 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,23 +274,96 @@ class HarddiskManager: for x in p: self.partitions.append(Partition(mountpoint = x[0], description = x[1])) + def getBlockDevInfo(self, blockdev): + devpath = "/sys/block/" + blockdev + error = False + removable = False + blacklisted = False + is_cdrom = False + partitions = [] + try: + removable = bool(int(open(devpath + "/removable").read())) + dev = int(open(devpath + "/dev").read().split(':')[0]) + if dev in [7, 31]: # loop, mtdblock + blacklisted = True + if blockdev[0:2] == 'sr': + is_cdrom = True + if blockdev[0:2] == 'hd': + try: + media = open("/proc/ide/%s/media" % blockdev).read() + if media.find("cdrom") != -1: + is_cdrom = True + except IOError: + error = True + # check for partitions + if not is_cdrom: + for partition in listdir(devpath): + if partition[0:len(blockdev)] != blockdev: + continue + partitions.append(partition) + except IOError: + error = True + return error, blacklisted, removable, is_cdrom, partitions + + def enumerateBlockDevices(self): + print "enumerating block devices..." + for blockdev in listdir("/sys/block"): + error, blacklisted, removable, is_cdrom, partitions = self.getBlockDevInfo(blockdev) + print "found block device '%s':" % blockdev, + if error: + print "error querying properties" + elif blacklisted: + print "blacklisted" + else: + print "ok, removable=%s, cdrom=%s, partitions=%s, device=%s" % (removable, is_cdrom, partitions, blockdev) + self.addHotplugPartition(blockdev, blockdev) + for part in partitions: + self.addHotplugPartition(part, part) + + 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) + l = len(device) + if l and device[l-1] not in ('0','1','2','3','4','5','6','7','8','9'): + error, blacklisted, removable, is_cdrom, partitions = self.getBlockDevInfo(device) + if not blacklisted and not removable and not is_cdrom: + self.hdd.append(Harddisk(device)) + self.hdd.sort() + SystemInfo["Harddisc"] = len(self.hdd) > 0 + + 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) + l = len(device) + if l and device[l-1] not in ('0','1','2','3','4','5','6','7','8','9'): + idx = 0 + for hdd in self.hdd: + if hdd.device == device: + del self.hdd[idx] + break + SystemInfo["Harddisc"] = len(self.hdd) > 0 + def HDDCount(self): return len(self.hdd) def HDDList(self): list = [ ] for hd in self.hdd: - hdd = hd.model() + " (" - hdd += hd.bus() - cap = hd.capacity() + hdd = hd.model() + " - " + hd.bus() + cap = hd.capacity() if cap != "": - hdd += ", " + cap - hdd += ")" + hdd += " (" + cap + ")" list.append((hdd, hd)) - 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()