hack to seek GOP-wise

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 1e2aca1d08118ad39f87c5935ca9c66d45290da7..08ea85900c90e052502eed5418256694922ebf33 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -22,12 +22,15 @@ from ServiceReference import ServiceReference
 
 
 # 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
@@ -83,7 +86,10 @@ class RecordTimerEntry(timer.TimerEntry):
                        self.log(1, "'record service' failed")
                        return False
                else:
-                       prep_res = self.record_service.prepare(self.Filename + ".ts")
+                       event_id = self.eit
+                       if event_id is None:
+                               event_id = -1
+                       prep_res = self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id )
                        if prep_res:
                                self.log(2, "'prepare' failed: error %d" % prep_res)
                                self.record_service = None
@@ -186,14 +192,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)
@@ -202,7 +206,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
@@ -217,7 +221,7 @@ class RecordTimer(timer.Timer):
                        self.loadTimer()
                except IOError:
                        print "unable to load timers from file!"
-
+                       
        def isRecording(self):
                isRunning = False
                for timer in self.timer_list:
@@ -293,7 +297,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')