quick work around for fixing return codes

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 6f33b54d41d1039c8e3159e4686af95715019a52..a98481c0a3f957bcf0cff965f2a8de1e785feb2c 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -3,30 +3,31 @@ import time
 from enigma import *
 
 class TimerEntry:
 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
        
        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.end = end
                self.state = 0
                self.resetRepeated()

+               self.backoff = 0
+               
+               self.disabled = False

                
        def resetRepeated(self):
                self.repeated = int(0)
                
        def resetRepeated(self):
                self.repeated = int(0)

-               
+

        def setRepeated(self, day):
                self.repeated |= (2 ** day)
                print "Repeated: " + str(self.repeated)
                
        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"
        # update self.begin and self.end according to the self.repeated-flags
        def processRepeated(self):
                print "ProcessRepeated"


@@ -54,23 +55,38 @@ class TimerEntry:
                                print time.strftime("%c", time.localtime(self.end))
                                self.begin += 86400
                                self.end += 86400
                                print time.strftime("%c", time.localtime(self.end))
                                self.begin += 86400
                                self.end += 86400

+                       
+                       self.timeChanged()
+                       

 
 

-       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 
-       

        def __lt__(self, o):
        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,
        # the time between "polls". We do this because
        # we want to account for time jumps etc.
        # of course if they occur <100s before starting,


@@ -91,19 +107,34 @@ class Timer:
                self.lastActivation = time.time()
                
                self.calcNextActivation()
                self.lastActivation = time.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]

        
        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.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):
+                       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()
                        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 +149,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.resetState()

                                self.addTimerEntry(x, noRecalc=1)
                
                self.processActivation()
                                self.addTimerEntry(x, noRecalc=1)
                
                self.processActivation()


@@ -127,36 +160,54 @@ class Timer:
                
                # calculate next activation point
                if len(self.timer_list):
                
                # 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):
                        if w < min:
                                min = w
                
                self.setNextActivation(min)
        
        def timeChanged(self, timer):

-               self.timer_list.remove(timer)
+               timer.timeChanged()
+               if timer.state == TimerEntry.StateEnded:
+                       self.processed_timers.remove(timer)
+               else:
+                       self.timer_list.remove(timer)

 
                self.addTimerEntry(timer)
        
        def doActivate(self, w):
 
                self.addTimerEntry(timer)
        
        def doActivate(self, w):

-               w.activate(w.state)

                self.timer_list.remove(w)
                self.timer_list.remove(w)

+               
+               # when activating a timer which has already passed,
+               # simply abort the timer. don't run trough all the stages.
+               if w.shouldSkip():
+                       w.state = TimerEntry.StateEnded
+               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

 
 

-               w.state += 1
+               # did this timer reached the last state?

                if w.state < TimerEntry.StateEnded:
                if w.state < TimerEntry.StateEnded:

+                       # no, sort it into active list

                        bisect.insort(self.timer_list, w)
                else:
                        bisect.insort(self.timer_list, w)
                else:

-                       if (w.repeated != 0):
+                       # yes. Process repeated, and re-add.
+                       if w.repeated:

                                w.processRepeated()
                                w.processRepeated()

-                               w.state = TimerEntry.StateWait
+                               w.state = TimerEntry.StateWaiting

                                self.addTimerEntry(w)
                        else:
                                bisect.insort(self.processed_timers, w)
                                self.addTimerEntry(w)
                        else:
                                bisect.insort(self.processed_timers, w)

+               
+               self.stateChanged(w)

 
 

-       

        def processActivation(self):
        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.
                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])
                        self.doActivate(self.timer_list[0])