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):
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+'/'
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
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])
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]])
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
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
# 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))
self.partitions.remove(x)
self.on_partition_list_change("remove", x)
l = len(device)
- if l and device[l-1] not in string.digits:
+ if l and not device[l-1].isdigit():
idx = 0
for hdd in self.hdd:
if hdd.device == device:
+ self.hdd[x].stop()
del self.hdd[idx]
break
SystemInfo["Harddisk"] = len(self.hdd) > 0
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
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()