From: acid-burn <acid-burn@opendreambox.org>
Date: Fri, 18 Feb 2011 15:32:40 +0000 (+0100)
Subject: PluginComponent.py/Plugin.py: better way to react on a language change. refs #670
X-Git-Tag: experimental-2011.03~4^2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/df1a17b12cb9535832a8db9bcbcf213210ddca81

PluginComponent.py/Plugin.py: better way to react on a language change. refs #670
---

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index e5194b28..93b08900 100755
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -14,6 +14,7 @@ class PluginComponent:
 	def __init__(self):
 		self.plugins = {}
 		self.pluginList = [ ]
+		self.installedPluginList = [ ]
 		self.setPluginPrefix("Plugins.")
 		self.resetWarnings()
 
@@ -73,6 +74,7 @@ class PluginComponent:
 							plugins = [ plugins ]
 
 						for p in plugins:
+							p.path = path
 							p.updateIcon(path)
 							new_plugins.append(p)
 
@@ -91,17 +93,25 @@ class PluginComponent:
 		#ignore already installed but reloaded plugins
 		for p in plugins_removed: 
 			for pa in plugins_added:
-				if pa.name == p.name and pa.where == p.where:
+				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"""
@@ -124,8 +134,6 @@ class PluginComponent:
 	def clearPluginList(self):
 		self.pluginList = []
 		self.plugins = {}
-		self.firstRun = True
-		self.restartRequired = False
 
 	def shutdown(self):
 		for p in self.pluginList[:]:
diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index 9ecdbc26..e26174a1 100755
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -65,6 +65,7 @@ class PluginDescriptor:
 		self.name = name
 		self.internal = internal
 		self.needsRestart = needsRestart
+		self.path = None
 		if isinstance(where, list):
 			self.where = where
 		else: