introduce BlinkingPointConditional, which blinks, if a condition-function returns...

[vuplus_dvbapp] / timer.py

diff --git a/timer.py b/timer.py
index afbbfdf..42bafe3 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -27,33 +27,37 @@ class TimerEntry:
                self.repeated |= (2 ** day)
                print "Repeated: " + str(self.repeated)
                
                self.repeated |= (2 ** day)
                print "Repeated: " + str(self.repeated)
                

+       def isRunning(self):
+               return self.state == self.StateRunning
+               

        # update self.begin and self.end according to the self.repeated-flags
        def processRepeated(self):
        # update self.begin and self.end according to the self.repeated-flags
        def processRepeated(self):

-               print "Processing repeated"
+               print "ProcessRepeated"
+               print time.strftime("%c", time.localtime(self.begin))
+               print time.strftime("%c", time.localtime(self.end))

                if (self.repeated != 0):
                if (self.repeated != 0):

-                       now = int(time.time())
-                       print "Now: " + str(now)
+                       now = int(time.time()) + 1

                        
                        day = []
                        flags = self.repeated
                        for x in range(0, 7):
                                if (flags & 1 == 1):
                                        day.append(0)
                        
                        day = []
                        flags = self.repeated
                        for x in range(0, 7):
                                if (flags & 1 == 1):
                                        day.append(0)

-                                       print "Day " + str(x)
+                                       print "Day: " + str(x)

                                else:
                                        day.append(1)
                                flags = flags >> 1
 
                                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)
+                       print time.strftime("%c", time.localtime(now))
+                       print time.strftime("%c", time.localtime(self.begin))
+                       print time.strftime("%c", time.localtime(self.end))
+                       print str(time.localtime(self.begin).tm_wday)
+                       while ((day[time.localtime(self.begin).tm_wday] != 0) or ((day[time.localtime(self.begin).tm_wday] == 0) and self.end < now)):
+                               print time.strftime("%c", time.localtime(self.begin))
+                               print time.strftime("%c", time.localtime(self.end))

                                self.begin += 86400
                                self.end += 86400
                                self.begin += 86400
                                self.end += 86400

-                       
-                                       
-               
+

        def getTime(self):
                if self.state == self.StateWait:
                        return self.begin - self.prepare_time
        def getTime(self):
                if self.state == self.StateWait:
                        return self.begin - self.prepare_time


@@ -134,16 +138,24 @@ class Timer:
        
        def timeChanged(self, timer):
                self.timer_list.remove(timer)
        
        def timeChanged(self, timer):
                self.timer_list.remove(timer)

+

                self.addTimerEntry(timer)
        
        def doActivate(self, w):
                w.activate(w.state)
                self.timer_list.remove(w)
                self.addTimerEntry(timer)
        
        def doActivate(self, w):
                w.activate(w.state)
                self.timer_list.remove(w)

+

                w.state += 1
                if w.state < TimerEntry.StateEnded:
                        bisect.insort(self.timer_list, w)
                else:
                w.state += 1
                if w.state < TimerEntry.StateEnded:
                        bisect.insort(self.timer_list, w)
                else:

-                       bisect.insort(self.processed_timers, w)
+                       if (w.repeated != 0):
+                               w.processRepeated()
+                               w.state = TimerEntry.StateWait
+                               self.addTimerEntry(w)
+                       else:
+                               bisect.insort(self.processed_timers, w)
+

        
        def processActivation(self):
                t = int(time.time()) + 1
        
        def processActivation(self):
                t = int(time.time()) + 1