X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8a6e44c53a3fb23ca87645fdfad73652a202b905..7c8c5bc3e04718569b1b848d252d515b81545130:/timer.py?ds=sidebyside

diff --git a/timer.py b/timer.py
index c8e78549..a98481c0 100644
--- a/timer.py
+++ b/timer.py
@@ -16,6 +16,8 @@ class TimerEntry:
 		self.resetRepeated()
 		self.backoff = 0
 		
+		self.disabled = False
+		
 	def resetRepeated(self):
 		self.repeated = int(0)
 
@@ -53,6 +55,9 @@ class TimerEntry:
 				print time.strftime("%c", time.localtime(self.end))
 				self.begin += 86400
 				self.end += 86400
+			
+			self.timeChanged()
+			
 
 	def __lt__(self, o):
 		return self.getNextActivation() < o.getNextActivation()
@@ -102,9 +107,19 @@ class Timer:
 		self.lastActivation = time.time()
 		
 		self.calcNextActivation()
+		self.on_state_change = [ ]
 	
 	def stateChanged(self, entry):
-		pass
+		for f in self.on_state_change:
+			f(entry)
+			
+	def getNextRecordingTime(self):
+		if len(self.timer_list) > 0:
+			return self.timer_list[0].begin
+		return -1
+			
+	def cleanup(self):
+		self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
 	
 	def addTimerEntry(self, entry, noRecalc=0):
 		entry.processRepeated()
@@ -112,7 +127,7 @@ class Timer:
 		# 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.shouldSkip() or entry.state == TimerEntry.StateEnded:
+		if entry.shouldSkip() or entry.state == TimerEntry.StateEnded or (entry.state == TimerEntry.StateWaiting and entry.disabled):
 			print "already passed, skipping"
 			bisect.insort(self.processed_timers, entry)
 			entry.state = TimerEntry.StateEnded
@@ -153,7 +168,10 @@ class Timer:
 	
 	def timeChanged(self, timer):
 		timer.timeChanged()
-		self.timer_list.remove(timer)
+		if timer.state == TimerEntry.StateEnded:
+			self.processed_timers.remove(timer)
+		else:
+			self.timer_list.remove(timer)
 
 		self.addTimerEntry(timer)
 	
@@ -163,8 +181,7 @@ class Timer:
 		# when activating a timer which has already passed,
 		# simply abort the timer. don't run trough all the stages.
 		if w.shouldSkip():
-			w.abort()
-			bisect.insort(self.processed_timers, w)
+			w.state = TimerEntry.StateEnded
 		else:
 			# when active returns true, this means "accepted".
 			# otherwise, the current state is kept.
@@ -178,7 +195,7 @@ class Timer:
 			bisect.insort(self.timer_list, w)
 		else:
 			# yes. Process repeated, and re-add.
-			if not w.repeated:
+			if w.repeated:
 				w.processRepeated()
 				w.state = TimerEntry.StateWaiting
 				self.addTimerEntry(w)