X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a3ccac772dd40db6e4878f1a818dfb346ac27341..25d7d8f83be2c4b4ede842e7311f0162d230b0c2:/RecordTimer.py diff --git a/RecordTimer.py b/RecordTimer.py index 2835a388..9bb1da71 100644 --- 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) @@ -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')