fix: résout les conflits de fusion dans Init.lua, PluginInfoDialogSections.lua et PublishTask.lua

Author: Gotcha26

piwigoPublish.lrplugin/Init.lua

@@ -73,7 +73,6 @@ else
 end
 
 _G.iconPath = _PLUGIN:resourceId("icons/icon_med.png")
-<<<<<<< HEAD
 
 -- Build version string from Info.lua VERSION table
 local versionInfo = _PLUGIN.VERSION or { major = 0, minor = 0, revision = 0 }
@@ -92,8 +91,5 @@ LrTasks.startAsyncTask(function()
         UpdateChecker.checkForUpdates(true) -- silent = true
     end
 end)
-=======
-_G.pluginVersion = "20260122.27"
->>>>>>> main
 --_G.LocStrings = utils.loadStrings()
 

piwigoPublish.lrplugin/PluginInfoDialogSections.lua

@@ -77,7 +77,6 @@ function PluginInfoDialogSections.sectionsForBottomOfDialog(f, propertyTable)
         {
             bind_to_object = propertyTable,
 
-<<<<<<< HEAD
             title = "Plugin Updates",
 
             f:row {
@@ -116,9 +115,6 @@ function PluginInfoDialogSections.sectionsForBottomOfDialog(f, propertyTable)
             bind_to_object = propertyTable,
 
             title = "Piwigo Publisher Plugin Logging",
-=======
-            title = "Piwigo Publisher Plugin Logging and Preferences",
->>>>>>> main
 
             f:row {
                 f:checkbox {

piwigoPublish.lrplugin/PublishTask.lua

@@ -161,7 +161,6 @@ function PublishTask.processRenderedPhotos(functionContext, exportContext)
 
         local lrPhoto = rendition.photo
         local remoteId = rendition.publishedPhotoId or ""
-<<<<<<< HEAD
 
         -- Detect photo already published in this service (multi-album support)
         local existingPwImageId = nil
@@ -199,9 +198,6 @@ function PublishTask.processRenderedPhotos(functionContext, exportContext)
             end
         end
 
-=======
-
->>>>>>> main
         -- Wait for next photo to render.
         local success, pathOrMessage = rendition:waitForRender()
         -- Check for cancellation again after photo has been rendered.
@@ -431,7 +427,6 @@ function PublishTask.deletePhotosFromPublishedCollection(publishSettings, arrayO
             log:info("PublishTask.deletePhotosFromPublishedCollection - dissociating photo " .. thispwImageID .. " from category " .. pwCatID)
             callStatus = PiwigoAPI.dissociateImageFromCategory(publishSettings, thispwImageID, pwCatID)
             if callStatus.status then
-<<<<<<< HEAD
                 -- 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()
@@ -453,18 +448,6 @@ function PublishTask.deletePhotosFromPublishedCollection(publishSettings, arrayO
                 else
                     log:info("PublishTask.deletePhotosFromPublishedCollection - photo " .. thispwImageID .. " still in other collections, keeping metadata")
                 end
-=======
-                local pluginData = {
-                    pwHostURL = "",
-                    albumName = "",
-                    albumUrl = "",
-                    imageUrl = "",
-                    pwUploadDate = "",
-                    pwUploadTime = "",
-                    pwCommentSync = ""
-                }
-                PiwigoAPI.storeMetaData(catalog, thisLrPhoto, pluginData)
->>>>>>> main
                 thisPhotoToUnpublish[4] = true
             else
                 PWStatusManager.setPiwigoBusy(publishService, false)