fix
[enigma2.git] / timer.py
index 6f33b54..f5aee84 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -27,6 +27,9 @@ class TimerEntry:
                self.repeated |= (2 ** day)
                print "Repeated: " + str(self.repeated)
                
                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"
        # update self.begin and self.end according to the self.repeated-flags
        def processRepeated(self):
                print "ProcessRepeated"
@@ -95,15 +98,16 @@ class Timer:
        def addTimerEntry(self, entry, noRecalc=0):
                entry.processRepeated()
 
        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()
                        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)
        
        def setNextActivation(self, when):
                delay = int((when - time.time()) * 1000)
@@ -118,6 +122,8 @@ class Timer:
                        tl = self.processed_timers
                        self.processed_timers = [ ]
                        for x in tl:
                        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()
                                self.addTimerEntry(x, noRecalc=1)
                
                self.processActivation()
@@ -141,7 +147,7 @@ class Timer:
        def doActivate(self, w):
                w.activate(w.state)
                self.timer_list.remove(w)
        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)
                w.state += 1
                if w.state < TimerEntry.StateEnded:
                        bisect.insort(self.timer_list, w)
@@ -153,7 +159,6 @@ class Timer:
                        else:
                                bisect.insort(self.processed_timers, w)
 
                        else:
                                bisect.insort(self.processed_timers, w)
 
-       
        def processActivation(self):
                t = int(time.time()) + 1
                
        def processActivation(self):
                t = int(time.time()) + 1