X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/605ad52612d47d3ff18a4b045bc1ade29277722e..9f233a55dbc640a9dd8d1aa46c1291d28fdea3b4:/lib/python/Screens/DefaultWizard.py

diff --git a/lib/python/Screens/DefaultWizard.py b/lib/python/Screens/DefaultWizard.py
index 33a3d20e..9883dc8e 100644
--- a/lib/python/Screens/DefaultWizard.py
+++ b/lib/python/Screens/DefaultWizard.py
@@ -1,21 +1,19 @@
 from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
-from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION
+from Tools.Directories import pathExists, resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION
 
 from Components.Pixmap import Pixmap, MovingPixmap
 from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, getConfigListEntry
-from Components.DreamInfoHandler import DreamInfoHandler, InfoHandler, InfoHandlerParseError
+from Components.DreamInfoHandler import DreamInfoHandler
 from Components.PluginComponent import plugins
 from Plugins.Plugin import PluginDescriptor
-import os
+from os import system as os_system, path as os_path, mkdir
 
 config.misc.defaultchosen = ConfigBoolean(default = True)
 
-import xml.sax
-
 class DefaultWizard(WizardLanguage, DreamInfoHandler):
-	def __init__(self, session, silent = True):
-		DreamInfoHandler.__init__(self, self.statusCallback)
+	def __init__(self, session, silent = True, showSteps = False, neededTag = None):
+		DreamInfoHandler.__init__(self, self.statusCallback, neededTag = neededTag)
 		self.silent = silent
 		self.setDirectory()
         
@@ -27,7 +25,7 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler):
 		self["arrowup2"] = MovingPixmap()
 	
 	def setDirectory(self):
-		os.system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))
+		os_system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))
 		self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
 		self.xmlfile = "defaultwizard.xml"
         
@@ -57,16 +55,16 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler):
 	def selectionMade(self):
 		print "selection made"
 		#self.installPackage(int(index))
-		indexList = []
+		self.indexList = []
 		for x in range(len(self.packagesConfig)):
 			if self.packagesConfig[x].value:
-				indexList.append(x)
-		self.installPackages(indexList)
-		
+				self.indexList.append(x)
+
 class DreamPackageWizard(DefaultWizard):
 	def __init__(self, session, packagefile, silent = False):
-		os.system("mkdir /tmp/package")
-		os.system("tar xpzf %s -C /tmp/package" % packagefile)
+		if not pathExists("/tmp/package"):
+			mkdir("/tmp/package")
+		os_system("tar xpzf %s -C /tmp/package" % packagefile)
 		self.packagefile = packagefile
 		DefaultWizard.__init__(self, session, silent)
 		
@@ -86,13 +84,13 @@ class ImageDefaultInstaller(DreamInfoHandler):
 
 def install(choice):
 	if choice is not None:
-		#os.system("mkdir /tmp/package && tar xpzf %s ")
+		#os_system("mkdir /tmp/package && tar xpzf %s ")
 		choice[2].open(DreamPackageWizard, choice[1])
 
 def filescan_open(list, session, **kwargs):
 	from Screens.ChoiceBox import ChoiceBox
 	print "open default wizard"
-	filelist = [(os.path.split(x.path)[1], x.path, session) for x in list]
+	filelist = [(os_path.split(x.path)[1], x.path, session) for x in list]
 	print filelist
 	session.openWithCallback(install, ChoiceBox, title = _("Please choose he package..."), list=filelist)