allow using other actionmap for InfobarSeekActions, only return MARKS in getNearestCu...

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 75519cf88b69bb82dd4cd9dac8dde7084150334e..0ad53af9d79addeb55d05f7454256fc7070d0af2 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -17,6 +17,9 @@ 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
@@ -31,29 +34,13 @@ class TimerEntry:
        def isRunning(self):
                return self.state == self.StateRunning
                
-       def addOneDay(self, timedatestruct):    
-               day = timedatestruct.tm_mday
-               month = timedatestruct.tm_mon
-               year = timedatestruct.tm_year
+       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
                
-               if calendar.isleap(year):
-                       leap = 29
-               else:
-                       leap = 28
-               monthdays = [0, 31, leap, 31, 30, 31, 30, 31, 31,30, 31,30, 31]
-               day += 1
-               
-               # check for sane dates and correct if needed
-               if day > monthdays[month]:
-                       day = 1
-                       month += 1
-               if month > 12:
-                       month = 1
-                       year += 1
-               
-               newdate = datetime.datetime(year, month, day, timedatestruct.tm_hour,  timedatestruct.tm_min, timedatestruct.tm_sec)
-               return newdate.timetuple()
-       
        # update self.begin and self.end according to the self.repeated-flags
        def processRepeated(self, findRunningEvent = True):
                print "ProcessRepeated"
@@ -61,12 +48,13 @@ 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 strftime("%c", localbegin)
-                       print strftime("%c", localend)
+                       print "localbegin:", strftime("%c", localbegin)
+                       print "localend:", strftime("%c", localend)
 
                        day = []
                        flags = self.repeated
@@ -80,15 +68,19 @@ class TimerEntry:
 
                        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)
+                       # 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)) + 1
+                       self.end = int(mktime(localend))
+                       if self.begin == self.end:
+                               self.end += 1
 
                        print "ProcessRepeated result"
                        print strftime("%c", localtime(self.begin))