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
+ 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:
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 ""
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]])
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:
# 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()
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
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":
{
- # 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",
+ # 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:
("/", _("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
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
# 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:
- 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
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 = open("/sys" + phys + "/model").read().strip()
except IOError, s:
print "couldn't read model: ", s
- for physdevprefix, pdescription in DEVICEDB.items():
+ from Tools.HardwareInfo import HardwareInfo
+ for physdevprefix, pdescription in DEVICEDB.get(HardwareInfo().device_name,{}).items():
if phys.startswith(physdevprefix):
description = pdescription
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()
git.cweiske.de / enigma2.git / blobdiff