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

diff --git a/configure.ac b/configure.ac
index fc761e1..07e9cb7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ lib/python/Components/Makefile
 lib/python/Screens/Makefile
 lib/python/Plugins/Makefile
 lib/python/Plugins/update/Makefile
+lib/python/Plugins/tuxboxplugins/Makefile
 lib/python/Tools/Makefile
 lib/service/Makefile
 lib/components/Makefile

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 172e33e..960043d 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) + "/"
-                       #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
        
@@ -58,14 +64,13 @@ class PluginComponent:
                        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")
-                       print self.prefix + plugin[2] + ".plugin." + plugin[4]
                        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":
-                               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()

diff --git a/lib/python/Plugins/Makefile.am b/lib/python/Plugins/Makefile.am
index 21dcb9c..24ee23d 100644 (file)
--- a/lib/python/Plugins/Makefile.am
+++ b/lib/python/Plugins/Makefile.am
@@ -1,6 +1,6 @@
 installdir = $(LIBDIR)/enigma2/python/Plugins
 
-SUBDIRS = update
+SUBDIRS = update tuxboxplugins
 
 install_PYTHON =       \
        __init__.py

diff --git a/lib/python/Plugins/tuxboxplugins/Makefile.am b/lib/python/Plugins/tuxboxplugins/Makefile.am
new file mode 100644 (file)
index 0000000..055d9bd
--- /dev/null
+++ b/lib/python/Plugins/tuxboxplugins/Makefile.am
@@ -0,0 +1,7 @@
+installdir = $(LIBDIR)/enigma2/python/Plugins/tuxboxplugins
+
+install_PYTHON =       \
+       __init__.py \
+       plugin.py
+
+ 

diff --git a/lib/python/Plugins/tuxboxplugins/__init__.py b/lib/python/Plugins/tuxboxplugins/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/lib/python/Plugins/tuxboxplugins/plugin.py b/lib/python/Plugins/tuxboxplugins/plugin.py
new file mode 100644 (file)
index 0000000..1e8d52e
--- /dev/null
+++ b/lib/python/Plugins/tuxboxplugins/plugin.py
@@ -0,0 +1,14 @@
+from enigma import *
+from Screens.Screen import Screen
+from Screens.MessageBox import MessageBox
+from Components.ActionMap import ActionMap
+from Components.Label import Label
+
+import os
+
+def getPlugins():
+       return [("Tuxbox-Plugin1", "function", "main", 0),
+                       ("Tuxbox-Plugin2", "function", "main", 1)]
+
+def main(session, args):
+       print "Running plugin with number", args
\ No newline at end of file

diff --git a/lib/python/Plugins/update/plugin.py b/lib/python/Plugins/update/plugin.py
index 79f6749..8fa21cb 100644 (file)
--- a/lib/python/Plugins/update/plugin.py
+++ b/lib/python/Plugins/update/plugin.py
@@ -12,7 +12,7 @@ class Example(Screen):
                        <widget name="text" position="0,0" size="550,400" font="Regular;15" />
                </screen>"""
                
-       def __init__(self, session):
+       def __init__(self, session, args = None):
                self.skin = Example.skin
                Screen.__init__(self, session)