X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08e972ae07f60852a888c93199319444e8c06714..5c098e9eadf42ec0e333c5d5c954ee408d9127e4:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index e55bbd4d..c91d6ad5 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,83 +1,111 @@
-import os
+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
-
-def my_import(name):
-	print name
-	mod = __import__(name)
-	components = name.split('.')
-	for comp in components[1:]:
-		mod = getattr(mod, comp)
-	return mod
+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 reReadPluginList(self, directory, depth = 1):
-		print "re-reading plugin list"
-		self.clearPluginList()
-		self.readPluginList(directory=directory, depth=depth)
-	
-	def readPluginList(self, directory, modules = [], depth = 1):
+
+	def readPluginList(self, directory):
 		"""enumerates plugins"""
-		
-		directories = os.listdir(directory)
-		
-		for x in directories:
-			path = directory + x + "/"
-			if os.path.isdir(path):
-				if fileExists(path + "plugin.py"):
-					plugin = my_import('.'.join(["Plugins"] + modules + [x, "plugin"]))
-					
-					if not plugin.__dict__.has_key("Plugins"):
-						print "Plugin %s doesn't have 'Plugin'-call." % (x)
-						continue
-					
-					plugins = plugin.Plugins()
-					
-					# allow single entry not to be a list
-					if type(plugins) is not list:
-						plugins = [ plugins ]
-					
-					for p in plugins:
-						p.updateIcon(path)
-						self.addPlugin(p);
-				else:
-					open(path + "__init__.py", "a").close()
-					self.readPluginList(path, modules + [x], depth - 1)
+
+		categories = os_listdir(directory)
+
+		new_plugins = [ ]
+
+		for c in categories:
+			directory_category = directory + c
+			if not os_path.isdir(directory_category):
+				continue
+			open(directory_category + "/__init__.py", "a").close()
+			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, pluginname, "plugin"]))
+
+							if not plugin.__dict__.has_key("Plugins"):
+								print "Plugin %s doesn't have 'Plugin'-call." % (pluginname)
+								continue
+
+							plugins = plugin.Plugins(path=path)
+						except Exception, exc:
+							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
+						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 not p.internal and 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:
+
+		if not isinstance(where, list):
 			where = [ where ]
 		res = [ ]
+
 		for x in where:
-			for p in self.plugins.get(x, [ ]):
-				res.append(p)
+			res.extend(self.plugins.get(x, [ ]))
+
+		return  res
+
+	def getPluginsForMenu(self, menuid):
+		res = [ ]
+		for p in self.getPlugins(PluginDescriptor.WHERE_MENU):
+			res += p(menuid)
 		return res
-	
+
 	def clearPluginList(self):
 		self.pluginList = []
 		self.plugins = {}
@@ -86,4 +114,15 @@ class PluginComponent:
 		for p in self.pluginList[:]:
 			self.removePlugin(p)
 
+	def resetWarnings(self):
+		self.warnings = [ ]
+
+	def getNextWakeupTime(self):
+		wakeup = -1
+		for p in self.pluginList:
+			current = p.getWakeupTime()
+			if current > -1 and (wakeup > current or wakeup == -1):
+				wakeup = current
+		return int(wakeup)
+
 plugins = PluginComponent()