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

lib/dtutils/file - replaced os.execute and io.popen with wrapper functions

Browse Source 
to sanitize windows calls
This commit is contained in:
Bill Ferguson
2024-06-04 23:41:07 -04:00
parent 2f330ea9cc
commit fe48d7498c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/dtutils/file.lua
View File

@@ -42,7 +42,7 @@ end
local function _win_os_execute(cmd) local function _win_os_execute(cmd)
local result = nil local result = nil
local p = io.popen(cmd) local p = dsys.io_popen(cmd)
local output = p:read("*a") local output = p:read("*a")
p:close() p:close()
if string.match(output, "true") then if string.match(output, "true") then
@@ -94,7 +94,7 @@ dtutils_file.libdoc.functions["test_file"] = {
function dtutils_file.test_file(path, test) function dtutils_file.test_file(path, test)
local cmd = "test -" local cmd = "test -"
local engine = os.execute local engine = dsys.os_execute
local cmdstring = "" local cmdstring = ""
if dt.configuration.running_os == "windows" then if dt.configuration.running_os == "windows" then
@@ -167,7 +167,7 @@ local function _search_for_bin_windows(bin)
for _,arg in ipairs(args) do for _,arg in ipairs(args) do
local cmd = "where " .. arg .. " " .. ds.sanitize(bin) local cmd = "where " .. arg .. " " .. ds.sanitize(bin)
local p = io.popen(cmd) local p = dsys.io_popen(cmd)
local output = p:read("*a") local output = p:read("*a")
p:close() p:close()
local lines = du.split(output, "\n") local lines = du.split(output, "\n")
@@ -191,7 +191,7 @@ end
local function _search_for_bin_nix(bin) local function _search_for_bin_nix(bin)
local result = false local result = false
local p = io.popen("command -v " .. bin) local p = dsys.io_popen("command -v " .. bin)
local output = p:read("*a") local output = p:read("*a")
p:close() p:close()
if string.len(output) > 0 then if string.len(output) > 0 then
@@ -220,7 +220,7 @@ local function _search_for_bin_macos(bin)
search_start = "/Applications/" .. bin .. ".app" search_start = "/Applications/" .. bin .. ".app"
end end
local p = io.popen("find " .. search_start .. " -type f -name " .. bin .. " -print") local p = dsys.io_popen("find " .. search_start .. " -type f -name " .. bin .. " -print")
local output = p:read("*a") local output = p:read("*a")
p:close() p:close()
local lines = du.split(output, "\n") local lines = du.split(output, "\n")
@@ -445,7 +445,7 @@ function dtutils_file.check_if_file_exists(filepath)
local result = false local result = false
if (dt.configuration.running_os == 'windows') then if (dt.configuration.running_os == 'windows') then
filepath = string.gsub(filepath, '[\\/]+', '\\') filepath = string.gsub(filepath, '[\\/]+', '\\')
local p = io.popen("if exist " .. dtutils_file.sanitize_filename(filepath) .. " (echo 'yes') else (echo 'no')") local p = dsys.io_popen("if exist " .. dtutils_file.sanitize_filename(filepath) .. " (echo 'yes') else (echo 'no')")
local ans = p:read("*all") local ans = p:read("*all")
p:close() p:close()
if string.match(ans, "yes") then if string.match(ans, "yes") then
@@ -456,7 +456,7 @@ function dtutils_file.check_if_file_exists(filepath)
-- result = false -- result = false
-- end -- end
elseif (dt.configuration.running_os == "linux") then elseif (dt.configuration.running_os == "linux") then
result = os.execute('test -e ' .. dtutils_file.sanitize_filename(filepath)) result = dsys.os_execute('test -e ' .. dtutils_file.sanitize_filename(filepath))
if not result then if not result then
result = false result = false
end end
@@ -522,9 +522,9 @@ function dtutils_file.file_copy(fromFile, toFile)
local result = nil local result = nil
-- if cp exists, use it -- if cp exists, use it
if dt.configuration.running_os == "windows" then if dt.configuration.running_os == "windows" then
result = os.execute('copy "' .. fromFile .. '" "' .. toFile .. '"') result = dsys.os_execute('copy "' .. fromFile .. '" "' .. toFile .. '"')
elseif dtutils_file.check_if_bin_exists("cp") then elseif dtutils_file.check_if_bin_exists("cp") then
result = os.execute("cp '" .. fromFile .. "' '" .. toFile .. "'") result = dsys.os_execute("cp '" .. fromFile .. "' '" .. toFile .. "'")
end end
-- if cp was not present, or if cp failed, then a pure lua solution -- if cp was not present, or if cp failed, then a pure lua solution
@@ -575,7 +575,7 @@ function dtutils_file.file_move(fromFile, toFile)
if not success then if not success then
-- an error occurred, so let's try using the operating system function -- an error occurred, so let's try using the operating system function
if dtutils_file.check_if_bin_exists("mv") then if dtutils_file.check_if_bin_exists("mv") then
success = os.execute("mv '" .. fromFile .. "' '" .. toFile .. "'") success = dsys.os_execute("mv '" .. fromFile .. "' '" .. toFile .. "'")
end end
-- if the mv didn't exist or succeed, then... -- if the mv didn't exist or succeed, then...
if not success then if not success then