fix segfault on zap with active timeshift

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index bbad0be1ec004dc5238784f2d6076214967b5aa2..5720cf9d5be638229286655bac1ddce23af7a840 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,28 +1,27 @@
-import bisect
-import time
-from enigma import *
+from bisect import insort
+from time import strftime, time, localtime, gmtime, mktime
+from calendar import timegm
+from enigma import eTimer

 
 class TimerEntry:
 
 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)


@@ -33,11 +32,17 @@ class TimerEntry:
        # 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"

-               print time.strftime("%c", time.localtime(self.begin))
-               print time.strftime("%c", time.localtime(self.end))

                if (self.repeated != 0):
                if (self.repeated != 0):

-                       now = int(time.time()) + 1
-                       
+                       now = int(time()) + 1
+
+                       #to avoid problems with daylight saving, we need to calculate with localtime, in struct_time representation
+                       localbegin = localtime(self.begin)
+                       localend = localtime(self.end)
+                       localnow = localtime(now)
+
+                       print strftime("%c", localbegin)
+                       print strftime("%c", localend)
+

                        day = []
                        flags = self.repeated
                        for x in range(0, 7):
                        day = []
                        flags = self.repeated
                        for x in range(0, 7):


@@ -48,32 +53,60 @@ class TimerEntry:
                                        day.append(1)
                                flags = flags >> 1
 
                                        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
-
-       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 
-       
+                       print strftime("%c", localnow)
+                       while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and localend < localnow)):
+                               print strftime("%c", localbegin)
+                               print strftime("%c", localend)
+                               #add one day to the struct_time, we have to convert using gmt functions, because the daylight saving flag might change after we add our 86400 seconds
+                               localbegin = gmtime(timegm(localbegin) + 86400)
+                               localend = gmtime(timegm(localend) + 86400)
+
+                       #we now have a struct_time representation of begin and end in localtime, but we have to calculate back to (gmt) seconds since epoch
+                       self.begin = int(mktime(localbegin))
+                       self.end = int(mktime(localend)) + 1
+
+                       print "ProcessRepeated result"
+                       print strftime("%c", localtime(self.begin))
+                       print strftime("%c", localtime(self.end))
+
+                       self.timeChanged()
+

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

-               return self.getTime() < o.getTime()
+               return self.getNextActivation() < o.getNextActivation()
+       
+       # must be overridden
+       def activate(self):
+               pass
+               
+       # can be overridden
+       def timeChanged(self):
+               pass
+
+       # check if a timer entry must be skipped
+       def shouldSkip(self):
+               return self.end <= time() and self.state == TimerEntry.StateWaiting
+
+       def abort(self):
+               self.end = 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
+
+               self.cancelled = True

        
        

-       def activate(self, event):
-               print "[timer.py] timer %s got activated (%d)!" % (self.description, event)
+       # must be overridden!
+       def getNextActivation():
+               pass

 
 

-class Timer:
+       def disable(self):
+               self.disabled = True
+       
+       def enable(self):
+               self.disabled = False

 
 

+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,9 +124,22 @@ class Timer:
                
                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.lastActivation = time()

                
                self.calcNextActivation()
                
                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()


@@ -101,64 +147,94 @@ class Timer:
                # 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.
                # 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)
+               if entry.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):
+                       print "already passed, skipping"
+                       print "shouldSkip:", entry.shouldSkip()
+                       print "state == ended", entry.state == TimerEntry.StateEnded
+                       print "waiting && disabled:", (entry.state == TimerEntry.StateWaiting and entry.disabled)
+                       insort(self.processed_timers, entry)
+                       entry.state = TimerEntry.StateEnded

                else:
                else:

-                       bisect.insort(self.timer_list, entry)
+                       insort(self.timer_list, entry)

                        if not noRecalc:
                                self.calcNextActivation()
        
        def setNextActivation(self, when):
                        if not noRecalc:
                                self.calcNextActivation()
        
        def setNextActivation(self, when):

-               delay = int((when - time.time()) * 1000)
+               delay = int((when - time()) * 1000)

                print "[timer.py] next activation: %d (in %d ms)" % (when, delay)
                
                self.timer.start(delay, 1)
                self.next = when
 
        def calcNextActivation(self):
                print "[timer.py] next activation: %d (in %d ms)" % (when, delay)
                
                self.timer.start(delay, 1)
                self.next = when
 
        def calcNextActivation(self):

-               if self.lastActivation > time.time():
+               if self.lastActivation > time():

                        print "[timer.py] timewarp - re-evaluating all processed timers."
                        tl = self.processed_timers
                        self.processed_timers = [ ]
                        for x in tl:
                        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.addTimerEntry(x, noRecalc=1)
                
                self.processActivation()

-               self.lastActivation = time.time()
+               self.lastActivation = time()

        
        

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

                
                # 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)
+               print "time changed"
+               timer.timeChanged()
+               if timer.state == TimerEntry.StateEnded:
+                       self.processed_timers.remove(timer)
+               else:
+                       self.timer_list.remove(timer)

 
 

+               # give the timer a chance to re-enqueue
+               if timer.state == TimerEntry.StateEnded:
+                       timer.state = TimerEntry.StateWaiting

                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)
                

-               w.state += 1
+               # 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
+
+               # did this timer reached the last state?

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

-                       bisect.insort(self.timer_list, w)
+                       # no, sort it into active list
+                       insort(self.timer_list, w)

                else:
                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:
                                self.addTimerEntry(w)
                        else:

-                               bisect.insort(self.processed_timers, w)
+                               insort(self.processed_timers, w)
+               
+               self.stateChanged(w)

 
        def processActivation(self):
 
        def processActivation(self):

-               t = int(time.time()) + 1
+               print "It's now ", strftime("%c", localtime(time()))
+               t = int(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.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])