remove wireless plugin
[enigma2.git] / timer.py
index 3caa288db0a81cd2e56b04756175d02bf2774d9c..3511694839ae635a773812e1235776c326b9fcce 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,6 +1,7 @@
-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:
        StateWaiting  = 0
@@ -29,13 +30,19 @@ class TimerEntry:
                return self.state == self.StateRunning
                
        # update self.begin and self.end according to the self.repeated-flags
-       def processRepeated(self):
+       def processRepeated(self, findRunningEvent = True):
                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
-                       
+                       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):
@@ -46,18 +53,24 @@ class TimerEntry:
                                        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
-                       
+                       print strftime("%c", localnow)
+
+                       while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and ((findRunningEvent and localend < localnow) or ((not findRunningEvent) and localbegin < localnow)))):
+                               print "localbegin:", strftime("%c", localbegin)
+                               print "localend:", 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):
                return self.getNextActivation() < o.getNextActivation()
@@ -72,10 +85,10 @@ class TimerEntry:
 
        # 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):
-               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.
@@ -88,6 +101,12 @@ class TimerEntry:
        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.
@@ -106,20 +125,15 @@ class Timer:
                
                self.timer = eTimer()
                self.timer.timeout.get().append(self.calcNextActivation)
-               self.lastActivation = time.time()
+               self.lastActivation = 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]
        
@@ -131,22 +145,25 @@ class Timer:
                # 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)
+                       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:
-                       bisect.insort(self.timer_list, entry)
+                       insort(self.timer_list, entry)
                        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):
-               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 = [ ]
@@ -156,9 +173,9 @@ class Timer:
                                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):
@@ -169,12 +186,16 @@ class Timer:
                self.setNextActivation(min)
        
        def timeChanged(self, 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):
@@ -194,7 +215,7 @@ class Timer:
                # 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:
@@ -202,13 +223,13 @@ class Timer:
                                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):
-               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.
                while len(self.timer_list) and self.timer_list[0].getNextActivation() < t: