X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=1608caaf74ad1fe2fb27d3e8745f6bb9c8e525d7;hp=f670417a5eddca05f8322c01b3b60c88bb372141;hb=b6da0afe0cd5cf7ba08427fd1b8e2fe9bb270901;hpb=864bab84ceacbaa2cf2814aa74f1379a0b9c8426

diff --git a/RecordTimer.py b/RecordTimer.py
old mode 100644
new mode 100755
index f670417..1608caa
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -129,6 +129,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 +138,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)