X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54ef002317d169d6dafbe48735560676435ce53d..2b557e7ef4b0518736c5162a501cd9bc743930b3:/lib/python/Screens/EventView.py diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py index 86947461..82bca9fd 100644 --- a/lib/python/Screens/EventView.py +++ b/lib/python/Screens/EventView.py @@ -3,23 +3,29 @@ from Components.ActionMap import ActionMap from Components.Button import Button from Components.Label import Label from Components.ScrollLabel import ScrollLabel -from enigma import eServiceEventPtr, eEPGCachePtr, eEPGCache +from enigma import eServiceEventPtr, eEPGCache, eTimer, eServiceReference from ServiceReference import ServiceReference from RecordTimer import RecordTimerEntry, parseEvent from TimerEntry import TimerEntry from time import localtime, asctime class EventViewBase: - def __init__(self, Event, Ref, callback=None): + def __init__(self, Event, Ref, callback=None, similarEPGCB=None): + self.similarEPGCB = similarEPGCB self.cbFunc = callback self.currentService=Ref - self.isRecording = len(Ref.ref.getPath()) + self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and len(Ref.ref.getPath()) self.event = Event self["epg_description"] = ScrollLabel() self["datetime"] = Label() self["channel"] = Label() self["duration"] = Label() self["key_red"] = Button("") + if similarEPGCB is not None: + self.SimilarBroadcastTimer = eTimer() + self.SimilarBroadcastTimer.timeout.get().append(self.getSimilarEvents) + else: + self.SimilarBroadcastTimer = None if self.isRecording: self["key_green"] = Button("") else: @@ -34,7 +40,8 @@ class EventViewBase: "pageDown": self.pageDown, "prevEvent": self.prevEvent, "nextEvent": self.nextEvent, - "timerAdd": self.timerAdd + "timerAdd": self.timerAdd, + "openSimilarList": self.openSimilarList }) self.onShown.append(self.onCreate) @@ -52,7 +59,7 @@ class EventViewBase: def timerAdd(self): if not self.isRecording: - newEntry = RecordTimerEntry(self.currentService, *parseEvent(self.event)) + newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, *parseEvent(self.event)) self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry) def timerEditFinished(self, answer): @@ -62,7 +69,6 @@ class EventViewBase: print "Timeredit aborted" def setService(self, service): - self.currentService=service if self.isRecording: self["channel"].setText(_("Recording")) @@ -83,10 +89,8 @@ class EventViewBase: def setEvent(self, event): self.event = event - id = event.getEventId() - - refstr = str(self.currentService) - epgcache = eEPGCache.getInstance() + if event is None: + return text = event.getEventName() short = event.getShortDescription() ext = event.getExtendedDescription() @@ -97,19 +101,13 @@ class EventViewBase: text = text + '\n\n' text = text + ext - # search similar broadcastings - ret = epgcache.search(('NB', 100, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, id)) - if ret is not None: - text += '\n\n' + _('Similar broadcasts:') - ret.sort(self.sort_func) - for x in ret: - t = localtime(x[1]) - text += '\n%d.%d.%d, %02d:%02d - %s'%(t[2], t[1], t[0], t[3], t[4], x[0]) - self.setTitle(event.getEventName()) self["epg_description"].setText(text) self["datetime"].setText(event.getBeginTimeString()) self["duration"].setText(_("%d min")%(event.getDuration()/60)) + self["key_red"].setText("") + if self.SimilarBroadcastTimer is not None: + self.SimilarBroadcastTimer.start(400,True) def pageUp(self): self["epg_description"].pageUp() @@ -117,21 +115,45 @@ class EventViewBase: def pageDown(self): self["epg_description"].pageDown() + def getSimilarEvents(self): + # search similar broadcastings + refstr = str(self.currentService) + id = self.event.getEventId() + epgcache = eEPGCache.getInstance() + ret = epgcache.search(('NB', 100, eEPGCache.SIMILAR_BROADCASTINGS_SEARCH, refstr, id)) + if ret is not None: + descr = self["epg_description"] + text = descr.getText() + text += '\n\n' + _('Similar broadcasts:') + ret.sort(self.sort_func) + for x in ret: + t = localtime(x[1]) + text += '\n%d.%d.%d, %02d:%02d - %s'%(t[2], t[1], t[0], t[3], t[4], x[0]) + descr.setText(text) + self["key_red"].setText(_("Similar")) + + def openSimilarList(self): + if self.similarEPGCB is not None and len(self["key_red"].getText()): + id = self.event and self.event.getEventId() + refstr = str(self.currentService) + if id is not None: + self.similarEPGCB(id, refstr) + class EventViewSimple(Screen, EventViewBase): - def __init__(self, session, Event, Ref, callback=None): + def __init__(self, session, Event, Ref, callback=None, similarEPGCB=None): Screen.__init__(self, session) self.skinName = "EventView" - EventViewBase.__init__(self, Event, Ref, callback) + EventViewBase.__init__(self, Event, Ref, callback, similarEPGCB) class EventViewEPGSelect(Screen, EventViewBase): - def __init__(self, session, Event, Ref, callback=None, singleEPGCB=None, multiEPGCB=None): + def __init__(self, session, Event, Ref, callback=None, singleEPGCB=None, multiEPGCB=None, similarEPGCB=None): Screen.__init__(self, session) self.skinName = "EventView" - EventViewBase.__init__(self, Event, Ref, callback) + EventViewBase.__init__(self, Event, Ref, callback, similarEPGCB) self["key_yellow"].setText(_("Single EPG")) self["key_blue"].setText(_("Multi EPG")) self["epgactions"] = ActionMap(["EventViewEPGActions"], { "openSingleServiceEPG": singleEPGCB, - "openMultiServiceEPG": multiEPGCB + "openMultiServiceEPG": multiEPGCB, })