X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/225bfe06cafe9cf403adf631731f5ae6574565e2..d6e5c101451d5528f7978a17043f553d951f45ef:/lib/python/Components/Harddisk.py diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py old mode 100644 new mode 100755 index 1fc629a0..6148caac --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -2,7 +2,7 @@ from os import system, listdir, statvfs, popen, makedirs, readlink, stat, major, from Tools.Directories import SCOPE_HDD, resolveFilename from Tools.CList import CList from SystemInfo import SystemInfo -import string, time +import time from Components.Console import Console def tryOpen(filename): @@ -21,6 +21,7 @@ class Harddisk: s_minor = int(tmp[1]) self.max_idle_time = 0 self.idle_running = False + self.timer = None for disc in listdir("/dev/discs"): path = readlink('/dev/discs/'+disc) devidex = '/dev/discs/'+disc+'/' @@ -37,9 +38,14 @@ class Harddisk: def __lt__(self, ob): return self.device < ob.device + def stop(self): + if self.timer: + self.timer.stop() + self.timer.callback.remove(self.runIdle) + def bus(self): - ide_cf = self.device.find("hd") == 0 and self.devidex2.find("host0") == -1 # 7025 specific - internal = self.device.find("hd") == 0 + ide_cf = self.device[:2] == "hd" and "host0" not in self.devidex2 # 7025 specific + internal = self.device[:2] == "hd" if ide_cf: ret = "External (CF)" elif internal: @@ -64,17 +70,17 @@ class Harddisk: cap = self.diskSize() if cap == 0: return "" - return "%d.%03d GB" % (cap/1024, cap%1024) + return "%d.%03d GB" % (cap/1000, cap%1000) def model(self): - if self.device.find("hd") == 0: + if self.device[:2] == "hd": procfile = tryOpen("/proc/ide/"+self.device+"/model") if procfile == "": return "" line = procfile.readline() procfile.close() return line.strip() - elif self.device.find("sd") == 0: + elif self.device[:2] == "sd": procfile = tryOpen("/sys/block/"+self.device+"/device/vendor") if procfile == "": return "" @@ -97,7 +103,7 @@ class Harddisk: line = procfile.readline() if line == "": break - if line.startswith(self.devidex): + if line.startswith(self.devidex) or line.startswith(self.devidex2): parts = line.strip().split(" ") try: stat = statvfs(parts[1]) @@ -130,7 +136,7 @@ class Harddisk: cmd = "/bin/umount" for line in procfile: - if line.startswith(self.devidex): + if line.startswith(self.devidex) or line.startswith(self.devidex2): parts = line.split() cmd = ' '.join([cmd, parts[1]]) @@ -150,14 +156,20 @@ class Harddisk: cmd = "/sbin/mkfs.ext3 " if self.diskSize() > 4 * 1024: cmd += "-T largefile " - cmd += "-m0 " + self.devidex + "part1" + cmd += "-m0 -O dir_index " + self.devidex + "part1" res = system(cmd) return (res >> 8) def mount(self): - cmd = "/bin/mount -t ext3 " + self.devidex + "part1" - res = system(cmd) - return (res >> 8) + res = -1 + #we don't know which type of devicename is used in fstab, try both + for device in [self.devidex, self.devidex2]: + cmd = "/bin/mount -t ext3 " + device + "part1" + res = system(cmd) + res >>= 8 + if not res: + break + return res def createMovieFolder(self): try: @@ -224,9 +236,8 @@ class Harddisk: # we set the hdd into standby. def readStats(self): l = open("/sys/block/%s/stat" % self.device).read() - nr_read = int(l[:8].strip()) - nr_write = int(l[4*9:4*9+8].strip()) - return nr_read, nr_write + (nr_read, _, _, _, nr_write) = l.split()[:5] + return int(nr_read), int(nr_write) def startIdle(self): self.last_access = time.time() @@ -248,15 +259,21 @@ class Harddisk: idle_time = t - self.last_access - l = sum(self.readStats()) + 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: # access + print "hdd was accessed since previous check!" self.last_stat = l self.last_access = t - self.idle_time = 0 + idle_time = 0 self.is_sleeping = False + else: + print "hdd IDLE!" - #print "[IDLE]", idle_time, self.max_idle_time, self.is_sleeping + 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 @@ -270,7 +287,7 @@ class Harddisk: if not idle: self.timer.stop() else: - self.timer.start(idle * 250, False) # poll 4 times per period. + self.timer.start(idle * 100, False) # poll 10 times per period. def isSleeping(self): return self.is_sleeping @@ -346,8 +363,7 @@ class HarddiskManager: ("/", _("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 @@ -359,14 +375,14 @@ class HarddiskManager: try: removable = bool(int(open(devpath + "/removable").read())) dev = int(open(devpath + "/dev").read().split(':')[0]) - if dev in [7, 31]: # loop, mtdblock + 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: + if "cdrom" in media: is_cdrom = True except IOError: error = True @@ -430,7 +446,7 @@ class HarddiskManager: # see if this is a harddrive l = len(device) - if l and device[l-1] not in string.digits: + 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)) @@ -444,11 +460,11 @@ class HarddiskManager: self.partitions.remove(x) self.on_partition_list_change("remove", x) l = len(device) - if l and device[l-1] not in string.digits: - idx = 0 + if l and not device[l-1].isdigit(): for hdd in self.hdd: if hdd.device == device: - del self.hdd[idx] + hdd.stop() + self.hdd.remove(hdd) break SystemInfo["Harddisk"] = len(self.hdd) > 0 @@ -486,7 +502,7 @@ class HarddiskManager: dev = devname[:3] part = devname[3:] for p in part: - if p not in string.digits: + if not p.isdigit(): return devname, 0 return dev, part and int(part) or 0 @@ -506,4 +522,18 @@ class HarddiskManager: 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()