add plugin weight to PluginDescriptor... so the plugin start order can be changed now

2 files changed, 6 insertions, 3 deletions

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
index 93b08900..a713c3b4 100755
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -122,13 +122,14 @@ class PluginComponent:
 
 		for x in where:
 			res.extend(self.plugins.get(x, [ ]))
-
-		return  res
+		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):
diff --git a/lib/python/Plugins/Plugin.py b/lib/python/Plugins/Plugin.py
index e26174a1..d87e6e96 100755
--- a/lib/python/Plugins/Plugin.py
+++ b/lib/python/Plugins/Plugin.py
@@ -61,7 +61,7 @@ class PluginDescriptor:
 	WHERE_SOFTWAREMANAGER = 14
 
 
-	def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, needsRestart = None, internal = False):
+	def __init__(self, name = "Plugin", where = [ ], description = "", icon = None, fnc = None, wakeupfnc = None, needsRestart = None, internal = False, weight = 0):
 		self.name = name
 		self.internal = internal
 		self.needsRestart = needsRestart
@@ -78,6 +78,8 @@ class PluginDescriptor:
 		else:
 			self.icon = icon
 
+		self.weight = weight
+
 		self.wakeupfnc = wakeupfnc
 
 		self.__call__ = fnc