projects / vuplus_dvbapp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental
[vuplus_dvbapp] / lib / python / Screens / EventView.py
diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py
index bb45836..cced3ce 100644 (file)
--- a/lib/python/Screens/EventView.py
+++ b/lib/python/Screens/EventView.py
@@ -1,25 +1,39 @@
 from Screen import Screen
 from Screen import Screen
+from Screens.TimerEdit import TimerSanityConflict
+from Screens.MessageBox import MessageBox
 from Components.ActionMap import ActionMap
 from Components.Button import Button
 from Components.Label import Label
 from Components.ScrollLabel import ScrollLabel
 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 ServiceReference import ServiceReference
-from RecordTimer import RecordTimerEntry, parseEvent
+from Components.TimerList import TimerList
+from Components.UsageConfig import preferredTimerPath
+from enigma import eEPGCache, eTimer, eServiceReference
+from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
 from TimerEntry import TimerEntry
 from TimerEntry import TimerEntry
-from time import localtime, asctime
+from time import localtime
+from Components.config import config
 
 class EventViewBase:
 
 class EventViewBase:
-       def __init__(self, Event, Ref, callback=None):
+       ADD_TIMER = 0
+       REMOVE_TIMER = 1
+       
+       def __init__(self, Event, Ref, callback=None, similarEPGCB=None):
+               self.similarEPGCB = similarEPGCB
                self.cbFunc = callback
                self.currentService=Ref
                self.cbFunc = callback
                self.currentService=Ref
-               self.isRecording = len(Ref.ref.getPath())
+               self.isRecording = (not Ref.ref.flags & eServiceReference.isGroup) and Ref.ref.getPath()
                self.event = Event
                self["epg_description"] = ScrollLabel()
                self["datetime"] = Label()
                self["channel"] = Label()
                self["duration"] = Label()
                self["key_red"] = Button("")
                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.callback.append(self.getSimilarEvents)
+               else:
+                       self.SimilarBroadcastTimer = None
+               self.key_green_choice = self.ADD_TIMER
                if self.isRecording:
                        self["key_green"] = Button("")
                else:
                if self.isRecording:
                        self["key_green"] = Button("")
                else:
@@ -34,13 +48,14 @@ class EventViewBase:
                                "pageDown": self.pageDown,
                                "prevEvent": self.prevEvent,
                                "nextEvent": self.nextEvent,
                                "pageDown": self.pageDown,
                                "prevEvent": self.prevEvent,
                                "nextEvent": self.nextEvent,
-                               "timerAdd": self.timerAdd
+                               "timerAdd": self.timerAdd,
+                               "openSimilarList": self.openSimilarList
                        })
                self.onShown.append(self.onCreate)
 
        def onCreate(self):
                        })
                self.onShown.append(self.onCreate)
 
        def onCreate(self):
-               self.setEvent(self.event)
                self.setService(self.currentService)
                self.setService(self.currentService)
+               self.setEvent(self.event)
 
        def prevEvent(self):
                if self.cbFunc is not None:
 
        def prevEvent(self):
                if self.cbFunc is not None:
@@ -50,16 +65,51 @@ class EventViewBase:
                if self.cbFunc is not None:
                        self.cbFunc(self.setEvent, self.setService, +1)
 
                if self.cbFunc is not None:
                        self.cbFunc(self.setEvent, self.setService, +1)
 
+       def removeTimer(self, timer):
+               timer.afterEvent = AFTEREVENT.NONE
+               self.session.nav.RecordTimer.removeEntry(timer)
+               self["key_green"].setText(_("Add timer"))
+               self.key_green_choice = self.ADD_TIMER
+       
        def timerAdd(self):
        def timerAdd(self):
