X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1e8da5bf1b50c41eba7b5ec8c10be4762f46015d..ebb18fe31efe7c97288f815950020b3f2dd6af98:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 71c03836..a6389770 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -24,11 +24,24 @@ class Harddisk:
 	def getIndex(self):
 		return self.index
 
+	def bus(self):
+		ret = ""
+
+		if self.index & 2:
+			ret = "External (CF) - "
+		else:
+			ret = "Internal - "
+		
+		if self.index & 1:
+			return ret + "Slave"
+		else:
+			return ret + "Master"
+
 	def capacity(self):
 		procfile = tryOpen(self.prochdx + "capacity")
 		
 		if procfile == "":
-			return -1
+			return ""
 
 		line = procfile.readline()
 		procfile.close()
@@ -36,10 +49,12 @@ class Harddisk:
 		try:
 			cap = int(line)
 		except:
-			return -1
+			return ""
 		
-		return cap	
-						
+		cap = cap / 1000 * 512 / 1000
+		
+		return "%d.%03d GB" % (cap/1024, cap%1024)
+								
 	def model(self):
 		procfile = tryOpen(self.prochdx + "model")
 		
@@ -157,28 +172,15 @@ class HarddiskManager:
 	def HDDList(self):
 		list = [ ]
 		for hd in self.hdd:
-			cap = hd.capacity() / 1000 * 512 / 1000
-			print cap
 			hdd = hd.model() + " (" 
-			if hd.index & 1:
-				hdd += "slave"
-			else:	
-				hdd += "master"
-			if cap > 0:
-				hdd += ", %d.%03d GB" % (cap/1024, cap%1024)
+			hdd += hd.bus()
+			cap = hd.capacity()	
+			if cap != "":
+				hdd += ", " + cap
 			hdd += ")"
-
-			print hdd
-			
-#			if hd.index == 0:
-#				if hd.initialize() == 0:
-#					print "hdd status ok"
-#				else:
-#					print "hdd status ok"
-
 			list.append((hdd, hd))
-		return list
 
+		return list
 
 harddiskmanager = HarddiskManager()