refs bug #429

[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 120b463..5e439fd
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,10 +1,11 @@
-import os
-import traceback
-import sys
+from os import path as os_path, listdir as os_listdir
+from traceback import print_exc
+from sys import stdout
 
-from Tools.Directories import *
+from Tools.Directories import fileExists
 from Tools.Import import my_import
 from Plugins.Plugin import PluginDescriptor
+import keymapparser
 
 class PluginComponent:
        def __init__(self):
@@ -32,20 +33,20 @@ class PluginComponent:
 
        def readPluginList(self, directory):
                """enumerates plugins"""
-               
-               categories = os.listdir(directory)
-               
+
+               categories = os_listdir(directory)
+
                new_plugins = [ ]
-               
+
                for c in categories:
                        directory_category = directory + c
-                       if not os.path.isdir(directory_category):
+                       if not os_path.isdir(directory_category):
                                continue
                        open(directory_category + "/__init__.py", "a").close()
-                       for pluginname in os.listdir(directory_category):
+                       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 os_path.isdir(path):
+                                       if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.pyo") or fileExists(path + "/plugin.py"):
                                                try:
                                                        plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
@@ -56,23 +57,30 @@ class PluginComponent:
                                                        plugins = plugin.Plugins(path=path)
                                                except Exception, exc:
                                                        print "Plugin ", c + "/" + pluginname, "failed to load:", exc
-                                                       traceback.print_exc(file=sys.stdout)
+                                                       print_exc(file=stdout)
                                                        print "skipping plugin."
                                                        self.warnings.append( (c + "/" + pluginname, str(exc)) )
                                                        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:
                                                        p.updateIcon(path)
                                                        new_plugins.append(p)
 
+                                               if fileExists(path + "/keymap.xml"):
+                                                       try:
+                                                               keymapparser.readKeymap(path + "/keymap.xml")
+                                                       except Exception, exc:
+                                                               print "keymap for plugin %s/%s failed to load: " % (c, pluginname), exc
+                                                               self.warnings.append( (c + "/" + pluginname, str(exc)) )
+
                # 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)
@@ -83,17 +91,18 @@ 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 = [ ]
-               for p in self.getPlugins(PluginDescriptor.WHERE_SETUP):
+               for p in self.getPlugins(PluginDescriptor.WHERE_MENU):
                        res += p(menuid)
                return res
 
@@ -108,4 +117,12 @@ class PluginComponent:
        def resetWarnings(self):
                self.warnings = [ ]
 
+       def getNextWakeupTime(self):
+               wakeup = -1
+               for p in self.pluginList:
+                       current = p.getWakeupTime()
+                       if current > -1 and (wakeup > current or wakeup == -1):
+                               wakeup = current
+               return int(wakeup)
+
 plugins = PluginComponent()