advertise timeshifting in the infobar

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 4cfada5ad38a268adedd214a34ca1df8647a4c59..9bb1da7107a17168dfe4de5b0018b72dc2bfba88 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -189,14 +189,12 @@ def createTimer(xml):
        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)
@@ -205,7 +203,7 @@ def createTimer(xml):
        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
@@ -296,7 +294,8 @@ class RecordTimer(timer.Timer):
                        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')