fsck_mainmenu by Moritz Venn

1 files changed, 57 insertions, 15 deletions

diff --git a/lib/python/Screens/HarddiskSetup.py b/lib/python/Screens/HarddiskSetup.py
index a6e14cb8..1578fae1 100644
--- a/lib/python/Screens/HarddiskSetup.py
+++ b/lib/python/Screens/HarddiskSetup.py
@@ -13,24 +13,47 @@ class HarddiskWait(Screen):
 		result = self.hdd.initialize()
 		self.close(result)
 
-	def __init__(self, session, hdd):
+	def doCheck(self):
+		self.timer.stop()
+		result = self.hdd.check()
+		self.close(result)
+
+	def __init__(self, session, hdd, type):
 		Screen.__init__(self, session)
 		self.hdd = hdd
-		self["wait"] = Label(_("Initializing Harddisk..."));
 		self.timer = eTimer()
-		self.timer.timeout.get().append(self.doInit)
+		if type == HarddiskSetup.HARDDISK_INITIALIZE:
+			text = _("Initializing Harddisk...")
+			self.timer.timeout.get().append(self.doInit)
+		else:
+			text = _("Checking Filesystem...")
+			self.timer.timeout.get().append(self.doCheck)
+		self["wait"] = Label(text)
 		self.timer.start(100)
 
 class HarddiskSetup(Screen):
-	def __init__(self, session, hdd):
+	HARDDISK_INITIALIZE = 1
+	HARDDISK_CHECK = 2
+
+	def __init__(self, session, hdd, type = None):
 		Screen.__init__(self, session)
 		self.hdd = hdd
-		
+
+		if type not in [self.HARDDISK_INITIALIZE, self.HARDDISK_CHECK]:
+			self.type = self.HARDDISK_INITIALIZE
+		else:
+			self.type = type
+
 		self["model"] = Label(_("Model: ") + hdd.model())
 		self["capacity"] = Label(_("Capacity: ") + hdd.capacity())
 		self["bus"] = Label(_("Bus: ") + hdd.bus())
 		self["initialize"] = Pixmap()
-		self["initializetext"] = Label(_("Initialize"))
+
+		if self.type == self.HARDDISK_INITIALIZE:
+			text = _("Initialize")
+		else:
+			text = _("Check")
+		self["initializetext"] = Label(text)
 
 		self["actions"] = ActionMap(["OkCancelActions"],
 		{
@@ -40,26 +63,34 @@ class HarddiskSetup(Screen):
 		
 		self["shortcuts"] = ActionMap(["ShortcutActions"],
 		{
-			"red": self.hddInitialize
+			"red": self.hddQuestion
 		})
 
 	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]), MessageBox.TYPE_ERROR)
+			if self.type == self.HARDDISK_INITIALIZE:
+				message = _("Unable to initialize harddisk.\nError: ")
+			else:
+				message = _("Unable to complete filesystem check.\nError: ")
+			self.session.open(MessageBox, message + str(self.hdd.errorList[0 - result]), MessageBox.TYPE_ERROR)
 		else:
 			self.close()
 
-	def hddInitialize(self):
-		self.session.openWithCallback(self.hddInitConfirmed, MessageBox, _("Do you really want to initialize the harddisk?\nAll data on the disk will be lost!"))
+	def hddQuestion(self):
+		if self.type == self.HARDDISK_INITIALIZE:
+			message = _("Do you really want to initialize the harddisk?\nAll data on the disk will be lost!")
+		else:
+			message = _("Do you really want to check the filesystem?\nThis could take lots of time!")
+		self.session.openWithCallback(self.hddConfirmed, MessageBox, message)
 
-	def hddInitConfirmed(self, confirmed):
+	def hddConfirmed(self, confirmed):
 		if not confirmed:
 			return
 
-		print "this will start the initialize now!"
-		self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd)
-			
+		print "this will start either the initialize or the fsck now!"
+		self.session.openWithCallback(self.hddReady, HarddiskWait, self.hdd, self.type)
+
 class HarddiskSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
@@ -80,4 +111,15 @@ class HarddiskSelection(Screen):
 	def okbuttonClick(self):
 		selection = self["hddlist"].getCurrent()
 		if selection[1] != 0:
-			self.session.open(HarddiskSetup, selection[1])
+			self.session.open(HarddiskSetup, selection[1], HarddiskSetup.HARDDISK_INITIALIZE)
+
+# This is actually just HarddiskSelection but with correct type
+class HarddiskFsckSelection(HarddiskSelection):
+	def __init__(self, session):
+		HarddiskSelection.__init__(self, session)
+		self.skinName = "HarddiskSelection"
+
+	def okbuttonClick(self):
+		selection = self["hddlist"].getCurrent()
+		if selection[1] != 0:
+			self.session.open(HarddiskSetup, selection[1], HarddiskSetup.HARDDISK_CHECK)