X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=11fe9712e636b9d2078652fed203871a582e6324;hp=dc2f6b2e0a3e474d488c488c266b3bf3fdab88c6;hb=d6c029c9f46709fb51b3dee340a088c0260b90b4;hpb=339fa730b8daeb2cb601585450040e1bd65e61db

diff --git a/RecordTimer.py b/RecordTimer.py
index dc2f6b2..11fe971 100755
--- 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
@@ -129,6 +132,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
 	def calculateFilename(self):
 		service_name = self.service_ref.getServiceName()
 		begin_date = strftime("%Y%m%d %H%M", localtime(self.begin))
+		begin_shortdate = strftime("%Y%m%d", localtime(self.begin))
 		
 		print "begin_date: ", begin_date
 		print "service_name: ", service_name
@@ -137,7 +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 += " - " + self.name + " - " + self.description
+				else:
+					filename += " - " + self.name # standard
+			else:
+				filename += " - " + self.name
 
 		if config.recording.ascii_filenames.value:
 			filename = ASCIItranslit.legacyEncode(filename)