From aad6753bde1688c05fbd3984b0e60eeda0e67034 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Sat, 6 Jan 2007 02:03:12 +0000 Subject: add ability to stop currently running repeated timer when disabling it --- timer.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'timer.py') diff --git a/timer.py b/timer.py index 5720cf9d..96e38e15 100644 --- a/timer.py +++ b/timer.py @@ -30,7 +30,7 @@ class TimerEntry: return self.state == self.StateRunning # update self.begin and self.end according to the self.repeated-flags - def processRepeated(self): + def processRepeated(self, findRunningEvent = True): print "ProcessRepeated" if (self.repeated != 0): now = int(time()) + 1 @@ -54,9 +54,10 @@ class TimerEntry: flags = flags >> 1 print strftime("%c", localnow) - while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and localend < localnow)): - print strftime("%c", localbegin) - print strftime("%c", localend) + + 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) -- cgit v1.2.3