Merge pull request #496 from wpferguson/desanitize_libs
Desanitize libs
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user