X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2d5b15f3ca1f7f92f949906d0199f9266d845e31..ceebb28346d39f3c18f5fdc47fd84f48a207589a:/timer.py

diff --git a/timer.py b/timer.py
index 9fa0ab2a..424dde09 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)
 
@@ -48,7 +50,7 @@ class TimerEntry:
 			print time.strftime("%c", time.localtime(self.begin))
 			print time.strftime("%c", time.localtime(self.end))
 			print str(time.localtime(self.begin).tm_wday)
-			while ((day[time.localtime(self.begin).tm_wday] != 0) or ((day[time.localtime(self.begin).tm_wday] == 0) and self.end < now)):
+			while ((day[time.localtime(self.begin).tm_wday] != 0) or ((day[time.localtime(self.begin).tm_wday] == 0) and self.begin < now)):
 				print time.strftime("%c", time.localtime(self.begin))
 				print time.strftime("%c", time.localtime(self.end))
 				self.begin += 86400
@@ -79,11 +81,19 @@ class TimerEntry:
 		# set begin to now.
 		if self.begin > self.end:
 			self.begin = self.end
+
+		self.cancelled = True
 	
 	# must be overridden!
 	def getNextActivation():
 		pass
 
+	def disable(self):
+		self.disabled = True
+	
+	def enable(self):
+		self.disabled = False
+
 class Timer:
 	# the time between "polls". We do this because
 	# we want to account for time jumps etc.
@@ -110,6 +120,14 @@ class Timer:
 	def stateChanged(self, entry):
 		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()
@@ -117,8 +135,11 @@ 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"
+			print "shouldSkip:", entry.shouldSkip()
+			print "state == ended", entry.state == TimerEntry.StateEnded
+			print "waiting && disabled:", (entry.state == TimerEntry.StateWaiting and entry.disabled)
 			bisect.insort(self.processed_timers, entry)
 			entry.state = TimerEntry.StateEnded
 		else:
@@ -157,9 +178,16 @@ class Timer:
 		self.setNextActivation(min)
 	
 	def timeChanged(self, timer):
+		print "time changed"
 		timer.timeChanged()
-		self.timer_list.remove(timer)
+		if timer.state == TimerEntry.StateEnded:
+			self.processed_timers.remove(timer)
+		else:
+			self.timer_list.remove(timer)
 
+		# give the timer a chance to re-enqueue
+		if timer.state == TimerEntry.StateEnded:
+			timer.state = TimerEntry.StateWaiting
 		self.addTimerEntry(timer)
 	
 	def doActivate(self, w):
@@ -168,8 +196,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.