update ca, sv language

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 186b386c7a4dc8bac93172b6b1b3e10dcd21c43b..b438910e5570580ff25c663493348b4fe4bcf7e1 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -3,11 +3,11 @@ import codecs
 #from time import datetime
 from Tools import Directories, Notifications
 
-from Components.config import config
+from Components.config import config, ConfigYesNo
 import timer
 import xml.dom.minidom
 
-from enigma import quitMainloop
+from enigma import quitMainloop, eEPGCache
 
 from Screens.MessageBox import MessageBox
 import NavigationInstance
@@ -25,14 +25,18 @@ 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()
+def parseEvent(ev, description = True):
+       if description:
+               name = ev.getEventName()
+               description = ev.getShortDescription()
+       else:
+               name = ""
+               description = ""
        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
+       begin -= config.recording.margin_before.value * 60
+       end += config.recording.margin_after.value * 60
        return (begin, end, name, description, eit)
 
 class AFTEREVENT:
@@ -115,7 +119,13 @@ class RecordTimerEntry(timer.TimerEntry):
                                        self.log(2, "'prepare' failed: error %d" % prep_res)
                                        self.record_service = None
                                        return False
-       
+
+                               if self.repeated:
+                                       epgcache = eEPGCache.getInstance()
+                                       queryTime=self.begin+(self.end-self.begin)/2
+                                       evt = epgcache.lookupEventTime(self.service_ref.ref, queryTime)
+                                       if evt:
+                                               self.description = evt.getShortDescription()
                                self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
                                try:
                                        f = open(self.Filename + ".ts.meta", "w")
@@ -152,11 +162,12 @@ class RecordTimerEntry(timer.TimerEntry):
                        self.log(7, "prepare failed")
                        if self.first_try_prepare:
                                self.first_try_prepare = False
-                               if config.recording.asktozap.value == 0:
+                               if not config.recording.asktozap.value:
                                        self.log(8, "asking user to zap away")
-                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"))
+                                       Notifications.AddNotificationWithCallback(self.failureCB, MessageBox, _("A timer failed to record!\nDisable TV and try again?\n"), timeout=20)
                                else: # zap without asking
                                        self.log(9, "zap without asking")
+                                       Notifications.AddNotification(MessageBox, _("In order to record a timer, the TV was switched to the recording service!\n"), type=MessageBox.TYPE_INFO, timeout=20)
                                        self.failureCB(True)
 
                        self.do_backoff()
@@ -219,13 +230,13 @@ class RecordTimerEntry(timer.TimerEntry):
                self.start_prepare = self.begin - self.prepare_time
                self.backoff = 0
                
-               if old_prepare != self.start_prepare:
+               if int(old_prepare) != int(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"))
        end = int(xml.getAttribute("end"))
-       serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
+       serviceref = ServiceReference(xml.getAttribute("serviceref").encode("utf-8"))
        description = xml.getAttribute("description").encode("utf-8")
        repeated = xml.getAttribute("repeated").encode("utf-8")
        disabled = long(xml.getAttribute("disabled") or "0")
@@ -340,14 +351,14 @@ class RecordTimer(timer.Timer):
                        list.append(' justplay="' + str(int(timer.justplay)) + '"')
                        list.append('>\n')
                        
-                       #for time, code, msg in timer.log_entries:
-                               #list.append('<log')
-                               #list.append(' code="' + str(code) + '"')
-                               #list.append(' time="' + str(time) + '"')
-                               #list.append('>')
-                               #list.append(str(msg))
-                               #list.append('</log>\n')
-
+                       if config.recording.debug.value:
+                               for time, code, msg in timer.log_entries:
+                                       list.append('<log')
+                                       list.append(' code="' + str(code) + '"')
+                                       list.append(' time="' + str(time) + '"')
+                                       list.append('>')
+                                       list.append(str(stringToXML(msg)))
+                                       list.append('</log>\n')
                        
                        list.append('</timer>\n')