fixes bug #314

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 5500c34ad4c84e0633bf682780973f9584afd558..aaae0b2a18f49ff0cb045ab82eea1d07a24e42b2 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,6 +1,9 @@
-import bisect
-import time
-from enigma import *
+from bisect import insort
+from time import strftime, time, localtime, mktime
+from enigma import eTimer
+import datetime
+
+import NavigationInstance

 
 class TimerEntry:
        StateWaiting  = 0
 
 class TimerEntry:
        StateWaiting  = 0


@@ -14,8 +17,19 @@ class TimerEntry:
                self.end = end
                self.state = 0
                self.resetRepeated()
                self.end = end
                self.state = 0
                self.resetRepeated()

+               #begindate = localtime(self.begin)
+               #newdate = datetime.datetime(begindate.tm_year, begindate.tm_mon, begindate.tm_mday 0, 0, 0);
+               self.repeatedbegindate = begin

                self.backoff = 0
                
                self.backoff = 0
                

+               self.disabled = False
+
+       def resetState(self):
+               self.state = self.StateWaiting
+               self.cancelled = False
+               self.first_try_prepare = True
+               self.timeChanged()
+

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


@@ -26,17 +40,33 @@ class TimerEntry:
        def isRunning(self):
                return self.state == self.StateRunning
                
        def isRunning(self):
                return self.state == self.StateRunning
                

+       def addOneDay(self, timedatestruct):
+               oldHour = timedatestruct.tm_hour
+               newdate =  (datetime.datetime(timedatestruct.tm_year, timedatestruct.tm_mon, timedatestruct.tm_mday, timedatestruct.tm_hour, timedatestruct.tm_min, timedatestruct.tm_sec) + datetime.timedelta(days=1)).timetuple()
+               if localtime(mktime(newdate)).tm_hour != oldHour:
+                       return (datetime.datetime(timedatestruct.tm_year, timedatestruct.tm_mon, timedatestruct.tm_mday, timedatestruct.tm_hour, timedatestruct.tm_min, timedatestruct.tm_sec) + datetime.timedelta(days=2)).timetuple()                        
+               return newdate
+               

        # update self.begin and self.end according to the self.repeated-flags
        # update self.begin and self.end according to the self.repeated-flags

-       def processRepeated(self):
+       def processRepeated(self, findRunningEvent = True):

                print "ProcessRepeated"
                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
+                       localrepeatedbegindate = localtime(self.repeatedbegindate)
+                       localbegin = localtime(self.begin)
+                       localend = localtime(self.end)
+                       localnow = localtime(now)
+
+                       print "localrepeatedbegindate:", strftime("%c", localrepeatedbegindate)
+                       print "localbegin:", strftime("%c", localbegin)
+                       print "localend:", strftime("%c", localend)
+                       print "localnow:", strftime("%c", localnow)
+

                        day = []
                        flags = self.repeated
                        day = []
                        flags = self.repeated

-                       for x in range(0, 7):
+                       for x in (0, 1, 2, 3, 4, 5, 6):

                                if (flags & 1 == 1):
                                        day.append(0)
                                        print "Day: " + str(x)
                                if (flags & 1 == 1):
                                        day.append(0)
                                        print "Day: " + str(x)


@@ -44,18 +74,26 @@ 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
-                       
+                       # if day is NOT in the list of repeated days
+                       # OR if the day IS in the list of the repeated days, check, if event is currently running... then if findRunningEvent is false, go to the next event
+                       while ((day[localbegin.tm_wday] != 0) or (mktime(localrepeatedbegindate) > mktime(localbegin))  or
+                               ((day[localbegin.tm_wday] == 0) and ((findRunningEvent and localend < localnow) or ((not findRunningEvent) and localbegin < localnow)))):
+                               localbegin = self.addOneDay(localbegin)
+                               localend = self.addOneDay(localend)
+                               print "localbegin after addOneDay:", strftime("%c", localbegin)
+                               print "localend after addOneDay:", strftime("%c", localend)
+                               
+                       #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))
+                       if self.begin == self.end:
+                               self.end += 1
+
+                       print "ProcessRepeated result"
+                       print strftime("%c", localtime(self.begin))
+                       print strftime("%c", localtime(self.end))
+

                        self.timeChanged()
                        self.timeChanged()

-                       

 
        def __lt__(self, o):
                return self.getNextActivation() < o.getNextActivation()
 
        def __lt__(self, o):
                return self.getNextActivation() < o.getNextActivation()


@@ -70,20 +108,28 @@ class TimerEntry:
 
        # check if a timer entry must be skipped
        def shouldSkip(self):
 
        # check if a timer entry must be skipped
        def shouldSkip(self):

