X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2c46a6c23b8612611143791cb217a4c58a846ff3..ab927305ad491e1e556932fb947836986457a636:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index dcf76570..133e063f 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -25,11 +25,17 @@ class Harddisk:
 		return self.index
 
 	def bus(self):
-		#TODO: add the host
+		ret = ""
+
+		if self.index & 2:
+			ret = "External (CF) - "
+		else:
+			ret = "Internal - "
+		
 		if self.index & 1:
-			return "Slave"
+			return ret + "Slave"
 		else:
-			return "Master"
+			return ret + "Master"
 
 	def capacity(self):
 		procfile = tryOpen(self.prochdx + "capacity")
@@ -97,7 +103,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"
@@ -117,11 +124,14 @@ class Harddisk:
 		return (res >> 8)
 
 	def createMovieFolder(self):
-		res = os.system("mkdir /hdd/movie")
+		res = os.system("mkdir /hdd/movies")
 		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()
+		if self.unmount() != 0:
+			return -5
 
 		if self.createPartition() != 0:
 			return -1
@@ -163,6 +173,12 @@ 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: