from time import strftime, time, localtime, gmtime, mktime
from calendar import timegm
from enigma import eTimer
+import calendar
+import datetime
class TimerEntry:
StateWaiting = 0
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
def processRepeated(self, findRunningEvent = True):
print "ProcessRepeated"
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
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)
- #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)
-
+ 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