lib/python/Components/PluginsComponent.py: even allow .pyo files

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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
old mode 100644 (file)
new mode 100755 (executable)
index 818ea58..5e439fd
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -46,7 +46,7 @@ class PluginComponent:
                        for pluginname in os_listdir(directory_category):
                                path = directory_category + "/" + pluginname
                                if os_path.isdir(path):
-                                       if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
+                                       if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.pyo") or fileExists(path + "/plugin.py"):
                                                try:
                                                        plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
@@ -63,7 +63,7 @@ class PluginComponent:
                                                        continue
 
                                                # allow single entry not to be a list
-                                               if type(plugins) is not list:
+                                               if not isinstance(plugins, list):
                                                        plugins = [ plugins ]
 
                                                for p in plugins:
@@ -80,7 +80,7 @@ class PluginComponent:
                # build a diff between the old list of plugins and the new one
                # internally, the "fnc" argument will be compared with __eq__
                plugins_added = [p for p in new_plugins if p not in self.pluginList]
-               plugins_removed = [p for p in self.pluginList if p not in new_plugins]
+               plugins_removed = [p for p in self.pluginList if not p.internal and p not in new_plugins]
 
                for p in plugins_removed:
                        self.removePlugin(p)
@@ -91,13 +91,14 @@ class PluginComponent:
        def getPlugins(self, where):
                """Get list of plugins in a specific category"""
 
-               if type(where) is not list:
+               if not isinstance(where, list):
                        where = [ where ]
                res = [ ]
+
                for x in where:
-                       for p in self.plugins.get(x, [ ]):
-                               res.append(p)
-               return res
+                       res.extend(self.plugins.get(x, [ ]))
+
+               return  res
 
        def getPluginsForMenu(self, menuid):
                res = [ ]
@@ -120,7 +121,7 @@ class PluginComponent:
                wakeup = -1
                for p in self.pluginList:
                        current = p.getWakeupTime()
-                       if current > -1 and wakeup < current:
+                       if current > -1 and (wakeup > current or wakeup == -1):
                                wakeup = current
                return int(wakeup)