diff options
| -rw-r--r-- | lib/python/Components/TimerList.py | 4 | ||||
| -rw-r--r-- | lib/python/Screens/TimerEdit.py | 1 | ||||
| -rw-r--r-- | timer.py | 11 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py index 81501ca8..6511f6f1 100644 --- a/lib/python/Components/TimerList.py +++ b/lib/python/Components/TimerList.py @@ -2,6 +2,7 @@ from HTMLComponent import * from GUIComponent import * from Tools.FuzzyDate import FuzzyTime +import time from enigma import eListboxPythonMultiContent, eListbox, gFont from timer import TimerEntry @@ -25,7 +26,6 @@ RT_WRAP = 32 def TimerEntryComponent(timer, processed): res = [ timer ] - res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName())) repeatedtext = "" days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ] @@ -39,8 +39,6 @@ def TimerEntryComponent(timer, processed): repeatedtext += days[x] count += 1 flags = flags >> 1 - print [FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]] - print (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]) res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1])))) else: res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))) diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 4f5039ec..0f902679 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -89,6 +89,7 @@ class TimerEditList(Screen): def finishedEdit(self, answer): if (answer[0]): print "Edited timer" + self.session.nav.RecordTimer.timeChanged(answer[1]) self.fillTimerList() else: print "Timeredit aborted" @@ -29,19 +29,26 @@ class TimerEntry: # update self.begin and self.end according to the self.repeated-flags def processRepeated(self): + print "Processing repeated" if (self.repeated != 0): - now = time.time() + 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 - while ((day[time.localtime(self.begin).tm_wday] != 0) and (self.end > now)): + 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 |