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

Merge pull request #141 from wpferguson/revert_script_manager_and

Browse Source 
reverted change from nested if statements to a multiple and statement
This commit is contained in:
wpferguson
2018-08-20 23:50:36 -04:00
committed by GitHub
parent f42199aec0 0858a19138
commit c6cccf2d93
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/script_manager.lua
View File

@@ -213,14 +213,18 @@ local function scan_scripts()
for line in output:lines() do
local l = string.gsub(line, LUA_DIR .. PS, "") -- strip the lua dir off
local script_file = l:sub(1,-5)
if not string.match(script_file, "script_manager") and -- let's not include ourself
not string.match(script_file, "plugins") and -- skip plugins
not string.match(script_file, "lib" .. PS) and -- let's not try and run libraries
not string.match(script_file, "include_all") and -- skip include_all.lua
not string.match(script_file, "yield") then -- special case, because everything needs this
add_script_data(script_file)
else
prequire(script_file) -- load yield.lua
if not string.match(script_file, "script_manager") then -- let's not include ourself
if not string.match(script_file, "plugins") then -- skip plugins
if not string.match(script_file, "lib" .. PS) then -- let's not try and run libraries
if not string.match(script_file, "include_all") then -- skip include_all.lua
if not string.match(script_file, "yield") then -- special case, because everything needs this
add_script_data(script_file)
else
prequire(script_file) -- load yield.lua
end
end
end
end
end
end
-- work around because we can't dynamically add a new stack child. We create an empty child that will be