X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6ac5293d96c9fcd2961d3a71c635c485cf254a1d..d0a84d65c3a38c3e85576159c39ac88a46bb7b4a:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 4356456c..44fe896a 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,61 +1,65 @@
-import os
-import traceback
+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):
 		self.plugins = {}
 		self.pluginList = [ ]
 		self.setPluginPrefix("Plugins.")
-		
+		self.resetWarnings()
+
 	def setPluginPrefix(self, prefix):
 		self.prefix = prefix
-	
+
 	def addPlugin(self, plugin):
 		self.pluginList.append(plugin)
 		for x in plugin.where:
 			self.plugins.setdefault(x, []).append(plugin)
 			if x == PluginDescriptor.WHERE_AUTOSTART:
 				plugin(reason=0)
-	
+
 	def removePlugin(self, plugin):
 		self.pluginList.remove(plugin)
 		for x in plugin.where:
 			self.plugins[x].remove(plugin)
 			if x == PluginDescriptor.WHERE_AUTOSTART:
 				plugin(reason=1)
-	
+
 	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 x in os.listdir(directory_category):
-				path = directory_category + "/" + x
-				if os.path.isdir(path):
+			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"):
 						try:
-							plugin = my_import('.'.join(["Plugins", c, x, "plugin"]))
+							plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
 							if not plugin.__dict__.has_key("Plugins"):
-								print "Plugin %s doesn't have 'Plugin'-call." % (x)
+								print "Plugin %s doesn't have 'Plugin'-call." % (pluginname)
 								continue
 
 							plugins = plugin.Plugins(path=path)
 						except Exception, exc:
-							print "Plugin ", path, "failed to load:", exc
-							traceback.print_exc(file=sys.stdout)
+							print "Plugin ", c + "/" + pluginname, "failed to load:", exc
+							print_exc(file=stdout)
 							print "skipping plugin."
+							self.warnings.append( (c + "/" + pluginname, str(exc)) )
 							continue
 
 						# allow single entry not to be a list
@@ -65,21 +69,28 @@ class PluginComponent:
 						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]
-		
+
 		for p in plugins_removed:
 			self.removePlugin(p)
-		
+
 		for p in plugins_added:
 			self.addPlugin(p)
 
 	def getPlugins(self, where):
 		"""Get list of plugins in a specific category"""
-		
+
 		if type(where) is not list:
 			where = [ where ]
 		res = [ ]
@@ -102,4 +113,7 @@ class PluginComponent:
 		for p in self.pluginList[:]:
 			self.removePlugin(p)
 
+	def resetWarnings(self):
+		self.warnings = [ ]
+
 plugins = PluginComponent()