Skip to content

fix major BUG : changeOrder can bump inferior photo to head. Plus: added... #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SamSamFR wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix major BUG : changeOrder can bump inferior photo to head. Plus: added... #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions src/Teekesselchen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,43 @@ local function markDuplicateEnv(settings, keyword)
if #tree == 1 then
tree[1]:addKeyword(keyword)
end
local continueOrder = true -- eg. if size has been found < to head, set to false and don't try further order changes that could fuck it up.
if uF then
-- deal with raw preference
if pRaw then
if tree[1]:getRawMetadata("fileFormat") ~= "RAW" then
if photo:getRawMetadata("fileFormat") == "RAW" then
local HisRaw, NisRaw = tree[1]:getRawMetadata("fileFormat")=="RAW", photo:getRawMetadata("fileFormat")=="RAW"
if not HisRaw and NisRaw then
changeOrder(tree,photo)
return true
end
end
continueOrder = (HisRaw == NisRaw)
end
-- deal with file size
if pL then
if pL and continueOrder then
local sizeHead = tree[1]:getRawMetadata("fileSize")
local sizeNew = photo:getRawMetadata("fileSize")
if sizeNew > sizeHead then
changeOrder(tree,photo)
return true
local function getMP(p) -- get MegaPixels count from photo
local l = {}
p:getFormattedMetadata("dimensions"):gsub("(%d+)%s*x%s*(%d+)", function (x,y) table.insert(l,x*y*1e-6) end)
return l[1]
end
end
-- deal with rating
if pR then
local MPhead, MPNew = getMP(tree[1]), getMP(photo)
if MPhead and MPNew then
if MPNew > MPhead then
changeOrder(tree, photo)
return true
end
continueOrder = (MPhead==MPNew)
else if sizeNew and sizeNew > sizeHead then
changeOrder(tree,photo)
return true
else if sizeNew then
continueOrder = (sizeNew == sizeHead)
end
end
end
end -- deal with rating
if pR and continueOrder then
local ratingHead = tree[1]:getRawMetadata("rating")
local ratingNew = photo:getRawMetadata("rating")
if ratingHead == nil then ratingHead = 0 end
Expand All @@ -95,7 +111,7 @@ local function markDuplicateEnv(settings, keyword)
end
end
-- deal with virtual copies
if not iVC then
if not iVC and continueOrder then
if tree[1]:getRawMetadata("isVirtualCopy") then
if not photo:getRawMetadata("isVirtualCopy") then
changeOrder(tree,photo)
Expand Down