Merge remote-tracking branch 'upstream/main'

Gotcha26 · Gotcha26 · commit c372febaa972 · 2026-01-24T23:09:41.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,5 @@ copilot-instructions.md
 
 # i18n
 localize_plugin.py
+extract_localizable_strings.py
 localization_report.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
+## [20260124.28] - 2026-01-24
+### Added
+ - Synchronisation of photos based on the Lr parameter: photoId, and Update system compatible with GitHub RCs. - PR (#40) - thank you @Gotcha26
+
+
 ## [20260122.27] - 2026-01-22
 ### Fixed
 #37 An error occurred while deleting images
diff --git a/README.md b/README.md
@@ -22,10 +22,12 @@ You should have received a copy of the GNU General Public License along with thi
 
 As a user of both Lightroom Classic and Piwigo, the ability use the powerful Publishing Service in LrC to keep my Piwigo galleries up to date is very appealing. I've been a long time user of a popular plugin that has been providing this functionality, but unfortunately since the version 15 release of LrC that has not been available. 
 
-This plugin is my attempt to allow me to continue publishing to Piwigo from LrC, and I have looked at the work of others for help and ideas in developing this plugin. In particular, the following should be credited:
+This plugin was developed to allow me to continue publishing to Piwigo from LrC, and I have looked at the work of others for help and ideas in developing this plugin. In particular, the following should be credited:
 
 [All the contributers to Piwigo](https://piwigo.org/)
 
+[Julien Moreau for contributing various improvements](https://julien-moreau.fr/)
+
 [Jeffrey Friedl for JSON.lua](http://regex.info/blog/lua/json)
 
 [Bastian Machek with his Immich Plugin](https://github.com/bmachek/lrc-immich-plugin)
diff --git a/piwigoPublish.lrplugin/Info.lua b/piwigoPublish.lrplugin/Info.lua
@@ -25,7 +25,6 @@ return {
     LrPluginName = "Piwigo Publisher",
     -- typo in PwigoPublish is noted but can't be changed without forcing all services using this plugin to be re-initialised.
     LrToolkitIdentifier = "fiona.boston.PwigoPublish",
-    -- LrToolkitIdentifier = "fiona.boston.PiwigoPublish",
     LrMetadataProvider  = 'CustomMetadata.lua',
     LrMetadataTagsetFactory = 'Tagset.lua',
     LrInitPlugin = "Init.lua",
@@ -67,5 +66,5 @@ return {
     
 	LrPluginInfoProvider = 'PluginInfo.lua',
 
-    VERSION = { major=20260122, minor=27, revision=0 },
+    VERSION = { major=20260124, minor=28, revision=0 },
 }
diff --git a/piwigoPublish.lrplugin/Init.lua b/piwigoPublish.lrplugin/Init.lua
@@ -75,7 +75,12 @@ end
 _G.iconPath = _PLUGIN:resourceId("icons/icon_med.png")
 
 -- Build version string from Info.lua VERSION table
-local versionInfo = _PLUGIN.VERSION or { major = 0, minor = 0, revision = 0 }
+--local versionInfo = _PLUGIN.VERSION or { major = 0, minor = 0, revision = 0 }
+-- _PLUGIN.VERSION is nil here for some reason, so hardcoding for now
+-- just need to ensure both places are updated together
+
+_G.versionInfo = { major=20260124, minor=28, revision=0 }
+
 _G.pluginVersion = string.format("%d.%d", versionInfo.major, versionInfo.minor)
 -- Auto-update checker
 _G.UpdateChecker = require "UpdateChecker"
@@ -91,5 +96,4 @@ LrTasks.startAsyncTask(function()
         UpdateChecker.checkForUpdates(true) -- silent = true
     end
 end)
---_G.LocStrings = utils.loadStrings()
 
diff --git a/piwigoPublish.lrplugin/Locales/en.lrproj/PluginStrings.txt b/piwigoPublish.lrplugin/Locales/en.lrproj/PluginStrings.txt
diff --git a/piwigoPublish.lrplugin/Locales/fr.lrproj/PluginStrings.txt b/piwigoPublish.lrplugin/Locales/fr.lrproj/PluginStrings.txt
diff --git a/piwigoPublish.lrplugin/PWExtraOptions.lua b/piwigoPublish.lrplugin/PWExtraOptions.lua
@@ -20,6 +20,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
+require "UIHelpers"
+
 -- *************************************************
 -- Define a value_equal function for the popup_menu
 local function valueEqual(a, b)
@@ -64,31 +66,7 @@ local function main()
         local c = f:column {
             spacing = f:dialog_spacing(),
 
-            f:row {
-                    f:picture {
-                        alignment = 'left',
-                        value = iconPath,
-                    },
-                f:column {
-                    spacing = f:control_spacing(),
-                    f:spacer { height = 1 },
-                    f:row {
-                        f:static_text {
-                            title = "    Piwigo Publisher Plugin",
-                            font = "<system/bold>",
-                            alignment = 'left',
-                            width = share 'labelWidth',
-                        },
-                    },
-                    f:row {
-                        f:static_text {
-                            title = "    Plugin Version " .. pluginVersion,
-                            alignment = 'left',
-                            width = share 'labelWidth',
-                        },
-                    },
-                },
-            },
+            UIHelpers.createPluginHeader(f, share, iconPath, pluginVersion),
 
             f:row {
                 spacing = f:label_spacing(),
diff --git a/piwigoPublish.lrplugin/PiwigoAPI.lua b/piwigoPublish.lrplugin/PiwigoAPI.lua
@@ -1430,14 +1430,14 @@ end
 function PiwigoAPI.getCommentInfos(propertyTable)
     -- return output from pwg.userComments.getList
     -- primarily used to check if comments are enabled on this Piwigo host
-    log:info("PiwigoAPI.getComments")
+    log:info("PiwigoAPI.getCommentInfos")
     local rtnStatus = {}
     rtnStatus.status = false
     rtnStatus.commentsEnabled = false
     -- successful connection, now get user role and token via pwg.session.getStatus
     local Params = { {
         name = "method",
-        value = "pwg.pwg.userComments.getList"
+        value = "pwg.userComments.getList"
     } }
     -- build headers to include cookies from pwConnect call
     local headers = {}
@@ -1448,9 +1448,9 @@ function PiwigoAPI.getCommentInfos(propertyTable)
     end
     local getResponse = httpGet(propertyTable.pwurl, Params, headers)
     if (not getResponse.response) then
-        log:info("PiwigoAPI.getComments - Params\n" .. utils.serialiseVar(Params))
-        log:info("PiwigoAPI.getComments - headers\n" .. utils.serialiseVar(headers))
-        log:info("PiwigoAPI.getComments - getResponse\n" .. utils.serialiseVar(getResponse))
+        log:info("PiwigoAPI.getCommentInfos - Params\n" .. utils.serialiseVar(Params))
+        log:info("PiwigoAPI.getCommentInfos - headers\n" .. utils.serialiseVar(headers))
+        log:info("PiwigoAPI.getCommentInfos - getResponse\n" .. utils.serialiseVar(getResponse))
         LrDialogs.message("Cannot get comments information from  Piwigo - Unknown error")
         return rtnStatus
     end
@@ -2450,10 +2450,6 @@ function PiwigoAPI.deletePhoto(propertyTable, pwCatID, pwImageID, callStatus)
         value = propertyTable.token
     } }
 
-    log:info("PiwigoAPI.deletePhoto - propertyTable \n " .. utils.serialiseVar(propertyTable))
-    log:info("PiwigoAPI.deletePhoto - params \n" .. utils.serialiseVar(params))
-    -- log:info("PiwigoAPI.deletePhoto - headrs \n" .. utils.serialiseVar(headers))
-
     local httpResponse, httpHeaders = LrHttp.postMultipart(propertyTable.pwurl, params, {
         headers = {
             field = "Cookie",
@@ -2462,9 +2458,6 @@ function PiwigoAPI.deletePhoto(propertyTable, pwCatID, pwImageID, callStatus)
         }
     })
 
-    log:info("PiwigoAPI.deletePhoto - httpResponse \n" .. utils.serialiseVar(httpResponse))
-    log:info("PiwigoAPI.deletePhoto - httpHeaders \n" .. utils.serialiseVar(httpHeaders))
-
     local body
     if httpResponse then
         body = JSON:decode(httpResponse)
@@ -2475,10 +2468,18 @@ function PiwigoAPI.deletePhoto(propertyTable, pwCatID, pwImageID, callStatus)
             callStatus.status = true
             callStatus.statusMsg = ""
         else
+            log:info("PiwigoAPI.deletePhoto - propertyTable \n " .. utils.serialiseVar(propertyTable))
+            log:info("PiwigoAPI.deletePhoto - params \n" .. utils.serialiseVar(params))
+            log:info("PiwigoAPI.deletePhoto - httpResponse \n" .. utils.serialiseVar(httpResponse))
+            log:info("PiwigoAPI.deletePhoto - httpHeaders \n" .. utils.serialiseVar(httpHeaders))
             callStatus.status = false
             callStatus.statusMsg = body.message or ""
         end
     else
+        log:info("PiwigoAPI.deletePhoto - propertyTable \n " .. utils.serialiseVar(propertyTable))
+        log:info("PiwigoAPI.deletePhoto - params \n" .. utils.serialiseVar(params))
+        log:info("PiwigoAPI.deletePhoto - httpResponse \n" .. utils.serialiseVar(httpResponse))
+        log:info("PiwigoAPI.deletePhoto - httpHeaders \n" .. utils.serialiseVar(httpHeaders))
         callStatus.status = false
         callStatus.statusMsg = body.message or ""
     end
@@ -2575,12 +2576,6 @@ function PiwigoAPI.addComment(publishSettings, metaData)
         return false
     end
     --end
-    -- log:info("PiwigoAPI.addComment - publishSettings\n" .. utils.serialiseVar(publishSettings))
-    -- check role is admin level
-    --if publishSettings.userStatus ~= "webmaster" then
-    --    LrDialogs.message("PiwigoAPI.addComment - user needs webmaster role ")
-    --    return false
-    --end
 
     -- get antispam token from image details (unique for each image)
     local rtnStatus = PiwigoAPI.checkPhoto(publishSettings, metaData.remoteId)
diff --git a/piwigoPublish.lrplugin/PluginInfoDialogSections.lua b/piwigoPublish.lrplugin/PluginInfoDialogSections.lua
@@ -31,12 +31,10 @@ local function resetPluginPrefs(prefix)
     log:info("resetPluginPrefs \n" .. utils.serialiseVar(prefs))
     for k, p in prefs:pairs() do
         if prefix then
-            log:info("resetting " .. utils.serialiseVar(k))
             if k:find(prefix, 1, true) == 1 then
                 prefs[k] = nil
             end
         else
-            log:info("resetting " .. utils.serialiseVar(k))
             prefs[k] = nil
         end
     end
@@ -63,6 +61,7 @@ function PluginInfoDialogSections.startDialog(propertyTable)
     else
         log:disable()
     end
+ 
     propertyTable.debugEnabled = prefs.debugEnabled
     propertyTable.debugToFile = prefs.debugToFile
 end
diff --git a/piwigoPublish.lrplugin/PublishDialogSections.lua b/piwigoPublish.lrplugin/PublishDialogSections.lua
@@ -22,6 +22,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ]]
 
+require "UIHelpers"
+
 PublishDialogSections = {}
 
 -- *************************************************
@@ -61,32 +63,7 @@ local function connectionDialog(f, propertyTable, pwInstance)
 		bind_to_object = propertyTable,
 
 		-- TOP: icon + version block
-		f:row {
-			f:picture {
-				alignment = 'left',
-				value = iconPath,
-				--value = _PLUGIN:resourceId("icons/icon_med.png"),
-			},
-			f:column {
-				spacing = f:control_spacing(),
-				f:spacer { height = 1 },
-				f:row {
-					f:static_text {
-						title = "    Piwigo Publisher Plugin",
-						font = "<system/bold>",
-						alignment = 'left',
-						width = share 'labelWidth',
-					},
-				},
-				f:row {
-					f:static_text {
-						title = "    Plugin Version " .. pluginVersion,
-						alignment = 'left',
-						width = share 'labelWidth',
-					},
-				},
-			},
-		},
+		UIHelpers.createPluginHeader(f, share, iconPath, pluginVersion),
 
 		-- PW Host
 		f:spacer { height = 1 },
diff --git a/piwigoPublish.lrplugin/PublishServiceProvider.lua b/piwigoPublish.lrplugin/PublishServiceProvider.lua
@@ -56,19 +56,21 @@ return {
 		{ key = "mdDescription",         default = "{{caption}}" },
 		{ key = "syncAlbumDescriptions", default = false },
 		{ key = "syncCommentsPublish",   default = true },
-		{ key = "syncCommentsPubOnly",   default = false }
-
+		{ key = "syncCommentsPubOnly",   default = false },
 	},
-	--[[
-	metadataThatTriggersRepublish = {
-		default = false,
-		title = true,
-		caption = true,
-		keywords = true,
-		gps = true,
-		dateCreated = true,
-    },
-]]
+
+	metadataThatTriggersRepublish = function(publishSettings, photoId, fieldName)
+		-- This function is called by Lightroom to determine whether a metadata
+		-- change should trigger republishing.
+		local triggerFields = {
+			title = true,
+			caption = true,
+			keywords = true,
+			gps = true,
+			dateCreated = true,
+		}
+		return triggerFields[fieldName] or false
+	end,
 	-- canExportToTemporaryLocation = true
 	-- canExportToTemporaryLocation = true
 	-- showSections = { 'fileNaming', 'fileSettings', etc... }
@@ -86,7 +88,7 @@ return {
 
 	-- Images Processing function
 	processRenderedPhotos                            = PublishTask.processRenderedPhotos,
-	canAddCommentsToService                          = PublishTask.PublishTaskcanAddCommentsToService,
+	canAddCommentsToService                          = PublishTask.canAddCommentsToService,
 	addCommentToPublishedPhoto                       = PublishTask.addCommentToPublishedPhoto,
 	getCommentsFromPublishedCollection               = PublishTask.getCommentsFromPublishedCollection,
 	deletePhotosFromPublishedCollection              = PublishTask.deletePhotosFromPublishedCollection,
@@ -107,6 +109,7 @@ return {
 	renamePublishedCollection                        = PublishTask.renamePublishedCollection,
 	reparentPublishedCollection                      = PublishTask.reparentPublishedCollection,
 	deletePublishedCollection                        = PublishTask.deletePublishedCollection,
+	imposeSortOrderOnPublishedCollection			 = PublishTask.imposeSortOrderOnPublishedCollection,
 	validatePublishedCollectionName                  = PublishTask.validatePublishedCollectionName,
 
 	-- view on Piwigo Options
diff --git a/piwigoPublish.lrplugin/PublishTask.lua b/piwigoPublish.lrplugin/PublishTask.lua
diff --git a/piwigoPublish.lrplugin/UIHelpers.lua b/piwigoPublish.lrplugin/UIHelpers.lua
diff --git a/piwigoPublish.lrplugin/UpdateChecker.lua b/piwigoPublish.lrplugin/UpdateChecker.lua
