X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c46312d7f5ce4113ece4c33595b7192eccadcb1d..89b408592c0f5756b0049a60832761646477cfa0:/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 d165e26c..ad6c1a3b
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -44,8 +44,8 @@ class Harddisk:
 			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:
@@ -73,14 +73,14 @@ class Harddisk:
 		return "%d.%03d GB" % (cap/1024, cap%1024)
 
 	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 ""
@@ -230,9 +230,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()
@@ -358,8 +357,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
@@ -371,14 +369,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
@@ -457,11 +455,10 @@ class HarddiskManager:
 				self.on_partition_list_change("remove", x)
 		l = len(device)
 		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]
+					hdd.stop()
+					self.hdd.remove(hdd)
 					break
 			SystemInfo["Harddisk"] = len(self.hdd) > 0
 
@@ -519,4 +516,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()