call loadBouquet after installing a bouquet

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 424dde0934d668e557f00313f9ee81feb708fda8..be629099f62e7f91464f92178e16553dcd7b5003 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, mktime
+from enigma import eTimer
+import datetime

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


@@ -14,10 +15,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.disabled = False
                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)
 


@@ -28,14 +38,30 @@ 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
                        for x in range(0, 7):
                        day = []
                        flags = self.repeated
                        for x in range(0, 7):


@@ -46,18 +72,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.begin < 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()


@@ -72,10 +106,10 @@ 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.
                
                # in case timer has not yet started, but gets aborted (so it's preparing),
                # set begin to now.


@@ -111,21 +145,16 @@ 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 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 cleanup(self):
                self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
        


@@ -140,22 +169,22 @@ class Timer:
                        print "shouldSkip:", entry.shouldSkip()
                        print "state == ended", entry.state == TimerEntry.StateEnded
                        print "waiting && disabled:", (entry.state == TimerEntry.StateWaiting and entry.disabled)
                        print "shouldSkip:", entry.shouldSkip()
                        print "state == ended", entry.state == TimerEntry.StateEnded
                        print "waiting && disabled:", (entry.state == TimerEntry.StateWaiting and entry.disabled)

-                       bisect.insort(self.processed_timers, entry)
+                       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()
        
        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 = [ ]
                        print "[timer.py] timewarp - re-evaluating all processed timers."
                        tl = self.processed_timers
                        self.processed_timers = [ ]


@@ -165,15 +194,17 @@ 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
                if len(self.timer_list):
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w
                
                # calculate next activation point
                if len(self.timer_list):
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w

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

                
                self.setNextActivation(min)
        
                
                self.setNextActivation(min)
        


@@ -207,7 +238,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:


@@ -215,13 +246,13 @@ 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.
                while len(self.timer_list) and self.timer_list[0].getNextActivation() < t:
                
                # 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: