X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d49e2877599ede3ac725f96f2d241b1d7369ca43..9fac5ff7371972cef663d456b96c68f51b5c2c01:/timer.py

diff --git a/timer.py b/timer.py
index 7855c098..87ecfa93 100644
--- a/timer.py
+++ b/timer.py
@@ -15,7 +15,7 @@ class TimerEntry:
 	
 	def __init__(self, begin, end):
 		self.begin = begin
-		self.prepare_time = 10
+		self.prepare_time = 20
 		self.end = end
 		self.state = 0
 		self.resetRepeated()
@@ -27,6 +27,9 @@ class TimerEntry:
 		self.repeated |= (2 ** day)
 		print "Repeated: " + str(self.repeated)
 		
+	def isRunning(self):
+		return self.state == self.StateRunning
+		
 	# update self.begin and self.end according to the self.repeated-flags
 	def processRepeated(self):
 		print "ProcessRepeated"
@@ -95,15 +98,16 @@ class Timer:
 	def addTimerEntry(self, entry, noRecalc=0):
 		entry.processRepeated()
 
-		# we either go trough Prepare/Start/End-state if the timer is still running,
-		# or skip it when it's alrady past the end.
-		
-		if entry.end > time.time():
+		# when the timer has not yet started, and is already passed,
+		# don't go trough waiting/running/end-states, but sort it
+		# right into the processedTimers.
+		if entry.end <= time.time() and entry.state == TimerEntry.StateWait:
+			bisect.insort(self.processed_timers, entry)
+			entry.state = TimerEntry.StateEnded
+		else:
 			bisect.insort(self.timer_list, entry)
 			if not noRecalc:
 				self.calcNextActivation()
-		else:
-			bisect.insort(self.processed_timers, entry)
 	
 	def setNextActivation(self, when):
 		delay = int((when - time.time()) * 1000)
@@ -118,6 +122,8 @@ class Timer:
 			tl = self.processed_timers
 			self.processed_timers = [ ]
 			for x in tl:
+				# simulate a "waiting" state to give them a chance to re-occure
+				x.state = TimerEntry.StateWaiting
 				self.addTimerEntry(x, noRecalc=1)
 		
 		self.processActivation()
@@ -141,17 +147,18 @@ class Timer:
 	def doActivate(self, w):
 		w.activate(w.state)
 		self.timer_list.remove(w)
-
+		
 		w.state += 1
 		if w.state < TimerEntry.StateEnded:
 			bisect.insort(self.timer_list, w)
 		else:
-			bisect.insort(self.processed_timers, w)
 			if (w.repeated != 0):
 				w.processRepeated()
 				w.state = TimerEntry.StateWait
 				self.addTimerEntry(w)
-	
+			else:
+				bisect.insort(self.processed_timers, w)
+
 	def processActivation(self):
 		t = int(time.time()) + 1