Add checks to ensure publish service is saved after changes and make ensure Check and Link Piwigo Structure is run after cloning

Author: fjb2020

.gitignore

@@ -4,6 +4,9 @@
 # macOS system files
 .DS_Store
 
+#localResources
+localResources/
+
 # not used
 piwigoPublish.lrplugin/icons/piwigoPublish_1_0-assets/
 piwigoPublish.lrplugin/icons/piwigoPublish_1_5-assets/

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [20260207.31] - 2026-02-06
+### Fixed
+Problem with Clone Existing Publish Service - smart collections
 
 ## [20260206.30] - 2026-02-06
 ### Fixed

piwigoPublish.lrplugin/Info.lua

@@ -66,5 +66,5 @@ return {
 
 	LrPluginInfoProvider = 'PluginInfo.lua',
 
-    VERSION = { major=20260206, minor=30, revision=0 },
+    VERSION = { major=20260207, minor=31, 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=20260206, minor=30, revision=0 }
+_G.versionInfo = { major=20260207, minor=31, revision=0 }
 
 _G.pluginVersion = string.format("%d.%d", versionInfo.major, versionInfo.minor)
 -- Auto-update checker

piwigoPublish.lrplugin/PWImportService.lua

@@ -328,7 +328,15 @@ local function populateCollections(stdColls, smartColls, publishService, propert
         processSmartCollectionQueue(smartColls, publishService, propertyTable, 1, progressScope, stats)
     else
         progressScope:done()
-        LrDialogs.message("Clone completed", "Publish Service Clone Complete.", "info")
+        if pwDetails.isPiwigo and pwDetails.isSameHost then
+            LrDialogs.message("Clone completed", "Publish Service Clone Complete.", "info")
+        else
+            LrDialogs.message("Clone completed",
+                "Clone Complete. Check and Link Piwigo Structure will now be run", "info")
+            --LrTasks.startAsyncTask(function()
+                PiwigoAPI.validatePiwigoStructure(propertyTable)
+            --end)
+        end
     end
 end
 
@@ -644,10 +652,10 @@ local function importServicePrelim(propertyTable, thisService, impService)
                     if numlrPhotos > numPubPhotos then
                         stats.unpublishedSmartCollImages = stats.unpublishedSmartCollImages +
                             (numlrPhotos - numPubPhotos)
+                        canClone = false
                     end
                     searchDesc = thisColl:getSearchDescription()
                     stats.smartCollections = stats.smartCollections + 1
-                    canClone = false
                 else
                     local numlrPhotos = #thisColl:getPhotos()
                     local numPubPhotos = #thisColl:getPublishedPhotos()
@@ -736,11 +744,11 @@ local function importServicePrelim(propertyTable, thisService, impService)
         else
             text2 =
             "The service being cloned is a Piwigo service but connected to a different Piwigo host."
-            text3 = "Collections/Sets will be cloned but links to Piwigo albums and images will not"
+            text3 = "Collections/Sets and images will be cloned but links to Piwigo will not"
         end
     else
         text2 = "The service being cloned is not a Piwigo service."
-        text3 = "Collections/Sets will be cloned but no links to Piwigo albums or images will be made"
+        text3 = "Collections/Sets and images will be cloned but no links to Piwigo albums or images will be made"
     end
     local f = LrView.osFactory()
     local c = f:column {
@@ -871,7 +879,6 @@ local function importServicePrelim(propertyTable, thisService, impService)
             actionVerb = "Clone",
             cancelVerb = "Cancel",
         })
-        log:info("importServicePrelim - dialog is " .. utils.serialiseVar(dialog))
         if dialog == "ok" then
             local rv = importService(propertyTable, thisService, impService, indexById, pwDetails, stats)
         end

piwigoPublish.lrplugin/PiwigoAPI.lua

@@ -240,7 +240,7 @@ end
 -- *************************************************
 local function buildCatHierarchy(allCats)
     -- convert flat list of categories to hierarchical table with children tables
-    log:info("buildCatHierarchy - allCats\n" .. utils.serialiseVar(allCats))
+    -- log:info("buildCatHierarchy - allCats\n" .. utils.serialiseVar(allCats))
     -- 1. Create all nodes (no hierarchy yet)
     local nodes = {}
     local roots = {}
@@ -273,7 +273,7 @@ local function buildCatHierarchy(allCats)
             end
         end
     end
-    log:info("buildCatHierarchy - hierarchy\n" .. utils.serialiseVar(roots))
+    -- log:info("buildCatHierarchy - hierarchy\n" .. utils.serialiseVar(roots))
     return roots
 end
 
@@ -1058,6 +1058,11 @@ function PiwigoAPI.ConnectionChange(propertyTable)
     propertyTable.cookieHeader = nil
     propertyTable.userStatus = ""
     propertyTable.token = ""
+
+    if (propertyTable.savedHost ~= propertyTable.host) or (propertyTable.savedUsername ~= propertyTable.userName) then
+        propertyTable.unsavedConnectionChanges = true
+    end
+
 end
 
 -- *************************************************
@@ -1247,6 +1252,7 @@ function PiwigoAPI.login(propertyTable)
             "Error: Piwigo server URL, username or password is empty.")
         return false
     end
