fix dvd hotplug: stop assuming dvd for every other medium. in case of multiple ISO...

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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 9425e56dcb4c3f35f324f43e7feefadd5c61d126..d72e2af36f1414c8ee4cc43c1ede6845c5644e6e 100644 (file)
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -5,6 +5,7 @@ from sys import stdout
 from Tools.Directories import fileExists
 from Tools.Import import my_import
 from Plugins.Plugin import PluginDescriptor
+import keymapparser
 
 class PluginComponent:
        def __init__(self):
@@ -32,11 +33,11 @@ class PluginComponent:
 
        def readPluginList(self, directory):
                """enumerates plugins"""
-               
+
                categories = os_listdir(directory)
-               
+
                new_plugins = [ ]
-               
+
                for c in categories:
                        directory_category = directory + c
                        if not os_path.isdir(directory_category):
@@ -69,10 +70,17 @@ class PluginComponent:
                                                        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)
@@ -86,6 +94,7 @@ class PluginComponent:
                if type(where) is not list:
                        where = [ where ]
                res = [ ]
+
                for x in where:
                        for p in self.plugins.get(x, [ ]):
                                res.append(p)
@@ -93,7 +102,7 @@ class PluginComponent:
 
        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:
+                               wakeup = current
+               return int(wakeup)
+
 plugins = PluginComponent()