-               if not self.isRecording:
-                       newEntry = RecordTimerEntry(self.currentService, *parseEvent(self.event))
-                       self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
-
-       def timerEditFinished(self, answer):
-               if (answer[0]):
-                       self.session.nav.RecordTimer.record(answer[1])
+               if self.isRecording:
+                       return
+               event = self.event
+               serviceref = self.currentService
+               if event is None:
+                       return
+               eventid = event.getEventId()
+               refstr = serviceref.ref.toString()
+               for timer in self.session.nav.RecordTimer.timer_list:
+                       if timer.eit == eventid and timer.service_ref.ref.toString() == refstr:
+                               cb_func = lambda ret : not ret or self.removeTimer(timer)
+                               self.session.openWithCallback(cb_func, MessageBox, _("Do you really want to delete %s?") % event.getEventName())
+                               break
+               else:
+                       newEntry = RecordTimerEntry(self.currentService, checkOldTimers = True, dirname = preferredTimerPath(), *parseEvent(self.event))
+                       self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry)
+
+       def finishedAdd(self, answer):
+               print "finished add"
+               if answer[0]:
+                       entry = answer[1]
+                       simulTimerList = self.session.nav.RecordTimer.record(entry)
+                       if simulTimerList is not None:
+                               for x in simulTimerList:
+                                       if x.setAutoincreaseEnd(entry):
+                                               self.session.nav.RecordTimer.timeChanged(x)
+                               simulTimerList = self.session.nav.RecordTimer.record(entry)
+                               if simulTimerList is not None:
+                                       self.session.openWithCallback(self.finishSanityCorrection, TimerSanityConflict, simulTimerList)
+                       self["key_green"].setText(_("Remove timer"))
+                       self.key_green_choice = self.REMOVE_TIMER
                else:
                else:
-                       print "Timeredit aborted"
+                       self["key_green"].setText(_("Add timer"))
+                       self.key_green_choice = self.ADD_TIMER
+                       print "Timeredit aborted"               
+
+       def finishSanityCorrection(self, answer):
+               self.finishedAdd(answer)
 
        def setService(self, service):
                self.currentService=service
 
        def setService(self, service):
                self.currentService=service
@@ -82,33 +132,41 @@ class EventViewBase:
 
        def setEvent(self, event):
                self.event = event
 
        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()
                text = event.getEventName()
                short = event.getShortDescription()
                ext = event.getExtendedDescription()
-               if len(short) > 0 and short != text:
-                       text = text + '\n\n' + short
-               if len(ext) > 0:
-                       if len(text) > 0:
-                               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 broadcastings:')
-                       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])
+               if short and short != text:
+                       text += '\n\n' + short
+               if ext:
+                       if text:
+                               text += '\n\n'
+                       text += ext
 
                self.setTitle(event.getEventName())
                self["epg_description"].setText(text)
                self["datetime"].setText(event.getBeginTimeString())
                self["duration"].setText(_("%d min")%(event.getDuration()/60))
 
                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)
+
+               serviceref = self.currentService
+               eventid = self.event.getEventId()
+               refstr = serviceref.ref.toString()
+               isRecordEvent = False
+               for timer in self.session.nav.RecordTimer.timer_list:
+                       if timer.eit == eventid and timer.service_ref.ref.toString() == refstr:
+                               isRecordEvent = True
+                               break
+               if isRecordEvent and self.key_green_choice != self.REMOVE_TIMER:
+                       self["key_green"].setText(_("Remove timer"))
+                       self.key_green_choice = self.REMOVE_TIMER
+               elif not isRecordEvent and self.key_green_choice != self.ADD_TIMER:
+                       self["key_green"].setText(_("Add timer"))
+                       self.key_green_choice = self.ADD_TIMER
+
 
        def pageUp(self):
                self["epg_description"].pageUp()
 
        def pageUp(self):
                self["epg_description"].pageUp()
@@ -116,21 +174,45 @@ class EventViewBase:
        def pageDown(self):
                self["epg_description"].pageDown()
 
        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 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):
 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"
                Screen.__init__(self, session)
                self.skinName = "EventView"
-               EventViewBase.__init__(self, Event, Ref, callback)
+               EventViewBase.__init__(self, Event, Ref, callback, similarEPGCB)
 
 class EventViewEPGSelect(Screen, EventViewBase):
 
 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"
                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,
                self["key_yellow"].setText(_("Single EPG"))
                self["key_blue"].setText(_("Multi EPG"))
                self["epgactions"] = ActionMap(["EventViewEPGActions"],
                        {
                                "openSingleServiceEPG": singleEPGCB,
-                               "openMultiServiceEPG": multiEPGCB
+                               "openMultiServiceEPG": multiEPGCB,
                        })
                        })
Unnamed repository; edit this file 'description' to name the repository.