Fix custom publish regressions: prevent propertyTable corruption on upload failure and preserve global resize when no album override is set

Author: fjb2020

CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
-## [20269999.99]
+## [20260305.34]
 ### Fixed
 Fix #45 Unable to remove photos from Piwigo
 Associating an existing image with a new album should force re-upload of image if it had been changed in LrC since first upload to Piwigo
 ### Added
-Fix #12 Feature request: Keyword removal by filtering when publising images to Piwigo
 Image assoication behaviour made optional to allow per-album custom export settings
+Fix #12 Feature request: Keyword removal by filtering when publising images to Piwigo
+Fix #14 Incorporate per-album custom export settings
 
 ## [20260221.33] - 2026-02-21
 ### Fixed

piwigoPublish.lrplugin/Info.lua

@@ -66,5 +66,5 @@ return {
 
 	LrPluginInfoProvider = 'PluginInfo.lua',
 
-    VERSION = { major=20269999, minor=99, revision=0 },
+    VERSION = { major=20260305, minor=34, revision=0 },
 }

piwigoPublish.lrplugin/Init.lua

@@ -79,7 +79,7 @@ _G.iconPath = _PLUGIN:resourceId("icons/icon_med.png")
 -- _PLUGIN.VERSION is nil here for some reason, so hardcoding for now
 -- just need to ensure both places are updated together
 
-_G.versionInfo = { major=20269999, minor=99, revision=0 }
+_G.versionInfo = { major=20260305, minor=34, revision=0 }
 
 _G.pluginVersion = string.format("%d.%d", versionInfo.major, versionInfo.minor)
 -- Auto-update checker

piwigoPublish.lrplugin/PublishTaskImageProcessing.lua

@@ -123,8 +123,8 @@ local function buildCustomOverrideSettings(sourceSettings, collectionSettings)
             overrideSettings.LR_size_userWantsConstrain = false
         end
     else
-        overrideSettings.LR_size_doConstrain = false
-        overrideSettings.LR_size_userWantsConstrain = false
+        -- no custom resize override requested for this collection;
+        -- preserve the global export resize settings from sourceSettings
     end
 
     return overrideSettings

piwigoPublish.lrplugin/utils.lua

@@ -98,21 +98,38 @@ end
 -- *************************************************
 function utils.anonymiseRenditionParams(renditionParams)
     -- return copy of renditionParams with sensitive data removed (for logging etc)
-    local rpCopy = {}
-        for k, v in pairs(renditionParams) do
-        rpCopy[k] = v
-    end
-    
-    rpCopy.exportContext.propertyTable.userPW = "****"
-    rpCopy.exportContext.propertyTable.userName = "****"
-    rpCopy.exportContext.propertyTable.host = "****"
-    rpCopy.exportContext.propertyTable.pwurl = "****"
-    rpCopy.exportContext.propertyTable.cookieHeader = "****"
-    rpCopy.exportContext.propertyTable.SessionCookie = "**** "
-    rpCopy.exportContext.propertyTable.token = "****"
-    rpCopy.exportContext.propertyTable.cookies = "****"
-    rpCopy.exportContext.propertyTable.tagTable = nil
-    rpCopy.exportContext.propertyTable._tagIndex = nil
+    if type(renditionParams) ~= "table" then
+        return renditionParams
+    end
+
+    local visited = {}
+
+    local function deepCopy(value)
+        if type(value) ~= "table" then
+            return value
+        end
+        if visited[value] then
+            return visited[value]
+        end
+
+        local copy = {}
+        visited[value] = copy
+        for k, v in pairs(value) do
+            copy[k] = deepCopy(v)
+        end
+        return copy
+    end
+
+    local rpCopy = deepCopy(renditionParams)
+
+    if type(rpCopy.exportContext) == "table" and type(rpCopy.exportContext.propertyTable) == "table" then
+        rpCopy.exportContext.propertyTable = utils.anonymisePropertyTable(rpCopy.exportContext.propertyTable)
+    end
+
+    if type(rpCopy.propertyTable) == "table" then
+        rpCopy.propertyTable = utils.anonymisePropertyTable(rpCopy.propertyTable)
+    end
+
     return rpCopy
 end