From bea4946ae09bcab368696c50031e29c635017585 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Wed, 12 May 2010 16:03:30 +0200 Subject: RecordTimer.py,RecordingConfig.py,setup.xml: *add possibility to change the default recording filename composition in expert mode. This allows now to have shorter recording filenames (Date-Name) or longer (DateTime-Channel-Name-Shortdescription) beside the default. This fixes #345 --- RecordTimer.py | 8 ++++++++ 1 file changed, 8 insertions(+) mode change 100644 => 100755 RecordTimer.py (limited to '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) -- cgit v1.2.3 From ec485b760f7aa361870421587055bcd929df7729 Mon Sep 17 00:00:00 2001 From: acid-burn Date: Fri, 28 May 2010 10:38:40 +0200 Subject: RecordTimer.py: fix double name in recording filenames. refs #345 --- RecordTimer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'RecordTimer.py') diff --git a/RecordTimer.py b/RecordTimer.py index 04c3ff12..1608caaf 100755 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -138,14 +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 = 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) -- cgit v1.2.3