X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FHarddisk.py;h=03f574f3dbb207e60e6f1c6a7e5ad6796461c0bc;hp=7209370183eccb6349f25ae982363976674c30e4;hb=0cf3bc28d59e7bfb8519839a8e9c36a87ea382c8;hpb=daa673f3b6bc40c4d1251335e233ffb1956f1722 diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py old mode 100644 new mode 100755 index 7209370..03f574f --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -1,139 +1,250 @@ -from os import system, listdir, statvfs, popen - +from os import system, listdir, statvfs, popen, makedirs, stat, major, minor, path, access from Tools.Directories import SCOPE_HDD, resolveFilename +from Tools.CList import CList +from SystemInfo import SystemInfo +import time +from Components.Console import Console -def tryOpen(filename): - try: - procFile = open(filename) - except IOError: - return "" - return procFile - -def num2prochdx(num): - return "/proc/ide/hd" + ("a","b","c","d","e","f","g","h","i")[num] + "/" +def readFile(filename): + file = open(filename) + data = file.read().strip() + file.close() + return data class Harddisk: - def __init__(self, index): - self.index = index + DEVTYPE_UDEV = 0 + DEVTYPE_DEVFS = 1 + + def __init__(self, device): + self.device = device - host = self.index / 4 - bus = (self.index & 2) - target = (self.index & 1) + if access("/dev/.udev", 0): + self.type = self.DEVTYPE_UDEV + elif access("/dev/.devfsd", 0): + self.type = self.DEVTYPE_DEVFS + else: + print "Unable to determine structure of /dev" + + self.max_idle_time = 0 + self.idle_running = False + self.timer = None + + self.dev_path = '' + self.disk_path = '' + self.phys_path = path.realpath(self.sysfsPath('device')) + + if self.type == self.DEVTYPE_UDEV: + self.dev_path = '/dev/' + self.device + self.disk_path = self.dev_path + + elif self.type == self.DEVTYPE_DEVFS: + tmp = readFile(self.sysfsPath('dev')).split(':') + s_major = int(tmp[0]) + s_minor = int(tmp[1]) + for disc in listdir("/dev/discs"): + dev_path = path.realpath('/dev/discs/' + disc) + disk_path = dev_path + '/disc' + try: + rdev = stat(disk_path).st_rdev + except OSError: + continue + if s_major == major(rdev) and s_minor == minor(rdev): + self.dev_path = dev_path + self.disk_path = disk_path + break - self.prochdx = num2prochdx(index) - self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target) + print "new Harddisk", self.device, '->', self.dev_path, '->', self.disk_path + self.startIdle() - def getIndex(self): - return self.index + def __lt__(self, ob): + return self.device < ob.device - def bus(self): - ret = "" + def partitionPath(self, n): + if self.type == self.DEVTYPE_UDEV: + return self.dev_path + n + elif self.type == self.DEVTYPE_DEVFS: + return self.dev_path + '/part' + n - if self.index & 2: - ret = "External (CF) - " - else: - ret = "Internal - " - - if self.index & 1: - return ret + "Slave" - else: - return ret + "Master" + def sysfsPath(self, filename): + return path.realpath('/sys/block/' + self.device + '/' + filename) - def capacity(self): - procfile = tryOpen(self.prochdx + "capacity") - - if procfile == "": - return "" + def stop(self): + if self.timer: + self.timer.stop() + self.timer.callback.remove(self.runIdle) - line = procfile.readline() - procfile.close() - + def bus(self): + # CF (7025 specific) + if self.type == self.DEVTYPE_UDEV: + ide_cf = False # FIXME + elif self.type == self.DEVTYPE_DEVFS: + ide_cf = self.device[:2] == "hd" and "host0" not in self.dev_path + + internal = "pci" in self.phys_path + + if ide_cf: + ret = "External (CF)" + elif internal: + ret = "Internal" + else: + ret = "External" + return ret + + def diskSize(self): + line = readFile(self.sysfsPath('size')) 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/1000, cap%1000) - line = procfile.readline() - procfile.close() - - return line.strip() + def model(self): + if self.device[:2] == "hd": + return readFile('/proc/ide/' + self.device + '/model') + elif self.device[:2] == "sd": + vendor = readFile(self.sysfsPath('device/vendor')) + model = readFile(self.sysfsPath('device/model')) + return vendor + '(' + model + ')' + else: + assert False, "no hdX or sdX" def free(self): - procfile = tryOpen("/proc/mounts") - - if procfile == "": + try: + mounts = open("/proc/mounts") + except IOError: return -1 - free = -1 - while 1: - line = procfile.readline() - if line == "": - break - if line.startswith(self.devidex): - parts = line.strip().split(" ") + lines = mounts.readlines() + mounts.close() + + for line in lines: + parts = line.strip().split(" ") + if path.realpath(parts[0]).startswith(self.dev_path): try: stat = statvfs(parts[1]) except OSError: continue - free = stat.f_bfree/1000 * stat.f_bsize/1000 - break - procfile.close() - return free + return stat.f_bfree/1000 * stat.f_bsize/1000 + + return -1 def numPartitions(self): - try: - idedir = listdir(self.devidex) - except OSError: - return -1 numPart = -1 - for filename in idedir: - if filename.startswith("disc"): - numPart += 1 - if filename.startswith("part"): - numPart += 1 + if self.type == self.DEVTYPE_UDEV: + try: + devdir = listdir('/dev') + except OSError: + return -1 + for filename in devdir: + if filename.startswith(self.device): + numPart += 1 + + elif self.type == self.DEVTYPE_DEVFS: + try: + idedir = listdir(self.dev_path) + except OSError: + return -1 + for filename in idedir: + if filename.startswith("disc"): + numPart += 1 + if filename.startswith("part"): + numPart += 1 return numPart def unmount(self): - cmd = "/bin/umount " + self.devidex + "part*" + try: + mounts = open("/proc/mounts") + except IOError: + return -1 + + lines = mounts.readlines() + mounts.close() + + cmd = "/bin/umount" + + for line in lines: + parts = line.strip().split(" ") + if path.realpath(parts[0]).startswith(self.dev_path): + cmd = ' ' . join([cmd, parts[1]]) + res = system(cmd) return (res >> 8) def createPartition(self): - cmd = "/sbin/sfdisk -f " + self.devidex + "disc" - sfdisk = popen(cmd, "w") - sfdisk.write("0,\n;\n;\n;\ny\n") - sfdisk.close() - return 0 + cmd = 'printf "0,\n;\n;\n;\ny\n" | /sbin/sfdisk -f ' + self.disk_path + res = system(cmd) + return (res >> 8) 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 -O dir_index " + self.partitionPath("1") res = system(cmd) return (res >> 8) def mount(self): - cmd = "/bin/mount -t ext3 " + self.devidex + "part1 /hdd" - res = system(cmd) + try: + fstab = open("/etc/fstab") + except IOError: + return -1 + + lines = fstab.readlines() + fstab.close() + + res = -1 + for line in lines: + parts = line.strip().split(" ") + if path.realpath(parts[0]) == self.partitionPath("1"): + cmd = "/bin/mount -t ext3 " + parts[0] + res = system(cmd) + break + 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.partitionPath("1") + res = system(cmd) + return (res >> 8) + + def killPartition(self, n): + part = self.partitionPath(n) + + if access(part, 0): + cmd = '/bin/dd bs=512 count=3 if=/dev/zero of=' + part + res = system(cmd) + else: + res = 0 + 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() + # Udev tries to mount the partition immediately if there is an + # old filesystem on it when fdisk reloads the partition table. + # To prevent that, we overwrite the first 3 sectors of the + # partition, if the partition existed before. That's enough for + # ext3 at least. + self.killPartition("1") + if self.createPartition() != 0: return -1 @@ -145,27 +256,107 @@ 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 + + if self.mount() != 0: + return -3 + + return 0 - line = mediafile.readline() - mediafile.close() - - if line.startswith("disk"): - return 1 - - return -1 + def getDeviceDir(self): + return self.dev_path + + def getDeviceName(self): + return self.disk_path + + # the HDD idle poll daemon. + # as some harddrives have a buggy standby timer, we are doing this by hand here. + # first, we disable the hardware timer. then, we check every now and then if + # any access has been made to the disc. If there has been no access over a specifed time, + # we set the hdd into standby. + def readStats(self): + try: + l = open("/sys/block/%s/stat" % self.device).read() + except IOError: + return -1,-1 + (nr_read, _, _, _, nr_write) = l.split()[:5] + return int(nr_read), int(nr_write) + + def startIdle(self): + self.last_access = time.time() + self.last_stat = 0 + self.is_sleeping = False + from enigma import eTimer + + # disable HDD standby timer + Console().ePopen(("hdparm", "hdparm", "-S0", self.disk_path)) + self.timer = eTimer() + self.timer.callback.append(self.runIdle) + self.idle_running = True + self.setIdleTime(self.max_idle_time) # kick the idle polling loop + + def runIdle(self): + if not self.max_idle_time: + return + t = time.time() + + idle_time = t - self.last_access + + stats = self.readStats() + print "nr_read", stats[0], "nr_write", stats[1] + l = sum(stats) + print "sum", l, "prev_sum", self.last_stat + + if l != self.last_stat and l >= 0: # access + print "hdd was accessed since previous check!" + self.last_stat = l + self.last_access = t + idle_time = 0 + self.is_sleeping = False + else: + print "hdd IDLE!" + + print "[IDLE]", idle_time, self.max_idle_time, self.is_sleeping + if idle_time >= self.max_idle_time and not self.is_sleeping: + self.setSleep() + self.is_sleeping = True + + def setSleep(self): + Console().ePopen(("hdparm", "hdparm", "-y", self.disk_path)) + + def setIdleTime(self, idle): + self.max_idle_time = idle + if self.idle_running: + if not idle: + self.timer.stop() + else: + self.timer.start(idle * 100, False) # poll 10 times per period. + + def isSleeping(self): + return self.is_sleeping class Partition: - def __init__(self, mountpoint, description = ""): + def __init__(self, mountpoint, device = None, 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. + self.device = device def stat(self): return statvfs(self.mountpoint) @@ -176,7 +367,7 @@ class Partition: return s.f_bavail * s.f_bsize except OSError: return None - + def total(self): try: s = self.stat() @@ -187,32 +378,63 @@ class Partition: def mounted(self): # THANK YOU PYTHON FOR STRIPPING AWAY f_fsid. # TODO: can os.path.ismount be used? - procfile = tryOpen("/proc/mounts") - for n in procfile.readlines(): - if n.split(' ')[1] == self.mountpoint: + if self.force_mounted: + return True + + try: + mounts = open("/proc/mounts") + except IOError: + return False + + lines = mounts.readlines() + mounts.close() + + for line in lines: + if line.split(' ')[1] == self.mountpoint: return True return False +DEVICEDB = \ + {"dm8000": + { + # dm8000: + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot", + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot", + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot", + "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0": "DVD Drive", + }, + "dm800": + { + # dm800: + "/devices/platform/brcm-ehci.0/usb1/1-2/1-2:1.0": "Upper USB Slot", + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1:1.0": "Lower USB Slot", + }, + "dm7025": + { + # dm7025: + "/devices/pci0000:00/0000:00:14.1/ide1/1.0": "CF Card Slot", #hdc + "/devices/pci0000:00/0000:00:14.1/ide0/0.0": "Internal Harddisk" + } + } + class HarddiskManager: def __init__(self): - hddNum = 0 self.hdd = [ ] - + self.cd = "" 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 - # external tools, everything is fine (until somebody inserts + # external tools, everything is fine (until somebody inserts # a second usb stick.) p = [ - ("/media/hdd", _("Harddisk")), - ("/media/card", _("Card")), + ("/media/hdd", _("Harddisk")), + ("/media/card", _("Card")), ("/media/cf", _("Compact Flash")), ("/media/mmc1", _("MMC Card")), ("/media/net", _("Network Mount")), @@ -220,9 +442,111 @@ class HarddiskManager: ("/media/usb", _("USB Stick")), ("/", _("Internal Flash")) ] - - for x in p: - self.partitions.append(Partition(mountpoint = x[0], description = x[1])) + + self.partitions.extend([ Partition(mountpoint = x[0], description = x[1]) for x in p ]) + + def getBlockDevInfo(self, blockdev): + devpath = "/sys/block/" + blockdev + error = False + removable = False + blacklisted = False + is_cdrom = False + partitions = [] + try: + removable = bool(int(readFile(devpath + "/removable"))) + dev = int(readFile(devpath + "/dev").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 = readFile("/proc/ide/%s/media" % blockdev) + if "cdrom" in media: + 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) + else: + self.cd = blockdev + except IOError: + error = True + # check for medium + medium_found = True + try: + open("/dev/" + blockdev).close() + except IOError, err: + if err.errno == 159: # no medium present + medium_found = False + + return error, blacklisted, removable, is_cdrom, partitions, medium_found + + def enumerateBlockDevices(self): + print "enumerating block devices..." + for blockdev in listdir("/sys/block"): + error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(blockdev) + print "found block device '%s':" % blockdev, + if error: + print "error querying properties" + elif blacklisted: + print "blacklisted" + elif not medium_found: + print "no medium" + else: + print "ok, removable=%s, cdrom=%s, partitions=%s, device=%s" % (removable, is_cdrom, partitions, blockdev) + + self.addHotplugPartition(blockdev) + for part in partitions: + self.addHotplugPartition(part) + + def getAutofsMountpoint(self, device): + return "/autofs/%s/" % (device) + + def addHotplugPartition(self, device, physdev = None): + if not physdev: + dev, part = self.splitDeviceName(device) + try: + physdev = path.realpath('/sys/block/' + dev + '/device')[4:] + except OSError: + physdev = dev + print "couldn't determine blockdev physdev for device", device + + # device is the device name, without /dev + # physdev is the physical device path, which we (might) use to determine the userfriendly name + description = self.getUserfriendlyDeviceName(device, physdev) + + p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True, device = device) + self.partitions.append(p) + self.on_partition_list_change("add", p) + + # see if this is a harddrive + l = len(device) + if l and not device[l-1].isdigit(): + error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(device) + if not blacklisted and not removable and not is_cdrom and medium_found: + self.hdd.append(Harddisk(device)) + self.hdd.sort() + SystemInfo["Harddisk"] = 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 not device[l-1].isdigit(): + for hdd in self.hdd: + if hdd.device == device: + hdd.stop() + self.hdd.remove(hdd) + break + SystemInfo["Harddisk"] = len(self.hdd) > 0 def HDDCount(self): return len(self.hdd) @@ -230,17 +554,67 @@ class HarddiskManager: 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 getCD(self): + return self.cd + + def getMountedPartitions(self, onlyhotplug = False): + parts = [x for x in self.partitions if (x.is_hotplug or not onlyhotplug) and x.mounted()] + devs = set([x.device for x in parts]) + for devname in devs.copy(): + if not devname: + continue + dev, part = self.splitDeviceName(devname) + if part and dev in devs: # if this is a partition and we still have the wholedisk, remove wholedisk + devs.remove(dev) + + # return all devices which are not removed due to being a wholedisk when a partition exists + return [x for x in parts if not x.device or x.device in devs] + + def splitDeviceName(self, devname): + # this works for: sdaX, hdaX, sr0 (which is in fact dev="sr0", part=""). It doesn't work for other names like mtdblock3, but they are blacklisted anyway. + dev = devname[:3] + part = devname[3:] + for p in part: + if not p.isdigit(): + return devname, 0 + return dev, part and int(part) or 0 + + def getUserfriendlyDeviceName(self, dev, phys): + dev, part = self.splitDeviceName(dev) + description = "External Storage %s" % dev + try: + description = readFile("/sys" + phys + "/model") + except IOError, s: + print "couldn't read model: ", s + from Tools.HardwareInfo import HardwareInfo + for physdevprefix, pdescription in DEVICEDB.get(HardwareInfo().device_name,{}).items(): + if phys.startswith(physdevprefix): + description = pdescription + + # not wholedisk and not partition 1 + if part and part != 1: + description += " (Partition %d)" % part + return description + + def addMountedPartition(self, device, desc): + already_mounted = False + for x in self.partitions[:]: + if x.mountpoint == device: + already_mounted = True + if not already_mounted: + self.partitions.append(Partition(mountpoint = device, description = desc)) + + def removeMountedPartition(self, mountpoint): + for x in self.partitions[:]: + if x.mountpoint == mountpoint: + self.partitions.remove(x) + self.on_partition_list_change("remove", x) harddiskmanager = HarddiskManager()