X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a7df600c514e420df8a7774c6ea8aafb91569a23..78329e83433e005aa3d4e6a6f0d526ec2bb9b8f6:/timer.py?ds=sidebyside

diff --git a/timer.py b/timer.py
index 3c66c925..aaae0b2a 100644
--- a/timer.py
+++ b/timer.py
@@ -1,10 +1,10 @@
 from bisect import insort
-from time import strftime, time, localtime, gmtime, mktime
-from calendar import timegm
+from time import strftime, time, localtime, mktime
 from enigma import eTimer
-import calendar
 import datetime
 
+import NavigationInstance
+
 class TimerEntry:
 	StateWaiting  = 0
 	StatePrepared = 1
@@ -17,10 +17,19 @@ class TimerEntry:
 		self.end = end
 		self.state = 0
 		self.resetRepeated()
+		#begindate = localtime(self.begin)
+		#newdate = datetime.datetime(begindate.tm_year, begindate.tm_mon, begindate.tm_mday 0, 0, 0);
+		self.repeatedbegindate = begin
 		self.backoff = 0
 		
 		self.disabled = False
-		
+
+	def resetState(self):
+		self.state = self.StateWaiting
+		self.cancelled = False
+		self.first_try_prepare = True
+		self.timeChanged()
+
 	def resetRepeated(self):
 		self.repeated = int(0)
 
@@ -45,16 +54,19 @@ class TimerEntry:
 			now = int(time()) + 1
 
 			#to avoid problems with daylight saving, we need to calculate with localtime, in struct_time representation
+			localrepeatedbegindate = localtime(self.repeatedbegindate)
 			localbegin = localtime(self.begin)
 			localend = localtime(self.end)
 			localnow = localtime(now)
 
+			print "localrepeatedbegindate:", strftime("%c", localrepeatedbegindate)
 			print "localbegin:", strftime("%c", localbegin)
 			print "localend:", strftime("%c", localend)
+			print "localnow:", strftime("%c", localnow)
 
 			day = []
 			flags = self.repeated
-			for x in range(0, 7):
+			for x in (0, 1, 2, 3, 4, 5, 6):
 				if (flags & 1 == 1):
 					day.append(0)
 					print "Day: " + str(x)
@@ -62,9 +74,10 @@ class TimerEntry:
 					day.append(1)
 				flags = flags >> 1
 
-			print strftime("%c", localnow)
-
-			while ((day[localbegin.tm_wday] != 0) or ((day[localbegin.tm_wday] == 0) and ((findRunningEvent and localend < localnow) or ((not findRunningEvent) and localbegin < localnow)))):
+			# if day is NOT in the list of repeated days
+			# OR if the day IS in the list of the repeated days, check, if event is currently running... then if findRunningEvent is false, go to the next event
+			while ((day[localbegin.tm_wday] != 0) or (mktime(localrepeatedbegindate) > mktime(localbegin))  or
+				((day[localbegin.tm_wday] == 0) and ((findRunningEvent and localend < localnow) or ((not findRunningEvent) and localbegin < localnow)))):
 				localbegin = self.addOneDay(localbegin)
 				localend = self.addOneDay(localend)
 				print "localbegin after addOneDay:", strftime("%c", localbegin)
@@ -134,7 +147,7 @@ class Timer:
 		self.processed_timers = [ ]
 		
 		self.timer = eTimer()
-		self.timer.timeout.get().append(self.calcNextActivation)
+		self.timer.callback.append(self.calcNextActivation)
 		self.lastActivation = time()
 		
 		self.calcNextActivation()
@@ -164,6 +177,27 @@ class Timer:
 			insort(self.timer_list, entry)
 			if not noRecalc:
 				self.calcNextActivation()
+
+# small piece of example code to understand how to use record simulation
+#		if NavigationInstance.instance:
+#			lst = [ ]
+#			cnt = 0
+#			for timer in self.timer_list:
+#				print "timer", cnt
+#				cnt += 1
+#				if timer.state == 0: #waiting
+#					lst.append(NavigationInstance.instance.recordService(timer.service_ref))
+#				else:
+#					print "STATE: ", timer.state
+#
+#			for rec in lst:
+#				if rec.start(True): #simulate
+#					print "FAILED!!!!!!!!!!!!"
+#				else:
+#					print "OK!!!!!!!!!!!!!!"
+#				NavigationInstance.instance.stopRecordService(rec)
+#		else:
+#			print "no NAV"
 	
 	def setNextActivation(self, when):
 		delay = int((when - time()) * 1000)
@@ -188,10 +222,12 @@ class Timer:
 		min = int(time()) + self.MaxWaitTime
 		
 		# calculate next activation point
-		if len(self.timer_list):
+		if self.timer_list:
 			w = self.timer_list[0].getNextActivation()
 			if w < min:
 				min = w
+			else:
+				print "next real activation is", strftime("%c", localtime(w))
 		
 		self.setNextActivation(min)
 	
@@ -210,7 +246,7 @@ class Timer:
 	
 	def doActivate(self, w):
 		self.timer_list.remove(w)
-		
+
 		# when activating a timer which has already passed,
 		# simply abort the timer. don't run trough all the stages.
 		if w.shouldSkip():
@@ -242,5 +278,5 @@ class Timer:
 		t = int(time()) + 1
 		
 		# we keep on processing the first entry until it goes into the future.
-		while len(self.timer_list) and self.timer_list[0].getNextActivation() < t:
+		while self.timer_list and self.timer_list[0].getNextActivation() < t:
 			self.doActivate(self.timer_list[0])