+    -- set default connectionname if blank
     if not (propertyTable.LR_publish_connectionName) or propertyTable.LR_publish_connectionName == "" then
         propertyTable.LR_publish_connectionName = propertyTable.userName .. "@" .. propertyTable.host
     end
@@ -1519,7 +1525,7 @@ function PiwigoAPI.importAlbums(propertyTable)
     -- log:info("PiwigoAPI:importAlbums - allCats\n" .. utils.serialiseVar(allCats)  )
     -- hierarchical table of categories
     local catHierarchy = buildCatHierarchy(allCats)
-    log:info("PiwigoAPI:importAlbums - catHierarchy\n" .. utils.serialiseVar(catHierarchy))
+    -- log:info("PiwigoAPI:importAlbums - catHierarchy\n" .. utils.serialiseVar(catHierarchy))
 
     local statusData = {
         existing = 0,
@@ -2026,11 +2032,12 @@ end
 -- *************************************************
 function PiwigoAPI.associateImageToCategory(propertyTable, imageId, categoryId)
     -- Associates an existing Piwigo image to an additional category without re-uploading
-    log:info("PiwigoAPI.associateImageToCategory - imageId: " .. tostring(imageId) .. ", categoryId: " .. tostring(categoryId))
-    
+    log:info("PiwigoAPI.associateImageToCategory - imageId: " ..
+        tostring(imageId) .. ", categoryId: " .. tostring(categoryId))
+
     local callStatus = { status = false }
     local rv
-    
+
     -- Check connection
     if not propertyTable.Connected then
         rv = PiwigoAPI.login(propertyTable)
@@ -2039,37 +2046,38 @@ function PiwigoAPI.associateImageToCategory(propertyTable, imageId, categoryId)
             return callStatus
         end
     end
-    
+
     local params = {
-        { name = "method", value = "pwg.images.setInfo" },
-        { name = "image_id", value = tostring(imageId) },
-        { name = "categories", value = tostring(categoryId) },
+        { name = "method",              value = "pwg.images.setInfo" },
+        { name = "image_id",            value = tostring(imageId) },
+        { name = "categories",          value = tostring(categoryId) },
         { name = "multiple_value_mode", value = "append" },
-        { name = "pwg_token", value = propertyTable.token }
+        { name = "pwg_token",           value = propertyTable.token }
     }
-    
+
     local postResponse = PiwigoAPI.httpPostMultiPart(propertyTable, params)
-    
+
     if postResponse.status then
         callStatus.status = true
         callStatus.remoteid = imageId
         callStatus.remoteurl = string.format("%s/picture.php?/%s/category/%s", propertyTable.host, imageId, categoryId)
     else
         callStatus.statusMsg = postResponse.statusMsg or "Association failed"
     end
-    
+
     return callStatus
 end
 
 -- *************************************************
 function PiwigoAPI.dissociateImageFromCategory(propertyTable, imageId, categoryId)
     -- Removes an image from a specific category WITHOUT deleting the image
     -- Uses pwg.images.setInfo to update categories list (excluding the target category)
-    log:info("PiwigoAPI.dissociateImageFromCategory - imageId: " .. tostring(imageId) .. ", categoryId: " .. tostring(categoryId))
-    
+    log:info("PiwigoAPI.dissociateImageFromCategory - imageId: " ..
+        tostring(imageId) .. ", categoryId: " .. tostring(categoryId))
+
     local callStatus = { status = false }
     local rv
-    
+
     -- Check connection
     if not propertyTable.Connected then
         rv = PiwigoAPI.login(propertyTable)
@@ -2078,58 +2086,58 @@ function PiwigoAPI.dissociateImageFromCategory(propertyTable, imageId, categoryI
             return callStatus
         end
     end
-    
+
     -- First, get current categories for this image
     local checkStatus = PiwigoAPI.checkPhoto(propertyTable, imageId)
     if not checkStatus.status then
         callStatus.statusMsg = "Cannot find image " .. tostring(imageId) .. " on Piwigo"
         return callStatus
     end
-    
+
     local imageDets = checkStatus.imageDets
     local currentCategories = imageDets.categories or {}
-    
+
     log:info("PiwigoAPI.dissociateImageFromCategory - image currently in " .. #currentCategories .. " categories")
-    
+
     -- Build new categories list excluding the target category
     local newCategoryIds = {}
     for _, cat in ipairs(currentCategories) do
         if tostring(cat.id) ~= tostring(categoryId) then
             table.insert(newCategoryIds, tostring(cat.id))
         end
     end
-    
+
     log:info("PiwigoAPI.dissociateImageFromCategory - remaining categories: " .. #newCategoryIds)
-    
+
     -- If image would be orphaned (no remaining categories), delete it entirely
     if #newCategoryIds == 0 then
         log:info("PiwigoAPI.dissociateImageFromCategory - image would be orphaned, deleting entirely")
         return PiwigoAPI.deletePhoto(propertyTable, categoryId, imageId, callStatus)
     end
-    
+
     -- Update image with new categories list (replaces all associations)
     local categoriesStr = table.concat(newCategoryIds, ";")
-    
+
     local params = {
-        { name = "method", value = "pwg.images.setInfo" },
-        { name = "image_id", value = tostring(imageId) },
-        { name = "categories", value = categoriesStr },
+        { name = "method",              value = "pwg.images.setInfo" },
+        { name = "image_id",            value = tostring(imageId) },
+        { name = "categories",          value = categoriesStr },
         { name = "multiple_value_mode", value = "replace" },
-        { name = "pwg_token", value = propertyTable.token }
+        { name = "pwg_token",           value = propertyTable.token }
     }
-    
+
     log:info("PiwigoAPI.dissociateImageFromCategory - new categories string: " .. categoriesStr)
-    
+
     local postResponse = PiwigoAPI.httpPostMultiPart(propertyTable, params)
-    
+
     if postResponse.status then
         callStatus.status = true
         log:info("PiwigoAPI.dissociateImageFromCategory - success")
     else
         callStatus.statusMsg = postResponse.statusMsg or "Dissociation failed"
         log:info("PiwigoAPI.dissociateImageFromCategory - failed: " .. callStatus.statusMsg)
     end
-    
+
     return callStatus
 end
 

piwigoPublish.lrplugin/PublishDialogSections.lua

@@ -37,7 +37,10 @@ function PublishDialogSections.startDialog(propertyTable)
 		propertyTable.ConCheck = true
 		propertyTable.ConStatus = "Not Connected"
 	end
-
+	-- Store the last saved connection details
+	propertyTable.savedHost = propertyTable.host or ""
+	propertyTable.savedUsername = propertyTable.userName or ""
+	propertyTable.unsavedConnectionChanges = false
 	propertyTable:addObserver('host', PiwigoAPI.ConnectionChange)
 	propertyTable:addObserver('userName', PiwigoAPI.ConnectionChange)
 	propertyTable:addObserver('userPW', PiwigoAPI.ConnectionChange)
@@ -50,7 +53,14 @@ end
 
 -- *************************************************
 function PublishDialogSections.endDialog(propertyTable, why)
+	log:info('PublishDialogSections.endDialog')
 
+	if why == 'ok' then
+		-- User clicked Save - update our saved values
+		propertyTable.savedHost = propertyTable.host
+		propertyTable.savedUsername = propertyTable.userName
+		propertyTable.unsavedConnectionChanges = false
+	end
 end
 
 -- *************************************************
@@ -187,6 +197,12 @@ local function prefsDialog(f, propertyTable)
 					enabled = bind('Connected', propertyTable),
 					tooltip = "Click to fetch the current album structure from the Piwigo Host above. Only albums the user has permission to see will be included",
 					action = function(button)
+						if propertyTable.unsavedConnectionChanges then
+							LrDialogs.message("Unsaved Connection Changes",
+								"You have changed the connection details. Please click 'Save' to save the publish service.",
+								"info")
+							return
+						end
 						local result = LrDialogs.confirm("Import Piwigo Albums",
 							"Are you sure you want to import the album structure from Piwigo?\nExisting collections will be unaffected.",
 							"Import", "Cancel")
@@ -219,6 +235,12 @@ local function prefsDialog(f, propertyTable)
 					--enabled = false, -- temporary disabled
 					tooltip = "Check Piwigo album structure against local collection / set structure",
 					action = function(button)
+						if propertyTable.unsavedConnectionChanges then
+							LrDialogs.message("Unsaved Connection Changes",
+								"You have changed the connection details. Please click 'Save' to save the publish service.",
+								"info")
+							return
+						end
 						local result = LrDialogs.confirm("Check / link Piwigo Structure",
 							"Are you sure you want to check / link Piwigo Structure?\nExisting collections will be unaffected.",
 							"Check", "Cancel")
@@ -249,6 +271,12 @@ local function prefsDialog(f, propertyTable)
 					--enabled = false, -- temporary disabled
 					tooltip = "Clone existing publish service (collections/sets and links to Piwigo)",
 					action = function(button)
+						if propertyTable.unsavedConnectionChanges then
+							LrDialogs.message("Unsaved Connection Changes",
+								"You have changed the connection details. Please click 'Save' to save the publish service.",
+								"info")
+							return
+						end
 						LrTasks.startAsyncTask(function()
 							PWImportService.selectService(propertyTable)
 						end)
@@ -275,6 +303,12 @@ local function prefsDialog(f, propertyTable)
 					--enabled = false, -- temporary disabled
 					tooltip = "Create special publish collections for publish collection sets, allowing images to be published to Piwigo albums with sub-albums",
 					action = function(button)
+						if propertyTable.unsavedConnectionChanges then
+							LrDialogs.message("Unsaved Connection Changes",
+								"You have changed the connection details. Please click 'Save' to save the publish service.",
+								"info")
+							return
+						end
 						local result = LrDialogs.confirm("Create Special Collections",
 							"Are you sure you want to create Special Collections?\nExisting collections may be updated and missing Piwigo albums will be created.",
 							"Create", "Cancel")