fix allocateRawChannel
[enigma2.git] / RecordTimer.py
index da629ee7750f8b6c37ecf22528ff637bda3a2bf2..f330f8c086c9197be1b4083ebbc0cd55db82eed6 100644 (file)
@@ -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, eEPGCache
+from enigma import quitMainloop, eEPGCache, getBestPlayableServiceReference, eServiceReference
 
 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:
@@ -102,37 +106,48 @@ class RecordTimerEntry(timer.TimerEntry):
                        return True
                else:
                        self.calculateFilename()
-                       self.record_service = NavigationInstance.instance.recordService(self.service_ref)
-                       if self.record_service == None:
+                       rec_ref = self.service_ref and self.service_ref.ref
+                       if rec_ref and rec_ref.flags & eServiceReference.isGroup:
+                               rec_ref = getBestPlayableServiceReference(rec_ref, eServiceReference())
+                               if not rec_ref:
+                                       self.log(1, "'get best playable service for group... record' failed")
+                                       return False
+                               
+                       self.record_service = rec_ref and NavigationInstance.instance.recordService(rec_ref)
+                       if not self.record_service:
                                self.log(1, "'record service' failed")
                                return False
-                       else:
-                               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
-                                       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")
-                                       f.write(str(self.service_ref) + "\n")
-                                       f.write(self.name + "\n")
-                                       f.write(self.description + "\n")
-                                       f.write(str(self.begin) + "\n")
-                                       f.close()
-                               except IOError:
-                                       self.log(4, "failed to write meta information")
-                               return True
+                               
+                       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
+                               return False
+                               
+                       if self.repeated:
+                               epgcache = eEPGCache.getInstance()
+                               queryTime=self.begin+(self.end-self.begin)/2
+                               evt = epgcache.lookupEventTime(rec_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")
+                               f.write(rec_ref.toString() + "\n")
+                               f.write(self.name + "\n")
+                               f.write(self.description + "\n")
+                               f.write(str(self.begin) + "\n")
+                               f.close()
+                       except IOError:
+                               self.log(4, "failed to write meta information")
+                               self.record_service = None
+                               return False
+                       return True
 
        def do_backoff(self):
                if self.backoff == 0:
@@ -158,7 +173,7 @@ 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"), timeout=20)
                                else: # zap without asking
@@ -194,7 +209,7 @@ class RecordTimerEntry(timer.TimerEntry):
                elif next_state == self.StateEnded:
                        self.log(12, "stop recording")
                        if not self.justplay:
-                               self.record_service.stop()
+                               NavigationInstance.instance.stopRecordService(self.record_service)
                                self.record_service = None
                        if self.afterEvent == AFTEREVENT.STANDBY:
                                if self.session is not None:
@@ -226,13 +241,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")
@@ -336,7 +351,7 @@ class RecordTimer(timer.Timer):
                        list.append('<timer')
                        list.append(' begin="' + str(int(timer.begin)) + '"')
                        list.append(' end="' + str(int(timer.end)) + '"')
-                       list.append(' serviceref="' + str(timer.service_ref) + '"')
+                       list.append(' serviceref="' + stringToXML(str(timer.service_ref)) + '"')
                        list.append(' repeated="' + str(int(timer.repeated)) + '"')
                        list.append(' name="' + str(stringToXML(timer.name)) + '"')
                        list.append(' description="' + str(stringToXML(timer.description)) + '"')
@@ -347,14 +362,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')