diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-05-30 23:57:52 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-05-30 23:57:52 +0200 |
| commit | d37c356fa54be2fd93a92566c686a468a741cd0f (patch) | |
| tree | 6a78e41a134825ea231409e2dc82ebe2a09cd425 /RecordTimer.py | |
| parent | 9529d3ec43c9d81811dd5efa4c998821df90c9b5 (diff) | |
| parent | ec485b760f7aa361870421587055bcd929df7729 (diff) | |
| download | enigma2-d37c356fa54be2fd93a92566c686a468a741cd0f.tar.gz enigma2-d37c356fa54be2fd93a92566c686a468a741cd0f.zip | |
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
Diffstat (limited to 'RecordTimer.py')
| -rwxr-xr-x[-rw-r--r--] | RecordTimer.py | 11 |
1 files changed, 10 insertions, 1 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) |