git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debug
[enigma2.git]
/
lib
/
python
/
Components
/
PluginComponent.py
diff --git
a/lib/python/Components/PluginComponent.py
b/lib/python/Components/PluginComponent.py
index e5ceb90d5b5a37ca272b959a417d59177d970d24..4356456cb034c26a4312c433abebcf726c0b19b3 100644
(file)
--- a/
lib/python/Components/PluginComponent.py
+++ b/
lib/python/Components/PluginComponent.py
@@
-1,16
+1,10
@@
import os
import os
+import traceback
from Tools.Directories import *
from Tools.Directories import *
+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
-
class PluginComponent:
def __init__(self):
self.plugins = {}
class PluginComponent:
def __init__(self):
self.plugins = {}
@@
-47,16
+41,22
@@
class PluginComponent:
continue
open(directory_category + "/__init__.py", "a").close()
for x in os.listdir(directory_category):
continue
open(directory_category + "/__init__.py", "a").close()
for x in os.listdir(directory_category):
- path = directory_category + "/" + x
+ "/"
+ path = directory_category + "/" + x
if os.path.isdir(path):
if os.path.isdir(path):
- if fileExists(path + "plugin.py"):
- plugin = my_import('.'.join(["Plugins", c, x, "plugin"]))
+ if fileExists(path + "/plugin.pyc") or fileExists(path + "/plugin.py"):
+ try:
+ plugin = my_import('.'.join(["Plugins", c, x, "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." % (x)
+
continue
- plugins = plugin.Plugins()
+ plugins = plugin.Plugins(path=path)
+ except Exception, exc:
+ print "Plugin ", path, "failed to load:", exc
+ traceback.print_exc(file=sys.stdout)
+ print "skipping plugin."
+ continue
# allow single entry not to be a list
if type(plugins) is not list:
# allow single entry not to be a list
if type(plugins) is not list:
@@
-87,7
+87,13
@@
class PluginComponent:
for p in self.plugins.get(x, [ ]):
res.append(p)
return res
for p in self.plugins.get(x, [ ]):
res.append(p)
return res
-
+
+ def getPluginsForMenu(self, menuid):
+ res = [ ]
+ for p in self.getPlugins(PluginDescriptor.WHERE_SETUP):
+ res += p(menuid)
+ return res
+
def clearPluginList(self):
self.pluginList = []
self.plugins = {}
def clearPluginList(self):
self.pluginList = []
self.plugins = {}