X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FPluginComponent.py;h=5e439fdfea437eb0402e121dbfdc40baea843825;hb=e2be31452f7c2d90fa7008583f36d6a6583cc83a;hp=44fe896a4e4884f3c88ca63866bc5a778b5fe272;hpb=986da589d6a21ff3f869f6761dea3676ab21744a;p=vuplus_dvbapp

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
old mode 100644
new mode 100755
index 44fe896..5e439fd
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -46,7 +46,7 @@ class PluginComponent:
 			for pluginname in os_listdir(directory_category):
 				path = directory_category + "/" + pluginname
 				if os_path.isdir(path):
-					if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
+					if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.pyo") or fileExists(path + "/plugin.py"):
 						try:
 							plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
 
@@ -63,7 +63,7 @@ class PluginComponent:
 							continue
 
 						# allow single entry not to be a list
-						if type(plugins) is not list:
+						if not isinstance(plugins, list):
 							plugins = [ plugins ]
 
 						for p in plugins:
@@ -80,7 +80,7 @@ class PluginComponent:
 		# 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]
+		plugins_removed = [p for p in self.pluginList if not p.internal and p not in new_plugins]
 
 		for p in plugins_removed:
 			self.removePlugin(p)
@@ -91,17 +91,18 @@ class PluginComponent:
 	def getPlugins(self, where):
 		"""Get list of plugins in a specific category"""
 
-		if type(where) is not list:
+		if not isinstance(where, list):
 			where = [ where ]
 		res = [ ]
+
 		for x in where:
-			for p in self.plugins.get(x, [ ]):
-				res.append(p)
-		return res
+			res.extend(self.plugins.get(x, [ ]))
+
+		return  res
 
 	def getPluginsForMenu(self, menuid):
 		res = [ ]
-		for p in self.getPlugins(PluginDescriptor.WHERE_SETUP):
+		for p in self.getPlugins(PluginDescriptor.WHERE_MENU):
 			res += p(menuid)
 		return res
 
@@ -116,4 +117,12 @@ class PluginComponent:
 	def resetWarnings(self):
 		self.warnings = [ ]
 
+	def getNextWakeupTime(self):
+		wakeup = -1
+		for p in self.pluginList:
+			current = p.getWakeupTime()
+			if current > -1 and (wakeup > current or wakeup == -1):
+				wakeup = current
+		return int(wakeup)
+
 plugins = PluginComponent()