X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/015ca89d848532627b188ae7dcb1254d8d9cb584..27af195d31298de858014931bdbe06fee1d244e4:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 92d82073..5d049545 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -7,7 +7,7 @@ from Components.ActionMap import NumberActionMap, ActionMap
 from Components.ConfigList import ConfigListScreen
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.Label import Label
-from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR
+from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITION
 from Screens.MessageBox import MessageBox
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, \
 	eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, \
@@ -282,10 +282,23 @@ class CableTransponderSearchSupport:
 class DefaultSatLists(DefaultWizard):
 	def __init__(self, session, silent = True, showSteps = False):
 		DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
+		print "configuredSats:", nimmanager.getConfiguredSats()
 
 	def setDirectory(self):
-		self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
-		self.xmlfile = "defaultsatlists.xml"		
+		self.directory = []
+		self.directory.append(resolveFilename(SCOPE_DEFAULTDIR))
+		import os
+		os.system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))
+		self.directory.append(resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR))
+		self.xmlfile = "defaultsatlists.xml"
+		
+	def statusCallback(self, status, progress):
+		print "statusCallback:", status, progress
+		from Components.DreamInfoHandler import DreamInfoHandler
+		if status == DreamInfoHandler.STATUS_DONE:
+			self["text"].setText(_("The installation of the default services lists is finished."))
+			self.markDone()
+			self.disableKeys = False	
 
 class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 	def __init__(self, session):