WIP

Author: fjb2020

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)

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 },
 }

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=20260122, minor=27, revision=0 }
+
 _G.pluginVersion = string.format("%d.%d", versionInfo.major, versionInfo.minor)
 -- Auto-update checker
 _G.UpdateChecker = require "UpdateChecker"
@@ -91,5 +96,5 @@ LrTasks.startAsyncTask(function()
         UpdateChecker.checkForUpdates(true) -- silent = true
     end
 end)
---_G.LocStrings = utils.loadStrings()
+
 

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

piwigoPublish.lrplugin/PublishTask.lua

@@ -28,7 +28,7 @@ PublishTask = {}
 function PublishTask.processRenderedPhotos(functionContext, exportContext)
     -- render photos and upload to Piwigo
 
-    log:info("PublishTask.processRenderedPhotos")
+    log:info("PublishTask.processRenderedPhotos - version: " .. utils.serialiseVar(_PLUGIN.VERSION))
     local callStatus = {}
     local catalog = LrApplication.activeCatalog()
     local exportSession = exportContext.exportSession

piwigoPublish.lrplugin/UpdateChecker.lua

@@ -31,7 +31,7 @@ local LrDate = import 'LrDate'
 local UpdateChecker = {}
 
 -- Configuration
-UpdateChecker.GITHUB_OWNER = "Gotcha26"
+UpdateChecker.GITHUB_OWNER = "Piwigo"
 UpdateChecker.GITHUB_REPO = "PiwigoPublish-lrc-plugin"
 UpdateChecker.CHECK_INTERVAL_DAYS = 1
 
@@ -90,9 +90,12 @@ function UpdateChecker.getInstalledVersionDate()
     -- For date-based: extracts YYYYMMDD from "20260111.26"
     -- For semver: uses a stored build date or returns 0
 
-    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
+    -- use _G.versionInfo set in Init.lua 
+    log:info("UpdateChecker.getInstalledVersionDate - versionInfo\n" .. utils.serialiseVar(versionInfo))
     local major = versionInfo.major or 0
-    
+    log:info("UpdateChecker.getInstalledVersionDate - major: " .. tostring(major))
     if major >= 20000000 then
         -- Date-based: major IS the date
         return major
@@ -138,8 +141,10 @@ function UpdateChecker.checkForUpdates(silent)
 
         -- Update last check timestamp
         prefs.lastUpdateCheck = LrDate.currentTime()
-        
+        log:info("UpdateChecker.checkForUpdates - response\n" .. utils.serialiseVar(response))
+        log:info("UpdateChecker.checkForUpdates - headers\n" .. utils.serialiseVar(headers))        
         -- Handle errors
+
         if not response or (headers and headers.status ~= 200) then
             log:info("UpdateChecker.checkForUpdates - failed to fetch release info")
             if not silent then