PluginComponent.py: small cleanup

[vuplus_dvbapp] / lib / python / Components / PluginComponent.py

diff --git a/lib/python/Components/PluginComponent.py b/lib/python/Components/PluginComponent.py
old mode 100644 (file)
new mode 100755 (executable)
index 6e357cd..0e178ff
--- a/lib/python/Components/PluginComponent.py
+++ b/lib/python/Components/PluginComponent.py
@@ -8,6 +8,9 @@ from Plugins.Plugin import PluginDescriptor
 import keymapparser
 
 class PluginComponent:
+       firstRun = True
+       restartRequired = False
+       
        def __init__(self):
                self.plugins = {}
                self.pluginList = [ ]
@@ -18,12 +21,15 @@ class PluginComponent:
                self.prefix = prefix
 
        def addPlugin(self, plugin):
-               self.pluginList.append(plugin)
-               for x in plugin.where:
-                       self.plugins.setdefault(x, []).append(plugin)
-                       if x == PluginDescriptor.WHERE_AUTOSTART:
-                               plugin(reason=0)
-
+               if self.firstRun or plugin.needsRestart is False:
+                       self.pluginList.append(plugin)
+                       for x in plugin.where:
+                               self.plugins.setdefault(x, []).append(plugin)
+                               if x == PluginDescriptor.WHERE_AUTOSTART:
+                                       plugin(reason=0)
+               else:
+                       self.restartRequired = True
+                               
        def removePlugin(self, plugin):
                self.pluginList.remove(plugin)
                for x in plugin.where:
@@ -46,7 +52,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"]))
 
@@ -81,12 +87,21 @@ class PluginComponent:
                # 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 not p.internal and p not in new_plugins]
+               
+               #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:
+                                       pa.needsRestart = False
 
                for p in plugins_removed:
                        self.removePlugin(p)
 
                for p in plugins_added:
                        self.addPlugin(p)
+               
+               if self.firstRun:
+                       self.firstRun = False
 
        def getPlugins(self, where):
                """Get list of plugins in a specific category"""
@@ -96,9 +111,9 @@ class PluginComponent:
                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 = [ ]
@@ -121,7 +136,7 @@ class PluginComponent:
                wakeup = -1
                for p in self.pluginList:
                        current = p.getWakeupTime()
-                       if current > -1 and wakeup < current:
+                       if current > -1 and (wakeup > current or wakeup == -1):
                                wakeup = current
                return int(wakeup)