X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/408a1d7daf4b4ba42a1baabf9bf7886f9c235282..3285eb3ebcd0ba134ac6b80337f8519d5a0da5b0:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 120b4636..44fe896a 100644
--- 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,19 +33,19 @@ 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 os_path.isdir(path):
 					if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
 						try:
 							plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
@@ -56,7 +57,7 @@ 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
@@ -69,6 +70,13 @@ 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]