add socket mmi plugin,

[enigma2.git] / timer.py

diff --git a/timer.py b/timer.py
index 3c66c9254793bd5be9ff4fab43fb2796487e047b..6f3a05fbfe97290c92a491089169a0ad07dfa665 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -1,8 +1,6 @@
 from bisect import insort
 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
 from enigma import eTimer

-import calendar

 import datetime
 
 class TimerEntry:
 import datetime
 
 class TimerEntry:


@@ -17,6 +15,9 @@ class TimerEntry:
                self.end = end
                self.state = 0
                self.resetRepeated()
                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
                self.backoff = 0
                
                self.disabled = False


@@ -45,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
                        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)
 
                        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 "localbegin:", strftime("%c", localbegin)
                        print "localend:", strftime("%c", localend)

+                       print "localnow:", strftime("%c", localnow)

 
                        day = []
                        flags = self.repeated
 
                        day = []
                        flags = self.repeated


@@ -62,9 +66,10 @@ class TimerEntry:
                                        day.append(1)
                                flags = flags >> 1
 
                                        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)
                                localbegin = self.addOneDay(localbegin)
                                localend = self.addOneDay(localend)
                                print "localbegin after addOneDay:", strftime("%c", localbegin)


@@ -192,6 +197,8 @@ class Timer:
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w
                        w = self.timer_list[0].getNextActivation()
                        if w < min:
                                min = w

+                       else:
+                               print "next real activation is", strftime("%c", localtime(w))

                
                self.setNextActivation(min)
        
                
                self.setNextActivation(min)