Fix #36 - Ajoute la fonctionnalité d'association d'images à des catégories et améliore la détection des photos déjà publiées dans le service Piwigo.

Gotcha26 · Gotcha26 · commit a2ed6de4f597 · 2026-01-21T23:17:31.000+01:00
diff --git a/piwigoPublish.lrplugin/PiwigoAPI.lua b/piwigoPublish.lrplugin/PiwigoAPI.lua
@@ -1957,6 +1957,116 @@ function PiwigoAPI.checkPhoto(propertyTable, pwImageID)
     return rtnStatus
 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))
+    
+    local callStatus = { status = false }
+    local rv
+    
+    -- Check connection
+    if not propertyTable.Connected then
+        rv = PiwigoAPI.login(propertyTable)
+        if not rv then
+            callStatus.statusMsg = "Cannot connect to Piwigo"
+            return callStatus
+        end
+    end
+    
+    local params = {
+        { 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 }
+    }
+    
+    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))
+    
+    local callStatus = { status = false }
+    local rv
+    
+    -- Check connection
+    if not propertyTable.Connected then
+        rv = PiwigoAPI.login(propertyTable)
+        if not rv then
+            callStatus.statusMsg = "Cannot connect to Piwigo"
+            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 = "multiple_value_mode", value = "replace" },
+        { 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
+
 -- *************************************************
 function PiwigoAPI.updateGallery(propertyTable, exportFilename, metaData)
     -- update gallery with image via pwg.images.addSimple
diff --git a/piwigoPublish.lrplugin/PublishTask.lua b/piwigoPublish.lrplugin/PublishTask.lua
@@ -134,6 +134,43 @@ function PublishTask.processRenderedPhotos(functionContext, exportContext)
 
         local lrPhoto = rendition.photo
         local remoteId = rendition.publishedPhotoId or ""
+        
+        -- Detect photo already published in this service (multi-album support)
+        local existingPwImageId = nil
+        if remoteId == "" then
+            -- Method 1: Via custom metadata (photos published with plugin >= 20251224.16)
+            local storedImageUrl = lrPhoto:getPropertyForPlugin(_PLUGIN, "pwImageURL")
+            local storedHost = lrPhoto:getPropertyForPlugin(_PLUGIN, "pwHostURL")
+            
+            log:info("DEBUG multi-album: remoteId vide, checking metadata...")
+            log:info("DEBUG storedHost: " .. tostring(storedHost))
+            log:info("DEBUG storedImageUrl: " .. tostring(storedImageUrl))
+            log:info("DEBUG propertyTable.host: " .. tostring(propertyTable.host))
+            
+            if storedHost == propertyTable.host and storedImageUrl then
+                existingPwImageId = utils.extractPwImageIdFromUrl(storedImageUrl, propertyTable.host)
+            end
+            
+            -- Method 2: Search in other collections of the service (fallback)
+            if not existingPwImageId then
+                log:info("DEBUG multi-album: metadata vides, recherche cross-collection...")
+                local publishService = publishedCollection:getService()
+                existingPwImageId = utils.findExistingPwImageId(publishService, lrPhoto)
+                if existingPwImageId then
+                    log:info("DEBUG multi-album: trouvé via cross-collection, ID = " .. tostring(existingPwImageId))
+                end
+            end
+            
+            -- Verify the image still exists on Piwigo
+            if existingPwImageId then
+                local checkStatus = PiwigoAPI.checkPhoto(propertyTable, existingPwImageId)
+                if not checkStatus.status then
+                    log:info("DEBUG multi-album: image " .. existingPwImageId .. " n'existe plus sur Piwigo")
+                    existingPwImageId = nil
+                end
+            end
+        end
+        
         -- Wait for next photo to render.
         local success, pathOrMessage = rendition:waitForRender()
 
@@ -149,6 +186,25 @@ function PublishTask.processRenderedPhotos(functionContext, exportContext)
             -- photo has been exported to temporary location - upload to piwigo
             callStatus = {}
             local filePath = pathOrMessage
+            
+            -- If photo already exists on Piwigo, associate instead of uploading
+            if existingPwImageId then
+                log:info("Photo exists on Piwigo (ID " .. existingPwImageId .. "), associating to album " .. albumId)
+                callStatus = PiwigoAPI.associateImageToCategory(propertyTable, existingPwImageId, albumId)
+                
+                if callStatus.status then
+                    rendition:recordPublishedPhotoId(callStatus.remoteid)
+                    rendition:recordPublishedPhotoUrl(callStatus.remoteurl)
+                    rendition:renditionIsDone(true)
+                    LrFileUtils.delete(pathOrMessage)
+                else
+                    log:warn("Association failed: " .. (callStatus.statusMsg or "") .. ", falling back to upload")
+                    existingPwImageId = nil
+                end
+            end
+            
+            if not existingPwImageId then
+            -- Begin existing upload block (indent all upload code until end of if success)
             local metaData = {}
             -- build metadata structure
             metaData = utils.getPhotoMetadata(propertyTable, lrPhoto)
@@ -202,6 +258,7 @@ function PublishTask.processRenderedPhotos(functionContext, exportContext)
             end
             -- When done with photo, delete temp file.
             LrFileUtils.delete(pathOrMessage)
+            end -- end if not existingPwImageId
         else
             rendition:uploadFailed(pathOrMessage or "Render failed")
         end
@@ -279,18 +336,32 @@ function PublishTask.deletePhotosFromPublishedCollection(publishSettings, arrayO
             local thisLrPhoto = thisPhotoToUnpublish[1]
             local thispwImageID = thisPhotoToUnpublish[2]
             local thisPubPhoto = thisPhotoToUnpublish[3]
-            callStatus = PiwigoAPI.deletePhoto(publishSettings, pwCatID, thispwImageID, callStatus)
+            
+            -- Use dissociate instead of delete to preserve multi-album associations
+            log:info("PublishTask.deletePhotosFromPublishedCollection - dissociating photo " .. thispwImageID .. " from category " .. pwCatID)
+            callStatus = PiwigoAPI.dissociateImageFromCategory(publishSettings, thispwImageID, pwCatID)
             if callStatus.status then
-                catalog:withWriteAccessDo("Updating " .. thisLrPhoto:getFormattedMetadata("fileName"),
-                    function()
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwHostURL", "")
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwAlbumName", "")
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwAlbumURL", "")
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwImageURL", "")
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwUploadDate", "")
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwUploadTime", "")
-                        thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwCommentSync", "")
-                    end)
+                -- Only clear metadata if photo is no longer in any other published collection
+                -- Check if photo exists in other collections of this service
+                local publishService = publishedCollection:getService()
+                local stillPublished = utils.findExistingPwImageId(publishService, thisLrPhoto)
+                
+                if not stillPublished then
+                    -- Photo is no longer published anywhere, clear all metadata
+                    log:info("PublishTask.deletePhotosFromPublishedCollection - photo " .. thispwImageID .. " orphaned, clearing metadata")
+                    catalog:withWriteAccessDo("Updating " .. thisLrPhoto:getFormattedMetadata("fileName"),
+                        function()
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwHostURL", "")
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwAlbumName", "")
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwAlbumURL", "")
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwImageURL", "")
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwUploadDate", "")
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwUploadTime", "")
+                            thisLrPhoto:setPropertyForPlugin(_PLUGIN, "pwCommentSync", "")
+                        end)
+                else
+                    log:info("PublishTask.deletePhotosFromPublishedCollection - photo " .. thispwImageID .. " still in other collections, keeping metadata")
+                end
                 thisPhotoToUnpublish[4] = true
             else
                 PiwigoBusy = false
diff --git a/piwigoPublish.lrplugin/utils.lua b/piwigoPublish.lrplugin/utils.lua
@@ -1219,4 +1219,61 @@ function utils.pwBusyMessage(callingFunction, displayFunction)
 end
 
 -- *************************************************
+function utils.extractPwImageIdFromUrl(url, expectedHost)
+    -- Extracts the Piwigo image_id from a URL like "http://host/picture.php?/822/..."
+    -- Verifies that the URL matches the expected host
+    if not url or url == "" then return nil end
+    if expectedHost and not url:find(expectedHost, 1, true) then return nil end
+    
+    local imageId = url:match("picture%.php%?/(%d+)")
+    return imageId
+end
+
+-- *************************************************
+function utils.findExistingPwImageId(publishService, lrPhoto)
+    -- Searches if this LR photo is already published in another collection of the same service
+    -- Returns the Piwigo remoteId if found, nil otherwise
+    
+    local foundRemoteId = nil
+    
+    local function searchInCollection(collection)
+        if foundRemoteId then return end
+        local pubPhotos = collection:getPublishedPhotos()
+        for _, pubPhoto in ipairs(pubPhotos) do
+            if pubPhoto:getPhoto().localIdentifier == lrPhoto.localIdentifier then
+                local rid = pubPhoto:getRemoteId()
+                if rid and rid ~= "" then
+                    foundRemoteId = rid
+                    return
+                end
+            end
+        end
+    end
+    
+    local function searchInSet(collectionSet)
+        if foundRemoteId then return end
+        -- Search in child collections
+        local childColls = collectionSet:getChildCollections()
+        if childColls then
+            for _, coll in ipairs(childColls) do
+                searchInCollection(coll)
+                if foundRemoteId then return end
+            end
+        end
+        -- Search in child sets (recursive)
+        local childSets = collectionSet:getChildCollectionSets()
+        if childSets then
+            for _, childSet in ipairs(childSets) do
+                searchInSet(childSet)
+                if foundRemoteId then return end
+            end
+        end
+    end
+    
+    -- Start search from service root
+    searchInSet(publishService)
+    
+    return foundRemoteId
+end
+
 return utils
