X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FPluginComponent.py;h=a713c3b42dd721d4664c70743a5532db7c81d664;hp=dd29628b80c96b3a10c68324f3e02be72528a46d;hb=f9f18f40a213b929bb065b913887cd390ef38454;hpb=1ce4dbb8ba49f5621b3ba6d85a149b48f1dc9031

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
old mode 100644
new mode 100755
index dd29628..a713c3b
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,86 +1,137 @@
-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
+import keymapparser
 
 class PluginComponent:
+	firstRun = True
+	restartRequired = False
+	
 	def __init__(self):
 		self.plugins = {}
 		self.pluginList = [ ]
+		self.installedPluginList = [ ]
 		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)
-	
+		if self.firstRun or plugin.needsRestart is False:
+			self.pluginList.append(plugin)
+			for x in plugin.where:
+				self.plugins.setdefault(x, []).append(plugin)
+				if x == PluginDescriptor.WHERE_AUTOSTART:
+					plugin(reason=0)
+		else:
+			self.restartRequired = True
+				
 	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):
-					if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
-						plugin = my_import('.'.join(["Plugins", c, x, "plugin"]))
-
-						if not plugin.__dict__.has_key("Plugins"):
-							print "Plugin %s doesn't have 'Plugin'-call." % (x)
-							continue
+			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.pyo") or fileExists(path + "/plugin.py"):
+						try:
+							plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
-						plugins = plugin.Plugins(path=path)
+							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 type(plugins) is not list:
+						if not isinstance(plugins, list):
 							plugins = [ plugins ]
 
 						for p in plugins:
+							p.path = path
 							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]
 		
+		#ignore already installed but reloaded plugins
+		for p in plugins_removed: 
+			for pa in plugins_added:
+				if pa.path == p.path and pa.where == p.where:
+					pa.needsRestart = False
+
 		for p in plugins_removed:
 			self.removePlugin(p)
-		
+
 		for p in plugins_added:
-			self.addPlugin(p)
+			if self.firstRun or p.needsRestart is False:
+				self.addPlugin(p)
+			else:
+				for installed_plugin in self.installedPluginList:
+					if installed_plugin.path == p.path:
+						if installed_plugin.where == p.where:
+							p.needsRestart = False
+				self.addPlugin(p)
+						
+		if self.firstRun:
+			self.firstRun = False
+			self.installedPluginList = self.pluginList
 
 	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, [ ]))
+		res.sort(key=lambda x:x.weight)
 		return res
-	
+
+	def getPluginsForMenu(self, menuid):
+		res = [ ]
+		for p in self.getPlugins(PluginDescriptor.WHERE_MENU):
+			res += p(menuid)
+		res.sort(key=lambda x:x.weight)
+		return res
+
 	def clearPluginList(self):
 		self.pluginList = []
 		self.plugins = {}
@@ -89,4 +140,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()