def __init__(self, begin, end):
self.begin = begin
- self.prepare_time = 10
+ self.prepare_time = 20
self.end = end
self.state = 0
self.resetRepeated()
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.end <= time.time() and entry.state == TimerEntry.StateWait:
+ 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)
tl = self.processed_timers
self.processed_timers = [ ]
for x in tl:
+ # simulate a "waiting" state to give them a chance to re-occure
+ x.state = TimerEntry.StateWaiting
self.addTimerEntry(x, noRecalc=1)
self.processActivation()
def doActivate(self, w):
w.activate(w.state)
self.timer_list.remove(w)
-
+
w.state += 1
if w.state < TimerEntry.StateEnded:
bisect.insort(self.timer_list, w)
else:
bisect.insort(self.processed_timers, w)
-
def processActivation(self):
t = int(time.time()) + 1