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

Merge pull request #469 from wpferguson/win_sanitize

Browse Source 
Sanitize windows command interactions
This commit is contained in:
wpferguson
2024-06-06 13:01:55 -04:00
committed by GitHub
parent 34d5df65b2 9f2dbef4f0
commit bbe9109fca
16 changed files with 99 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/autostyle.lua
View File

@@ -39,6 +39,7 @@ GPLv2
local darktable = require "darktable"
local du = require "lib/dtutils"
local filelib = require "lib/dtutils.file"
local syslib = require "lib/dtutils.system"
du.check_min_api_version("7.0.0", "autostyle")
@@ -68,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(io.popen(cmd, 'r'))
local fd = assert(syslib.io_popen(cmd, 'r'))
darktable.control.read(fd)
-- slurp the whole file
local data = assert(fd:read('*a'))

3
contrib/color_profile_manager.lua
View File

@@ -45,6 +45,7 @@
local dt = require "darktable"
local du = require "lib/dtutils"
local df = require "lib/dtutils.file"
local dtsys = require "lib/dtutils.system"
du.check_min_api_version("7.0.0", "color_profile_manager")
@@ -106,7 +107,7 @@ end
local function list_profiles(dir)
local files = {}
local p = io.popen(DIR_CMD .. " " .. dir)
local p = dtsys.io_popen(DIR_CMD .. " " .. dir)
if p then
for line in p:lines() do
table.insert(files, line)

3
contrib/fujifilm_dynamic_range.lua
View File

@@ -60,6 +60,7 @@ cameras may behave in other ways.
local dt = require "darktable"
local du = require "lib/dtutils"
local df = require "lib/dtutils.file"
local dtsys = require "lib/dtutils.system"
local gettext = dt.gettext.gettext
du.check_min_api_version("7.0.0", "fujifilm_dynamic_range")
@@ -105,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 = io.popen(command)
output = dtsys.io_popen(command)
local raf_result = output:read("*all")
output:close()
if #raf_result == 0 then

5
contrib/fujifilm_ratings.lua
View File

@@ -26,6 +26,7 @@ Dependencies:
local dt = require "darktable"
local du = require "lib/dtutils"
local df = require "lib/dtutils.file"
local dtsys = require "lib/dtutils.system"
local gettext = dt.gettext.gettext
du.check_min_api_version("7.0.0", "fujifilm_ratings")
@@ -61,7 +62,7 @@ local function detect_rating(event, image)
local JPEG_filename = string.gsub(RAF_filename, "%.RAF$", ".JPG")
local command = "exiftool -Rating " .. JPEG_filename
dt.print_error(command)
local output = io.popen(command)
local output = dtsys.io_popen(command)
local jpeg_result = output:read("*all")
output:close()
if string.len(jpeg_result) > 0 then
@@ -72,7 +73,7 @@ local function detect_rating(event, image)
end
command = "exiftool -Rating " .. RAF_filename
dt.print_error(command)
output = io.popen(command)
output = dtsys.io_popen(command)
local raf_result = output:read("*all")
output:close()
if string.len(raf_result) > 0 then

3
contrib/geoJSON_export.lua
View File

@@ -35,6 +35,7 @@ USAGE
local dt = require "darktable"
local du = require "lib/dtutils"
local df = require "lib/dtutils.file"
local dtsys = require "lib/dtutils.system"
local gettext = dt.gettext.gettext
du.check_min_api_version("7.0.0", "geoJSON_export")
@@ -330,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 = io.popen("xdg-user-dir DESKTOP")
local handle = dtsys.io_popen("xdg-user-dir DESKTOP")
local result = handle:read()
handle:close()
if (result == nil) then

3
contrib/geoToolbox.lua
View File

@@ -28,6 +28,7 @@ require "geoToolbox"
local dt = require "darktable"
local du = require "lib/dtutils"
local df = require "lib/dtutils.file"
local dtsys = require "lib/dtutils.system"
local gettext = dt.gettext.gettext
du.check_min_api_version("7.0.0", "geoToolbox")
@@ -411,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 = io.popen(startCommand)
local handle = dtsys.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 = io.popen(ls .. search_string)
local f = dtsys.io_popen(ls .. search_string)
if f then
local found_file = f:read()
while found_file do

7
contrib/image_time.lua
View File

@@ -107,6 +107,7 @@ local dt = require "darktable"
local du = require "lib/dtutils"
local df = require "lib/dtutils.file"
local ds = require "lib/dtutils.string"
local dtsys = require "lib/dtutils.system"
local gettext = dt.gettext.gettext
local img_time = {}
@@ -225,7 +226,7 @@ local function get_image_taken_time(image)
local exiv2 = df.check_if_bin_exists("exiv2")
if exiv2 then
p = io.popen(exiv2 .. " -K Exif.Image.DateTime " .. image.path .. PS .. image.filename)
p = dtsys.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
@@ -243,7 +244,7 @@ end
local function _get_windows_image_file_creation_time(image)
local datetime = nil
local p = io.popen("dir " .. image.path .. PS .. image.filename)
local p = dtsys.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
@@ -264,7 +265,7 @@ end
local function _get_nix_image_file_creation_time(image)
local datetime = nil
local p = io.popen("ls -lL --time-style=full-iso " .. image.path .. PS .. image.filename)
local p = dtsys.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 = io.popen("xdg-user-dir DESKTOP")
local handle = dsys.io_popen("xdg-user-dir DESKTOP")
defaultDir = handle:read()
handle:close()
end