add a tuxbox plugins plugin to prepare loading of tuxbox plugins when the c++ part...

[enigma2.git] / lib / python / Components / PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 172e33e32e60732ae65495ed9d0e0fe3cb86a622..960043d68d98c624d6aacc626670032e94ee182a 100644 (file)
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -20,32 +20,38 @@ class PluginComponent:
 
                for x in dir:
                        path = resolveFilename(SCOPE_PLUGINS, x) + "/"
 
                for x in dir:
                        path = resolveFilename(SCOPE_PLUGINS, x) + "/"

-                       #try:
-                       if os.path.exists(path):
-                               if fileExists(path + "plugin.py"):
-                                       pluginmodule = self.prefix + x + ".plugin"
-                                       print "trying to import " + pluginmodule
-                                       exec "import " + pluginmodule
-                                       plugin = eval(pluginmodule)
-                                       picturepaths = plugin.getPicturePaths()
-                                       plugins = plugin.getPlugins()
-                                       try:
-                                               for menuEntry in plugin.getMenuRegistrationList():
-                                                       self.menuEntries.append([menuEntry, pluginmodule])
-                                       except:
-                                               pass
-
-                                       for y in range(len(plugins)):
-                                               list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2]))
-                                       if runAutostartPlugins:
-                                               try: plugin.autostart()
-                                               except: pass
-                                       if runAutoendPlugins:
-                                               try: plugin.autoend()
-                                               except: pass
-                                                       
-                       #except:
-                       #       print "Directory", path, "contains a faulty plugin"
+                       try:
+                               if os.path.exists(path):
+                                       if fileExists(path + "plugin.py"):
+                                               pluginmodule = self.prefix + x + ".plugin"
+                                               print "trying to import " + pluginmodule
+                                               exec "import " + pluginmodule
+                                               plugin = eval(pluginmodule)
+                                               plugins = plugin.getPlugins()
+                                               try: picturepaths = plugin.getPicturePaths()
+                                               except:
+                                                       picturepaths = []
+                                                       for p in plugins:
+                                                               picturepaths.append("")
+                                               try:
+                                                       for menuEntry in plugin.getMenuRegistrationList():
+                                                               self.menuEntries.append([menuEntry, pluginmodule])
+                                               except:
+                                                       pass
+       
+                                               for y in range(len(plugins)):
+                                                       if len(plugins[y]) < 4:
+                                                               list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2], None))
+                                                       else:
+                                                               list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2], plugins[y][3]))
+                                               if runAutostartPlugins:
+                                                       try: plugin.autostart()
+                                                       except: pass
+                                               if runAutoendPlugins:
+                                                       try: plugin.autoend()
+                                                       except: pass
+                       except:
+                               print "Directory", path, "contains a faulty plugin"

                self.menuUpdate()
                return list
        
                self.menuUpdate()
                return list
        


@@ -58,14 +64,13 @@ class PluginComponent:
                        menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
        
        def runPlugin(self, plugin, session):
                        menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
        
        def runPlugin(self, plugin, session):

-               #try:
+               try:

                        exec("import " + self.prefix + plugin[2] + ".plugin")
                        exec("import " + self.prefix + plugin[2] + ".plugin")

-                       print self.prefix + plugin[2] + ".plugin." + plugin[4]

                        if plugin[3] == "screen":
                        if plugin[3] == "screen":

-                               session.open(eval(self.prefix + plugin[2] + ".plugin." + plugin[4]))
+                               session.open(eval(self.prefix + plugin[2] + ".plugin." + plugin[4]), plugin[5])

                        elif plugin[3] == "function":
                        elif plugin[3] == "function":

-                               eval(self.prefix + plugin[2] + ".plugin." + plugin[4])(session)
-               #except:
-                       #print "exec of plugin failed!"
+                               eval(self.prefix + plugin[2] + ".plugin." + plugin[4])(session, plugin[5])
+               except:
+                       print "exec of plugin failed!"

 
 plugins = PluginComponent()
 
 plugins = PluginComponent()