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

diff --git a/timer.py b/timer.py
index 96e38e15..6f3a05fb 100644
--- a/timer.py
+++ b/timer.py
@@ -1,7 +1,7 @@
 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 datetime
 
 class TimerEntry:
 	StateWaiting  = 0
@@ -15,6 +15,9 @@ 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
@@ -29,6 +32,13 @@ class TimerEntry:
 	def isRunning(self):
 		return self.state == self.StateRunning
 		
+	def addOneDay(self, timedatestruct):
+		oldHour = timedatestruct.tm_hour
+		newdate =  (datetime.datetime(timedatestruct.tm_year, timedatestruct.tm_mon, timedatestruct.tm_mday, timedatestruct.tm_hour, timedatestruct.tm_min, timedatestruct.tm_sec) + datetime.timedelta(days=1)).timetuple()
+		if localtime(mktime(newdate)).tm_hour != oldHour:
+			return (datetime.datetime(timedatestruct.tm_year, timedatestruct.tm_mon, timedatestruct.tm_mday, timedatestruct.tm_hour, timedatestruct.tm_min, timedatestruct.tm_sec) + datetime.timedelta(days=2)).timetuple()			
+		return newdate
+		
 	# update self.begin and self.end according to the self.repeated-flags
 	def processRepeated(self, findRunningEvent = True):
 		print "ProcessRepeated"
@@ -36,12 +46,15 @@ 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 strftime("%c", localbegin)
-			print strftime("%c", localend)
+			print "localrepeatedbegindate:", strftime("%c", localrepeatedbegindate)
+			print "localbegin:", strftime("%c", localbegin)
+			print "localend:", strftime("%c", localend)
+			print "localnow:", strftime("%c", localnow)
 
 			day = []
 			flags = self.repeated
@@ -53,18 +66,20 @@ 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)))):
-				print "localbegin:", strftime("%c", localbegin)
-				print "localend:", strftime("%c", localend)
-				#add one day to the struct_time, we have to convert using gmt functions, because the daylight saving flag might change after we add our 86400 seconds
-				localbegin = gmtime(timegm(localbegin) + 86400)
-				localend = gmtime(timegm(localend) + 86400)
-
+			# 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)
+				print "localend after addOneDay:", strftime("%c", localend)
+				
 			#we now have a struct_time representation of begin and end in localtime, but we have to calculate back to (gmt) seconds since epoch
 			self.begin = int(mktime(localbegin))
-			self.end = int(mktime(localend)) + 1
+			self.end = int(mktime(localend))
+			if self.begin == self.end:
+				self.end += 1
 
 			print "ProcessRepeated result"
 			print strftime("%c", localtime(self.begin))
@@ -129,16 +144,11 @@ class Timer:
 		
 		self.calcNextActivation()
 		self.on_state_change = [ ]
-	
+
 	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]
 	
@@ -187,6 +197,8 @@ class Timer:
 			w = self.timer_list[0].getNextActivation()
 			if w < min:
 				min = w
+			else:
+				print "next real activation is", strftime("%c", localtime(w))
 		
 		self.setNextActivation(min)