X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=4ece9c58133a76216017010d5b165c0c2aabc0cb;hp=448a5003379e3b7332503d2d4ac4039378cb526a;hb=a97f3cb3fc63e25d6378a75cb7649563d18f2a5e;hpb=b9b1fece7a26c91b993e234563160c56b44ed9a8 diff --git a/RecordTimer.py b/RecordTimer.py old mode 100644 new mode 100755 index 448a500..4ece9c5 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -1,25 +1,23 @@ -import time -#from time import datetime -from Tools import Directories, Notifications, ASCIItranslit - -from Components.config import config -import timer -import xml.etree.cElementTree - from enigma import eEPGCache, getBestPlayableServiceReference, \ eServiceReference, iRecordableService, quitMainloop -from Screens.MessageBox import MessageBox +from Components.config import config +from Components.UsageConfig import defaultMoviePath from Components.TimerSanityCheck import TimerSanityCheck -import NavigationInstance +from Screens.MessageBox import MessageBox import Screens.Standby - -from time import localtime - +from Tools import Directories, Notifications, ASCIItranslit from Tools.XMLTools import stringToXML + +import timer +import xml.etree.cElementTree +import NavigationInstance from ServiceReference import ServiceReference +from time import localtime, strftime, ctime, time +from bisect import insort + # ok, for descriptions etc we have: # service reference (to get the service name) # name (title) @@ -65,8 +63,8 @@ class RecordTimerEntry(timer.TimerEntry, object): recordings = NavigationInstance.instance.getRecordings() if not recordings: # no more recordings exist rec_time = NavigationInstance.instance.RecordTimer.getNextRecordingTime() - if rec_time > 0 and (rec_time - time.time()) < 360: - print "another recording starts in", rec_time - time.time(), "seconds... do not shutdown yet" + if rec_time > 0 and (rec_time - time()) < 360: + print "another recording starts in", rec_time - time(), "seconds... do not shutdown yet" else: print "no starting records in the next 360 seconds... immediate shutdown" RecordTimerEntry.shutdown() # immediate shutdown @@ -96,15 +94,18 @@ class RecordTimerEntry(timer.TimerEntry, object): timer.TimerEntry.__init__(self, int(begin), int(end)) if checkOldTimers == True: - if self.begin < time.time() - 1209600: - self.begin = int(time.time()) + if self.begin < time() - 1209600: + self.begin = int(time()) if self.end < self.begin: self.end = self.begin assert isinstance(serviceref, ServiceReference) - self.service_ref = serviceref + if serviceref.isRecordable(): + self.service_ref = serviceref + else: + self.service_ref = ServiceReference(None) self.eit = eit self.dontSave = False self.name = name @@ -125,12 +126,13 @@ class RecordTimerEntry(timer.TimerEntry, object): self.resetState() def log(self, code, msg): - self.log_entries.append((int(time.time()), code, msg)) + self.log_entries.append((int(time()), code, msg)) print "[TIMER]", msg def calculateFilename(self): service_name = self.service_ref.getServiceName() - begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin)) + begin_date = strftime("%Y%m%d %H%M", localtime(self.begin)) + begin_shortdate = strftime("%Y%m%d", localtime(self.begin)) print "begin_date: ", begin_date print "service_name: ", service_name @@ -139,16 +141,26 @@ class RecordTimerEntry(timer.TimerEntry, object): filename = begin_date + " - " + service_name if self.name: - filename += " - " + self.name + if config.usage.setup_level.index >= 2: # expert+ + if config.recording.filename_composition.value == "short": + filename = begin_shortdate + " - " + self.name + elif config.recording.filename_composition.value == "long": + filename += " - " + self.name + " - " + self.description + else: + filename += " - " + self.name # standard + else: + filename += " - " + self.name if config.recording.ascii_filenames.value: filename = ASCIItranslit.legacyEncode(filename) - if self.dirname and not Directories.fileExists(self.dirname, 'w'): - self.dirnameHadToFallback = True - self.Filename = Directories.getRecordingFilename(filename, None) + if not self.dirname or not Directories.fileExists(self.dirname, 'w'): + if self.dirname: + self.dirnameHadToFallback = True + dirname = defaultMoviePath() else: - self.Filename = Directories.getRecordingFilename(filename, self.dirname) + dirname = self.dirname + self.Filename = Directories.getRecordingFilename(filename, dirname) self.log(0, "Filename calculated as: '%s'" % self.Filename) #begin_date + " - " + service_name + description) @@ -190,6 +202,12 @@ class RecordTimerEntry(timer.TimerEntry, object): self.log(4, "failed to write meta information") else: self.log(2, "'prepare' failed: error %d" % prep_res) + + # we must calc nur start time before stopRecordService call because in Screens/Standby.py TryQuitMainloop tries to get + # the next start time in evEnd event handler... + self.do_backoff() + self.start_prepare = time() + self.backoff + NavigationInstance.instance.stopRecordService(self.record_service) self.record_service = None return False @@ -211,6 +229,12 @@ class RecordTimerEntry(timer.TimerEntry, object): if next_state == self.StatePrepared: if self.tryPrepare(): self.log(6, "prepare ok, waiting for begin") + # create file to "reserve" the filename + # because another recording at the same time on another service can try to record the same event + # i.e. cable / sat.. then the second recording needs an own extension... when we create the file + # here than calculateFilename is happy + if not self.justplay: + open(self.Filename + ".ts", "w").close() # fine. it worked, resources are allocated. self.next_activation = self.begin self.backoff = 0 @@ -232,10 +256,6 @@ class RecordTimerEntry(timer.TimerEntry, object): self.log(8, "currently running service is not a live service.. so stop it makes no sense") else: self.log(8, "currently no service running... so we dont need to stop it") - - self.do_backoff() - # retry - self.start_prepare = time.time() + self.backoff return False elif next_state == self.StateRunning: # if this timer has been cancelled, just go to "end" state. @@ -261,7 +281,7 @@ class RecordTimerEntry(timer.TimerEntry, object): self.log(13, "start record returned %d" % record_res) self.do_backoff() # retry - self.begin = time.time() + self.backoff + self.begin = time() + self.backoff return False return True @@ -290,7 +310,7 @@ class RecordTimerEntry(timer.TimerEntry, object): if not self.autoincrease: return False if entry is None: - new_end = int(time.time()) + self.autoincreasetime + new_end = int(time()) + self.autoincreasetime else: new_end = entry.begin -30 @@ -303,7 +323,7 @@ class RecordTimerEntry(timer.TimerEntry, object): del simulTimerList new_end -= 30 # 30 Sekunden Prepare-Zeit lassen del dummyentry - if new_end <= time.time(): + if new_end <= time(): return False self.end = new_end return True @@ -341,7 +361,7 @@ class RecordTimerEntry(timer.TimerEntry, object): self.backoff = 0 if int(old_prepare) != int(self.start_prepare): - self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare)) + self.log(15, "record time changed, start prepare is now: %s" % ctime(self.start_prepare)) def gotRecordEvent(self, record, event): # TODO: this is not working (never true), please fix. (comparing two swig wrapped ePtrs) @@ -433,7 +453,36 @@ class RecordTimer(timer.Timer): self.loadTimer() except IOError: print "unable to load timers from file!" - + + def doActivate(self, w): + # when activating a timer which has already passed, + # simply abort the timer. don't run trough all the stages. + if w.shouldSkip(): + w.state = RecordTimerEntry.StateEnded + else: + # when active returns true, this means "accepted". + # otherwise, the current state is kept. + # the timer entry itself will fix up the delay then. + if w.activate(): + w.state += 1 + + self.timer_list.remove(w) + + # did this timer reached the last state? + if w.state < RecordTimerEntry.StateEnded: + # no, sort it into active list + insort(self.timer_list, w) + else: + # yes. Process repeated, and re-add. + if w.repeated: + w.processRepeated() + w.state = RecordTimerEntry.StateWaiting + self.addTimerEntry(w) + else: + insort(self.processed_timers, w) + + self.stateChanged(w) + def isRecording(self): isRunning = False for timer in self.timer_list: @@ -565,7 +614,7 @@ class RecordTimer(timer.Timer): file.close() def getNextZapTime(self): - now = time.time() + now = time() for timer in self.timer_list: if not timer.justplay or timer.begin < now: continue @@ -573,15 +622,16 @@ class RecordTimer(timer.Timer): return -1 def getNextRecordingTime(self): - now = time.time() + now = time() for timer in self.timer_list: - if timer.justplay or timer.begin < now: + next_act = timer.getNextActivation() + if timer.justplay or next_act < now: continue - return timer.begin + return next_act return -1 def isNextRecordAfterEventActionAuto(self): - now = time.time() + now = time() t = None for timer in self.timer_list: if timer.justplay or timer.begin < now: @@ -655,7 +705,7 @@ class RecordTimer(timer.Timer): chktimecmp_end = chktimecmp + (duration / 60) time = localtime(x.begin) for y in (0, 1, 2, 3, 4, 5, 6): - if x.repeated & (2 ** y) and (x.begin <= begin or begin <= x.begin <= end): + if x.repeated & (1 << y) and (x.begin <= begin or begin <= x.begin <= end): 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