X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e9df68d0ed6ba7a8da987282f4bfae3824b8eb29..6e4fe9bcc4aeab419ca25ea8cf8dfe274a7868bd:/RecordTimer.py diff --git a/RecordTimer.py b/RecordTimer.py index 4c3304c7..dfddb73c 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -10,8 +10,9 @@ import xml.dom.minidom 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: @@ -35,7 +36,7 @@ def parseEvent(ev): # 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): timer.TimerEntry.__init__(self, int(begin), int(end)) assert isinstance(serviceref, ServiceReference) @@ -49,6 +50,7 @@ class RecordTimerEntry(timer.TimerEntry): self.timer = None self.record_service = None self.start_prepare = 0 + self.justplay = justplay self.log_entries = [] self.resetState() @@ -59,6 +61,7 @@ class RecordTimerEntry(timer.TimerEntry): def resetState(self): self.state = self.StateWaiting + self.cancelled = False self.first_try_prepare = True self.timeChanged() @@ -80,32 +83,35 @@ 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: - 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 + 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 + + 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: @@ -143,21 +149,31 @@ 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 return True def getNextActivation(self): @@ -193,6 +209,7 @@ def createTimer(xml): 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") if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None": eit = long(xml.getAttribute("eit")) else: @@ -200,7 +217,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) entry.repeated = int(repeated) for l in elementsWithTag(xml.childNodes, "log"): @@ -225,7 +242,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 @@ -237,9 +254,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') @@ -295,20 +309,21 @@ 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(' name="' + str(stringToXML(timer.name)) + '"') + list.append(' description="' + str(stringToXML(timer.description)) + '"') 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') @@ -328,16 +343,29 @@ class RecordTimer(timer.Timer): def isInTimer(self, eventid, begin, duration, service): time_match = 0 - for x in self.timer: - if x.service_ref == service: - if x.eit is not None and x.repeated == 0: - if x.eit == eventid: - return duration - elif x.repeated != 0: - # TODO: implement! - pass - elif x.eit is None: - end = begin + duration + 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: @@ -347,10 +375,6 @@ class RecordTimer(timer.Timer): if time_match < diff: time_match = diff return time_match - - - - def removeEntry(self, entry): print "[Timer] Remove " + str(entry)