# 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()
+ 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
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:
+ disabled = long(xml.getAttribute("disabled") or "0")
+ if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None":
+ eit = long(xml.getAttribute("eit"))
+ else:
eit = None
+
name = xml.getAttribute("name").encode("utf-8")
#filename = xml.getAttribute("filename").encode("utf-8")
entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled)
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
list.append(' repeated="' + str(int(timer.repeated)) + '"')
list.append(' name="' + str(self.strToXML(timer.name)) + '"')
list.append(' description="' + str(self.strToXML(timer.description)) + '"')
- list.append(' eit="' + str(timer.eit) + '"')
+ if timer.eit is not None:
+ list.append(' eit="' + str(timer.eit) + '"')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
list.append('>\n')