catch a None case in the xml parsing of the timer

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 8f6999c91ead4ef4a00badc4ed5607b26a83338d..a257b2fa8b3d9875816b9a8c817763dd0048d5b6 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -44,6 +44,7 @@ class RecordTimerEntry(timer.TimerEntry):
                self.description = description
                self.timer = None
                self.record_service = None
+               self.start_prepare = 0
                
                self.log_entries = []
                self.resetState()
@@ -168,9 +169,12 @@ class RecordTimerEntry(timer.TimerEntry):
                        self.log(14, "user didn't want to zap away, record will probably fail")
 
        def timeChanged(self):
+               old_prepare = self.start_prepare
                self.start_prepare = self.begin - self.prepare_time
                self.backoff = 0
-               self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare))
+               
+               if old_prepare != self.start_prepare:
+                       self.log(15, "record time changed, start prepare is now: %s" % time.ctime(self.start_prepare))
 
 def createTimer(xml):
        begin = int(xml.getAttribute("begin"))
@@ -178,7 +182,10 @@ def createTimer(xml):
        serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
        description = xml.getAttribute("description").encode("utf-8")
        repeated = xml.getAttribute("repeated").encode("utf-8")
-       eit = xml.getAttribute("eit").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)