X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/57534d26a3ec9cc77ab3eedc5ad393897e4dee95..63f8fba0e343ed772e81ce4015583e33a6bdc6e0:/lib/python/Components/PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index bd8a6d07..e5ceb90d 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -4,6 +4,7 @@ from Tools.Directories import *
 from Plugins.Plugin import PluginDescriptor
 
 def my_import(name):
+	print name
 	mod = __import__(name)
 	components = name.split('.')
 	for comp in components[1:]:
@@ -33,30 +34,48 @@ class PluginComponent:
 			if x == PluginDescriptor.WHERE_AUTOSTART:
 				plugin(reason=1)
 	
-	def readPluginList(self):
+	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.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()
+
+						# allow single entry not to be a list
+						if type(plugins) is not list:
+							plugins = [ plugins ]
 
-		directories = os.listdir(resolveFilename(SCOPE_PLUGINS))
+						for p in plugins:
+							p.updateIcon(path)
+							new_plugins.append(p)
 		
-		for x in directories:
-			path = resolveFilename(SCOPE_PLUGINS, x) + "/"
-			if os.path.exists(path):
-				if fileExists(path + "plugin.py"):
-					plugin = my_import('.'.join(("Plugins", x, "plugin")))
-					
-					if not plugin.__dict__.has_key("Plugins"):
-						print "Plugin %s doesn't have 'Plugin'-call." % (x)
-						continue
-					
-					print "plugin", plugin
-					plugins = plugin.Plugins()
-					
-					# allow single entry not to be a list
-					if type(plugins) is not list:
-						plugins = [ plugins ]
-					
-					for p in plugins:
-						self.addPlugin(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"""
@@ -68,6 +87,10 @@ class PluginComponent:
 			for p in self.plugins.get(x, [ ]):
 				res.append(p)
 		return res
+	
+	def clearPluginList(self):
+		self.pluginList = []
+		self.plugins = {}
 
 	def shutdown(self):
 		for p in self.pluginList[:]: