X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/47eaccfd3d5c4ca46ff339cb64a077a0f269d671..1ce4dbb8ba49f5621b3ba6d85a149b48f1dc9031:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 960043d6..dd29628b 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,76 +1,92 @@
 import os
 
 from Tools.Directories import *
-from Screens.Menu import menuupdater
+from Tools.Import import my_import
+from Plugins.Plugin import PluginDescriptor
 
 class PluginComponent:
 	def __init__(self):
-		self.plugins = []
+		self.plugins = {}
+		self.pluginList = [ ]
 		self.setPluginPrefix("Plugins.")
-		self.menuEntries = []
 		
 	def setPluginPrefix(self, prefix):
 		self.prefix = prefix
-
-	def getPluginList(self, runAutostartPlugins=False, runAutoendPlugins=False):
-		list = []
-		dir = os.listdir(resolveFilename(SCOPE_PLUGINS))
-		self.menuDelete()
-		self.menuEntries = []
-
-		for x in dir:
-			path = resolveFilename(SCOPE_PLUGINS, x) + "/"
-			try:
-				if os.path.exists(path):
-					if fileExists(path + "plugin.py"):
-						pluginmodule = self.prefix + x + ".plugin"
-						print "trying to import " + pluginmodule
-						exec "import " + pluginmodule
-						plugin = eval(pluginmodule)
-						plugins = plugin.getPlugins()
-						try: picturepaths = plugin.getPicturePaths()
-						except:
-							picturepaths = []
-							for p in plugins:
-								picturepaths.append("")
-						try:
-							for menuEntry in plugin.getMenuRegistrationList():
-								self.menuEntries.append([menuEntry, pluginmodule])
-						except:
-							pass
 	
-						for y in range(len(plugins)):
-							if len(plugins[y]) < 4:
-								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2], None))
-							else:
-								list.append((path + picturepaths[y], plugins[y][0] , x, plugins[y][1], plugins[y][2], plugins[y][3]))
-						if runAutostartPlugins:
-							try: plugin.autostart()
-							except:	pass
-						if runAutoendPlugins:
-							try: plugin.autoend()
-							except:	pass
-			except:
-				print "Directory", path, "contains a faulty plugin"
-		self.menuUpdate()
-		return list
+	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 menuDelete(self):
-		for menuEntry in self.menuEntries:
-			menuupdater.delMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+	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)
+		
+		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 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
+
+						plugins = plugin.Plugins(path=path)
 
-	def menuUpdate(self):
-		for menuEntry in self.menuEntries:
-			menuupdater.addMenuItem(menuEntry[0][0], menuEntry[0][2], menuEntry[1], menuEntry[0][3])
+						# allow single entry not to be a list
+						if type(plugins) is not list:
+							plugins = [ plugins ]
+
+						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 = [ ]
+		for x in where:
+			for p in self.plugins.get(x, [ ]):
+				res.append(p)
+		return res
 	
-	def runPlugin(self, plugin, session):
-		try:
-			exec("import " + self.prefix + plugin[2] + ".plugin")
-			if plugin[3] == "screen":
-				session.open(eval(self.prefix + plugin[2] + ".plugin." + plugin[4]), plugin[5])
-			elif plugin[3] == "function":
-				eval(self.prefix + plugin[2] + ".plugin." + plugin[4])(session, plugin[5])
-		except:
-			print "exec of plugin failed!"
+	def clearPluginList(self):
+		self.pluginList = []
+		self.plugins = {}
+
+	def shutdown(self):
+		for p in self.pluginList[:]:
+			self.removePlugin(p)
 
 plugins = PluginComponent()