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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 9425e56d..6e357cd0 100644
--- 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):
@@ -62,17 +63,24 @@ class PluginComponent:
 							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,9 +91,10 @@ 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)
@@ -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()