X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=ab26f24e9149ed543eef197874d4b63020879b5f;hp=f41a485737b0bb45bde349ad55e6862ccda1c0ea;hb=2b557e7ef4b0518736c5162a501cd9bc743930b3;hpb=4abd28c8904cc0858fa811e8d9438304624f888b diff --git a/RecordTimer.py b/RecordTimer.py index f41a485..ab26f24 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -3,12 +3,13 @@ import codecs #from time import datetime from Tools import Directories, Notifications -from Components.config import config +from Components.config import config, ConfigYesNo import timer import xml.dom.minidom +from enigma import quitMainloop, eEPGCache, getBestPlayableServiceReference, eServiceReference + from Screens.MessageBox import MessageBox -from Screens.SubserviceSelection import SubserviceSelection import NavigationInstance from time import localtime @@ -24,21 +25,37 @@ from ServiceReference import ServiceReference # parses an event, and gives out a (begin, end, name, duration, eit)-tuple. # begin and end will be corrected -def parseEvent(ev): - name = ev.getEventName() - description = ev.getShortDescription() +def parseEvent(ev, description = True): + if description: + name = ev.getEventName() + description = ev.getShortDescription() + else: + name = "" + description = "" begin = ev.getBeginTime() end = begin + ev.getDuration() eit = ev.getEventId() - begin -= config.recording.margin_before.value[0] * 60 - end += config.recording.margin_after.value[0] * 60 + begin -= config.recording.margin_before.value * 60 + end += config.recording.margin_after.value * 60 return (begin, end, name, description, eit) +class AFTEREVENT: + NONE = 0 + STANDBY = 1 + DEEPSTANDBY = 2 + # please do not translate log messages class RecordTimerEntry(timer.TimerEntry): - def __init__(self, serviceref, begin, end, name, description, eit, disabled = False): + def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False): timer.TimerEntry.__init__(self, int(begin), int(end)) + if checkOldTimers == True: + if self.begin < time.time() - 1209600: + self.begin = int(time.time()) + + if self.end < self.begin: + self.end = self.begin + assert isinstance(serviceref, ServiceReference) self.service_ref = serviceref @@ -50,6 +67,9 @@ class RecordTimerEntry(timer.TimerEntry): self.timer = None self.record_service = None self.start_prepare = 0 + self.justplay = justplay + self.afterEvent = afterEvent + self.session = None self.log_entries = [] self.resetState() @@ -60,6 +80,7 @@ class RecordTimerEntry(timer.TimerEntry): def resetState(self): self.state = self.StateWaiting + self.cancelled = False self.first_try_prepare = True self.timeChanged() @@ -81,31 +102,50 @@ class RecordTimerEntry(timer.TimerEntry): #begin_date + " - " + service_name + description) def tryPrepare(self): - self.calculateFilename() - self.record_service = NavigationInstance.instance.recordService(self.service_ref) - if self.record_service == None: - self.log(1, "'record service' failed") - return False + if self.justplay: + return True else: + self.calculateFilename() + rec_ref = self.service_ref and self.service_ref.ref + if rec_ref and rec_ref.flags & eServiceReference.isGroup: + rec_ref = getBestPlayableServiceReference(rec_ref, eServiceReference()) + if not rec_ref: + self.log(1, "'get best playable service for group... record' failed") + return False + + self.record_service = rec_ref and NavigationInstance.instance.recordService(rec_ref) + if not self.record_service: + self.log(1, "'record service' failed") + return False + event_id = self.eit if event_id is None: event_id = -1 - prep_res = self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id ) - if prep_res: + + if self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id): self.log(2, "'prepare' failed: error %d" % prep_res) self.record_service = None return False - + + if self.repeated: + epgcache = eEPGCache.getInstance() + queryTime=self.begin+(self.end-self.begin)/2 + evt = epgcache.lookupEventTime(rec_ref, queryTime) + if evt: + self.description = evt.getShortDescription() + self.log(3, "prepare ok, writing meta information to %s" % self.Filename) try: f = open(self.Filename + ".ts.meta", "w") - f.write(str(self.service_ref) + "\n") + f.write(str(rec_ref) + "\n") f.write(self.name + "\n") f.write(self.description + "\n") f.write(str(self.begin) + "\n") f.close() - except: + except IOError: self.log(4, "failed to write meta information") + self.record_service = None + return False return True def do_backoff(self): @@ -132,11 +172,12 @@ class RecordTimerEntry(timer.TimerEntry): self.log(7, "prepare failed") if self.first_try_prepare: self.first_try_prepare = False - if config.recording.asktozap.value == 0: + if not config.recording.asktozap.value: self.log(8, "asking user to zap away") - Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n")) + Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20) else: # zap without asking self.log(9, "zap without asking") + Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_INFO, timeout=20) self.failureCB(True) self.do_backoff() @@ -144,21 +185,36 @@ class RecordTimerEntry(timer.TimerEntry): self.start_prepare = time.time() + self.backoff return False elif next_state == self.StateRunning: - self.log(11, "start recording") - record_res = self.record_service.start() - - if record_res: - self.log(13, "start record returned %d" % record_res) - self.do_backoff() - # retry - self.begin = time.time() + self.backoff - return False - - return True + # if this timer has been cancelled, just go to "end" state. + if self.cancelled: + return True + + if self.justplay: + self.log(11, "zapping") + NavigationInstance.instance.playService(self.service_ref.ref) + return True + else: + self.log(11, "start recording") + record_res = self.record_service.start() + + if record_res: + self.log(13, "start record returned %d" % record_res) + self.do_backoff() + # retry + self.begin = time.time() + self.backoff + return False + + return True elif next_state == self.StateEnded: self.log(12, "stop recording") - self.record_service.stop() - self.record_service = None + if not self.justplay: + NavigationInstance.instance.stopRecordService(self.record_service) + self.record_service = None + if self.afterEvent == AFTEREVENT.STANDBY: + if self.session is not None: + self.session.open(Standby, self) + elif self.afterEvent == AFTEREVENT.DEEPSTANDBY: + quitMainloop(1) return True def getNextActivation(self): @@ -184,16 +240,19 @@ class RecordTimerEntry(timer.TimerEntry): self.start_prepare = self.begin - self.prepare_time self.backoff = 0 - if old_prepare != self.start_prepare: + if int(old_prepare) != int(self.start_prepare): self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare)) def createTimer(xml): begin = int(xml.getAttribute("begin")) end = int(xml.getAttribute("end")) - serviceref = ServiceReference(str(xml.getAttribute("serviceref"))) + serviceref = ServiceReference(xml.getAttribute("serviceref").encode("utf-8")) description = xml.getAttribute("description").encode("utf-8") repeated = xml.getAttribute("repeated").encode("utf-8") disabled = long(xml.getAttribute("disabled") or "0") + justplay = long(xml.getAttribute("justplay") or "0") + afterevent = str(xml.getAttribute("afterevent") or "nothing") + afterevent = { "nothing": AFTEREVENT.NONE, "standby": AFTEREVENT.STANDBY, "deepstandby": AFTEREVENT.DEEPSTANDBY }[afterevent] if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None": eit = long(xml.getAttribute("eit")) else: @@ -201,7 +260,7 @@ def createTimer(xml): name = xml.getAttribute("name").encode("utf-8") #filename = xml.getAttribute("filename").encode("utf-8") - entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled) + entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent) entry.repeated = int(repeated) for l in elementsWithTag(xml.childNodes, "log"): @@ -226,7 +285,7 @@ class RecordTimer(timer.Timer): def isRecording(self): isRunning = False for timer in self.timer_list: - if timer.isRunning(): + if timer.isRunning() and not timer.justplay: isRunning = True return isRunning @@ -291,23 +350,25 @@ class RecordTimer(timer.Timer): list.append('\n') - #for time, code, msg in timer.log_entries: - #list.append('') - #list.append(str(msg)) - #list.append('\n') - + if config.recording.debug.value: + for time, code, msg in timer.log_entries: + list.append('') + list.append(str(stringToXML(msg))) + list.append('\n') list.append('\n') @@ -326,24 +387,29 @@ class RecordTimer(timer.Timer): def isInTimer(self, eventid, begin, duration, service): time_match = 0 + chktime = None + chktimecmp = None + chktimecmp_end = None + end = begin + duration for x in self.timer_list: if str(x.service_ref) == str(service): #if x.eit is not None and x.repeated == 0: # if x.eit == eventid: # return duration if x.repeated != 0: - chktime = localtime(begin) + if chktime is None: + chktime = localtime(begin) + chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min + chktimecmp_end = chktimecmp + (duration / 60) time = localtime(x.begin) - chktimecmp = chktime.tm_wday * 1440 + chktime.tm_hour * 60 + chktime.tm_min for y in range(7): if x.repeated & (2 ** y): timecmp = y * 1440 + time.tm_hour * 60 + time.tm_min if timecmp <= chktimecmp < (timecmp + ((x.end - x.begin) / 60)): time_match = ((timecmp + ((x.end - x.begin) / 60)) - chktimecmp) * 60 - elif chktimecmp <= timecmp < (chktimecmp + (duration / 60)): - time_match = ((chktimecmp + (duration / 60)) - timecmp) * 60 + elif chktimecmp <= timecmp < chktimecmp_end: + time_match = (chktimecmp_end - timecmp) * 60 else: #if x.eit is None: - end = begin + duration if begin <= x.begin <= end: diff = end - x.begin if time_match < diff: @@ -353,10 +419,6 @@ class RecordTimer(timer.Timer): if time_match < diff: time_match = diff return time_match - - - - def removeEntry(self, entry): print "[Timer] Remove " + str(entry)