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

diff --git a/timer.py b/timer.py
index 75519cf8..6f3a05fb 100644
--- a/timer.py
+++ b/timer.py
@@ -1,8 +1,6 @@
 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
 
 class TimerEntry:
@@ -17,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
@@ -31,29 +32,13 @@ class TimerEntry:
 	def isRunning(self):
 		return self.state == self.StateRunning
 		
-	def addOneDay(self, timedatestruct):	
-		day = timedatestruct.tm_mday
-		month = timedatestruct.tm_mon
-		year = timedatestruct.tm_year
+	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
 		
-		if calendar.isleap(year):
-			leap = 29
-		else:
-			leap = 28
-		monthdays = [0, 31, leap, 31, 30, 31, 30, 31, 31,30, 31,30, 31]
-		day += 1
-		
-		# check for sane dates and correct if needed
-		if day > monthdays[month]:
-			day = 1
-			month += 1
-		if month > 12:
-			month = 1
-			year += 1
-		
-		newdate = datetime.datetime(year, month, day, timedatestruct.tm_hour,  timedatestruct.tm_min, timedatestruct.tm_sec)
-		return newdate.timetuple()
-	
 	# update self.begin and self.end according to the self.repeated-flags
 	def processRepeated(self, findRunningEvent = True):
 		print "ProcessRepeated"
@@ -61,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
@@ -78,17 +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)
+			# 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))
@@ -206,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)