better fix for previous commit
[enigma2.git] / timer.py
index 75519cf..0ca4888 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -31,29 +31,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"
@@ -65,8 +49,8 @@ class TimerEntry:
                        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
@@ -81,11 +65,11 @@ 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)
                                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