show search results for currently playing service by default
authorMoritz Venn <ritzmo@users.schwerkraft.elitedvb.net>
Mon, 23 Feb 2009 18:28:12 +0000 (18:28 +0000)
committerMoritz Venn <ritzmo@users.schwerkraft.elitedvb.net>
Mon, 23 Feb 2009 18:28:12 +0000 (18:28 +0000)
epgsearch/src/plugin.py

index 38892bf..7d4e969 100644 (file)
@@ -19,7 +19,11 @@ from Plugins.Plugin import PluginDescriptor
 
 # Mainfunction
 def main(session, *args, **kwargs):
-       session.open(EPGSearch)
+       s = session.nav.getCurrentService()
+       info = s.info()
+       event = info.getEvent(0) # 0 = now, 1 = next
+       name = event and event.getEventName() or ''
+       session.open(EPGSearch, name, False)
 
 # Movielist
 def movielist(session, service, **kwargs):
@@ -29,15 +33,6 @@ def movielist(session, service, **kwargs):
 
        session.open(EPGSearch, name)
 
-# Event Info
-def eventinfo(session, servicelist, **kwargs):
-       s = session.nav.getCurrentService()
-       info = s.info()
-       event = info.getEvent(0) # 0 = now, 1 = next
-       name = event and event.getEventName() or ''
-
-       session.open(EPGSearch, name, False)
-
 def Plugins(**kwargs):
        return [
                PluginDescriptor(
@@ -49,7 +44,7 @@ def Plugins(**kwargs):
                PluginDescriptor(
                        name = _("Search EPG..."),
                        where = PluginDescriptor.WHERE_EVENTINFO,
-                       fnc = eventinfo,
+                       fnc = main,
                ),
                PluginDescriptor(
                        name = "EPGSearch",