git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "bug #258"
[enigma2.git]
/
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
095be39
..
c91d6ad
--- a/
lib/python/Components/PluginComponent.py
+++ b/
lib/python/Components/PluginComponent.py
@@
-1,93
+1,111
@@
-import os
+from os import path as os_path, listdir as os_listdir
+from traceback import print_exc
+from sys import stdout
-from Tools.Directories import *
+from Tools.Directories import fileExists
+from Tools.Import import my_import
from Plugins.Plugin import PluginDescriptor
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
+import keymapparser
class PluginComponent:
def __init__(self):
self.plugins = {}
self.pluginList = [ ]
self.setPluginPrefix("Plugins.")
class PluginComponent:
def __init__(self):
self.plugins = {}
self.pluginList = [ ]
self.setPluginPrefix("Plugins.")
-
+ self.resetWarnings()
+
def setPluginPrefix(self, prefix):
self.prefix = prefix
def setPluginPrefix(self, prefix):
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)
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)
-
+
def removePlugin(self, plugin):
self.pluginList.remove(plugin)
for x in plugin.where:
self.plugins[x].remove(plugin)
if x == PluginDescriptor.WHERE_AUTOSTART:
plugin(reason=1)
def removePlugin(self, plugin):
self.pluginList.remove(plugin)
for x in plugin.where:
self.plugins[x].remove(plugin)
if x == PluginDescriptor.WHERE_AUTOSTART:
plugin(reason=1)
-
+
def readPluginList(self, directory):
"""enumerates plugins"""
def readPluginList(self, directory):
"""enumerates plugins"""
-
- categories = os
.
listdir(directory)
-
+
+ categories = os
_
listdir(directory)
+
new_plugins = [ ]
new_plugins = [ ]
-
+
for c in categories:
directory_category = directory + c
for c in categories:
directory_category = directory + c
- if not os
.
path.isdir(directory_category):
+ if not os
_
path.isdir(directory_category):
continue
open(directory_category + "/__init__.py", "a").close()
continue
open(directory_category + "/__init__.py", "a").close()
- for
x in os.
listdir(directory_category):
- path = directory_category + "/" +
x
- if os
.
path.isdir(path):
+ 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.py"):
- plugin = my_import('.'.join(["Plugins", c, x, "plugin"]))
+ try:
+ plugin = my_import('.'.join(["Plugins", c, pluginname, "plugin"]))
- if not plugin.__dict__.has_key("Plugins"):
-
print "Plugin %s doesn't have 'Plugin'-call." % (x
)
- continue
+
if not plugin.__dict__.has_key("Plugins"):
+
print "Plugin %s doesn't have 'Plugin'-call." % (pluginname
)
+
continue
- plugins = plugin.Plugins(path=path)
+ plugins = plugin.Plugins(path=path)
+ except Exception, exc:
+ print "Plugin ", c + "/" + pluginname, "failed to load:", exc
+ print_exc(file=stdout)
+ print "skipping plugin."
+ self.warnings.append( (c + "/" + pluginname, str(exc)) )
+ continue
# allow single entry not to be a list
# 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:
p.updateIcon(path)
new_plugins.append(p)
plugins = [ plugins ]
for p in plugins:
p.updateIcon(path)
new_plugins.append(p)
-
+
+ if fileExists(path + "/keymap.xml"):
+ try:
+ keymapparser.readKeymap(path + "/keymap.xml")
+ except Exception, exc:
+ print "keymap for plugin %s/%s failed to load: " % (c, pluginname), exc
+ self.warnings.append( (c + "/" + pluginname, str(exc)) )
+
# 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]
# 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)
for p in plugins_removed:
self.removePlugin(p)
-
+
for p in plugins_added:
self.addPlugin(p)
def getPlugins(self, where):
"""Get list of plugins in a specific category"""
for p in plugins_added:
self.addPlugin(p)
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 = [ ]
where = [ where ]
res = [ ]
+
for x in where:
for x in where:
- for p in self.plugins.get(x, [ ]):
- res.append(p)
+ res.extend(self.plugins.get(x, [ ]))
+
+ return res
+
+ def getPluginsForMenu(self, menuid):
+ res = [ ]
+ for p in self.getPlugins(PluginDescriptor.WHERE_MENU):
+ res += p(menuid)
return res
return res
-
+
def clearPluginList(self):
self.pluginList = []
self.plugins = {}
def clearPluginList(self):
self.pluginList = []
self.plugins = {}
@@
-96,4
+114,15
@@
class PluginComponent:
for p in self.pluginList[:]:
self.removePlugin(p)
for p in self.pluginList[:]:
self.removePlugin(p)
+ 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()
plugins = PluginComponent()