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

diff --git a/timer.py b/timer.py
index 53ce8c42..87ecfa93 100644
--- a/timer.py
+++ b/timer.py
@@ -15,15 +15,49 @@ 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()
+		
+	def resetRepeated(self):
 		self.repeated = int(0)
 		
 	def setRepeated(self, day):
 		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"
+		print time.strftime("%c", time.localtime(self.begin))
+		print time.strftime("%c", time.localtime(self.end))
+		if (self.repeated != 0):
+			now = int(time.time()) + 1
+			
+			day = []
+			flags = self.repeated
+			for x in range(0, 7):
+				if (flags & 1 == 1):
+					day.append(0)
+					print "Day: " + str(x)
+				else:
+					day.append(1)
+				flags = flags >> 1
+
+			print time.strftime("%c", time.localtime(now))
+			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)):
+				print time.strftime("%c", time.localtime(self.begin))
+				print time.strftime("%c", time.localtime(self.end))
+				self.begin += 86400
+				self.end += 86400
+
 	def getTime(self):
 		if self.state == self.StateWait:
 			return self.begin - self.prepare_time
@@ -62,14 +96,18 @@ class Timer:
 		self.calcNextActivation()
 	
 	def addTimerEntry(self, entry, noRecalc=0):
-		# 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():
+		entry.processRepeated()
+
+		# 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)
@@ -84,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()
@@ -101,17 +141,24 @@ class Timer:
 	
 	def timeChanged(self, timer):
 		self.timer_list.remove(timer)
+
 		self.addTimerEntry(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