fix cable and terrestrial scan

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 8ae28ab8917eeee14288e8275ea172cb8e09a295..4b6062aaf8a18a4d03ac4351b20eb546665224f5 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -17,7 +17,7 @@ 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()
 
@@ -29,19 +29,20 @@ try:
        
        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()
 
@@ -270,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]