fixed repeated timers

[vuplus_dvbapp] / timer.py

diff --git a/timer.py b/timer.py
index a230545..afbbfdf 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -18,7 +18,42 @@ class TimerEntry:
                self.prepare_time = 10
                self.end = end
                self.state = 0
-       
+               self.resetRepeated()
+               
+       def resetRepeated(self):
+               self.repeated = int(0)
+               
+       def setRepeated(self, day):
+               self.repeated |= (2 ** day)
+               print "Repeated: " + str(self.repeated)
+               
+       # update self.begin and self.end according to the self.repeated-flags
+       def processRepeated(self):
+               print "Processing repeated"
+               if (self.repeated != 0):
+                       now = int(time.time())
+                       print "Now: " + str(now)
+                       
+                       day = []
+                       flags = self.repeated
+                       for x in range(0, 7):
+                               if (flags & 1 == 1):
+                                       day.append(0)
+                                       print "Day " + str(x)
+                               else:
+                                       day.append(1)
+                               flags = flags >> 1
+
+                       print time.localtime(self.begin).tm_wday
+                       print day
+                       print str(now) + " " + str(self.end) + " " + str(self.begin)
+                       while ((day[time.localtime(self.begin).tm_wday] != 0) and (self.end < now)):
+                               print str(now) + " " + str(self.end) + " " + str(self.begin)
+                               self.begin += 86400
+                               self.end += 86400
+                       
+                                       
+               
        def getTime(self):
                if self.state == self.StateWait:
                        return self.begin - self.prepare_time
@@ -57,8 +92,11 @@ class Timer:
                self.calcNextActivation()
        
        def addTimerEntry(self, entry, noRecalc=0):
+               entry.processRepeated()
+
                # we either go trough Prepare/Start/End-state if the timer is still running,
                # or skip it when it's alrady past the end.
+               
                if entry.end > time.time():
                        bisect.insort(self.timer_list, entry)
                        if not noRecalc: