X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3604798b6ce86c19cb3e045b0808b91ea7dc3a3a..ff008af237bba3e58012f637cbe8996f4450f031:/RecordTimer.py diff --git a/RecordTimer.py b/RecordTimer.py index 9a874a4c..b438910e 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 + 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, justplay = 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 @@ -51,6 +68,8 @@ class RecordTimerEntry(timer.TimerEntry): self.record_service = None self.start_prepare = 0 self.justplay = justplay + self.afterEvent = afterEvent + self.session = None self.log_entries = [] self.resetState() @@ -100,7 +119,13 @@ class RecordTimerEntry(timer.TimerEntry): 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") @@ -109,7 +134,7 @@ class RecordTimerEntry(timer.TimerEntry): f.write(self.description + "\n") f.write(str(self.begin) + "\n") f.close() - except: + except IOError: self.log(4, "failed to write meta information") return True @@ -137,11 +162,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() @@ -174,6 +200,11 @@ class RecordTimerEntry(timer.TimerEntry): 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): @@ -199,17 +230,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: @@ -217,7 +250,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, justplay) + entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent) entry.repeated = int(repeated) for l in elementsWithTag(xml.childNodes, "log"): @@ -242,7 +275,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 @@ -311,20 +344,21 @@ class RecordTimer(timer.Timer): list.append(' repeated="' + str(int(timer.repeated)) + '"') 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') - + 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') @@ -343,24 +377,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: