fix cancel handling

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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 5315d3d94c68c0dd630951eed9406092bca278c6..adfc98a0855a9d69af4cf731d16f7559e231c3cb 100644 (file)
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -2,7 +2,6 @@ import os
 
 from Tools.Directories import *
 from Screens.Menu import menuupdater
-#import Plugins
 
 class PluginComponent:
        def __init__(self):
@@ -13,39 +12,64 @@ class PluginComponent:
        def setPluginPrefix(self, prefix):
                self.prefix = prefix
 
-       def getPluginList(self):
+       def getPluginList(self, runAutostartPlugins=False, runAutoendPlugins=False):
                list = []
-               dir = os.listdir("/usr/lib/enigma2/python/Plugins/")
+               dir = os.listdir(resolveFilename(SCOPE_PLUGINS))
                self.menuDelete()
                self.menuEntries = []
-               for x in dir:
-                       if x[-3:] == ".py" and x[:-3] != "__init__":
-                               print "trying to import " + self.prefix + x[:-3]
-                               exec "import " + self.prefix + x[:-3]
-                               picturepath = eval(self.prefix + x[:-3]).getPicturePath()
-                               pluginname = eval(self.prefix + x[:-3]).getPluginName()
-                               try:
-                                       for menuEntry in eval(self.prefix + x[:-3]).getMenuRegistrationList():
-                                               self.menuEntries.append([menuEntry, self.prefix + x[:-3]])
-                               except:
-                                       pass
 
-                               list.append((picturepath, pluginname , x[:-3]))
+               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)
+                                               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]) < 5:
+                                                               list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], None, plugins[y][1]))
+                                                       else:
+                                                               list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][2], plugins[y][3], plugins[y][4], plugins[y][1]))
+                                               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
        
        def menuDelete(self):
                for menuEntry in self.menuEntries:
-                       menuupdater.delMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+                       menuupdater.delMenuItem(menuEntry[0][0], menuEntry[0][1], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
 
        def menuUpdate(self):
                for menuEntry in self.menuEntries:
-                       menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+                       menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][1], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
        
        def runPlugin(self, plugin, session):
                try:
-                       exec "import " + self.prefix + plugin[2]
-                       eval(self.prefix + plugin[2]).main(session)
+                       exec("import " + self.prefix + plugin[2] + ".plugin")
+                       if plugin[3] == "screen":
+                               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, plugin[5])
                except:
                        print "exec of plugin failed!"