summaryrefslogtreecommitdiff
path: root/rapid/renamesubfolderprefs.py
diff options
context:
space:
mode:
authorJulien Valroff <julien@kirya.net>2010-10-25 18:42:39 +0200
committerJulien Valroff <julien@kirya.net>2010-10-25 18:42:39 +0200
commitdf7192b0010e7f454622f1b215dfa6aff64e679b (patch)
tree001b443664d32eb98c359f1c45dd675af01b5f93 /rapid/renamesubfolderprefs.py
parente653d7822032e1a963c9546357146e76c1a4dff8 (diff)
Imported Upstream version 0.3.3upstream/0.3.3
Diffstat (limited to 'rapid/renamesubfolderprefs.py')
-rw-r--r--rapid/renamesubfolderprefs.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/rapid/renamesubfolderprefs.py b/rapid/renamesubfolderprefs.py
index 727eef0..845f809 100644
--- a/rapid/renamesubfolderprefs.py
+++ b/rapid/renamesubfolderprefs.py
@@ -98,6 +98,7 @@ IMAGE_DATE = 'Image date'
TODAY = 'Today'
YESTERDAY = 'Yesterday'
VIDEO_DATE = 'Video date'
+DOWNLOAD_TIME = 'Download time'
# File name
NAME_EXTENSION = 'Name + extension'
@@ -200,6 +201,8 @@ class i18TranslateMeThanks:
_('Video date')
_('Today')
_('Yesterday')
+ # Translators: Download time is the time and date that the download started (when the user clicked the Download button)
+ _('Download time')
# Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
_('Name + extension')
# Translators: for an explanation of what this means, see http://damonlynch.net/rapid/documentation/index.html#renamefilename
@@ -357,13 +360,14 @@ LIST_SHUTTER_COUNT_L2 = [
]
# Level 1
-LIST_DATE_TIME_L1 = [IMAGE_DATE, TODAY, YESTERDAY]
-LIST_VIDEO_DATE_TIME_L1 = [VIDEO_DATE, TODAY, YESTERDAY]
+LIST_DATE_TIME_L1 = [IMAGE_DATE, TODAY, YESTERDAY, DOWNLOAD_TIME]
+LIST_VIDEO_DATE_TIME_L1 = [VIDEO_DATE, TODAY, YESTERDAY, DOWNLOAD_TIME]
DICT_DATE_TIME_L1 = {
IMAGE_DATE: LIST_IMAGE_DATE_TIME_L2,
TODAY: LIST_DATE_TIME_L2,
YESTERDAY: LIST_DATE_TIME_L2,
+ DOWNLOAD_TIME: LIST_DATE_TIME_L2,
ORDER_KEY: LIST_DATE_TIME_L1
}
@@ -371,6 +375,7 @@ VIDEO_DICT_DATE_TIME_L1 = {
VIDEO_DATE: LIST_IMAGE_DATE_TIME_L2,
TODAY: LIST_DATE_TIME_L2,
YESTERDAY: LIST_DATE_TIME_L2,
+ DOWNLOAD_TIME: LIST_DATE_TIME_L2,
ORDER_KEY: LIST_VIDEO_DATE_TIME_L1
}
@@ -918,10 +923,11 @@ class ImageRenamePreferences:
return v
- def setJobCode(self, job_code):
+ def setJobCode(self, job_code):
self.job_code = job_code
-
+ def setDownloadStartTime(self, download_start_time):
+ self.download_start_time = download_start_time
def _getDateComponent(self):
"""
@@ -946,6 +952,8 @@ class ImageRenamePreferences:
elif self.L1 == YESTERDAY:
delta = datetime.timedelta(days = 1)
d = datetime.datetime.now() - delta
+ elif self.L1 == DOWNLOAD_TIME:
+ d = self.download_start_time
else:
raise("Date options invalid")
@@ -1405,7 +1413,7 @@ def getVideoMetadataComponent(video):
elif video.L1 == HEIGHT:
v = video.metadata.height()
elif video.L1 == FPS:
- v = video.metadata.fps()
+ v = video.metadata.framesPerSecond()
elif video.L1 == LENGTH:
v = video.metadata.length()
else:
@@ -1416,7 +1424,7 @@ def getVideoMetadataComponent(video):
elif video.L2 == LOWERCASE:
v = v.lower()
if not v:
- self.problem.add_problem(self.component, pn.MISSING_METADATA, _(video.L1))
+ video.problem.add_problem(video.component, pn.MISSING_METADATA, _(video.L1))
return v
class VideoRenamePreferences(ImageRenamePreferences):