fix inverted setting (meaning was inverted too)

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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 960043d68d98c624d6aacc626670032e94ee182a..26eadd10438b0bee0b22832915fb110be5777dad 100644 (file)
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -20,48 +20,48 @@ 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)
-                                               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"
+#                      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: