Skip to content

Commit d609823

Browse files
authored
Merge pull request darktable-org#368 from wpferguson/fix_rename_sequence_leading_zeros
Fix rename_images sequence substitution
2 parents e93f5fc + 8f414f7 commit d609823

File tree

2 files changed

+44
-6
lines changed

2 files changed

+44
-6
lines changed

ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## Changes from most recent to oldest
2+
**22 Oct 2021 - wpferguson for Volker Bödker - make sure sequence is 4 digits in rename_images.lua**
23
**31 Aug 2021 - wpferguson - remove styles hiding from AutoGrouper.lua**
34
**02 Jul 2021 - wpferguson - merged API-7.0.0-dev branch to master**
45
* API-7.0.0 is darktable 3.6

contrib/rename_images.lua

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,49 @@ local function build_substitution_list(image, sequence, datetime, username, pic_
103103
if image.purple then table.insert(colorlabels, "purple") end
104104
local labels = #colorlabels == 1 and colorlabels[1] or du.join(colorlabels, ",")
105105
local eyear,emon,eday,ehour,emin,esec = string.match(image.exif_datetime_taken, "(%d-):(%d-):(%d-) (%d-):(%d-):(%d-)$")
106-
local replacements = {image.film,image.path,df.get_filename(image.filename),string.upper(df.get_filetype(image.filename)),image.id,image.duplicate_index,
107-
sequence,datetime.year,string.format("%02d", datetime.month),string.format("%02d", datetime.day),string.format("%02d", datetime.hour),
108-
string.format("%02d", datetime.min),string.format("%02d", datetime.sec),eyear,emon,eday,ehour,emin,esec,image.rating,labels,
109-
image.exif_maker,image.exif_model,image.title,image.creator,image.publisher,image.rights,username,pic_folder,home,desktop,
110-
image.exif_iso,image.exif_exposure,image.exif_exposure_bias,image.exif_aperture,image.exif_focus_distance,image.exif_focal_length,
111-
image.longitude,image.latitude,image.elevation,image.exif_lens,image.description,image.exif_crop}
106+
local replacements = {image.film,
107+
image.path,
108+
df.get_filename(image.filename),
109+
string.upper(df.get_filetype(image.filename)),
110+
image.id,image.duplicate_index,
111+
string.format("%04d", sequence),
112+
datetime.year,
113+
string.format("%02d", datetime.month),
114+
string.format("%02d", datetime.day),
115+
string.format("%02d", datetime.hour),
116+
string.format("%02d", datetime.min),
117+
string.format("%02d", datetime.sec),
118+
eyear,
119+
emon,
120+
eday,
121+
ehour,
122+
emin,
123+
esec,
124+
image.rating,
125+
labels,
126+
image.exif_maker,
127+
image.exif_model,
128+
image.title,
129+
image.creator,
130+
image.publisher,
131+
image.rights,
132+
username,
133+
pic_folder,
134+
home,
135+
desktop,
136+
image.exif_iso,
137+
image.exif_exposure,
138+
image.exif_exposure_bias,
139+
image.exif_aperture,
140+
image.exif_focus_distance,
141+
image.exif_focal_length,
142+
image.longitude,
143+
image.latitude,
144+
image.elevation,
145+
image.exif_lens,
146+
image.description,
147+
image.exif_crop
148+
}
112149

113150
for i=1,#rename.placeholders,1 do rename.substitutes[rename.placeholders[i]] = replacements[i] end
114151
end

0 commit comments

Comments
 (0)