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 time changed for ended timers
[enigma2.git]
/
RecordTimer.py
diff --git
a/RecordTimer.py
b/RecordTimer.py
index a257b2fa8b3d9875816b9a8c817763dd0048d5b6..2835a3881f5791e7ffca13426d36689da452a718 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-22,17
+22,20
@@
from ServiceReference import ServiceReference
# parses an event, and gives out a (begin, end, name, duration, eit)-tuple.
# parses an event, and gives out a (begin, end, name, duration, eit)-tuple.
+# begin and end will be corrected
def parseEvent(ev):
name = ev.getEventName()
description = ev.getShortDescription()
begin = ev.getBeginTime()
end = begin + ev.getDuration()
eit = ev.getEventId()
def parseEvent(ev):
name = ev.getEventName()
description = ev.getShortDescription()
begin = ev.getBeginTime()
end = begin + ev.getDuration()
eit = ev.getEventId()
+ begin -= config.recording.margin_before.value[0] * 60
+ end += config.recording.margin_after.value[0] * 60
return (begin, end, name, description, eit)
# please do not translate log messages
class RecordTimerEntry(timer.TimerEntry):
return (begin, end, name, description, eit)
# please do not translate log messages
class RecordTimerEntry(timer.TimerEntry):
- def __init__(self, serviceref, begin, end, name, description, eit):
+ def __init__(self, serviceref, begin, end, name, description, eit
, disabled = False
):
timer.TimerEntry.__init__(self, int(begin), int(end))
assert isinstance(serviceref, ServiceReference)
timer.TimerEntry.__init__(self, int(begin), int(end))
assert isinstance(serviceref, ServiceReference)
@@
-42,6
+45,7
@@
class RecordTimerEntry(timer.TimerEntry):
self.dontSave = False
self.name = name
self.description = description
self.dontSave = False
self.name = name
self.description = description
+ self.disabled = disabled
self.timer = None
self.record_service = None
self.start_prepare = 0
self.timer = None
self.record_service = None
self.start_prepare = 0
@@
-60,15
+64,18
@@
class RecordTimerEntry(timer.TimerEntry):
def calculateFilename(self):
service_name = self.service_ref.getServiceName()
def calculateFilename(self):
service_name = self.service_ref.getServiceName()
-# begin_date = datetime.fromtimestamp(begin).strf...
- begin_date = ""
+ begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin))
print "begin_date: ", begin_date
print "service_name: ", service_name
print "name:", self.name
print "description: ", self.description
print "begin_date: ", begin_date
print "service_name: ", service_name
print "name:", self.name
print "description: ", self.description
+
+ filename = begin_date + " - " + service_name
+ if self.name:
+ filename += " - " + self.name
- self.Filename = Directories.getRecordingFilename(
service_
name)
+ self.Filename = Directories.getRecordingFilename(
file
name)
self.log(0, "Filename calculated as: '%s'" % self.Filename)
#begin_date + " - " + service_name + description)
self.log(0, "Filename calculated as: '%s'" % self.Filename)
#begin_date + " - " + service_name + description)
@@
-182,19
+189,23
@@
def createTimer(xml):
serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
description = xml.getAttribute("description").encode("utf-8")
repeated = xml.getAttribute("repeated").encode("utf-8")
serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
description = xml.getAttribute("description").encode("utf-8")
repeated = xml.getAttribute("repeated").encode("utf-8")
+ try:
+ disabled = eval(xml.getAttribute("disabled"))
+ except:
+ disabled = False
try:
eit = long(xml.getAttribute("eit").encode("utf-8"))
except:
eit = None
name = xml.getAttribute("name").encode("utf-8")
#filename = xml.getAttribute("filename").encode("utf-8")
try:
eit = long(xml.getAttribute("eit").encode("utf-8"))
except:
eit = None
name = xml.getAttribute("name").encode("utf-8")
#filename = xml.getAttribute("filename").encode("utf-8")
- entry = RecordTimerEntry(serviceref, begin, end, name, description, eit)
+ entry = RecordTimerEntry(serviceref, begin, end, name, description, eit
, disabled
)
entry.repeated = int(repeated)
for l in elementsWithTag(xml.childNodes, "log"):
time = int(l.getAttribute("time"))
code = int(l.getAttribute("code"))
entry.repeated = int(repeated)
for l in elementsWithTag(xml.childNodes, "log"):
time = int(l.getAttribute("time"))
code = int(l.getAttribute("code"))
- msg = mergeText(l.childNodes).strip()
+ msg = mergeText(l.childNodes).strip()
.encode("utf-8")
entry.log_entries.append((time, code, msg))
return entry
entry.log_entries.append((time, code, msg))
return entry
@@
-224,7
+235,10
@@
class RecordTimer(timer.Timer):
root = doc.childNodes[0]
for timer in elementsWithTag(root.childNodes, "timer"):
self.record(createTimer(timer))
root = doc.childNodes[0]
for timer in elementsWithTag(root.childNodes, "timer"):
self.record(createTimer(timer))
-
+
+ def strToXML(self, str):
+ return str.replace('&', '&').replace('<', '<').replace('>', '>').replace("'", '''). replace('"', '&qout;')
+
def saveTimer(self):
#doc = xml.dom.minidom.Document()
#root_element = doc.createElement('timers')
def saveTimer(self):
#doc = xml.dom.minidom.Document()
#root_element = doc.createElement('timers')
@@
-272,14
+286,18
@@
class RecordTimer(timer.Timer):
list.append('<timers>\n')
for timer in self.timer_list + self.processed_timers:
list.append('<timers>\n')
for timer in self.timer_list + self.processed_timers:
+ if timer.dontSave:
+ continue
+
list.append('<timer')
list.append(' begin="' + str(int(timer.begin)) + '"')
list.append(' end="' + str(int(timer.end)) + '"')
list.append(' serviceref="' + str(timer.service_ref) + '"')
list.append(' repeated="' + str(int(timer.repeated)) + '"')
list.append('<timer')
list.append(' begin="' + str(int(timer.begin)) + '"')
list.append(' end="' + str(int(timer.end)) + '"')
list.append(' serviceref="' + str(timer.service_ref) + '"')
list.append(' repeated="' + str(int(timer.repeated)) + '"')
- list.append(' name="' + str(
timer.name
) + '"')
- list.append(' description="' + str(
timer.description
) + '"')
+ list.append(' name="' + str(
self.strToXML(timer.name)
) + '"')
+ list.append(' description="' + str(
self.strToXML(timer.description)
) + '"')
list.append(' eit="' + str(timer.eit) + '"')
list.append(' eit="' + str(timer.eit) + '"')
+ list.append(' disabled="' + str(int(timer.disabled)) + '"')
list.append('>\n')
for time, code, msg in timer.log_entries:
list.append('>\n')
for time, code, msg in timer.log_entries: