X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/57534d26a3ec9cc77ab3eedc5ad393897e4dee95..842dabf727814691bfd949ac4d910ce04c32b887:/mytest.py

diff --git a/mytest.py b/mytest.py
index 91cb9f95..9dba16ea 100644
--- a/mytest.py
+++ b/mytest.py
@@ -17,30 +17,32 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
-from Tools.Directories import InitFallbackFiles
+from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS
 InitFallbackFiles()
 eDVBDB.getInstance().reloadBouquets()
 
 try:
-	from twisted.internet import e2reactor
+	import e2reactor
 	e2reactor.install()
 	
 	from twisted.internet import reactor
 	
 	def runReactor():
 		reactor.run()
-except:
+except ImportError:
+	print "twisted not available"
 	def runReactor():
 		runMainloop()
 
 # initialize autorun plugins and plugin menu entries
 from Components.PluginComponent import plugins
-plugins.readPluginList()
+plugins.readPluginList(resolveFilename(SCOPE_PLUGINS))
 
 from Screens.Wizard import wizardManager
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
+from Plugins.Plugin import PluginDescriptor
 
 had = dict()
 
@@ -118,22 +120,22 @@ class Session:
 		self.currentDialog.execEnd()
 		self.currentDialog.hide()
 	
-	def create(self, screen, arguments):
+	def create(self, screen, arguments, **kwargs):
 		# creates an instance of 'screen' (which is a class)
 		try:
-			return screen(self, *arguments)
+			return screen(self, *arguments, **kwargs)
 		except:
-			errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), sys.exc_info()[0])
+			errstr = "Screen %s(%s, %s): %s" % (str(screen), str(arguments), str(kwargs), sys.exc_info()[0])
 			print errstr
 			traceback.print_exc(file=sys.stdout)
 			quitMainloop(5)
 			
 	
-	def instantiateDialog(self, screen, *arguments):
+	def instantiateDialog(self, screen, *arguments, **kwargs):
 		# create dialog
 		
 		try:
-			dlg = self.create(screen, arguments)
+			dlg = self.create(screen, arguments, **kwargs)
 		except:
 			print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
 			print '-'*60
@@ -182,13 +184,13 @@ class Session:
 		self.currentDialog.callback = None # would cause re-entrancy problems.
 		self.execBegin()
 
-	def openWithCallback(self, callback, screen, *arguments):
-		dlg = self.open(screen, *arguments)
+	def openWithCallback(self, callback, screen, *arguments, **kwargs):
+		dlg = self.open(screen, *arguments, **kwargs)
 		dlg.callback = callback
 
-	def open(self, screen, *arguments):
+	def open(self, screen, *arguments, **kwargs):
 		self.pushCurrent()
-		dlg = self.currentDialog = self.instantiateDialog(screen, *arguments)
+		dlg = self.currentDialog = self.instantiateDialog(screen, *arguments, **kwargs)
 		dlg.isTmp = True
 		dlg.callback = None
 		self.execBegin()
@@ -269,12 +271,19 @@ def runScreenTest():
 	
 	session.nav = Navigation()
 	
-	screensToRun = wizardManager.getWizards()
+	screensToRun = [ ]
+	
+	for p in plugins.getPlugins(PluginDescriptor.WHERE_WIZARD):
+		screensToRun.append(p.__call__)
+	
+	screensToRun += wizardManager.getWizards()
+	
 	screensToRun.append(Screens.InfoBar.InfoBar)
 
 	def runNextScreen(session, screensToRun, *result):
 		if result:
-			quitMainloop(result)
+			quitMainloop(*result)
+			return
 	
 		screen = screensToRun[0]