yet another small fix

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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 9425e56dcb4c3f35f324f43e7feefadd5c61d126..44fe896a4e4884f3c88ca63866bc5a778b5fe272 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
 from Tools.Directories import fileExists
 from Tools.Import import my_import
 from Plugins.Plugin import PluginDescriptor

+import keymapparser

 
 class PluginComponent:
        def __init__(self):
 
 class PluginComponent:
        def __init__(self):


@@ -32,11 +33,11 @@ class PluginComponent:
 
        def readPluginList(self, directory):
                """enumerates plugins"""
 
        def readPluginList(self, directory):
                """enumerates plugins"""

-               
+

                categories = os_listdir(directory)
                categories = os_listdir(directory)

-               
+

                new_plugins = [ ]
                new_plugins = [ ]

-               
+

                for c in categories:
                        directory_category = directory + c
                        if not os_path.isdir(directory_category):
                for c in categories:
                        directory_category = directory + c
                        if not os_path.isdir(directory_category):


@@ -69,6 +70,13 @@ class PluginComponent:
                                                        p.updateIcon(path)
                                                        new_plugins.append(p)
 
                                                        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]
                # 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]