[crossepg] r289 committed - Added helpers for plugin load (fixed quickbutton problem with GP3)

[cros...@googlecode.com]

Revision: 289
Author: san...@skanetwork.com
Date: Sat Apr 30 14:28:22 2011
Log: Added helpers for plugin load (fixed quickbutton problem with GP3)
http://code.google.com/p/crossepg/source/detail?r=289

Modified:
/trunk/src/enigma2/python/crossepg_main.py
/trunk/src/enigma2/python/plugin.py

=======================================
--- /trunk/src/enigma2/python/crossepg_main.py Sun Apr 24 12:54:57 2011
+++ /trunk/src/enigma2/python/crossepg_main.py Sat Apr 30 14:28:22 2011
@@ -15,7 +15,7 @@
self.config = CrossEPG_Config()
self.patchtype = getEPGPatchType()

- def downloader(self, session, **kwargs):
+ def downloader(self, session):
self.session = session
crossepg_auto.lock = True
crossepg_auto.stop()
@@ -26,7 +26,7 @@
self.config.deleteLog()
self.session.openWithCallback(self.downloadCallback,
CrossEPG_Downloader, self.config.providers)

- def loaderAsPlugin(self, session, **kwargs):
+ def loaderAsPlugin(self, session):
self.session = session
crossepg_auto.lock = True
crossepg_auto.stop()
@@ -78,7 +78,7 @@
def loaderCallback(self, ret):
crossepg_auto.lock = False

- def setup(self, session, **kwargs):
+ def setup(self, session):
crossepg_auto.lock = True
crossepg_auto.stop()
session.openWithCallback(self.setupCallback, CrossEPG_Menu)
=======================================
--- /trunk/src/enigma2/python/plugin.py Sun Apr 24 12:54:57 2011
+++ /trunk/src/enigma2/python/plugin.py Sat Apr 30 14:28:22 2011
@@ -9,6 +9,18 @@
else:
return []

+def call_downloader(session, **kwargs):
+ crossepg_main.downloader(session)
+
+def call_loaderAsPlugin(session, **kwargs):
+ crossepg_main.loaderAsPlugin(session)
+
+def call_setup(session, **kwargs):
+ crossepg_main.setup(session)
+
+def call_autostart(reason, session):
+ crossepg_main.autostart(reason, session)
+
def Plugins(**kwargs):
config = CrossEPG_Config()
config.load()
@@ -17,23 +29,23 @@
plugins.append(PluginDescriptor(name="CrossEPG Downloader",
description=_("An EPG downloader"),
where = [ PluginDescriptor.WHERE_EXTENSIONSMENU,
PluginDescriptor.WHERE_PLUGINMENU ],
- fnc = crossepg_main.downloader))
+ fnc = call_downloader))
elif config.show_extension == 1:
plugins.append(PluginDescriptor(name="CrossEPG Downloader",
description=_("An EPG downloader"),
where = PluginDescriptor.WHERE_EXTENSIONSMENU,
- fnc = crossepg_main.downloader))
+ fnc = call_downloader))
elif config.show_plugin == 1:
plugins.append(PluginDescriptor(name="CrossEPG Downloader",
description=_("An EPG downloader"),
where = PluginDescriptor.WHERE_PLUGINMENU,
- fnc = crossepg_main.downloader))
+ fnc = call_downloader))

if config.isQBOXHD():
plugins.append(PluginDescriptor(name="CrossEPG",
description=_("CrossEPG setup panel"),
where = PluginDescriptor.WHERE_PLUGINMENU,
- fnc = crossepg_main.setup))
+ fnc = call_setup))
else:
plugins.append(PluginDescriptor(name="CrossEPG",
description=_("CrossEPG setup panel"),
@@ -43,12 +55,12 @@
plugins.append(PluginDescriptor(name="CrossEPG Auto",
description = _("CrossEPG automatic actions"),
where = PluginDescriptor.WHERE_SESSIONSTART,
- fnc = crossepg_main.autostart))
+ fnc = call_autostart))

if config.show_force_reload_as_plugin == 1:
plugins.append(PluginDescriptor(name="CrossEPG Force Reload",
description=_("CrossEPG Force Reload"),
where = PluginDescriptor.WHERE_PLUGINMENU,
- fnc = crossepg_main.loaderAsPlugin))
+ fnc = call_loaderAsPlugin))

return plugins;