darktable/lua-scripts-w-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug where the wrong script could be activated, because the script to activate was found by string matching. Replaced string match with value of category selector and script name to avoid any ambiguity.

Browse Source
This commit is contained in:
Bill Ferguson
2018-11-21 21:24:28 -05:00
parent 3456dc90d8
commit 0550f4e28a
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/script_manager.lua
View File

@@ -291,19 +291,10 @@ local function create_enable_disable_button(btext, sname, req)
-- split the label into action and target -- split the label into action and target
local action, target = string.match(self.label, "(.+) (.+)") local action, target = string.match(self.label, "(.+) (.+)")
-- load the script if it's not loaded -- load the script if it's not loaded
local scat = "" dt.print_log("Looking for target " .. target)
for _,scatn in ipairs(sm.script_categories) do local scat = sm.category_selector.value
-- check, and fix, the filename for a - since it is a lua magic character in string match -- check, and fix, the filename for a - since it is a lua magic character in string match
local mtarget = target dt.print_log("checking category " .. scat .. " for target " .. target)
if string.match(mtarget, "-") then
mtarget = string.gsub(mtarget, "%-", "%%-")
dt.print_log("fixed target is " .. mtarget)
end
if string.match(table.concat(sm.script_names[scatn]), mtarget) then
dt.print_log("got a string match")
scat = scatn
end
end
local starget = du.join({scat, target}, "/") local starget = du.join({scat, target}, "/")
dt.print_log("starget to activate is " .. starget) dt.print_log("starget to activate is " .. starget)
dt.print_log("target to activate is " .. target) dt.print_log("target to activate is " .. target)