git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sorry, i REALLY don't know, how to fix it other than using a try/except block
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index aa48415a7babcb1c45467f64f884d922c3ecbc0b..18cc64ab4bd2be40b4f9de40df5a0c7dc8377b60 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-86,9
+86,12
@@
def createTimer(xml):
end = int(xml.getAttribute("end"))
serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
description = xml.getAttribute("description")
end = int(xml.getAttribute("end"))
serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
description = xml.getAttribute("description")
+ repeated = xml.getAttribute("repeated")
epgdata = xml.getAttribute("epgdata")
#filename = xml.getAttribute("filename")
epgdata = xml.getAttribute("epgdata")
#filename = xml.getAttribute("filename")
- return RecordTimerEntry(begin, end, serviceref, epgdata, description)
+ entry = RecordTimerEntry(begin, end, serviceref, epgdata, description)
+ entry.repeated = int(repeated)
+ return entry
class RecordTimer(timer.Timer):
def __init__(self):
class RecordTimer(timer.Timer):
def __init__(self):
@@
-100,6
+103,13
@@
class RecordTimer(timer.Timer):
self.loadTimer()
except:
print "unable to load timers from file!"
self.loadTimer()
except:
print "unable to load timers from file!"
+
+ def isRecording(self):
+ isRunning = False
+ for timer in self.timer_list:
+ if timer.isRunning():
+ isRunning = True
+ return isRunning
def loadTimer(self):
# TODO: PATH!
def loadTimer(self):
# TODO: PATH!
@@
-126,6
+136,7
@@
class RecordTimer(timer.Timer):
t.setAttribute("begin", str(timer.begin))
t.setAttribute("end", str(timer.end))
t.setAttribute("serviceref", str(timer.service_ref))
t.setAttribute("begin", str(timer.begin))
t.setAttribute("end", str(timer.end))
t.setAttribute("serviceref", str(timer.service_ref))
+ t.setAttribute("repeated", str(timer.repeated))
#t.setAttribute("epgdata", timer.)
t.setAttribute("description", timer.description)
root_element.appendChild(t)
#t.setAttribute("epgdata", timer.)
t.setAttribute("description", timer.description)
root_element.appendChild(t)
@@
-138,23
+149,38
@@
class RecordTimer(timer.Timer):
file.close()
def record(self, entry):
file.close()
def record(self, entry):
+ print "[Timer] Record " + str(entry)
entry.Timer = self
self.addTimerEntry(entry)
def removeEntry(self, entry):
entry.Timer = self
self.addTimerEntry(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.activate(timer.TimerEntry.EventAbort)
entry.end = time.time()
self.timeChanged(entry)
elif entry.state != timer.TimerEntry.StateEnded:
entry.activate(timer.TimerEntry.EventAbort)
- self.timer_list.remove(entry)
+ try: # FIXME: is needed, because after loading the timers, every timer (even already ended ones)
+ # have the state EventWaiting..
+ self.timer_list.remove(entry)
+ except:
+ pass
+
self.calcNextActivation()
print "timer did not yet start - removing"
else:
print "timer did already end - doing nothing."
self.calcNextActivation()
print "timer did not yet start - removing"
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.
- self.processed_timers.remove(entry)
+ try:
+ self.processed_timers.remove(entry)
+ except:
+ pass
def shutdown(self):
self.saveTimer()
def shutdown(self):
self.saveTimer()