git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
aa81a97
)
timer: fix remove of timer
author
Felix Domke
<tmbinc@elitedvb.net>
Fri, 25 Nov 2005 23:34:50 +0000
(23:34 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Fri, 25 Nov 2005 23:34:50 +0000
(23:34 +0000)
RecordTimer.py
patch
|
blob
|
history
timer.py
patch
|
blob
|
history
diff --git
a/RecordTimer.py
b/RecordTimer.py
index e26bda6078e2136ada32856017e55ff82ae571c5..45a21aebfd02db9d99cd30418fa2a8375aa4224f 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-148,7
+148,9
@@
class RecordTimer(timer.Timer):
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)
def removeEntry(self, entry):
print "[Timer] Remove " + str(entry)
+
if entry.state == timer.TimerEntry.StateRunning:
if entry.state == timer.TimerEntry.StateRunning:
+ print "remove running timer."
entry.end = time.time()
self.timeChanged(entry)
elif entry.state != timer.TimerEntry.StateEnded:
entry.end = time.time()
self.timeChanged(entry)
elif entry.state != timer.TimerEntry.StateEnded:
@@
-159,11
+161,11
@@
class RecordTimer(timer.Timer):
else:
print "timer did already end - doing nothing."
else:
print "timer did already end - doing nothing."
+ print "state: ", entry.state
+ print "in processed: ", entry in self.processed_timers
+ print "in running: ", entry in self.timer_list
# now the timer should be in the processed_timers list. remove it from there.
# now the timer should be in the processed_timers list. remove it from there.
- try:
- self.processed_timers.remove(entry)
- except:
- pass
+ self.processed_timers.remove(entry)
def shutdown(self):
self.saveTimer()
def shutdown(self):
self.saveTimer()
diff --git
a/timer.py
b/timer.py
index 42bafe350e4ac73f2a6fde81a703777f8549202e..bbad0be1ec004dc5238784f2d6076214967b5aa2 100644
(file)
--- a/
timer.py
+++ b/
timer.py
@@
-98,15
+98,15
@@
class Timer:
def addTimerEntry(self, entry, noRecalc=0):
entry.processRepeated()
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():
+ # when the timer has not yet started, and is already passed,
+ # don't go trough waiting/running/end-states, but sort it
+ # right into the processedTimers.
+ if entry.end <= time.time() and entry.state == TimerEntry.StateWait:
+ bisect.insort(self.processed_timers, entry)
+ else:
bisect.insort(self.timer_list, entry)
if not noRecalc:
self.calcNextActivation()
bisect.insort(self.timer_list, entry)
if not noRecalc:
self.calcNextActivation()
- else:
- bisect.insort(self.processed_timers, entry)
def setNextActivation(self, when):
delay = int((when - time.time()) * 1000)
def setNextActivation(self, when):
delay = int((when - time.time()) * 1000)
@@
-144,7
+144,7
@@
class Timer:
def doActivate(self, w):
w.activate(w.state)
self.timer_list.remove(w)
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)
w.state += 1
if w.state < TimerEntry.StateEnded:
bisect.insort(self.timer_list, w)
@@
-156,7
+156,6
@@
class Timer:
else:
bisect.insort(self.processed_timers, w)
else:
bisect.insort(self.processed_timers, w)
-
def processActivation(self):
t = int(time.time()) + 1
def processActivation(self):
t = int(time.time()) + 1