X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f0273520285e28b22053eda706690774b0c8448c..a4048ce604ef796f0cab302f972e711c405f2584:/timer.py?ds=sidebyside

diff --git a/timer.py b/timer.py
index 294102b7..1679a9b7 100644
--- a/timer.py
+++ b/timer.py
@@ -1,5 +1,5 @@
 import bisect
-from time import *
+import time
 from enigma import *
 
 class TimerEntry:
@@ -14,81 +14,92 @@ class TimerEntry:
 	StateEnded   = 3
 	
 	def __init__(self, begin, end):
-		self.Begin = begin
-		self.Prepare = 10
-		self.End = end
-		self.State = 0
+		self.begin = begin
+		self.prepare_time = 10
+		self.end = end
+		self.state = 0
 	
 	def getTime(self):
-		if self.State == 0:
-			return self.Begin - self.Prepare
-		elif self.State == 1:
-			return self.Begin
+		if self.state == self.StateWait:
+			return self.begin - self.prepare_time
+		elif self.state == self.StatePrepare:
+			return self.begin
 		else:
-			return self.End 
+			return self.end 
 	
 	def __lt__(self, o):
 		return self.getTime() < o.getTime()
 	
 	def activate(self, event):
-		print "timer %s got activated (%d)!" % (self.Description, event)
+		print "[timer.py] timer %s got activated (%d)!" % (self.description, event)
 
 class Timer:
 
+	# the time between "polls". We do this because
+	# we want to account for time jumps etc.
+	# of course if they occur <100s before starting,
+	# it's not good. thus, you have to repoll when
+	# you change the time.
+	#
+	# this is just in case. We don't want the timer 
+	# hanging. we use this "edge-triggered-polling-scheme"
+	# anyway, so why don't make it a bit more fool-proof?
 	MaxWaitTime = 100
 
 	def __init__(self):
-		self.TimerList = [ ]
-		self.ProcessedTimers = [ ]
+		self.timer_list = [ ]
+		self.processed_timers = [ ]
 		
-		self.Timer = eTimer()
-		self.Timer.timeout.get().append(self.calcNextActivation)
+		self.timer = eTimer()
+		self.timer.timeout.get().append(self.calcNextActivation)
 		
 		self.calcNextActivation()
 	
 	def addTimerEntry(self, entry):
-		bisect.insort(self.TimerList, entry)
-		self.calcNextActivation()
+		# 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():
+			bisect.insort(self.timer_list, entry)
+			self.calcNextActivation()
+		else:
+			bisect.insort(self.processed_timers, entry)
 	
 	def setNextActivation(self, when):
-		delay = int((when - time()) * 1000)
-		print "next activation: %d (in %d seconds)" % (when, delay)
+		delay = int((when - time.time()) * 1000)
+		print "[timer.py] next activation: %d (in %d ms)" % (when, delay)
 		
-		self.Timer.start(delay, 1)
+		self.timer.start(delay, 1)
 		self.next = when
 
 	def calcNextActivation(self):
 		self.processActivation()
 	
-		min = int(time()) + self.MaxWaitTime
+		min = int(time.time()) + self.MaxWaitTime
 		
 		# calculate next activation point
-		if len(self.TimerList):
-			w = self.TimerList[0].getTime()
+		if len(self.timer_list):
+			w = self.timer_list[0].getTime()
 			if w < min:
 				min = w
 		
 		self.setNextActivation(min)
 	
+	def timeChanged(self, timer):
+		self.timer_list.remove(timer)
+		bisect.insort(self.timer_list, timer)
+	
 	def doActivate(self, w):
-		w.activate(w.State)
-		self.TimerList.remove(w)
-		w.State += 1
-		if w.State < TimerEntry.StateEnded:
-			bisect.insort(self.TimerList, 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.ProcessedTimers, w)
+			bisect.insort(self.processed_timers, w)
 	
 	def processActivation(self):
-		t = int(time()) + 1
+		t = int(time.time()) + 1
 		
 		# we keep on processing the first entry until it goes into the future.
-		while len(self.TimerList) and self.TimerList[0].getTime() < t:
-			self.doActivate(self.TimerList[0])
-
-#t = Timer()
-#base = time() + 5
-#t.addTimerEntry(TimerEntry(base+10, base+20, None, None, "test #1: 10 - 20"))
-#t.addTimerEntry(TimerEntry(base+10, base+30, None, None, "test #2: 10 - 30"))
-#t.addTimerEntry(TimerEntry(base+15, base+20, None, None, "test #3: 15 - 20"))
-#t.addTimerEntry(TimerEntry(base+20, base+35, None, None, "test #4: 20 - 35"))
+		while len(self.timer_list) and self.timer_list[0].getTime() < t:
+			self.doActivate(self.timer_list[0])