X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/80069b70a6b69e8e0ef0aeef5dbd8a1655a5e713..42cd3117269bec99fffbeda8188f889c3a08678d:/timer.py diff --git a/timer.py b/timer.py index 525014fe..9fa0ab2a 100644 --- a/timer.py +++ b/timer.py @@ -3,66 +3,88 @@ import time from enigma import * class TimerEntry: - EventPrepare = 0 - EventStart = 1 - EventEnd = 2 - EventAbort = 3 - - StateWait = 0 - StatePrepare = 1 - StateRunning = 2 - StateEnded = 3 + StateWaiting = 0 + StatePrepared = 1 + StateRunning = 2 + StateEnded = 3 def __init__(self, begin, end): self.begin = begin - self.prepare_time = 10 + self.prepare_time = 20 self.end = end self.state = 0 self.resetRepeated() + self.backoff = 0 def resetRepeated(self): self.repeated = int(0) - + def setRepeated(self, day): self.repeated |= (2 ** day) print "Repeated: " + str(self.repeated) + def isRunning(self): + return self.state == self.StateRunning + # update self.begin and self.end according to the self.repeated-flags def processRepeated(self): + print "ProcessRepeated" + print time.strftime("%c", time.localtime(self.begin)) + print time.strftime("%c", time.localtime(self.end)) if (self.repeated != 0): - now = time.time() + now = int(time.time()) + 1 day = [] flags = self.repeated for x in range(0, 7): if (flags & 1 == 1): day.append(0) + print "Day: " + str(x) else: day.append(1) flags = flags >> 1 - while ((day[time.localtime(self.begin).tm_wday] != 0) and (self.end > now)): + print time.strftime("%c", time.localtime(now)) + print time.strftime("%c", time.localtime(self.begin)) + print time.strftime("%c", time.localtime(self.end)) + print str(time.localtime(self.begin).tm_wday) + while ((day[time.localtime(self.begin).tm_wday] != 0) or ((day[time.localtime(self.begin).tm_wday] == 0) and self.end < now)): + print time.strftime("%c", time.localtime(self.begin)) + print time.strftime("%c", time.localtime(self.end)) self.begin += 86400 self.end += 86400 - - - def getTime(self): - if self.state == self.StateWait: - return self.begin - self.prepare_time - elif self.state == self.StatePrepare: - return self.begin - else: - return self.end - + self.timeChanged() + + def __lt__(self, o): - return self.getTime() < o.getTime() + return self.getNextActivation() < o.getNextActivation() - def activate(self, event): - print "[timer.py] timer %s got activated (%d)!" % (self.description, event) + # must be overridden + def activate(self): + pass + + # can be overridden + def timeChanged(self): + pass -class Timer: + # check if a timer entry must be skipped + def shouldSkip(self): + return self.end <= time.time() and self.state == TimerEntry.StateWaiting + def abort(self): + self.end = time.time() + + # in case timer has not yet started, but gets aborted (so it's preparing), + # set begin to now. + if self.begin > self.end: + self.begin = self.end + + # must be overridden! + def getNextActivation(): + pass + +class Timer: # the time between "polls". We do this because # we want to account for time jumps etc. # of course if they occur <100s before starting, @@ -83,19 +105,26 @@ class Timer: self.lastActivation = time.time() self.calcNextActivation() + self.on_state_change = [ ] + + def stateChanged(self, entry): + for f in self.on_state_change: + f(entry) def addTimerEntry(self, entry, noRecalc=0): entry.processRepeated() - # we either go trough Prepare/Start/End-state if the timer is still running, - # or skip it when it's alrady past the end. - - if entry.end > time.time(): + # when the timer has not yet started, and is already passed, + # don't go trough waiting/running/end-states, but sort it + # right into the processedTimers. + if entry.shouldSkip() or entry.state == TimerEntry.StateEnded: + print "already passed, skipping" + bisect.insort(self.processed_timers, entry) + entry.state = TimerEntry.StateEnded + else: bisect.insort(self.timer_list, entry) if not noRecalc: self.calcNextActivation() - else: - bisect.insort(self.processed_timers, entry) def setNextActivation(self, when): delay = int((when - time.time()) * 1000) @@ -110,6 +139,8 @@ class Timer: tl = self.processed_timers self.processed_timers = [ ] for x in tl: + # simulate a "waiting" state to give them a chance to re-occure + x.resetState() self.addTimerEntry(x, noRecalc=1) self.processActivation() @@ -119,28 +150,52 @@ class Timer: # calculate next activation point if len(self.timer_list): - w = self.timer_list[0].getTime() + w = self.timer_list[0].getNextActivation() if w < min: min = w self.setNextActivation(min) def timeChanged(self, timer): + timer.timeChanged() self.timer_list.remove(timer) + self.addTimerEntry(timer) def doActivate(self, w): - w.activate(w.state) self.timer_list.remove(w) - w.state += 1 + + # when activating a timer which has already passed, + # simply abort the timer. don't run trough all the stages. + if w.shouldSkip(): + w.abort() + bisect.insort(self.processed_timers, w) + 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 + + # did this timer reached the last state? if w.state < TimerEntry.StateEnded: + # no, sort it into active list bisect.insort(self.timer_list, w) else: - bisect.insort(self.processed_timers, w) - + # yes. Process repeated, and re-add. + if w.repeated: + w.processRepeated() + w.state = TimerEntry.StateWaiting + self.addTimerEntry(w) + else: + bisect.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 # we keep on processing the first entry until it goes into the future. - while len(self.timer_list) and self.timer_list[0].getTime() < t: + while len(self.timer_list) and self.timer_list[0].getNextActivation() < t: self.doActivate(self.timer_list[0])