X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=timer.py;h=6f3a05fbfe97290c92a491089169a0ad07dfa665;hp=0ad53af9d79addeb55d05f7454256fc7070d0af2;hb=a63fc630b49788a73c4c39d46fb92c242c6163e0;hpb=69d19bb77913e6b543a9bdae403c31550114cfdf

diff --git a/timer.py b/timer.py
index 0ad53af..6f3a05f 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:
@@ -53,8 +51,10 @@ class TimerEntry:
 			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
@@ -66,11 +66,10 @@ class TimerEntry:
 					day.append(1)
 				flags = flags >> 1
 
-			print strftime("%c", 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)))):
+			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)
@@ -198,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)