permit also to record from service groups (services with associated alternative services)

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 5720cf9d5be638229286655bac1ddce23af7a840..aaae0b2a18f49ff0cb045ab82eea1d07a24e42b2 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,7 +1,9 @@
 from bisect import insort
 from bisect import insort

-from time import strftime, time, localtime, gmtime, mktime
-from calendar import timegm
+from time import strftime, time, localtime, mktime

 from enigma import eTimer
 from enigma import eTimer

+import datetime
+
+import NavigationInstance

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


@@ -15,10 +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.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)
 


@@ -29,23 +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"
                if (self.repeated != 0):
                        now = int(time()) + 1
 
                        #to avoid problems with daylight saving, we need to calculate with localtime, in struct_time representation
                print "ProcessRepeated"
                if (self.repeated != 0):
                        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)
 
                        localbegin = localtime(self.begin)
                        localend = localtime(self.end)
                        localnow = localtime(now)
 

-                       print strftime("%c", localbegin)
-                       print strftime("%c", localend)
+                       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)


@@ -53,17 +74,20 @@ class TimerEntry:
                                        day.append(1)
                                flags = flags >> 1
 
                                        day.append(1)
                                flags = flags >> 1
 

-                       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)
-
+                       # 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))
                        #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
+                       self.end = int(mktime(localend))
+                       if self.begin == self.end:
+                               self.end += 1

 
                        print "ProcessRepeated result"
                        print strftime("%c", localtime(self.begin))
 
                        print "ProcessRepeated result"
                        print strftime("%c", localtime(self.begin))


@@ -123,21 +147,16 @@ class Timer:
                self.processed_timers = [ ]
                
                self.timer = eTimer()
                self.processed_timers = [ ]
                
                self.timer = eTimer()

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

                self.lastActivation = time()
                
                self.calcNextActivation()
                self.on_state_change = [ ]
                self.lastActivation = time()
                
                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]
        


@@ -158,6 +177,27 @@ class Timer:
                        insort(self.timer_list, entry)
                        if not noRecalc:
                                self.calcNextActivation()
                        insort(self.timer_list, entry)
                        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):
                delay = int((when - time()) * 1000)
        
        def setNextActivation(self, when):
                delay = int((when - time()) * 1000)


@@ -182,10 +222,12 @@ class Timer:
                min = int(time()) + self.MaxWaitTime
                
                # calculate next activation point
                min = int(time()) + self.MaxWaitTime
                
                # 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)
        
                
                self.setNextActivation(min)
        


@@ -204,7 +246,7 @@ class Timer:
        
        def doActivate(self, w):
                self.timer_list.remove(w)
        
        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():


@@ -236,5 +278,5 @@ class Timer:
                t = int(time()) + 1
                
                # we keep on processing the first entry until it goes into the future.
                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:
+               while self.timer_list and self.timer_list[0].getNextActivation() < t:

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