speedup resolveFilename a bit
[enigma2.git] / RecordTimer.py
index 73e7eefee6af881c78ce0949f2bdc46efb042fb5..dde6c4ccb1a7dfb3f74dd5ac1ad8b2be2c25fdda 100644 (file)
@@ -1,9 +1,8 @@
 import time
-import codecs
 #from time import datetime
 from Tools import Directories, Notifications
 
-from Components.config import config, ConfigYesNo
+from Components.config import config
 import timer
 import xml.dom.minidom
 
@@ -92,7 +91,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                        Notifications.AddNotification(Screens.Standby.TryQuitMainloop, 1, onSessionOpenCallback=RecordTimerEntry.stopTryQuitMainloop)
 #################################################################
 
-       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False):
+       def __init__(self, serviceref, begin, end, name, description, eit, disabled = False, justplay = False, afterEvent = AFTEREVENT.NONE, checkOldTimers = False, dirname = None):
                timer.TimerEntry.__init__(self, int(begin), int(end))
 
                if checkOldTimers == True:
@@ -115,6 +114,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                self.start_prepare = 0
                self.justplay = justplay
                self.afterEvent = afterEvent
+               self.dirname = dirname
                
                self.log_entries = []
                self.resetState()
@@ -122,13 +122,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
        def log(self, code, msg):
                self.log_entries.append((int(time.time()), code, msg))
                print "[TIMER]", msg
-       
-       def resetState(self):
-               self.state = self.StateWaiting
-               self.cancelled = False
-               self.first_try_prepare = True
-               self.timeChanged()
-       
+
        def calculateFilename(self):
                service_name = self.service_ref.getServiceName()
                begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin))
@@ -142,7 +136,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
                if self.name:
                        filename += " - " + self.name
 
-               self.Filename = Directories.getRecordingFilename(filename)
+               self.Filename = Directories.getRecordingFilename(filename, self.dirname)
                self.log(0, "Filename calculated as: '%s'" % self.Filename)
                #begin_date + " - " + service_name + description)
 
@@ -164,23 +158,26 @@ class RecordTimerEntry(timer.TimerEntry, object):
                                self.log(1, "'record service' failed")
                                return False
 
-                       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)
-                               NavigationInstance.instance.stopRecordService(self.record_service)
-                               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()
+                                       event_id = evt.getEventId()
+                               else:
+                                       event_id = -1
+                       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)
+                               NavigationInstance.instance.stopRecordService(self.record_service)
+                               self.record_service = None
+                               return False
 
                        self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
                        try:
@@ -357,10 +354,15 @@ def createTimer(xml):
                eit = long(xml.getAttribute("eit"))
        else:
                eit = None
-       
+       if xml.hasAttribute("location") and xml.getAttribute("location") != "None":
+               location = str(xml.getAttribute("location")).encode("utf-8")
+       else:
+               location = None
+
+
        name = xml.getAttribute("name").encode("utf-8")
        #filename = xml.getAttribute("filename").encode("utf-8")
-       entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent)
+       entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled, justplay, afterevent, dirname = location)
        entry.repeated = int(repeated)
        
        for l in elementsWithTag(xml.childNodes, "log"):
@@ -391,8 +393,22 @@ class RecordTimer(timer.Timer):
        
        def loadTimer(self):
                # TODO: PATH!
