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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 095be396..120b4636 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,39 +1,35 @@
 import os
+import traceback
+import sys
 
 from Tools.Directories import *
+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
-
 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"""
 		
@@ -46,17 +42,24 @@ class PluginComponent:
 			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
+			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"):
-						plugin = my_import('.'.join(["Plugins", c, x, "plugin"]))
+						try:
+							plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
-						if not plugin.__dict__.has_key("Plugins"):
-							print "Plugin %s doesn't have 'Plugin'-call." % (x)
-							continue
+							if not plugin.__dict__.has_key("Plugins"):
+								print "Plugin %s doesn't have 'Plugin'-call." % (pluginname)
+								continue
 
-						plugins = plugin.Plugins(path=path)
+							plugins = plugin.Plugins(path=path)
+						except Exception, exc:
+							print "Plugin ", c + "/" + pluginname, "failed to load:", exc
+							traceback.print_exc(file=sys.stdout)
+							print "skipping plugin."
+							self.warnings.append( (c + "/" + pluginname, str(exc)) )
+							continue
 
 						# allow single entry not to be a list
 						if type(plugins) is not list:
@@ -65,21 +68,21 @@ class PluginComponent:
 						for p in plugins:
 							p.updateIcon(path)
 							new_plugins.append(p)
-		
+
 		# 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 = [ ]
@@ -87,7 +90,13 @@ class PluginComponent:
 			for p in self.plugins.get(x, [ ]):
 				res.append(p)
 		return res
-	
+
+	def getPluginsForMenu(self, menuid):
+		res = [ ]
+		for p in self.getPlugins(PluginDescriptor.WHERE_SETUP):
+			res += p(menuid)
+		return res
+
 	def clearPluginList(self):
 		self.pluginList = []
 		self.plugins = {}
@@ -96,4 +105,7 @@ class PluginComponent:
 		for p in self.pluginList[:]:
 			self.removePlugin(p)
 
+	def resetWarnings(self):
+		self.warnings = [ ]
+
 plugins = PluginComponent()