From a02b205a9e7009fdcd52c12be88eeb2ca28835db Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 20 Dec 2010 23:21:59 +0100 Subject: TimerSanityCheck.py: ignore ended singleshot timers in timersanity check (speedup) fixes #635 --- lib/python/Components/TimerSanityCheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py index b472a19e..dc1b519f 100644 --- a/lib/python/Components/TimerSanityCheck.py +++ b/lib/python/Components/TimerSanityCheck.py @@ -107,7 +107,7 @@ class TimerSanityCheck: self.rep_eventlist.append((begin, idx)) begin += 86400 rflags >>= 1 - else: + elif timer.state < TimerEntry.StateEnded: self.nrep_eventlist.extend([(timer.begin,self.bflag,idx),(timer.end,self.eflag,idx)]) idx += 1 -- cgit v1.2.3 From 68d7804ff72c80b4ba7c4e64e6a3ae36c1bad68b Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 20 Dec 2010 23:40:40 +0100 Subject: add missing import refs #635 --- lib/python/Components/TimerSanityCheck.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py index dc1b519f..b9dda6a6 100644 --- a/lib/python/Components/TimerSanityCheck.py +++ b/lib/python/Components/TimerSanityCheck.py @@ -2,6 +2,7 @@ import NavigationInstance from time import localtime, mktime, gmtime from ServiceReference import ServiceReference from enigma import iServiceInformation, eServiceCenter, eServiceReference +from timer import TimerEntry class TimerSanityCheck: def __init__(self, timerlist, newtimer=None): -- cgit v1.2.3 From bceeb1e944f82724d3cdcf1871f29d8926386dbc Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 21 Dec 2010 10:39:43 +0100 Subject: RecordTimer.py: fixed typo (thx to dr.best) refs #635 --- RecordTimer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecordTimer.py b/RecordTimer.py index 4ece9c58..1cb7eb3b 100755 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -517,7 +517,7 @@ class RecordTimer(timer.Timer): checkit = True for timer in root.findall("timer"): newTimer = createTimer(timer) - if (self.record(newTimer, True, True) is not None) and (checkit == True): + if (self.record(newTimer, True, dosave=False) is not None) and (checkit == True): from Tools.Notifications import AddPopup from Screens.MessageBox import MessageBox AddPopup(_("Timer overlap in timers.xml detected!\nPlease recheck it!"), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed") -- cgit v1.2.3