Merge branch 'bug_537_ignore_vob_pgs_subtitles' into master

[enigma2.git] / RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
index 04c3ff122a2fd9dd7e81ccca82d64564f380986e..1cb7eb3b02442b1dd616ec89906ec88446ee80df 100755 (executable)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -102,7 +102,10 @@ class RecordTimerEntry(timer.TimerEntry, object):
                
                assert isinstance(serviceref, ServiceReference)
                
-               self.service_ref = serviceref
+               if serviceref.isRecordable():
+                       self.service_ref = serviceref
+               else:
+                       self.service_ref = ServiceReference(None)
                self.eit = eit
                self.dontSave = False
                self.name = name
@@ -138,14 +141,15 @@ class RecordTimerEntry(timer.TimerEntry, object):
                
                filename = begin_date + " - " + service_name
                if self.name:
-                       filename += " - " + self.name
                        if config.usage.setup_level.index >= 2: # expert+
                                if config.recording.filename_composition.value == "short":
                                        filename = begin_shortdate + " - " + self.name
                                elif config.recording.filename_composition.value == "long":
-                                       filename = begin_date + " - " + service_name + " - " + self.name + " - " + self.description
+                                       filename += " - " + self.name + " - " + self.description
                                else:
                                        filename += " - " + self.name # standard
+                       else:
+                               filename += " - " + self.name
 
                if config.recording.ascii_filenames.value:
                        filename = ASCIItranslit.legacyEncode(filename)
@@ -513,7 +517,7 @@ class RecordTimer(timer.Timer):
                checkit = True
                for timer in root.findall("timer"):
                        newTimer = createTimer(timer)
-                       if (self.record(newTimer, True, True) is not None) and (checkit == True):
+                       if (self.record(newTimer, True, dosave=False) is not None) and (checkit == True):
                                from Tools.Notifications import AddPopup
                                from Screens.MessageBox import MessageBox
                                AddPopup(_("Timer overlap in timers.xml detected!\nPlease recheck it!"), type = MessageBox.TYPE_ERROR, timeout = 0, id = "TimerLoadFailed")