add basic support for repeated timers (doesn't work yet)

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index ff23b70d91808960f201b67a89918201ea869fd1..53ce8c42335ee3e6ab7fad04a5816150338af1ed 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -18,7 +18,12 @@ class TimerEntry:
                self.prepare_time = 10
                self.end = end
                self.state = 0
-       
+               self.repeated = int(0)
+               
+       def setRepeated(self, day):
+               self.repeated |= (2 ** day)
+               print "Repeated: " + str(self.repeated)
+               
        def getTime(self):
                if self.state == self.StateWait:
                        return self.begin - self.prepare_time
@@ -52,17 +57,19 @@ class Timer:
                
                self.timer = eTimer()
                self.timer.timeout.get().append(self.calcNextActivation)
+               self.lastActivation = time.time()
                
                self.calcNextActivation()
        
-       def addTimerEntry(self, entry):
+       def addTimerEntry(self, entry, noRecalc=0):
                # 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():
                        bisect.insort(self.timer_list, entry)
-                       self.calcNextActivation()
+                       if not noRecalc:
+                               self.calcNextActivation()
                else:
-                       bisect.insort(self.process_timers, entry)
+                       bisect.insort(self.processed_timers, entry)
        
        def setNextActivation(self, when):
                delay = int((when - time.time()) * 1000)
@@ -72,7 +79,15 @@ class Timer:
                self.next = when
 
        def calcNextActivation(self):
+               if self.lastActivation > time.time():
+                       print "[timer.py] timewarp - re-evaluating all processed timers."
+                       tl = self.processed_timers
+                       self.processed_timers = [ ]
+                       for x in tl:
+                               self.addTimerEntry(x, noRecalc=1)
+               
                self.processActivation()
+               self.lastActivation = time.time()
        
                min = int(time.time()) + self.MaxWaitTime
                
@@ -86,7 +101,7 @@ class Timer:
        
        def timeChanged(self, timer):
                self.timer_list.remove(timer)
-               bisect.insort(self.timer_list, timer)
+               self.addTimerEntry(timer)
        
        def doActivate(self, w):
                w.activate(w.state)