X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f51fb455f939496048538044c1597f2a8e14edba..01f6932815a6a21ab46bb420be093685378b43dd:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 3c242510..37e957e4 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -1,5 +1,7 @@
 import os
 
+from Tools.Directories import *
+
 def tryOpen(filename):
 	try:
 		procFile = open(filename)
@@ -21,11 +23,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 +51,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")
 		
@@ -85,7 +105,8 @@ class Harddisk:
 
 	def unmount(self):
 		cmd = "/bin/umount " + self.devidex + "part*"
-		os.system(cmd)
+		res = os.system(cmd)
+		return (res >> 8)
 
 	def createPartition(self):
 		cmd = "/sbin/sfdisk -f " + self.devidex + "disc"
@@ -105,9 +126,11 @@ class Harddisk:
 		return (res >> 8)
 
 	def createMovieFolder(self):
-		res = os.system("mkdir /hdd/movie")
+		res = os.system("mkdir " + resolveFilename(SCOPE_HDD))
 		return (res >> 8)
 		
+	errorList = [ _("Everything is fine"), _("Creating partition failed"), _("Mkfs failed"), _("Mount failed"), _("Create movie folder failed"), _("Unmount failed")]
+
 	def initialize(self):
 		self.unmount()
 
@@ -151,31 +174,24 @@ class HarddiskManager:
 			if hddNum > 8:
 				break
 
+	def HDDCount(self):
+		cnt = 0
+		for hd in self.hdd:
+			cnt = cnt + 1
+		return cnt	
+
 	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()