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

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index ae06d776..dd29628b 100644
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -1,16 +1,9 @@
 import os
 
 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 = {}
@@ -34,32 +27,48 @@ class PluginComponent:
 			if x == PluginDescriptor.WHERE_AUTOSTART:
 				plugin(reason=1)
 	
-	def readPluginList(self, directory, modules = [], depth = 1):
+	def readPluginList(self, directory):
 		"""enumerates plugins"""
 		
-		directories = os.listdir(directory)
+		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)
+
+						# 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 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:
-					self.readPluginList(path, modules + [x], depth - 1)
+		for p in plugins_added:
+			self.addPlugin(p)
 
 	def getPlugins(self, where):
 		"""Get list of plugins in a specific category"""
@@ -71,6 +80,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[:]: