From d9b77bb3a232c9a060cd0d44d93ad9d128b61ffe Mon Sep 17 00:00:00 2001
From: deekayhd <53017684+deekayhd@users.noreply.github.com>
Date: Fri, 10 Apr 2026 19:56:00 +0200
Subject: [PATCH 1/3] fix incomplete removal of datetime_taken in PR #653

---
 lib/dtutils/string.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua
index c03bd66..eefe56c 100644
--- a/lib/dtutils/string.lua
+++ b/lib/dtutils/string.lua
@@ -785,11 +785,11 @@ function dtutils_string.build_substitute_list(image, sequence, variable_string,
     emon_short = os.date("%b", exiftime2systime(image.exif_datetime_taken))
     if use_millisecs then
       eyear, emon, eday, ehour, emin, esec, emsec = 
-        string.match(datetime_taken, "(%d+):(%d+):(%d+) (%d+):(%d+):(%d+)%.(%d+)$")
+        string.match(image.exif_datetime_taken, "(%d+):(%d+):(%d+) (%d+):(%d+):(%d+)%.(%d+)$")
     else
       emsec = "0"
       eyear, emon, eday, ehour, emin, esec = 
-        string.match(datetime_taken, "(%d+):(%d+):(%d+) (%d+):(%d+):(%d+)$")
+        string.match(image.exif_datetime_taken, "(%d+):(%d+):(%d+) (%d+):(%d+):(%d+)$")
     end    
   else
     log.msg(log.warn, "no capture date and time found in EXIF data")

From 34b88490c2ddac757e099616b3570e7cb5dc2cca Mon Sep 17 00:00:00 2001
From: deekayhd <53017684+deekayhd@users.noreply.github.com>
Date: Sat, 11 Apr 2026 14:30:29 +0200
Subject: [PATCH 2/3] fix assignment of empty variables derived from
 exit_datetime_taken

---
 lib/dtutils/string.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua
index eefe56c..0d9594f 100644
--- a/lib/dtutils/string.lua
+++ b/lib/dtutils/string.lua
@@ -793,7 +793,7 @@ function dtutils_string.build_substitute_list(image, sequence, variable_string,
     end    
   else
     log.msg(log.warn, "no capture date and time found in EXIF data")
-    emon_long, emon_short, eyear, emon, eday, ehour, emin, esec, emsec = ""
+    emon_long, emon_short, eyear, emon, eday, ehour, emin, esec, emsec = "", "", "", "", "", "", "", "", ""
   end
 
   local version_multi = #image:get_group_members() > 1 and image.duplicate_index or ""

From dc31b221efa749e7a5853114ee5194c0ab5eebcb Mon Sep 17 00:00:00 2001
From: deekayhd <53017684+deekayhd@users.noreply.github.com>
Date: Sat, 11 Apr 2026 14:36:11 +0200
Subject: [PATCH 3/3] fix username  as nil

---
 lib/dtutils/string.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dtutils/string.lua b/lib/dtutils/string.lua
index 0d9594f..6d8c41b 100644
--- a/lib/dtutils/string.lua
+++ b/lib/dtutils/string.lua
@@ -890,7 +890,7 @@ function dtutils_string.build_substitute_list(image, sequence, variable_string,
                         home_folder,                           -- FOLDER.HOME
                         desktop_folder,                        -- FOLDER.DESKTOP
                         "",                                    -- OPENCL.ACTIVATED - wont be implemented
-                        user_name,                             -- USERNAME
+                        (user_name ~= nil) and user_name or "",-- USERNAME
                         "",                                    -- NL - wont be implemented
                         ""                                     -- JOBCODE - wont be implemented
   }