git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WirelessLan/plugin.py: - properly escape spaces inside an SSID name when returning...
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
TuxboxPlugins
/
plugin.py
diff --git
a/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
b/lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
index 7ab02da7cf3fd323cbb00628c4444369f96dd52b..05085ead2c42ccd004566404b88cb66b6fd8f96a 100644
(file)
--- a/
lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
+++ b/
lib/python/Plugins/Extensions/TuxboxPlugins/plugin.py
@@
-1,14
+1,10
@@
# must be fixed for the new plugin interface
# must be fixed for the new plugin interface
-from enigma import *
-from Screens.Screen import Screen
-from Screens.MessageBox import MessageBox
-from Components.ActionMap import ActionMap
-from Components.Label import Label
from Tools.BoundFunction import boundFunction
from Tools.Directories import pathExists
from Plugins.Plugin import PluginDescriptor
from Tools.BoundFunction import boundFunction
from Tools.Directories import pathExists
from Plugins.Plugin import PluginDescriptor
+from pluginrunner import PluginRunner
-import os
+from os import listdir
TUXBOX_PLUGINS_PATH = "/usr/lib/tuxbox/plugins/"
TUXBOX_PLUGINS_PATH = "/usr/lib/tuxbox/plugins/"
@@
-16,7
+12,7
@@
def getPlugins():
pluginlist = []
if pathExists(TUXBOX_PLUGINS_PATH):
pluginlist = []
if pathExists(TUXBOX_PLUGINS_PATH):
- dir =
os.
listdir(TUXBOX_PLUGINS_PATH)
+ dir = listdir(TUXBOX_PLUGINS_PATH)
for x in dir:
if x[-3:] == "cfg":
for x in dir:
if x[-3:] == "cfg":
@@
-38,9
+34,10
@@
def getPluginParams(file):
return params
return params
-def main(session, plugin):
+def main(session, plugin
, **kwargs
):
print "Running plugin " + plugin[:-4] + ".so with config file", plugin
print getPluginParams(plugin)
print "Running plugin " + plugin[:-4] + ".so with config file", plugin
print getPluginParams(plugin)
+ session.open(PluginRunner, plugin[:-4].split(".so")[0])
-def Plugins():
- return getPlugins()
\ No newline at end of file
+def Plugins(**kwargs):
+ return getPlugins()