X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a3ccac772dd40db6e4878f1a818dfb346ac27341..c5d48668f18226413164d84ff808547bb10fcbba:/RecordTimer.py?ds=sidebyside diff --git a/RecordTimer.py b/RecordTimer.py index 2835a388..1d343952 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -7,11 +7,13 @@ from Components.config import config import timer import xml.dom.minidom +from enigma import quitMainloop, eEPGCache, eEPGCachePtr + from Screens.MessageBox import MessageBox -from Screens.SubserviceSelection import SubserviceSelection import NavigationInstance +from time import localtime -from Tools.XMLTools import elementsWithTag, mergeText +from Tools.XMLTools import elementsWithTag, mergeText, stringToXML from ServiceReference import ServiceReference # ok, for descriptions etc we have: @@ -33,11 +35,23 @@ def parseEvent(ev): end += config.recording.margin_after.value[0] * 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 @@ -49,6 +63,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() @@ -59,6 +76,7 @@ class RecordTimerEntry(timer.TimerEntry): def resetState(self): self.state = self.StateWaiting + self.cancelled = False self.first_try_prepare = True self.timeChanged() @@ -80,29 +98,41 @@ 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: - prep_res = self.record_service.prepare(self.Filename + ".ts") - if prep_res: - self.log(2, "'prepare' failed: error %d" % prep_res) - self.record_service = None + self.calculateFilename() + self.record_service = NavigationInstance.instance.recordService(self.service_ref) + if self.record_service == None: + self.log(1, "'record service' failed") return False - - 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(self.name + "\n") - f.write(self.description + "\n") - f.write(str(self.begin) + "\n") - f.close() - except: - self.log(4, "failed to write meta information") - return True + else: + 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: + 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(self.service_ref.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(self.name + "\n") + f.write(self.description + "\n") + f.write(str(self.begin) + "\n") + f.close() + except IOError: + self.log(4, "failed to write meta information") + return True def do_backoff(self): if self.backoff == 0: @@ -130,9 +160,10 @@ class RecordTimerEntry(timer.TimerEntry): self.first_try_prepare = False if config.recording.asktozap.value == 0: 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() @@ -140,21 +171,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: + self.record_service.stop() + 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): @@ -189,17 +235,18 @@ def createTimer(xml): serviceref = ServiceReference(str(xml.getAttribute("serviceref"))) description = xml.getAttribute("description").encode("utf-8") repeated = xml.getAttribute("repeated").encode("utf-8") - try: - disabled = eval(xml.getAttribute("disabled")) - except: - disabled = False - try: - eit = long(xml.getAttribute("eit").encode("utf-8")) - except: + 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: eit = None + 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"): @@ -220,11 +267,11 @@ class RecordTimer(timer.Timer): self.loadTimer() except IOError: print "unable to load timers from file!" - + 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 @@ -236,9 +283,6 @@ class RecordTimer(timer.Timer): for timer in elementsWithTag(root.childNodes, "timer"): self.record(createTimer(timer)) - def strToXML(self, str): - return str.replace('&', '&').replace('<', '<').replace('>', '>').replace("'", '''). replace('"', '&qout;') - def saveTimer(self): #doc = xml.dom.minidom.Document() #root_element = doc.createElement('timers') @@ -294,19 +338,22 @@ class RecordTimer(timer.Timer): list.append(' end="' + str(int(timer.end)) + '"') list.append(' serviceref="' + str(timer.service_ref) + '"') list.append(' repeated="' + str(int(timer.repeated)) + '"') - list.append(' name="' + str(self.strToXML(timer.name)) + '"') - list.append(' description="' + str(self.strToXML(timer.description)) + '"') - list.append(' eit="' + str(timer.eit) + '"') + list.append(' name="' + str(stringToXML(timer.name)) + '"') + list.append(' description="' + str(stringToXML(timer.description)) + '"') + list.append(' afterevent="' + str(stringToXML({ AFTEREVENT.NONE: "nothing", AFTEREVENT.STANDBY: "standby", AFTEREVENT.DEEPSTANDBY: "deepstandby" }[timer.afterEvent])) + '"') + if timer.eit is not None: + list.append(' eit="' + str(timer.eit) + '"') list.append(' disabled="' + str(int(timer.disabled)) + '"') + list.append(' justplay="' + str(int(timer.justplay)) + '"') list.append('>\n') - for time, code, msg in timer.log_entries: - list.append('') - list.append(str(msg)) - list.append('\n') + #for time, code, msg in timer.log_entries: + #list.append('') + #list.append(str(msg)) + #list.append('\n') list.append('\n') @@ -323,6 +370,41 @@ class RecordTimer(timer.Timer): print "[Timer] Record " + str(entry) entry.Timer = self self.addTimerEntry(entry) + + 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: + 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) + 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_end: + time_match = (chktimecmp_end - timecmp) * 60 + else: #if x.eit is None: + if begin <= x.begin <= end: + diff = end - x.begin + if time_match < diff: + time_match = diff + elif x.begin <= begin <= x.end: + diff = x.end - begin + if time_match < diff: + time_match = diff + return time_match def removeEntry(self, entry): print "[Timer] Remove " + str(entry)