from Tools.Directories import SCOPE_HDD, resolveFilename
from Tools.CList import CList
+from SystemInfo import SystemInfo
+
def tryOpen(filename):
try:
procFile = open(filename)
else:
return ret + "Master"
- def capacity(self):
+ def diskSize(self):
procfile = tryOpen(self.prochdx + "capacity")
-
+
if procfile == "":
- return ""
+ return 0
line = procfile.readline()
procfile.close()
-
+
try:
cap = int(line)
except:
+ return 0
+
+ return cap / 1000 * 512 / 1000
+
+ def capacity(self):
+ cap = self.diskSize()
+ if cap == 0:
return ""
- cap = cap / 1000 * 512 / 1000
-
return "%d.%03d GB" % (cap/1024, cap%1024)
-
+
def model(self):
procfile = tryOpen(self.prochdx + "model")
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)
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)
return -1
return 0
- errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
+ 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"), _("Fsck failed"), _("Please Reboot"), _("Filesystem contains uncorrectable errors"), _("Unmount failed")]
def initialize(self):
self.unmount()
return -4
return 0
-
+
+ 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
+
def existHDD(num):
mediafile = tryOpen(num2prochdx(num) + "media")
if mediafile == "":
- return -1
+ return False
line = mediafile.readline()
mediafile.close()
-
+
if line.startswith("disk"):
- return 1
-
- return -1
+ return True
+
+ return False
class Partition:
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 statvfs(self.mountpoint)
hdd = Harddisk(hddNum)
self.hdd.append(hdd)
+ self.enumerateBlockDevices()
+
+ SystemInfo["Harddisc"] = len(self.hdd) > 0
+
# 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
for x in p:
self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
+ def enumerateBlockDevices(self):
+ print "enumerating block devices..."
+ import os
+ for blockdev in os.listdir("/sys/block"):
+ 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 os.listdir(devpath):
+ if partition[0:len(blockdev)] != blockdev:
+ continue
+ partitions.append(partition)
+ except IOError:
+ error = True
+ 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" % (removable, is_cdrom, partitions)
+ self.addHotplugPartition(blockdev, blockdev)
+ for part in partitions:
+ self.addHotplugPartition(part, part)
+
def getAutofsMountpoint(self, device):
return "/autofs/%s/" % (device)
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()
git.cweiske.de / enigma2.git / blobdiff