Merge branch 'pr-44'

Author: fjb2020

.gitignore

@@ -14,12 +14,13 @@ piwigoPublish.lrplugin/lrcUtils.lua
 piwigoPublish.lrplugin/PiwigoHelper.lua 
 
 # Other files
+*.bak
+.claude/
+__pycache__/
 cat layout.odt
 deploy.sh
 diagnostic.txt
 copilot-instructions.md
 
-# i18n
-localize_plugin.py
-extract_localizable_strings.py
-localization_report.txt
+# Temporary folder for localisation tools
+piwigoPublish.lrplugin/__i18n_tmp__/

CHANGELOG.md

@@ -1,4 +1,12 @@
 # Changelog
+
+## [20260205.30] - 2026-02-05
+### Fixed
+Fix #41 Problem with 'Clone Existing Publish Service - public/private setting
+
+### Added
+- Preparation for locatalistion
+
 ## [20260126.29] - 2026-01-26
 ### Fixed
 Fix #41 Allow clone service to include unpublished photos from standard published collections

piwigoPublish.lrplugin/Info.lua

@@ -66,5 +66,5 @@ return {
 
 	LrPluginInfoProvider = 'PluginInfo.lua',
 
-    VERSION = { major=20260126, minor=29, revision=0 },
+    VERSION = { major=20260205, minor=30, 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=20260126, minor=29, revision=0 }
+_G.versionInfo = { major=20260205, minor=30, revision=0 }
 
 _G.pluginVersion = string.format("%d.%d", versionInfo.major, versionInfo.minor)
 -- Auto-update checker
@@ -97,4 +97,3 @@ LrTasks.startAsyncTask(function()
     end
 end)
 
-

piwigoPublish.lrplugin/Locales/en.lrproj/PluginStrings.txt

@@ -101,15 +101,15 @@ local function processSmartCollectionQueue(smartColls, publishService, propertyT
     if not smartColls or index > #smartColls then
         releasePublishLock(serviceId)
         progressScope:done()
-        LrDialogs.message("Clone completed", "Publish Service Clone omplete.", "info")
+        LrDialogs.message("Clone completed", "Publish Service Clone Complete.", "info")
         return
     end
 
     local entry = smartColls[index]
     if not entry then
         releasePublishLock(serviceId)
         progressScope:done()
-        LrDialogs.message("Clone completed", "Publish Service Clone omplete.", "info")
+        LrDialogs.message("Clone completed", "Publish Service Clone Complete.", "info")
         return -- done
     end
 
@@ -362,7 +362,7 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
         if extra then
             if extra.collSettings then
                 comment = extra.collSettings.comment or ""
-                status = extra.collSettings.status or ""
+                status = extra.collSettings.status or "public"
             end
             isSmartColl = extra.isSmartColl
             searchDesc = extra.searchDesc
@@ -388,22 +388,36 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
                 local collectionSettings = newCollorSet:getCollectionSetInfoSummary().collectionSettings or {}
                 if propertyTable.syncAlbumDescriptions then
                     collectionSettings.albumDescription = comment
-                    collectionSettings.albumPrivate = status == "private"
                 else
                     collectionSettings.albumDescription = ""
+                end
+                if status == "private" then
+                    collectionSettings.albumPrivate = true
+                else
                     collectionSettings.albumPrivate = false
                 end
+
                 if remoteAlbumId then
                     local thisCat = PiwigoAPI.pwCategoriesGetThis(propertyTable, remoteAlbumId)
                     if thisCat then
-                        if thisCat.name == name then
-                            albumUrl = propertyTable.host .. "/index.php?/category/" .. remoteAlbumId
-                            catalog:withWriteAccessDo("Add Piwigo details to collections", function()
-                                newCollorSet:setRemoteId(remoteAlbumId)
-                                newCollorSet:setRemoteUrl(albumUrl)
-                                newCollorSet:setCollectionSetSettings(collectionSettings)
-                            end)
+                        if propertyTable.syncAlbumDescriptions then
+                            if thisCat.description then
+                                collectionSettings.albumDescription = thisCat.description
+                            else
+                                collectionSettings.albumDescription = ""
+                            end
+                        end
+                        if thisCat.status == "public" then
+                            collectionSettings.albumPrivate = false
+                        else
+                            collectionSettings.albumPrivate = true
                         end
+                        albumUrl = propertyTable.host .. "/index.php?/category/" .. remoteAlbumId
+                        catalog:withWriteAccessDo("Add Piwigo details to collections", function()
+                            newCollorSet:setRemoteId(remoteAlbumId)
+                            newCollorSet:setRemoteUrl(albumUrl)
+                            newCollorSet:setCollectionSetSettings(collectionSettings)
+                        end)
                     end
                 end
             end
@@ -464,6 +478,18 @@ local function createTree(nodes, parentSet, publishService, created, childrenInd
                     -- check if remoote album exists and add to collection if so
                     local thisCat = PiwigoAPI.pwCategoriesGetThis(propertyTable, remoteAlbumId)
                     if thisCat then
+                        if propertyTable.syncAlbumDescriptions then
+                            if thisCat.description then
+                                collectionSettings.albumDescription = thisCat.description
+                            else
+                                collectionSettings.albumDescription = ""
+                            end
+                        end
+                        if thisCat.status == "public" then
+                            collectionSettings.albumPrivate = false
+                        else
+                            collectionSettings.albumPrivate = true
+                        end
                         albumUrl = propertyTable.host .. "/index.php?/category/" .. remoteAlbumId
                         catalog:withWriteAccessDo("Add Piwigo details to collections", function()
                             newCollorSet:setRemoteId(remoteAlbumId)

piwigoPublish.lrplugin/Locales/en.lrproj/PluginStrings.txt.old

@@ -115,7 +115,7 @@ local function SetAlbumCover()
     if not (publishSettings.Connected) then
         rv = PiwigoAPI.login(publishSettings)
         if not rv then
-            LrDialogs.message('SetAlbumCover - cannot connect to piwigo')
+            LrDialogs.message("SetAlbumCover - cannot connect to piwigo")
             return false
         end
     end

piwigoPublish.lrplugin/Locales/fr.lrproj/PluginStrings.txt

@@ -1365,7 +1365,7 @@ function PiwigoAPI.pwConnect(propertyTable)
     -- get list of all tagIDs
     rv, propertyTable.tagTable = PiwigoAPI.getTagList(propertyTable)
     if not rv then
-        LrDialogs.message('PiwigoAPI.pwConnect - cannot get taglist from Piwigo')
+        LrDialogs.message("PiwigoAPI.pwConnect - cannot get taglist from Piwigo")
         return false
     end
 
@@ -2795,7 +2795,7 @@ function PiwigoAPI.setAlbumCover(publishService)
     if not (publishSettings.Connected) then
         rv = PiwigoAPI.login(publishSettings)
         if not rv then
-            LrDialogs.message('PiwigoAPI.setAlbumCover - cannot connect to piwigo')
+            LrDialogs.message("PiwigoAPI.setAlbumCover - cannot connect to piwigo")
             return false
         end
     end