-               doc = xml.dom.minidom.parse(self.Filename)
-               
+               try:
+                       doc = xml.dom.minidom.parse(self.Filename)
+               except xml.parsers.expat.ExpatError:
+                       from Tools.Notifications import AddPopup
+                       from Screens.MessageBox import MessageBox
+
+                       AddPopup(_("The timer file (timers.xml) is corrupt and could not be loaded."), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed")
+
+                       print "timers.xml failed to load!"
+                       try:
+                               import os
+                               os.rename(self.Filename, self.Filename + "_old")
+                       except IOError:
+                               print "renaming broken timer failed"
+                       return
+
                root = doc.childNodes[0]
                for timer in elementsWithTag(root.childNodes, "timer"):
                        self.record(createTimer(timer))
@@ -457,6 +473,8 @@ class RecordTimer(timer.Timer):
                        list.append(' afterevent="' + str(stringToXML({ AFTEREVENT.NONE: "nothing", AFTEREVENT.STANDBY: "standby", AFTEREVENT.DEEPSTANDBY: "deepstandby" }[timer.afterEvent])) + '"')
                        if timer.eit is not None:
                                list.append(' eit="' + str(timer.eit) + '"')
+                       if timer.dirname is not None:
+                               list.append(' location="' + str(stringToXML(timer.dirname)) + '"')
                        list.append(' disabled="' + str(int(timer.disabled)) + '"')
                        list.append(' justplay="' + str(int(timer.justplay)) + '"')
                        list.append('>\n')
@@ -480,27 +498,19 @@ class RecordTimer(timer.Timer):
                file.close()
 
        def getNextZapTime(self):
-               llen = len(self.timer_list)
-               idx = 0
                now = time.time()
-               while idx < llen:
-                       timer = self.timer_list[idx]
+               for timer in self.timer_list:
                        if not timer.justplay or timer.begin < now:
-                               idx += 1
-                       else:
-                               return timer.begin
+                               continue
+                       return timer.begin
                return -1
 
        def getNextRecordingTime(self):
-               llen = len(self.timer_list)
-               idx = 0
                now = time.time()
-               while idx < llen:
-                       timer = self.timer_list[idx]
+               for timer in self.timer_list:
                        if timer.justplay or timer.begin < now:
-                               idx += 1
-                       else:
-                               return timer.begin
+                               continue
+                       return timer.begin
                return -1
 
        def record(self, entry):
@@ -508,6 +518,7 @@ class RecordTimer(timer.Timer):
                print "[Timer] Record " + str(entry)
                entry.Timer = self
                self.addTimerEntry(entry)
+               self.saveTimer()
                
        def isInTimer(self, eventid, begin, duration, service):
                time_match = 0
@@ -516,7 +527,34 @@ class RecordTimer(timer.Timer):
                chktimecmp_end = None
                end = begin + duration
                for x in self.timer_list:
-                       if str(x.service_ref) == str(service):
+                       check = x.service_ref.ref.toCompareString() == str(service)
+                       if not check:
+                               sref = x.service_ref.ref
+                               parent_sid = sref.getUnsignedData(5)
+                               parent_tsid = sref.getUnsignedData(6)
+                               if parent_sid and parent_tsid: # check for subservice
+                                       sid = sref.getUnsignedData(1)
+                                       tsid = sref.getUnsignedData(2)
+                                       sref.setUnsignedData(1, parent_sid)
+                                       sref.setUnsignedData(2, parent_tsid)
+                                       sref.setUnsignedData(5, 0)
+                                       sref.setUnsignedData(6, 0)
+                                       check = x.service_ref.ref.toCompareString() == str(service)
+                                       num = 0
+                                       if check:
+                                               check = False
+                                               event = eEPGCache.getInstance().lookupEventId(sref, eventid)
+                                               num = event and event.getNumOfLinkageServices() or 0
+                                       sref.setUnsignedData(1, sid)
+                                       sref.setUnsignedData(2, tsid)
+                                       sref.setUnsignedData(5, parent_sid)
+                                       sref.setUnsignedData(6, parent_tsid)
+                                       for cnt in range(num):
+                                               subservice = event.getLinkageService(sref, cnt)
+                                               if sref.toCompareString() == subservice.toCompareString():
+                                                       check = True
+                                                       break
+                       if check:
                                #if x.eit is not None and x.repeated == 0:
                                #       if x.eit == eventid:
                                #               return duration
@@ -562,6 +600,7 @@ class RecordTimer(timer.Timer):
                print "in running: ", entry in self.timer_list
                # now the timer should be in the processed_timers list. remove it from there.
                self.processed_timers.remove(entry)
+               self.saveTimer()
 
        def shutdown(self):
                self.saveTimer()