-               return self.end <= time.time() and self.state == TimerEntry.StateWaiting
+               return self.end <= time() and self.state == TimerEntry.StateWaiting

 
        def abort(self):
 
        def abort(self):

-               self.end = time.time()
+               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
                
                # 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

        
        # must be overridden!
        def getNextActivation():
                pass
 
        
        # must be overridden!
        def getNextActivation():
                pass
 

+       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.
 class Timer:
        # the time between "polls". We do this because
        # we want to account for time jumps etc.


@@ -101,18 +147,18 @@ class Timer:
                self.processed_timers = [ ]
                
                self.timer = eTimer()
                self.processed_timers = [ ]
                
                self.timer = eTimer()

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

                
                self.calcNextActivation()
                self.on_state_change = [ ]
                
                self.calcNextActivation()
                self.on_state_change = [ ]

-       
+

        def stateChanged(self, entry):
                for f in self.on_state_change:
                        f(entry)
        def stateChanged(self, entry):
                for f in self.on_state_change:
                        f(entry)

-                       
+

        def cleanup(self):
        def cleanup(self):

-               self.processed_timers = []
+               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()


@@ -120,24 +166,48 @@ 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.shouldSkip() or entry.state == TimerEntry.StateEnded:
+               if entry.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):

                        print "already passed, skipping"
                        print "already passed, skipping"

-                       bisect.insort(self.processed_timers, entry)
+                       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:
                        entry.state = TimerEntry.StateEnded
                else:

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

                        if not noRecalc:
                                self.calcNextActivation()
                        if not noRecalc:
                                self.calcNextActivation()

+
+# small piece of example code to understand how to use record simulation
+#              if NavigationInstance.instance:
+#                      lst = [ ]
+#                      cnt = 0
+#                      for timer in self.timer_list:
+#                              print "timer", cnt
+#                              cnt += 1
+#                              if timer.state == 0: #waiting
+#                                      lst.append(NavigationInstance.instance.recordService(timer.service_ref))
+#                              else:
+#                                      print "STATE: ", timer.state
+#
+#                      for rec in lst:
+#                              if rec.start(True): #simulate
+#                                      print "FAILED!!!!!!!!!!!!"
+#                              else:
+#                                      print "OK!!!!!!!!!!!!!!"
+#                              NavigationInstance.instance.stopRecordService(rec)
+#              else:
+#                      print "no NAV"

        
        def setNextActivation(self, when):
        
        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 = [ ]
                        print "[timer.py] timewarp - re-evaluating all processed timers."
                        tl = self.processed_timers
                        self.processed_timers = [ ]


@@ -147,32 +217,40 @@ class Timer:
                                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
                
                # calculate next activation point

-               if len(self.timer_list):
+               if self.timer_list:

                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w

+                       else:
+                               print "next real activation is", strftime("%c", localtime(w))

                
                self.setNextActivation(min)
        
        def timeChanged(self, timer):
                
                self.setNextActivation(min)
        
        def timeChanged(self, timer):

+               print "time changed"

                timer.timeChanged()
                timer.timeChanged()

-               self.timer_list.remove(timer)
+               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.timer_list.remove(w)
                self.addTimerEntry(timer)
        
        def doActivate(self, 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():
                # 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)
+                       w.state = TimerEntry.StateEnded

                else:
                        # when active returns true, this means "accepted".
                        # otherwise, the current state is kept.
                else:
                        # when active returns true, this means "accepted".
                        # otherwise, the current state is kept.


@@ -183,7 +261,7 @@ class Timer:
                # did this timer reached the last state?
                if w.state < TimerEntry.StateEnded:
                        # no, sort it into active list
                # did this timer reached the last state?
                if w.state < TimerEntry.StateEnded:
                        # no, sort it into active list

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

                else:
                        # yes. Process repeated, and re-add.
                        if w.repeated:
                else:
                        # yes. Process repeated, and re-add.
                        if w.repeated:


@@ -191,14 +269,14 @@ class Timer:
                                w.state = TimerEntry.StateWaiting
                                self.addTimerEntry(w)
                        else:
                                w.state = TimerEntry.StateWaiting
                                self.addTimerEntry(w)
                        else:

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

                
                self.stateChanged(w)
 
        def processActivation(self):
                
                self.stateChanged(w)
 
        def processActivation(self):

-               print "It's now ", time.strftime("%c", time.localtime(time.time()))
-               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].getNextActivation() < t:
+               while self.timer_list and self.timer_list[0].getNextActivation() < t:

                        self.doActivate(self.timer_list[0])
                        self.doActivate(self.timer_list[0])