X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0ccffb6b503d7a285f3d5f7d7e44999d6eb60784..da1955116b7e8b8c203e27c7e5994537219a0632:/lib/python/Components/Harddisk.py?ds=sidebyside

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 7ba468e9..3e72122e 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,6 +1,9 @@
-from os import system, listdir, statvfs, popen
+from os import system, listdir, statvfs, popen, makedirs
 
 from Tools.Directories import SCOPE_HDD, resolveFilename
+from Tools.CList import CList
+
+from SystemInfo import SystemInfo
 
 def tryOpen(filename):
 	try:
@@ -16,8 +19,8 @@ class Harddisk:
 	def __init__(self, index):
 		self.index = index
 
-		host = self.index / 4
-		bus = (self.index & 2)
+		host = (self.index & 2) >> 1
+		bus = 0
 		target = (self.index & 1)
 
 		self.prochdx = num2prochdx(index)
@@ -104,7 +107,20 @@ class Harddisk:
 		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)
 
@@ -121,15 +137,25 @@ class Harddisk:
 		return (res >> 8)
 
 	def mount(self):
-		cmd = "/bin/mount -t ext3 " + self.devidex + "part1 /hdd"
+		cmd = "/bin/mount -t ext3 " + self.devidex + "part1"
 		res = system(cmd)
 		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.devidex + "part1"
+		res = system(cmd)
 		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()
@@ -143,11 +169,31 @@ class Harddisk:
 		if self.mount() != 0:
 			return -3
 
-		if self.createMovieFolder() != 0:
+		#only create a movie folder on the internal hdd
+		if not self.index & 2 and self.createMovieFolder() != 0:
 			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")
 
@@ -163,9 +209,10 @@ def existHDD(num):
 	return -1
 
 class Partition:
-	def __init__(self, mountpoint, description = ""):
+	def __init__(self, mountpoint, description = "", force_mounted = False):
 		self.mountpoint = mountpoint
 		self.description = description
+		self.force_mounted = force_mounted
 
 	def stat(self):
 		return statvfs(self.mountpoint)
@@ -186,6 +233,9 @@ class Partition:
 
 	def mounted(self):
 		# THANK YOU PYTHON FOR STRIPPING AWAY f_fsid.
+		# TODO: can os.path.ismount be used?
+		if self.force_mounted:
+			return True
 		procfile = tryOpen("/proc/mounts")
 		for n in procfile.readlines():
 			if n.split(' ')[1] == self.mountpoint:
@@ -199,11 +249,15 @@ class HarddiskManager:
 		
 		self.partitions = [ ]
 		
+		self.on_partition_list_change = CList()
+		
 		for hddNum in range(8):
 			if existHDD(hddNum):
 				hdd = Harddisk(hddNum)
 				self.hdd.append(hdd)
 
+		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
@@ -223,6 +277,21 @@ class HarddiskManager:
 		for x in p:
 			self.partitions.append(Partition(mountpoint = x[0], description = x[1]))
 
+	def getAutofsMountpoint(self, device):
+		return "/autofs/%s/" % (device)
+
+	def addHotplugPartition(self, device, description):
+		p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True)
+		self.partitions.append(p)
+		self.on_partition_list_change("add", p)
+
+	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)
+
 	def HDDCount(self):
 		return len(self.hdd)