X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/089c965d09e2af09a4731ff164e1b68b3daf8047..86d0f1d05eea8098b32897eb0cffc18c6a861be1:/RecordTimer.py

diff --git a/RecordTimer.py b/RecordTimer.py
old mode 100644
new mode 100755
index f670417a..04c3ff12
--- 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
@@ -138,6 +139,13 @@ 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
+				else:
+					filename += " - " + self.name # standard
 
 		if config.recording.ascii_filenames.value:
 			filename = ASCIItranslit.legacyEncode(filename)