X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b8e6fb4d9994d2a23a719589d22bd6d637e95da0..9fac5ff7371972cef663d456b96c68f51b5c2c01:/RecordTimer.py diff --git a/RecordTimer.py b/RecordTimer.py index 85e9d172..37aecdbd 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -3,6 +3,7 @@ import codecs #from time import datetime from Tools import Directories, Notifications +from Components.config import config import timer import xml.dom.minidom @@ -12,21 +13,34 @@ import NavigationInstance from Tools.XMLTools import elementsWithTag from ServiceReference import ServiceReference +# ok, for descriptions etc we have: +# service reference (to get the service name) +# name (title) +# description (description) +# event data (ONLY for time adjustments etc.) + + +# parses an event, and gives out a (begin, end, name, duration, eit)-tuple. +def parseEvent(ev): + name = ev.getEventName() + description = ev.getShortDescription() + begin = ev.getBeginTime() + end = begin + ev.getDuration() + eit = None + return (begin, end, name, description, eit) + class RecordTimerEntry(timer.TimerEntry): - def __init__(self, begin, end, serviceref, epg, description): + def __init__(self, serviceref, begin, end, name, description, eit): timer.TimerEntry.__init__(self, int(begin), int(end)) assert isinstance(serviceref, ServiceReference) self.service_ref = serviceref - if epg is not None: - self.epg_data = "" - #str(epg.m_event_name) - else: - self.epg_data = "" + self.eit = eit self.dontSave = False + self.name = name self.description = description self.timer = None self.record_service = None @@ -37,40 +51,31 @@ class RecordTimerEntry(timer.TimerEntry): service_name = self.service_ref.getServiceName() # begin_date = datetime.fromtimestamp(begin).strf... begin_date = "" - if self.epg_data is not None: - description = " - " + self.epg_data - else: - description = "" - print "begin_date: " + str(begin_date) - print "service_name: " + str(service_name) - print "description: " + str(description) + print "begin_date: ", begin_date + print "service_name: ", service_name + print "name:", self.name + print "description: ", self.description + self.Filename = Directories.getRecordingFilename(service_name) #begin_date + " - " + service_name + description) - # build filename from epg - - # pff das geht noch nicht... -# if epg == None: -# self.Filename = "recording.ts" -# else: -# self.Filename = "record_" + str(epg.m_event_name) + ".ts" -# -# print "------------ record filename: %s" % (self.Filename) def tryPrepare(self): self.calculateFilename() self.record_service = NavigationInstance.instance.recordService(self.service_ref) if self.record_service == None: return False - else: + else: if self.record_service.prepare(self.Filename + ".ts"): self.record_service = None return False f = open(self.Filename + ".ts.meta", "w") f.write(str(self.service_ref) + "\n") - f.write(self.epg_data + "\n") + f.write(self.name + "\n") + f.write(self.description + "\n") + f.write(str(self.begin) + "\n") del f return True @@ -81,7 +86,10 @@ class RecordTimerEntry(timer.TimerEntry): self.prepareOK = True else: # error. - Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n")) + if config.recording.asktozap.value == 0: + Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n")) + else: # zap without asking + self.failureCB(True) elif event == self.EventStart: if self.prepareOK: self.record_service.start() @@ -94,6 +102,7 @@ class RecordTimerEntry(timer.TimerEntry): if self.prepareOK: self.record_service.stop() self.record_service = None + print "Timer successfully ended" else: print "prepare failed, thus nothing was recorded." @@ -104,8 +113,11 @@ class RecordTimerEntry(timer.TimerEntry): def failureCB(self, answer): if answer == True: - NavigationInstance.instance.stopUserServices() + #NavigationInstance.instance.stopUserServices() + print "[RecordTimer] zapping to", self.service_ref + NavigationInstance.instance.playService(self.service_ref.ref) self.activate(self.EventPrepare) + if self.wantStart: print "post-activating record" self.activate(self.EventStart) @@ -116,11 +128,12 @@ def createTimer(xml): begin = int(xml.getAttribute("begin")) end = int(xml.getAttribute("end")) serviceref = ServiceReference(str(xml.getAttribute("serviceref"))) - description = xml.getAttribute("description") - repeated = xml.getAttribute("repeated") - epgdata = xml.getAttribute("epgdata") - #filename = xml.getAttribute("filename") - entry = RecordTimerEntry(begin, end, serviceref, epgdata, description) + description = xml.getAttribute("description").encode("utf-8") + repeated = xml.getAttribute("repeated").encode("utf-8") + eit = xml.getAttribute("eit").encode("utf-8") + name = xml.getAttribute("name").encode("utf-8") + #filename = xml.getAttribute("filename").encode("utf-8") + entry = RecordTimerEntry(serviceref, begin, end, name, description, eit) entry.repeated = int(repeated) return entry @@ -132,7 +145,7 @@ class RecordTimer(timer.Timer): try: self.loadTimer() - except: + except IOError: print "unable to load timers from file!" def isRecording(self): @@ -168,14 +181,16 @@ class RecordTimer(timer.Timer): t.setAttribute("end", str(timer.end)) t.setAttribute("serviceref", str(timer.service_ref)) t.setAttribute("repeated", str(timer.repeated)) - #t.setAttribute("epgdata", timer.) - t.setAttribute("description", "no description") # timer.description) + t.setAttribute("name", timer.name) + t.setAttribute("description", timer.description) + t.setAttribute("eit", str(timer.eit)) + root_element.appendChild(t) t = doc.createTextNode("\n") root_element.appendChild(t) file = open(self.Filename, "w") - doc.writexml(codecs.getwriter('UTF-8')(file)) + doc.writexml(file) file.write("\n") file.close() @@ -189,8 +204,6 @@ class RecordTimer(timer.Timer): entry.repeated = False - entry.repeated = False - if entry.state == timer.TimerEntry.StateRunning: print "remove running timer." entry.end = time.time()