From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Tue, 29 Nov 2005 23:33:59 +0000 (+0000)
Subject: show error messages when hdd-init fails
X-Git-Tag: 2.6.0~4882
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/09bec48e92abda051445a3888767fff1081bbe22?hp=d290a6895aaba9660184b2ac9c1bb90d81ae494c

show error messages when hdd-init fails
---

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 09864fc9..133e063f 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -127,6 +127,8 @@ class Harddisk:
 		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):
 		if self.unmount() != 0:
 			return -5
diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index 3e90d4fb..1f936010 100644
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -9,8 +9,8 @@ from enigma import eTimer
 class HarddiskWait(Screen):
 	def doInit(self):
 		self.timer.stop()
-		self.hdd.initialize()
-		self.close()
+		result = self.hdd.initialize()
+		self.close(result)
 
 	def __init__(self, session, hdd):
 		Screen.__init__(self, session)
@@ -41,9 +41,13 @@ class HarddiskSetup(Screen):
 			"red": self.hddInitialize
 		})
 
-	def hddReady(self):
-		self.close()
-
+	def hddReady(self, result):
+		print "Result: " + str(result)
+		if (result != 0):
+			self.session.open(MessageBox, _("Unable to initialize harddisk.\nPlease refer to the user-manual.\nError: ") + str(self.hdd.errorList[0 - result]))
+		else:
+			self.close()
+			
 	def hddInitialize(self):
 		print "this will start the initialize now!"
 		self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)