diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2007-03-26 17:54:50 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2007-03-26 17:54:50 +0000 |
| commit | 190bff9a042beabcb620605e3883191bd749859f (patch) | |
| tree | b9e104e1ffce0714b25e8d79eb3d4789b929f840 | |
| parent | bf09dd130c878c91013ab13824f1b7c45b551bd7 (diff) | |
| download | enigma2-190bff9a042beabcb620605e3883191bd749859f.tar.gz enigma2-190bff9a042beabcb620605e3883191bd749859f.zip | |
change addOneDay to work correctly on non existing dst changing times
| -rw-r--r-- | timer.py | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -32,7 +32,11 @@ class TimerEntry: return self.state == self.StateRunning def addOneDay(self, timedatestruct): - return (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() + 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 def processRepeated(self, findRunningEvent = True): @@ -45,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 @@ -61,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 |