git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cancellation of broken timer entries
[enigma2.git]
/
timer.py
diff --git
a/timer.py
b/timer.py
index c03eb1e78d3fae37087230733ff138cf03377f51..3caa288db0a81cd2e56b04756175d02bf2774d9c 100644
(file)
--- a/
timer.py
+++ b/
timer.py
@@
-81,6
+81,8
@@
class TimerEntry:
# set begin to now.
if self.begin > self.end:
self.begin = self.end
# set begin to now.
if self.begin > self.end:
self.begin = self.end
+
+ self.cancelled = True
# must be overridden!
def getNextActivation():
# must be overridden!
def getNextActivation():
@@
-113,6
+115,11
@@
class Timer:
for f in self.on_state_change:
f(entry)
for f in self.on_state_change:
f(entry)
+ def getNextRecordingTime(self):
+ if len(self.timer_list) > 0:
+ return self.timer_list[0].begin
+ return -1
+
def cleanup(self):
self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
def cleanup(self):
self.processed_timers = [entry for entry in self.processed_timers if entry.disabled]
@@
-163,7
+170,10
@@
class Timer:
def timeChanged(self, timer):
timer.timeChanged()
def timeChanged(self, timer):
timer.timeChanged()
- self.timer_list.remove(timer)
+ if timer.state == TimerEntry.StateEnded:
+ self.processed_timers.remove(timer)
+ else:
+ self.timer_list.remove(timer)
self.addTimerEntry(timer)
self.addTimerEntry(timer)
@@
-173,8
+183,7
@@
class Timer:
# when activating a timer which has already passed,
# simply abort the timer. don't run trough all the stages.
if w.shouldSkip():
# when activating a timer which has already passed,
# simply abort the timer. don't run trough all the stages.
if w.shouldSkip():
- w.abort()
- bisect.insort(self.processed_timers, w)
+ w.state = TimerEntry.StateEnded
else:
# when active returns true, this means "accepted".
# otherwise, the current state is kept.
else:
# when active returns true, this means "accepted".
# otherwise, the current state is kept.