imdb/ofdb: allow to select event from epg ("menu" in plugin)

[vuplus_dvbapp-plugin] / ofdb / src / plugin.py

diff --git a/ofdb/src/plugin.py b/ofdb/src/plugin.py
index f29fe4a..e256969 100644 (file)
--- a/ofdb/src/plugin.py
+++ b/ofdb/src/plugin.py
@@ -1,9 +1,10 @@
 # -*- coding: utf8 -*-
 from Plugins.Plugin import PluginDescriptor
 from twisted.web.client import downloadPage
-from enigma import ePicLoad
+from enigma import ePicLoad, eServiceReference
 from Screens.Screen import Screen
 from Screens.EpgSelection import EPGSelection
+from Screens.ChannelSelection import SimpleChannelSelection
 from Components.ActionMap import ActionMap
 from Components.Pixmap import Pixmap
 from Components.Label import Label
@@ -18,11 +19,39 @@ import re
 import htmlentitydefs
 import urllib
 
+class OFDBChannelSelection(SimpleChannelSelection):
+       def __init__(self, session):
+               SimpleChannelSelection.__init__(self, session, _("Channel Selection"))
+               self.skinName = "SimpleChannelSelection"
+
+               self["ChannelSelectEPGActions"] = ActionMap(["ChannelSelectEPGActions"],
+                       {
+                               "showEPGList": self.channelSelected
+                       }
+               )
+
+       def channelSelected(self):
+               ref = self.getCurrentSelection()
+               if (ref.flags & 7) == 7:
+                       self.enterPath(ref)
+               elif not (ref.flags & eServiceReference.isMarker):
+                       self.session.openWithCallback(
+                               self.epgClosed,
+                               OFDBEPGSelection,
+                               ref,
+                               openPlugin = False
+                       )
+
+       def epgClosed(self, ret = None):
+               if ret:
+                       self.close(ret)
+
 class OFDBEPGSelection(EPGSelection):
-       def __init__(self, *args):
-               EPGSelection.__init__(self, *args)
+       def __init__(self, session, ref, openPlugin = True):
+               EPGSelection.__init__(self, session, ref)
                self.skinName = "EPGSelection"
                self["key_green"].setText(_("Lookup"))
+               self.openPlugin = openPlugin
 
        def infoKeyPressed(self):
                self.timerAdd()
@@ -34,10 +63,13 @@ class OFDBEPGSelection(EPGSelection):
                if not evt: 
                        return
 
-               self.session.open(
-                       OFDB,
-                       evt.getEventName()
-               )
+               if self.openPlugin:
+                       self.session.open(
+                               OFDB,
+                               evt.getEventName()
+                       )
+               else:
+                       self.close(evt.getEventName())
 
        def onSelectionChanged(self):
                pass
@@ -107,6 +139,7 @@ class OFDB(Screen):
                        "green": self.showMenu,
                        "yellow": self.showDetails,
                        "blue": self.showExtras,
+                       "contextMenu": self.openChannelSelection,
                        "showEventInfo": self.showDetails
                }, -1)
                
@@ -232,6 +265,17 @@ class OFDB(Screen):
                        self["ratinglabel"].hide()
                        self.Page = 2
 
+       def openChannelSelection(self):
+               self.session.openWithCallback(
+                       self.channelSelectionClosed,
+                       OFDBChannelSelection
+               )
+
+       def channelSelectionClosed(self, ret = None):
+               if ret:
+                       self.eventName = ret
+                       self.getOFDB()
+
        def getOFDB(self):
                self.resetLabels()
                if self.eventName is "":