X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67b53c1cb06988394c35a6e965c99b72b67fe1be..f0f15413d9ccea0bf3a214814178de74dff8e392:/timer.py

diff --git a/timer.py b/timer.py
index d4ac23d7..be629099 100644
--- a/timer.py
+++ b/timer.py
@@ -21,7 +21,13 @@ class TimerEntry:
 		self.backoff = 0
 		
 		self.disabled = False
-		
+
+	def resetState(self):
+		self.state = self.StateWaiting
+		self.cancelled = False
+		self.first_try_prepare = True
+		self.timeChanged()
+
 	def resetRepeated(self):
 		self.repeated = int(0)
 
@@ -51,8 +57,10 @@ class TimerEntry:
 			localend = localtime(self.end)
 			localnow = localtime(now)
 
+			print "localrepeatedbegindate:", strftime("%c", localrepeatedbegindate)
 			print "localbegin:", strftime("%c", localbegin)
 			print "localend:", strftime("%c", localend)
+			print "localnow:", strftime("%c", localnow)
 
 			day = []
 			flags = self.repeated
@@ -64,11 +72,10 @@ class TimerEntry:
 					day.append(1)
 				flags = flags >> 1
 
-			print strftime("%c", localnow)
-
 			# 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)))):
+			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)
@@ -138,7 +145,7 @@ class Timer:
 		self.processed_timers = [ ]
 		
 		self.timer = eTimer()
-		self.timer.timeout.get().append(self.calcNextActivation)
+		self.timer.callback.append(self.calcNextActivation)
 		self.lastActivation = time()
 		
 		self.calcNextActivation()
@@ -196,6 +203,8 @@ class Timer:
 			w = self.timer_list[0].getNextActivation()
 			if w < min:
 				min = w
+			else:
+				print "next real activation is", strftime("%c", localtime(w))
 		
 		self.setNextActivation(min)