diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 09:57:51 +0200 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 09:57:51 +0200 |
| commit | b5d9fa054d38ffbda31b0982ed3c9b55f99f4b9e (patch) | |
| tree | 00b7f691ad6b0946e9ccd115e4457df760084b1f | |
| parent | 3cc82828e92d2e8b5125de590ddc9e693a2a2ea0 (diff) | |
| parent | 296d197199348f0f39834308768487ee4b9f0285 (diff) | |
| download | enigma2-b5d9fa054d38ffbda31b0982ed3c9b55f99f4b9e.tar.gz enigma2-b5d9fa054d38ffbda31b0982ed3c9b55f99f4b9e.zip | |
Merge commit 'origin/bug_345_configurable_recordingnames'
| -rwxr-xr-x[-rw-r--r--] | RecordTimer.py | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | data/setup.xml | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/python/Components/RecordingConfig.py | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/RecordTimer.py b/RecordTimer.py index f670417a..1608caaf 100644..100755 --- 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) diff --git a/data/setup.xml b/data/setup.xml index 9425afda..23338254 100644..100755 --- a/data/setup.xml +++ b/data/setup.xml @@ -70,6 +70,7 @@ <item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item> <item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item> <item level="2" text="Limited character set for recording filenames">config.recording.ascii_filenames</item> + <item level="2" text="Composition of the recording filenames">config.recording.filename_composition</item> </setup> <setup key="harddisk" title="Harddisk setup" > <item level="0" text="Harddisk standby after">config.usage.hdd_standby</item> diff --git a/lib/python/Components/RecordingConfig.py b/lib/python/Components/RecordingConfig.py index fe9284d9..40dfb2ca 100644..100755 --- a/lib/python/Components/RecordingConfig.py +++ b/lib/python/Components/RecordingConfig.py @@ -1,4 +1,4 @@ -from config import ConfigNumber, ConfigYesNo, ConfigSubsection, config +from config import ConfigNumber, ConfigYesNo, ConfigSubsection, ConfigSelection, config def InitRecordingConfig(): config.recording = ConfigSubsection(); @@ -8,3 +8,7 @@ def InitRecordingConfig(): config.recording.margin_after = ConfigNumber(default=0) config.recording.debug = ConfigYesNo(default = False) config.recording.ascii_filenames = ConfigYesNo(default = False) + config.recording.filename_composition = ConfigSelection(default = "standard", choices = [ + ("standard", _("standard")), + ("short", _("Short filenames")), + ("long", _("Long filenames")) ] )
\ No newline at end of file |