X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=timer.py;h=75519cf88b69bb82dd4cd9dac8dde7084150334e;hp=e298f665557d87e93b04ef7f7ec1d501d439fb15;hb=c8c7ddb799e423a4dae05c6871c32f539f206f7a;hpb=18fe904a07ad9fd15d53f80361e35b481507f2be diff --git a/timer.py b/timer.py index e298f66..75519cf 100644 --- a/timer.py +++ b/timer.py @@ -1,7 +1,9 @@ -import bisect -import time +from bisect import insort +from time import strftime, time, localtime, gmtime, mktime +from calendar import timegm +from enigma import eTimer import calendar -from enigma import * +import datetime class TimerEntry: StateWaiting = 0 @@ -29,19 +31,42 @@ class TimerEntry: def isRunning(self): return self.state == self.StateRunning + def addOneDay(self, timedatestruct): + day = timedatestruct.tm_mday + month = timedatestruct.tm_mon + year = timedatestruct.tm_year + + if calendar.isleap(year): + leap = 29 + else: + leap = 28 + monthdays = [0, 31, leap, 31, 30, 31, 30, 31, 31,30, 31,30, 31] + day += 1 + + # check for sane dates and correct if needed + if day > monthdays[month]: + day = 1 + month += 1 + if month > 12: + month = 1 + year += 1 + + newdate = datetime.datetime(year, month, day, timedatestruct.tm_hour, timedatestruct.tm_min, timedatestruct.tm_sec) + return newdate.timetuple() + # update self.begin and self.end according to the self.repeated-flags - def processRepeated(self): + def processRepeated(self, findRunningEvent = True): print "ProcessRepeated" if (self.repeated != 0): - now = int(time.time()) + 1 + now = int(time()) + 1 #to avoid problems with daylight saving, we need to calculate with localtime, in struct_time representation - localbegin = time.localtime(self.begin) - localend = time.localtime(self.end) - localnow = time.localtime(now) + localbegin = localtime(self.begin) + localend = localtime(self.end) + localnow = localtime(now) - print time.strftime("%c", localbegin) - print time.strftime("%c", localend) + print strftime("%c", localbegin) + print strftime("%c", localend) day = [] flags = self.repeated @@ -53,21 +78,21 @@ class TimerEntry: day.append(1) flags = flags >> 1 - print time.strftime("%c", localnow) - while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and localend < localnow)): - print time.strftime("%c", localbegin) - print time.strftime("%c", localend) - #add one day to the struct_time, we have to convert using gmt functions, because the daylight saving flag might change after we add our 86400 seconds - localbegin = time.gmtime(calendar.timegm(localbegin) + 86400) - localend = time.gmtime(calendar.timegm(localend) + 86400) + print strftime("%c", localnow) + + while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and ((findRunningEvent and localend < localnow) or ((not findRunningEvent) and localbegin < localnow)))): + print "localbegin:", strftime("%c", localbegin) + print "localend:", strftime("%c", localend) + localbegin = self.addOneDay(localbegin) + localend = self.addOneDay(localend) #we now have a struct_time representation of begin and end in localtime, but we have to calculate back to (gmt) seconds since epoch - self.begin = int(time.mktime(localbegin)) - self.end = int(time.mktime(localend)) + 1 + self.begin = int(mktime(localbegin)) + self.end = int(mktime(localend)) + 1 print "ProcessRepeated result" - print time.strftime("%c", time.localtime(self.begin)) - print time.strftime("%c", time.localtime(self.end)) + print strftime("%c", localtime(self.begin)) + print strftime("%c", localtime(self.end)) self.timeChanged() @@ -84,10 +109,10 @@ class TimerEntry: # check if a timer entry must be skipped def shouldSkip(self): - return self.end <= time.time() and self.state == TimerEntry.StateWaiting + return self.end <= time() and self.state == TimerEntry.StateWaiting def abort(self): - self.end = time.time() + self.end = time() # in case timer has not yet started, but gets aborted (so it's preparing), # set begin to now. @@ -124,20 +149,15 @@ class Timer: self.timer = eTimer() self.timer.timeout.get().append(self.calcNextActivation) - self.lastActivation = time.time() + self.lastActivation = time() self.calcNextActivation() self.on_state_change = [ ] - + def stateChanged(self, entry): for f in self.on_state_change: f(entry) - - def getNextRecordingTime(self): - if len(self.timer_list) > 0: - return self.timer_list[0].begin - return -1 - + def cleanup(self): self.processed_timers = [entry for entry in self.processed_timers if entry.disabled] @@ -152,22 +172,22 @@ class Timer: print "shouldSkip:", entry.shouldSkip() print "state == ended", entry.state == TimerEntry.StateEnded print "waiting && disabled:", (entry.state == TimerEntry.StateWaiting and entry.disabled) - bisect.insort(self.processed_timers, entry) + insort(self.processed_timers, entry) entry.state = TimerEntry.StateEnded else: - bisect.insort(self.timer_list, entry) + insort(self.timer_list, entry) if not noRecalc: self.calcNextActivation() def setNextActivation(self, when): - delay = int((when - time.time()) * 1000) + delay = int((when - time()) * 1000) print "[timer.py] next activation: %d (in %d ms)" % (when, delay) self.timer.start(delay, 1) self.next = when def calcNextActivation(self): - if self.lastActivation > time.time(): + if self.lastActivation > time(): print "[timer.py] timewarp - re-evaluating all processed timers." tl = self.processed_timers self.processed_timers = [ ] @@ -177,9 +197,9 @@ class Timer: self.addTimerEntry(x, noRecalc=1) self.processActivation() - self.lastActivation = time.time() + self.lastActivation = time() - min = int(time.time()) + self.MaxWaitTime + min = int(time()) + self.MaxWaitTime # calculate next activation point if len(self.timer_list): @@ -219,7 +239,7 @@ class Timer: # did this timer reached the last state? if w.state < TimerEntry.StateEnded: # no, sort it into active list - bisect.insort(self.timer_list, w) + insort(self.timer_list, w) else: # yes. Process repeated, and re-add. if w.repeated: @@ -227,13 +247,13 @@ class Timer: w.state = TimerEntry.StateWaiting self.addTimerEntry(w) else: - bisect.insort(self.processed_timers, w) + insort(self.processed_timers, w) self.stateChanged(w) def processActivation(self): - print "It's now ", time.strftime("%c", time.localtime(time.time())) - t = int(time.time()) + 1 + print "It's now ", strftime("%c", localtime(time())) + t = int(time()) + 1 # we keep on processing the first entry until it goes into the future. while len(self.timer_list) and self.timer_list[0].getNextActivation() < t: