fix Screen order in channelselectionradio

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 294102b7c1720789c6d1985e0e8f1e76c5897da5..9fa0ab2a865dd26d9a012af554ed0fedfa760534 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,94 +1,201 @@
 import bisect
 import bisect

-from time import *
+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):
        
        def __init__(self, begin, end):

-               self.Begin = begin
-               self.Prepare = 10
-               self.End = end
-               self.State = 0
-       
-       def getTime(self):
-               if self.State == 0:
-                       return self.Begin - self.Prepare
-               elif self.State == 1:
-                       return self.Begin
-               else:
-                       return self.End 
-       
+               self.begin = begin
+               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 = 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
+
+                       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
+                       
+                       self.timeChanged()
+                       
+

        def __lt__(self, o):
        def __lt__(self, o):

-               return self.getTime() < o.getTime()
+               return self.getNextActivation() < o.getNextActivation()

        
        

-       def activate(self, event):
-               print "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,
+       # it's not good. thus, you have to repoll when
+       # you change the time.
+       #
+       # this is just in case. We don't want the timer 
+       # hanging. we use this "edge-triggered-polling-scheme"
+       # anyway, so why don't make it a bit more fool-proof?

        MaxWaitTime = 100
 
        def __init__(self):
        MaxWaitTime = 100
 
        def __init__(self):

-               self.TimerList = [ ]
-               self.ProcessedTimers = [ ]
+               self.timer_list = [ ]
+               self.processed_timers = [ ]

                
                

-               self.Timer = eTimer()
-               self.Timer.timeout.get().append(self.calcNextActivation)
+               self.timer = eTimer()
+               self.timer.timeout.get().append(self.calcNextActivation)
+               self.lastActivation = time.time()

                
                self.calcNextActivation()
                
                self.calcNextActivation()

+               self.on_state_change = [ ]

        
        

-       def addTimerEntry(self, entry):
-               bisect.insort(self.TimerList, entry)
-               self.calcNextActivation()
+       def stateChanged(self, entry):
+               for f in self.on_state_change:
+                       f(entry)
+       
+       def addTimerEntry(self, entry, noRecalc=0):
+               entry.processRepeated()
+
+               # 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()

        
        def setNextActivation(self, when):
        
        def setNextActivation(self, when):

-               delay = int((when - time()) * 1000)
-               print "next activation: %d (in %d seconds)" % (when, delay)
+               delay = int((when - time.time()) * 1000)
+               print "[timer.py] next activation: %d (in %d ms)" % (when, delay)

                
                

-               self.Timer.start(delay, 1)
+               self.timer.start(delay, 1)

                self.next = when
 
        def calcNextActivation(self):
                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:
+                               # simulate a "waiting" state to give them a chance to re-occure
+                               x.resetState()
+                               self.addTimerEntry(x, noRecalc=1)
+               

                self.processActivation()
                self.processActivation()

+               self.lastActivation = time.time()

        
        

-               min = int(time()) + self.MaxWaitTime
+               min = int(time.time()) + self.MaxWaitTime

                
                # calculate next activation point
                
                # calculate next activation point

-               if len(self.TimerList):
-                       w = self.TimerList[0].getTime()
+               if len(self.timer_list):
+                       w = self.timer_list[0].getNextActivation()

                        if w < min:
                                min = w
                
                self.setNextActivation(min)
        
                        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):
        def doActivate(self, w):

-               w.activate(w.State)
-               self.TimerList.remove(w)
-               w.State += 1
-               if w.State < TimerEntry.StateEnded:
-                       bisect.insort(self.TimerList, 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.abort()
+                       bisect.insort(self.processed_timers, w)

                else:
                else:

-                       bisect.insort(self.ProcessedTimers, w)
-       
+                       # 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:
+                       # 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):
        def processActivation(self):

-               t = int(time()) + 1
+               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.
                
                # we keep on processing the first entry until it goes into the future.

-               while len(self.TimerList) and self.TimerList[0].getTime() < t:
-                       self.doActivate(self.TimerList[0])
-
-#t = Timer()
-#base = time() + 5
-#t.addTimerEntry(TimerEntry(base+10, base+20, None, None, "test #1: 10 - 20"))
-#t.addTimerEntry(TimerEntry(base+10, base+30, None, None, "test #2: 10 - 30"))
-#t.addTimerEntry(TimerEntry(base+15, base+20, None, None, "test #3: 15 - 20"))
-#t.addTimerEntry(TimerEntry(base+20, base+35, None, None, "test #4: 20 - 35"))
+               while len(self.timer_list) and self.timer_list[0].getNextActivation() < t:
+                       self.doActivate(self.timer_list[0])