official/apply_camera_style - backported bug fix to API-9.5.0 branch

2025-12-02 16:32:54 -05:00
4 changed files with 17 additions and 204 deletions
--- a/contrib/ext_editor.lua
+++ b/contrib/ext_editor.lua
@@ -328,7 +328,7 @@ local function export2collection(storage, image_table, extra_data)

    -- create unique filename
    new_name = image.path..PS..df.get_filename(temp_name)
-    new_name = df.sanitize_filename(df.create_unique_filename(new_name))
+    new_name = df.create_unique_filename(new_name)

    -- move image to collection folder, check result, return if error
    move_success = df.file_move(temp_name, new_name)
--- a/examples/multi_os.lua
+++ b/examples/multi_os.lua
@@ -29,7 +29,8 @@
    by hovering over the image and pressing the key combination.

    ADDITIONAL SOFTWARE NEEDED FOR THIS SCRIPT
-    * exiftool - https://exiftool.org
+    * ufraw-batch - https://ufraw.sourceforge.net
+                    MacOS - install with homebrew

    USAGE
    * require this script from your main lua file
@@ -43,7 +44,6 @@
    * Send to Bill Ferguson, wpferguson@gmail.com

    CHANGES
-    20251205 - replaced ufraw-batch with exiftool
 ]]

 --[[
@@ -139,36 +139,6 @@ local function copy_image_attributes(from, to, ...)
  end
 end

-local function check_file_size(img_name)
-  local result = 0
-
-  if dt.configuration.running_os == "windows" then
-    local path = df.get_path(img_name)
-    local fname = df.get_filename(img_name)
-
-    local p = io.open("forfiles /P " .. path .. " /M " .. fname .. " /C \"cmd /c echo $fsize\"")
-
-    if p then
-      for line in p:lines() do
-        if line:length() > 5 then
-          result = tonumber(line)
-        end
-      end
-      p:close()
-    end
-  else
-    local p = io.popen("ls -s " .. img_name)
-
-    if p then
-      local line = p:read("*a")
-      result = tonumber(du.split(line, " ")[1])
-      p:close()
-    end
-  end
-
-  return result
-end
-
 --[[
    The main function called from the button or the shortcut.  It takes one or more raw files, passed
    in a table and extracts the embedded jpeg images
@@ -182,12 +152,11 @@ local function extract_embedded_jpeg(images)
      in the user's path.  When it finds the executable, it returns the command to run it.
  ]]

-  local exiftool_executable = df.check_if_bin_exists("exiftool")
-  if exiftool_executable then
+  local ufraw_executable = df.check_if_bin_exists("ufraw-batch")
+  if ufraw_executable then
    for _, image in ipairs(images) do
      if image.is_raw then
-        local img_file = tostring(image)
-        local jpg_img_file = string.gsub(img_file, "%....$", ".jpg")
+        local img_file = du.join({image.path, image.filename}, "/")

        --[[
            dtsys.external_command() is operating system aware and formats the command as necessary.  
@@ -195,12 +164,8 @@ local function extract_embedded_jpeg(images)
            operating system aware and uses the corresponding quotes.
        ]]

-        if dtsys.external_command(exiftool_executable .. " -b -JpgFromRaw " .. df.sanitize_filename(img_file) .. " > " .. df.sanitize_filename(jpg_img_file)) then
-          dt.print_log("created jpg from raw")
-          if check_file_size(df.sanitize_filename(jpg_img_file)) == 0 then
-            dt.print_log("using preview")
-            dtsys.external_command(exiftool_executable .. " -b -PreviewImage " .. df.sanitize_filename(img_file) .. " > " .. df.sanitize_filename(jpg_img_file))
-          end
+        if dtsys.external_command(ufraw_executable .. " --silent --embedded-image " .. df.sanitize_filename(img_file)) then
+          local jpg_img_file = df.chop_filetype(img_file) .. ".embedded.jpg"
          dt.print_log("jpg_img_file set to ", jpg_img_file) -- print a debugging message
          local myimage = dt.database.import(jpg_img_file)
          myimage:group_with(image.group_leader)
@@ -223,8 +188,8 @@ local function extract_embedded_jpeg(images)
      end
    end
  else
-    dt.print_error("exiftool not found.  Exiting...") -- print debugging error message
-    dt.print("exiftool not found, exiting...") -- print the error to the screen
+    dt.print_error("ufraw-batch not found.  Exiting...") -- print debugging error message
+    dt.print("ufraw-batch not found, exiting...") -- print the error to the screen
  end
 end

--- a/lib/dtutils/string.lua
+++ b/lib/dtutils/string.lua
@@ -543,13 +543,10 @@ local PLACEHOLDERS = {"ROLL.NAME",
                      "FILE.NAME",
                      "FILE.EXTENSION", 
                      "ID", 
-                      "IMAGE.ID",
-                      "IMAGE.ID.NEXT",
                      "VERSION", 
                      "VERSION.IF.MULTI",
                      "VERSION.NAME",
                      "DARKTABLE.VERSION",
-                      "Xmp.darktable.version",
                      "DARKTABLE.NAME",           -- Not Implemented
                      "SEQUENCE",
                      "WIDTH.SENSOR",
@@ -615,15 +612,10 @@ local PLACEHOLDERS = {"ROLL.NAME",
                      "LABELS",
                      "LABELS.ICONS",             -- Not Implemented 
                      "TITLE",
-                      "Xmp.dc.title",
                      "DESCRIPTION",
-                      "Xmp.dc.description",
                      "CREATOR", 
-                      "Xmp.dc.creator",
                      "PUBLISHER", 
-                      "Xmp.dc.publisher",
                      "RIGHTS", 
-                      "Xmp.dc.rights",
                      "TAGS",                     -- Not Implemented
                      "SIDECAR.TXT",              -- Not Implemented
                      "FOLDER.PICTURES",
@@ -660,37 +652,6 @@ local function get_colorlabels(image)
  return labels 
 end

-- handle the ROLL.NAME[n] case
-
-local function build_rollname_substitution_list(image, variable_string)
-  local old_log_level = log.log_level()
-  log.log_level(dtutils_string.log_level)
-
-  for match in string.gmatch(variable_string, "%$%(.-%)?%)") do -- grab each complete variable 
-    log.msg(log.info, "match is " .. match)
-
-    local var = string.match(match, "%$%((.-%)?)%)")  -- strip of the leading $( and trailing )
-    log.msg(log.info, "var is " .. var)
-
-    local element = nil
-
-    if string.match(var, "ROLL.NAME%[") then
-      element = string.match(var, "%[(%d)%]")
-
-      local path = du.split(image.film.path, dt.configuration.running_os ~= "windows" and "/" or "\\")
-
-      element = tonumber(element) + 1 -- add one because c arrays are 0 based and lua are 1 based
-      
-      if element > #path then
-        log.msg(log.warn, "ROLL.NAME element requested was more than number of elements in film roll")
-        substitutes[var] = ""
-      else
-        substitutes[var] = path[(#path + 1) - element]
-      end
-    end
-  end
-end
-
 -- find the $CATEGORYn and $CATEGORY[n,m] requests and add them to the substitute list

 local function build_category_substitution_list(image, variable_string)
@@ -807,13 +768,10 @@ function dtutils_string.build_substitute_list(image, sequence, variable_string,
                        dtutils_string.get_basename(image.filename),-- FILE.NAME
                        dtutils_string.get_filetype(image.filename),-- FILE.EXTENSION
                        image.id,                              -- ID
-                        image.id,                              -- IMAGE.ID
-                        dt.database[#dt.database].id + 1,      -- IMAGE.ID.NEXT
                        image.duplicate_index,                 -- VERSION
                        version_multi,                         -- VERSION.IF_MULTI
                        image.version_name and image.version_name or "", -- VERSION.NAME
                        dt.configuration.version,              -- DARKTABLE.VERSION
-                        dt.configuration.version,              -- Xmp.darktable.version
                        "",                                    -- DARKTABLE.NAME
                        string.format("%04d", sequence),       -- SEQUENCE
                        image.width,                           -- WIDTH.SENSOR
@@ -879,15 +837,10 @@ function dtutils_string.build_substitute_list(image, sequence, variable_string,
                        labels,                                -- LABELS
                        "",                                    -- LABELS.ICONS - wont be implemented
                        image.title and image.title or "",     -- TITLE
-                        image.title and image.title or "",     -- Xmp.dc.title
                        image.description and image.description or "", -- DESCRIPTION
-                        image.description and image.description or "", -- Xmp.dc.description
                        image.creator and image.creator or "",  -- CREATOR
-                        image.creator and image.creator or "",  -- Xmp.dc.creator
                        image.publisher and image.publisher or "", -- PUBLISHER
-                        image.publisher and image.publisher or "", -- Xmp.dc.publisher
                        image.rights and image.rights or "",   -- RIGHTS
-                        image.rights and image.rights or "",   -- Xmp.dc.rights
                        "",                                    -- TAGS - wont be implemented
                        "",                                    -- SIDECAR.TXT - wont be implemented
                        pictures_folder,                       -- FOLDER.PICTURES
@@ -909,7 +862,6 @@ function dtutils_string.build_substitute_list(image, sequence, variable_string,
  -- do category substitutions separately

  build_category_substitution_list(image, variable_string)
-  build_rollname_substitution_list(image, variable_string)

  log.log_level(old_log_level)
 end
@@ -937,13 +889,10 @@ function dtutils_string.get_substitution_tooltip()
          _("$(FILE.NAME) - basename of the input image"),
          _("$(FILE.EXTENSION) - extension of the input image"),
          _("$(ID) - image ID"),
-          _("$(IMAGE.ID) - image ID"),
-          _("$(IMAGE.ID.NEXT) - next image ID to be assigned on import"),
          _("$(VERSION) - duplicate version"),
          _("$(VERSION.IF_MULTI) - same as $(VERSION) but null string if only one version exists"),
          _("$(VERSION.NAME) - version name from metadata"),
          _("$(DARKTABLE.VERSION) - current darktable version"),
-          _("$(Xmp.darktable.version) - current darktable version"),
          -- _("$(DARKTABLE.NAME) - darktable name"),  -- not implemented
          _("$(SEQUENCE[n,m]) - sequence number, n: number of digits, m: start number"),
          _("$(WIDTH.SENSOR) - image sensor width"),
@@ -1008,15 +957,10 @@ function dtutils_string.get_substitution_tooltip()
          _("$(LABELS) - color labels as text"),
          -- _("$(LABELS.ICONS) - color labels as icons"),-- not implemented
          _("$(TITLE) - title from metadata"),
-          _("$(Xmp.dc.title) - title from metadata"),
          _("$(DESCRIPTION) - description from metadata"),
-          _("$(Xmp.dc.description) - description from metadata"),
          _("$(CREATOR) - creator from metadata"),
-          _("$(Xmp.dc.creator) - creator from metadata"),
          _("$(PUBLISHER) - publisher from metadata"),
-          _("$(Xmp.dc.publisher) - publisher from metadata"),
          _("$(RIGHTS) - rights from metadata"),
-          _("$(Xmp.dc.rights) - rights from metadata"),
          --_("$(TAGS) - tags as set in metadata settings"),
          _("$(CATEGORY[n,category]) - subtag of level n in hierarchical tags"),
          _("$(SIDECAR_TXT) - contents of .txt sidecar file, if present"),
@@ -1066,11 +1010,6 @@ local function treat(var_string)
    if not ret_val then ret_val = "" end
    log.msg(log.info, "ret_val is " .. ret_val)

-  elseif string.match(var_string, "ROLL.NAME%[") then
-    ret_val = substitutes[var_string]
-    if not ret_val then ret_val = "" end
-    log.msg(log.info, "ret_val is " .. ret_val)
-
  elseif string.match(var_string, "SEQUENCE%[") then
    local width, start = string.match(var_string, "(%d+),(%d+)")
    local seq_val = tonumber(substitutes[var])
@@ -1304,49 +1243,6 @@ function dtutils_string.substitute(image, sequence, variable_string, username, p
  return str
 end

-dtutils_string.libdoc.functions["format_exposure"] = {
-  Name = [[format_exposure]],
-  Synopsis = [[format exif_exposure from dt_lua_image_t to an exposure time]],
-  Usage = [[local ds = require "lib/dtutils.string"
-    ds.format_exposure(image.exif_exposure)
-      image.exif_exposure - dt_lua_image_t exif exposure field
-  Description = [[format_exposure takes the EXIF exposure field and formats it into an exposure string]],
-  Return_Value = [[result - string - the EXIF exposure formatted as an exposure string]],
-  Limitations = [[]],
-  Example = [[]],
-  See_Also = [[https://docs.darktable.org/usermanual/4.6/en/special-topics/variables/]],
-  Reference = [[]],
-  License = [[]],
-  Copyright = [[]],
-}

-local function _nearbyintf(v)
-  return math.floor(v + .5)
-end
-
-function dtutils_string.format_exposure(exif_exposure)
-  result = nil
-
-  if exif_exposure > 1.0 then
-    if _nearbyintf(exif_exposure) == exif_exposure then
-      result = string.format("%.0f″", exif_exposure)
-    else
-      result = string.format("%.1f″", exif_exposure)
-    end
-  -- catch everything below 0.3 seconds
-  elseif exif_exposure < 0.2 then
-    result = string.format("1/%.0f", 1.0 / exif_exposure)
-  -- catch 1/2, 1/3, ...
-  elseif _nearbyintf(1.0 / exif_exposure) == (1.0 / exif_exposure) then
-    result = string.format("1/%.0f", 1.0 / exif_exposure)
-  -- catch 1/1.3, 1/1.6, ...
-  elseif (10 * _nearbyintf(10.0 / exif_exposure)) == _nearbyintf(100.0 / exif_exposure) then
-    result = string.format("1/%.1f", 1.0 / exif_exposure)
-  else
-    result = string.format("%.1f″", exif_exposure)
-  end
-
-  return result
-end

 return dtutils_string
--- a/tools/script_manager.lua
+++ b/tools/script_manager.lua
@@ -54,7 +54,7 @@ local df = require "lib/dtutils.file"
 local ds = require "lib/dtutils.string"
 local dtsys = require "lib/dtutils.system"
 local log = require "lib/dtutils.log"
-local dtdebug = require "darktable.debug"
+local debug = require "darktable.debug"

 local gettext = dt.gettext.gettext

@@ -62,21 +62,6 @@ local function _(msgid)
    return gettext(msgid)
 end

-- figure out where we are running from
-
-local info = debug.getinfo(1, "S")
-local scripts_path = info.source:sub(2)
-
-dt.print_log("scripts path is " .. scripts_path)
-
-- assume user based
-local system_based = false
-
-if string.match(scripts_path, dt.configuration.data_dir) then
-  dt.print_log("script_manager using system based scripts")
-  system_based = true
-end
-
 -- api check

 -- du.check_min_api_version("9.3.0", "script_manager")
@@ -86,7 +71,7 @@ end
 -- - - - - - - - - - - - - - - - - - - - - - - - 

 -- script_manager required API version
-local SM_API_VER_REQD <const> = "9.7.0"
+local SM_API_VER_REQD <const> = "9.3.0"

 -- path separator
 local PS <const> = dt.configuration.running_os == "windows" and "\\" or "/"
@@ -102,29 +87,15 @@ local DEFAULT_BUTTONS_PER_PAGE <const> = 10

 local DEFAULT_LOG_LEVEL <const> = log.warn

-local USER_LUA_DIR <const> = dt.configuration.config_dir .. PS .. "lua"
-local SYSTEM_LUA_DIR <const> = dt.configuration.data_dir .. PS .. "lua-scripts"
-
+local LUA_DIR <const> = dt.configuration.config_dir .. PS .. "lua"
 local LUA_SCRIPT_REPO <const> = "https://github.com/darktable-org/lua-scripts.git"

 local LUA_API_VER <const> = "API-" .. dt.configuration.api_version_string

 -- local POWER_ICON = dt.configuration.config_dir .. "/lua/data/data/icons/power.png"
-local USER_POWER_ICON <const> = dt.configuration.config_dir .. "/lua/data/icons/path20.png"
-local USER_BLANK_ICON <const> = dt.configuration.config_dir .. "/lua/data/icons/blank20.png"
+local POWER_ICON <const> = dt.configuration.config_dir .. "/lua/data/icons/path20.png"
+local BLANK_ICON <const> = dt.configuration.config_dir .. "/lua/data/icons/blank20.png"

-local SYSTEM_POWER_ICON <const> = dt.configuration.data_dir .. "/lua-scripts/data/icons/path20.png"
-local SYSTEM_BLANK_ICON <const> = dt.configuration.data_dir .. "/lua-scripts/data/icons/blank20.png"
-
-local LUA_DIR = USER_LUA_DIR
-local POWER_ICON = USER_POWER_ICON
-local BLANK_ICON = USER_BLANK_ICON
-
-if system_based then
-  LUA_DIR = SYSTEM_LUA_DIR
-  POWER_ICON = SYSTEM_POWER_ICON
-  BLANK_ICON = SYSTEM_BLANK_ICON
-end
 -- - - - - - - - - - - - - - - - - - - - - - - - 
 -- P R E F E R E N C E S
 -- - - - - - - - - - - - - - - - - - - - - - - - 
@@ -1272,7 +1243,7 @@ end

 script_manager_running_script = "script_manager"

-if (check_for_updates or SM_API_VER_REQD > dt.configuration.api_version_string) and not system_based then
+if check_for_updates or SM_API_VER_REQD > dt.configuration.api_version_string then
  local repo_data = get_repo_status(LUA_DIR)
  local current_branch = get_current_repo_branch(LUA_DIR)
  local clean = is_repo_clean(repo_data)
@@ -1354,25 +1325,6 @@ end
 scan_scripts(LUA_DIR)
 log.msg(log.debug, "finished processing scripts")

-if system_based then
-  -- exec user luarc file if it exists
-  local luarc = loadfile(USER_LUA_DIR .. "rc")
-  if luarc then
-    luarc()
-  end
-
-  if df.test_file(USER_LUA_DIR, "d") then
-    LUA_DIR = USER_LUA_DIR
-    scan_scripts(LUA_DIR)
-    LUA_DIR = SYSTEM_LUA_DIR
-  end
-
-  dt.configuration["lua_dir"] = LUA_DIR
-
-  dt.print_log("lua dir is " .. dt.configuration.lua_dir)
-  -- scan_script(USER_LUA_DIR)
-end
-

 -- - - - - - - - - - - - - - - - - - - - - - - - 
 -- U S E R  I N T E R F A C E