X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8a6e44c53a3fb23ca87645fdfad73652a202b905..dfbd5853de864053e8ac10d1269e8137f3cb5a34:/RecordTimer.py diff --git a/RecordTimer.py b/RecordTimer.py index e375c9f2..9f78ff24 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -22,17 +22,20 @@ 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() 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 return (begin, end, name, description, eit) # please do not translate log messages class RecordTimerEntry(timer.TimerEntry): - def __init__(self, serviceref, begin, end, name, description, eit): + def __init__(self, serviceref, begin, end, name, description, eit, disabled = False): timer.TimerEntry.__init__(self, int(begin), int(end)) assert isinstance(serviceref, ServiceReference) @@ -42,8 +45,10 @@ class RecordTimerEntry(timer.TimerEntry): self.dontSave = False self.name = name self.description = description + self.disabled = disabled self.timer = None self.record_service = None + self.start_prepare = 0 self.log_entries = [] self.resetState() @@ -59,15 +64,18 @@ class RecordTimerEntry(timer.TimerEntry): def calculateFilename(self): service_name = self.service_ref.getServiceName() -# begin_date = datetime.fromtimestamp(begin).strf... - begin_date = "" + begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin)) print "begin_date: ", begin_date print "service_name: ", service_name print "name:", self.name print "description: ", self.description + + filename = begin_date + " - " + service_name + if self.name: + filename += " - " + self.name - self.Filename = Directories.getRecordingFilename(service_name) + self.Filename = Directories.getRecordingFilename(filename) self.log(0, "Filename calculated as: '%s'" % self.Filename) #begin_date + " - " + service_name + description) @@ -78,7 +86,10 @@ class RecordTimerEntry(timer.TimerEntry): self.log(1, "'record service' failed") return False else: - prep_res = self.record_service.prepare(self.Filename + ".ts") + 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 @@ -168,9 +179,12 @@ class RecordTimerEntry(timer.TimerEntry): self.log(14, "user didn't want to zap away, record will probably fail") def timeChanged(self): + old_prepare = self.start_prepare self.start_prepare = self.begin - self.prepare_time self.backoff = 0 - self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare)) + + if old_prepare != 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")) @@ -178,16 +192,21 @@ def createTimer(xml): serviceref = ServiceReference(str(xml.getAttribute("serviceref"))) description = xml.getAttribute("description").encode("utf-8") repeated = xml.getAttribute("repeated").encode("utf-8") - eit = xml.getAttribute("eit").encode("utf-8") + disabled = long(xml.getAttribute("disabled") or "0") + 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) + entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled) entry.repeated = int(repeated) for l in elementsWithTag(xml.childNodes, "log"): time = int(l.getAttribute("time")) code = int(l.getAttribute("code")) - msg = mergeText(l.childNodes).strip() + msg = mergeText(l.childNodes).strip().encode("utf-8") entry.log_entries.append((time, code, msg)) return entry @@ -202,7 +221,7 @@ 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: @@ -217,45 +236,88 @@ class RecordTimer(timer.Timer): root = doc.childNodes[0] 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') - doc.appendChild(root_element) - root_element.appendChild(doc.createTextNode("\n")) + #doc = xml.dom.minidom.Document() + #root_element = doc.createElement('timers') + #doc.appendChild(root_element) + #root_element.appendChild(doc.createTextNode("\n")) - for timer in self.timer_list + self.processed_timers: + #for timer in self.timer_list + self.processed_timers: # some timers (instant records) don't want to be saved. # skip them + #if timer.dontSave: + #continue + #t = doc.createTextNode("\t") + #root_element.appendChild(t) + #t = doc.createElement('timer') + #t.setAttribute("begin", str(int(timer.begin))) + #t.setAttribute("end", str(int(timer.end))) + #t.setAttribute("serviceref", str(timer.service_ref)) + #t.setAttribute("repeated", str(timer.repeated)) + #t.setAttribute("name", timer.name) + #t.setAttribute("description", timer.description) + #t.setAttribute("eit", str(timer.eit)) + + #for time, code, msg in timer.log_entries: + #t.appendChild(doc.createTextNode("\t\t")) + #l = doc.createElement('log') + #l.setAttribute("time", str(time)) + #l.setAttribute("code", str(code)) + #l.appendChild(doc.createTextNode(msg)) + #t.appendChild(l) + #t.appendChild(doc.createTextNode("\n")) + + #root_element.appendChild(t) + #t = doc.createTextNode("\n") + #root_element.appendChild(t) + + + #file = open(self.Filename, "w") + #doc.writexml(file) + #file.write("\n") + #file.close() + + list = [] + + list.append('\n') + list.append('\n') + + for timer in self.timer_list + self.processed_timers: if timer.dontSave: continue - t = doc.createTextNode("\t") - root_element.appendChild(t) - t = doc.createElement('timer') - t.setAttribute("begin", str(int(timer.begin))) - t.setAttribute("end", str(int(timer.end))) - t.setAttribute("serviceref", str(timer.service_ref)) - t.setAttribute("repeated", str(timer.repeated)) - t.setAttribute("name", timer.name) - t.setAttribute("description", timer.description) - t.setAttribute("eit", str(timer.eit)) + + list.append('\n') for time, code, msg in timer.log_entries: - t.appendChild(doc.createTextNode("\t\t")) - l = doc.createElement('log') - l.setAttribute("time", str(time)) - l.setAttribute("code", str(code)) - l.appendChild(doc.createTextNode(msg)) - t.appendChild(l) - t.appendChild(doc.createTextNode("\n")) - - root_element.appendChild(t) - t = doc.createTextNode("\n") - root_element.appendChild(t) + list.append('') + list.append(str(msg)) + list.append('\n') + + + list.append('\n') + + list.append('\n') file = open(self.Filename, "w") - doc.writexml(file) - file.write("\n") + for x in list: + file.write(x) file.close() def record(self, entry): @@ -263,6 +325,32 @@ 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 + 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 + elif x.repeated != 0: + # TODO: implement! + pass + elif x.eit is None: + end = begin + duration + 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)