new plugin interface

7 files changed, 19 insertions, 39 deletions

diff --git a/lib/python/Plugins/Makefile.am b/lib/python/Plugins/Makefile.am
index 01f21d4e..ec43b903 100644
--- a/lib/python/Plugins/Makefile.am
+++ b/lib/python/Plugins/Makefile.am
@@ -1,6 +1,7 @@
 installdir = $(LIBDIR)/enigma2/python/Plugins
 
-SUBDIRS = update tuxboxplugins web
+SUBDIRS = update tuxboxplugins web test
 
 install_PYTHON =	\
-	__init__.py
+	__init__.py Plugin.py
+
diff --git a/lib/python/Plugins/__init__.py b/lib/python/Plugins/__init__.py
index e69de29b..2a64fc37 100644
--- a/lib/python/Plugins/__init__.py
+++ b/lib/python/Plugins/__init__.py
@@ -0,0 +1 @@
+#__all__ = [ "Plugin" ]
diff --git a/lib/python/Plugins/example.py b/lib/python/Plugins/example.py
deleted file mode 100644
index e69de29b..00000000
--- a/lib/python/Plugins/example.py
+++ /dev/null
diff --git a/lib/python/Plugins/test/plugin.py b/lib/python/Plugins/test/plugin.py
index 90c45e6e..1500dd8d 100644
--- a/lib/python/Plugins/test/plugin.py
+++ b/lib/python/Plugins/test/plugin.py
@@ -5,6 +5,7 @@ from Components.ActionMap import NumberActionMap
 from Components.Label import Label
 from Components.Input import Input
 from Components.GUIComponent import *
+from Plugins.Plugin import PluginDescriptor
 
 import os
 
@@ -48,8 +49,8 @@ class Test(Screen):
 		print "pressed", number
 		self["text"].number(number)
 
-def getPicturePaths():
-	return [ "" ]
+def main(session):
+	session.open(Test)
 
-def getPlugins():
-	return [("Test", "plugin to test some capabilities", "screen", "Test")]
+def Plugins():
+ 	return PluginDescriptor(name="Test", description="plugin to test some capabilities", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)
diff --git a/lib/python/Plugins/tuxboxplugins/plugin.py b/lib/python/Plugins/tuxboxplugins/plugin.py
index bf789465..01d57456 100644
--- a/lib/python/Plugins/tuxboxplugins/plugin.py
+++ b/lib/python/Plugins/tuxboxplugins/plugin.py
@@ -1,3 +1,4 @@
+# must be fixed for the new plugin interface
 from enigma import *
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
diff --git a/lib/python/Plugins/update/plugin.py b/lib/python/Plugins/update/plugin.py
index fb332a5e..070c199c 100644
--- a/lib/python/Plugins/update/plugin.py
+++ b/lib/python/Plugins/update/plugin.py
@@ -4,6 +4,7 @@ from Screens.MessageBox import MessageBox
 from Components.ActionMap import ActionMap
 from Components.ScrollLabel import ScrollLabel
 from Components.GUIComponent import *
+from Plugins.Plugin import PluginDescriptor
 
 import os
 
@@ -161,23 +162,8 @@ class Ipkg(Screen):
 		else:
 			self.close()
 
+def main(session):
+	session.open(Upgrade)
 
-
-def autostart():
-	return
-	os.popen("ipkg update", "r")	
-#
-#def autoend():
-	#print "**************************** AUTOEND"
-
-def getPicturePaths():
-	return ["update.png", "update.png"]
-
-def getPlugins():
-	return [("Softwareupdate", "Updates your receiver's software", "screen", "Upgrade"),
-			("IPKG", "Updates your receiver's software", "screen", "Ipkg")]
-	
-def getMenuRegistrationList():
-	list = []
-	list.append(("setup", 2, "Softwareupdate", "Upgrade"))
-	return list
\ No newline at end of file
+def Plugins():
+	return PluginDescriptor(name="Softwareupdate", description="Updates your receiver's software", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=main)
diff --git a/lib/python/Plugins/web/plugin.py b/lib/python/Plugins/web/plugin.py
index b450b8cd..e4c099bb 100644
--- a/lib/python/Plugins/web/plugin.py
+++ b/lib/python/Plugins/web/plugin.py
@@ -1,23 +1,13 @@
-from enigma import *
-
 from twisted.internet import reactor
 from twisted.web2 import server, http, static
 
-def autostart():
+# this is currently not working
+def startWebserver():
 	print "Web startup"
 	toplevel = static.File("/hdd")
 	site = server.Site(toplevel)
 	
 	reactor.listenTCP(80, http.HTTPFactory(site))
 
-def autoend():
-	pass
-
-def getPicturePaths():
-	return []
-
-def getPlugins():
-	return []
-	
-def getMenuRegistrationList():
-	return []
+def Plugins():
+    return [ ]