use functions for sequence instead of tuple or list.. so both types are

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 0ca4888d7548a48b66f3ad2febcf1edbf7957ca9..750a8c0300e2537c90628fd4c1e23f07a3deeeff 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,10 +1,10 @@
 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
-import calendar
 import datetime
 
+import NavigationInstance
+
 class TimerEntry:
        StateWaiting  = 0
        StatePrepared = 1
@@ -17,10 +17,19 @@ class TimerEntry:
                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
-               
+
+       def resetState(self):
+               self.state = self.StateWaiting
+               self.cancelled = False
+               self.first_try_prepare = True
+               self.timeChanged()
+
        def resetRepeated(self):
                self.repeated = int(0)
 
@@ -45,12 +54,15 @@ class TimerEntry:
                        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
@@ -62,9 +74,10 @@ class TimerEntry:
                                        day.append(1)
                                flags = flags >> 1
 
-                       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)))):
+                       # 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)
@@ -72,7 +85,9 @@ class TimerEntry:
                                
                        #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))
@@ -132,7 +147,7 @@ class Timer:
                self.processed_timers = [ ]
                
                self.timer = eTimer()
-               self.timer.timeout.get().append(self.calcNextActivation)
+               self.timer.callback.append(self.calcNextActivation)
                self.lastActivation = time()
                
                self.calcNextActivation()
@@ -162,6 +177,27 @@ class Timer:
                        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)
@@ -190,6 +226,8 @@ class Timer:
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w
+                       else:
+                               print "next real activation is", strftime("%c", localtime(w))
                
                self.setNextActivation(min)