X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b5eaeb4432e0b881f3348a8abd2cb1c5f6b082ce..cf3e9383de633c9305a950ba5896376b14e43e12:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 6283f51c..a6389770 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -21,11 +21,27 @@ class Harddisk:
 		self.prochdx = num2prochdx(index)
 		self.devidex = "/dev/ide/host%d/bus%d/target%d/lun0/" % (host, bus, target)
 
+	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()
@@ -33,10 +49,12 @@ class Harddisk:
 		try:
 			cap = int(line)
 		except:
-			return -1
+			return ""
+		
+		cap = cap / 1000 * 512 / 1000
 		
-		return cap	
-						
+		return "%d.%03d GB" % (cap/1024, cap%1024)
+								
 	def model(self):
 		procfile = tryOpen(self.prochdx + "model")
 		
@@ -150,27 +168,20 @@ class HarddiskManager:
 			
 			if hddNum > 8:
 				break
-		
+
 	def HDDList(self):
 		list = [ ]
 		for hd in self.hdd:
-			cap = hd.capacity() / 1000 * 512 / 1000
 			hdd = hd.model() + " (" 
-			if hd.index & 1:
-				hdd += "slave"
-			else:	
-				hdd += "master"
-			if cap > 0:
-				hdd += ", %d,%d 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
+
+harddiskmanager = HarddiskManager()
+
+