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

various scripts - reverted the calls to io_popen and os_execute back

Browse Source 
to the respective lua calls.
This commit is contained in:
Bill Ferguson
2024-07-13 12:48:37 -04:00
parent 9f423eeef3
commit 1b272be5f5
14 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/autostyle.lua
View File

@@ -69,7 +69,7 @@ script_data.show = nil -- only required for libs since the destroy_method only h
-- run command and retrieve stdout
local function get_stdout(cmd)
-- Open the command, for reading
local fd = assert(syslib.io_popen(cmd, 'r'))
local fd = assert(io.popen(cmd, 'r'))
darktable.control.read(fd)
-- slurp the whole file
local data = assert(fd:read('*a'))
@@ -188,4 +188,4 @@ darktable.register_event("autostyle", "post-import-image",
script_data.destroy = destroy
return script_data
return script_data

2
contrib/color_profile_manager.lua
View File

@@ -107,7 +107,7 @@ end
local function list_profiles(dir)
local files = {}
local p = dtsys.io_popen(DIR_CMD .. " " .. dir)
local p = io.popen(DIR_CMD .. " " .. dir)
if p then
for line in p:lines() do
table.insert(files, line)

2
contrib/fujifilm_dynamic_range.lua
View File

@@ -106,7 +106,7 @@ local function detect_dynamic_range(event, image)
-- without -n flag, exiftool will round to the nearest tenth
command = command .. " -RawExposureBias -n -t " .. RAF_filename
dt.print_log(command)
output = dtsys.io_popen(command)
output = io.popen(command)
local raf_result = output:read("*all")
output:close()
if #raf_result == 0 then

4
contrib/fujifilm_ratings.lua
View File

@@ -65,7 +65,7 @@ local function detect_rating(event, image)
local JPEG_filename = string.gsub(RAF_filename, "%.RAF$", ".JPG")
local command = "exiftool -Rating " .. JPEG_filename
dt.print_log(command)
local output = dtsys.io_popen(command)
local output = io.popen(command)
local jpeg_result = output:read("*all")
output:close()
if string.len(jpeg_result) > 0 then
@@ -76,7 +76,7 @@ local function detect_rating(event, image)
end
command = "exiftool -Rating " .. RAF_filename
dt.print_log(command)
output = dtsys.io_popen(command)
output = io.popen(command)
local raf_result = output:read("*all")
output:close()
if string.len(raf_result) > 0 then

2
contrib/geoJSON_export.lua
View File

@@ -331,7 +331,7 @@ dt.preferences.register("geoJSON_export",
_("opens the geoJSON file after the export with the standard program for geoJSON files"),
false )
local handle = dtsys.io_popen("xdg-user-dir DESKTOP")
local handle = io.popen("xdg-user-dir DESKTOP")
local result = handle:read()
handle:close()
if (result == nil) then

2
contrib/geoToolbox.lua
View File

@@ -412,7 +412,7 @@ local function reverse_geocode()
-- jq could be replaced with a Lua JSON parser
startCommand = string.format("curl --silent \"https://api.mapbox.com/geocoding/v5/mapbox.places/%s,%s.json?types=%s&access_token=%s\" | jq '.features | .[0] | '.text''", lon1, lat1, types, tokan)
local handle = dtsys.io_popen(startCommand)
local handle = io.popen(startCommand)
local result = trim12(handle:read("*a"))
handle:close()

2
contrib/image_stack.lua
View File

@@ -348,7 +348,7 @@ local function list_files(search_string)
search_string = string.gsub(search_string, "/", "\\\\")
end
local f = dtsys.io_popen(ls .. search_string)
local f = io.popen(ls .. search_string)
if f then
local found_file = f:read()
while found_file do

6
contrib/image_time.lua
View File

@@ -226,7 +226,7 @@ local function get_image_taken_time(image)
local exiv2 = df.check_if_bin_exists("exiv2")
if exiv2 then
p = dtsys.io_popen(exiv2 .. " -K Exif.Image.DateTime " .. image.path .. PS .. image.filename)
p = io.popen(exiv2 .. " -K Exif.Image.DateTime " .. image.path .. PS .. image.filename)
if p then
for line in p:lines() do
if string.match(line, "Exif.Image.DateTime") then
@@ -244,7 +244,7 @@ end
local function _get_windows_image_file_creation_time(image)
local datetime = nil
local p = dtsys.io_popen("dir " .. image.path .. PS .. image.filename)
local p = io.popen("dir " .. image.path .. PS .. image.filename)
if p then
for line in p:lines() do
if string.match(line, ds.sanitize_lua(image.filename)) then
@@ -265,7 +265,7 @@ end
local function _get_nix_image_file_creation_time(image)
local datetime = nil
local p = dtsys.io_popen("ls -lL --time-style=full-iso " .. image.path .. PS .. image.filename)
local p = io.popen("ls -lL --time-style=full-iso " .. image.path .. PS .. image.filename)
if p then
for line in p:lines() do
if string.match(line, ds.sanitize_lua(image.filename)) then

2
contrib/kml_export.lua
View File

@@ -343,7 +343,7 @@ if dt.configuration.running_os == "windows" then
elseif dt.configuration.running_os == "macos" then
defaultDir = os.getenv("HOME")
else
local handle = dsys.io_popen("xdg-user-dir DESKTOP")
local handle = io.popen("xdg-user-dir DESKTOP")
defaultDir = handle:read()
handle:close()
end

2
official/enfuse.lua
View File

@@ -116,7 +116,7 @@ if enfuse_installed then
local version = nil
local p = dtsys.io_popen(enfuse_installed .. " --version")
local p = io.popen(enfuse_installed .. " --version")
local f = p:read("all")
p:close()
version = string.match(f, "enfuse (%d.%d)")

4
tools/executable_manager.lua
View File

@@ -76,7 +76,7 @@ local function grep(file, pattern)
if dt.configuration.running_os == "windows" then
-- use find to get the matches
local command = "\\windows\\system32\\find.exe " .. "\"" .. pattern .. "\"" .. " " .. file
local f = dtsys.io_popen(command)
local f = io.popen(command)
local output = f:read("all")
f:close()
-- strip out the first line
@@ -85,7 +85,7 @@ local function grep(file, pattern)
else
-- use grep and just return the answers
local command = "grep " .. pattern .. " " .. file
local f = dtsys.io_popen(command)
local f = io.popen(command)
local output = f:read("all")
f:close()
result = du.split(output, "\n")

4
tools/get_lib_manpages.lua
View File

@@ -46,7 +46,7 @@ local function output_man(d)
mf:close()
if df.check_if_bin_exists("groff") then
if df.check_if_bin_exists("ps2pdf") then
dtsys.os_execute("groff -man " .. fname .. " | ps2pdf - " .. fname .. ".pdf")
os.execute("groff -man " .. fname .. " | ps2pdf - " .. fname .. ".pdf")
else
log.msg(log.error, "Missing ps2pdf. Can't generate pdf man pages.")
end
@@ -60,7 +60,7 @@ end
-- find the libraries
local output = dtsys.io_popen("cd "..dt.configuration.config_dir.."/lua/lib ;find . -name \\*.lua -print | sort")
local output = io.popen("cd "..dt.configuration.config_dir.."/lua/lib ;find . -name \\*.lua -print | sort")
-- loop through the libraries

2
tools/get_libdoc.lua
View File

@@ -37,7 +37,7 @@ end
-- find the libraries
local output = dtsys.io_popen("cd "..dt.configuration.config_dir.."/lua/lib ;find . -name \\*.lua -print | sort")
local output = io.popen("cd "..dt.configuration.config_dir.."/lua/lib ;find . -name \\*.lua -print | sort")
-- loop through the libraries

14
tools/script_manager.lua
View File

@@ -89,7 +89,7 @@ local MIN_BUTTONS_PER_PAGE <const> = 5
local MAX_BUTTONS_PER_PAGE <const> = 20
local DEFAULT_BUTTONS_PER_PAGE <const> = 10
local DEFAULT_LOG_LEVEL <const> = log.error
local DEFAULT_LOG_LEVEL <const> = log.debug
local LUA_DIR <const> = dt.configuration.config_dir .. PS .. "lua"
local LUA_SCRIPT_REPO <const> = "https://github.com/darktable-org/lua-scripts.git"
@@ -244,7 +244,7 @@ end
local function get_repo_status(repo)
local old_log_level = set_log_level(sm.log_level)
local p = dtsys.io_popen("cd " .. repo .. CS .. "git status")
local p = io.popen("cd " .. repo .. CS .. "git status")
if p then
local data = p:read("*a")
@@ -262,7 +262,7 @@ local function get_current_repo_branch(repo)
local branch = nil
local p = dtsys.io_popen("cd " .. repo .. CS .. "git branch --all")
local p = io.popen("cd " .. repo .. CS .. "git branch --all")
if p then
local data = p:read("*a")
@@ -292,7 +292,7 @@ local function get_repo_branches(repo)
local old_log_level = set_log_level(sm.log_level)
local branches = {}
local p = dtsys.io_popen("cd " .. repo .. CS .. "git pull --all" .. CS .. "git branch --all")
local p = io.popen("cd " .. repo .. CS .. "git pull --all" .. CS .. "git branch --all")
if p then
local data = p:read("*a")
@@ -332,7 +332,7 @@ local function checkout_repo_branch(repo, branch)
log.msg(log.info, "checkout out branch " .. branch .. " from repository " .. repo)
dtsys.os_execute("cd " .. repo .. CS .. "git checkout " .. branch)
os.execute("cd " .. repo .. CS .. "git checkout " .. branch)
restore_log_level(old_log_level)
end
@@ -668,7 +668,7 @@ local function scan_scripts(script_dir)
log.msg(log.debug, "find command is " .. find_cmd)
-- scan the scripts
local output = dtsys.io_popen(find_cmd)
local output = io.popen(find_cmd)
for line in output:lines() do
log.msg(log.debug, "line is " .. line)
local l = string.gsub(line, ds.sanitize_lua(LUA_DIR) .. PS, "") -- strip the lua dir off
@@ -754,7 +754,7 @@ local function scan_repositories()
log.msg(log.debug, "find command is " .. find_cmd)
local output = dtsys.io_popen(find_cmd)
local output = io.popen(find_cmd)
for line in output:lines() do
local l = string.gsub(line, ds.sanitize_lua(LUA_DIR) .. PS, "") -- strip the lua dir off