Add collection configuration "Keep no longer published photos in albums"

CHANGELOG.md

@@ -117,3 +117,10 @@ rendition is marked as skipped.
 ### Added
 
 * Add preference Truncate Version. If set to true the version in the catalog name will be truncated.
+
+## [2.1.2.0]
+
+### Added
+
+* Add collection configuration "Keep no longer published photos in albums". If set to false (default value) photos will
+  be removed from Photos app if they are removed from collection, otherwise photos must be removed from album manually.

README.md

@@ -15,11 +15,11 @@ LRPhotos is a Lightroom Classic publishing service for Apple's Photos app.
 * MacOS 10.10 (Yosemite) or later.
 * Windows is not supported.
 
-## Installation
+## Installaftion
 
 ---
 
-1. Download the zip archive from [GitHub](https://github.com/sto3014/LRPhotos/blob/main/target/LRPhotos2.1.1.0_mac.zip).
+1. Download the zip archive from [GitHub](https://github.com/sto3014/LRPhotos/blob/main/target/LRPhotos2.1.2.0_mac.zip).
 2. Extract the archive in the download folder
 3. Copy plug-in, applescript files and automator workflow into ~/Library  
    Open a terminal window, change to Downloads/LRPhotos and execute install.sh:
@@ -74,10 +74,13 @@ The re-publishing process…
 * puts re-published photos into the same albums as their predecessors.
 * puts tag __lr:out-of-date__ on the predecessor
 * removes out-of-date photos if collection configuration __Keep out of date photos in albums__ is un-checked.
+* removes photos that were removed from publish service if collection configuration __Keep no longer published photos in
+  albums__ is unchecked.
 
 ### Remove photos from publishing service
 
-* Removes the photo from the Photos album.
+* Removes the photo from the Photos album if collection configuration __Keep no longer published photos in albums__ is
+  unchecked.
 * Set tag __lr:no-longer-published__ to the current media item in Photos if it is no longer used in any album
 * Set back the Photos metadata in Lightroom, if the photo is no longer used in any album.
 

package.sh

@@ -9,7 +9,7 @@ export SOURCE_DIR=$SCRIPT_DIR/src/main/$PACKAGE_NAME.lrdevplugin
 export SOURCE_DIR_SERVICES=/Users/dieterstockhausen/Projekte/Automation/Services
 export SOURCE_DIR_SCRIPT_LIBRARIES="/Users/dieterstockhausen/Projekte/Automation/Script Libraries/src"
 export RESOURCE_DIR=$SCRIPT_DIR/res
-export VERSION=2.1.1.0
+export VERSION=2.1.2.0
 #
 # mac
 #

src/main/lrphotos.lrdevplugin/Info.lua

@@ -4,7 +4,7 @@ return {
 
   LrPluginName = 'Photos',
   LrToolkitIdentifier = 'at.homebrew.lrphotos',
-  VERSION = { major = 2, minor = 1, revision = 1, build = 0, },
+  VERSION = { major = 2, minor = 1, revision = 2, build = 0, },
   LrInitPlugin = "InitPlugin.lua",
   -- Add the Metadata Definition File
   LrMetadataProvider = 'PhotosMetadataDefinition.lua',

src/main/lrphotos.lrdevplugin/PhotosImport.applescript

@@ -82,7 +82,7 @@ end getMode
 -------------------------------------------------------------------------------
 on getSession(sessionContents)
 	local session
-	set session to {mode:"", albumName:"", ignoreByRegex:"", hasErrors:false, errorMsg:"", exportDone:false, keepOldPhotos:true} as record
+	set session to {mode:"", albumName:"", ignoreByRegex:"", hasErrors:false, errorMsg:"", exportDone:false, keepOldPhotos:true, keepNoLongerPublishedPhotos:true} as record
 	local allLines
 	set allLines to every paragraph of sessionContents
 	repeat with aLine in allLines
@@ -117,6 +117,10 @@ on getSession(sessionContents)
 								else
 									if aKey is equal to "keepOldPhotos" then
 										set keepOldPhotos of session to value is equal to "true"
+									else
+										if aKey is equal to "keepNoLongerPublishedPhotos" then
+											set keepNoLongerPublishedPhotos of session to value is equal to "true"
+										end if
 									end if
 								end if
 							end if
@@ -667,7 +671,9 @@ on remove(photoDescriptors, session)
 			end try
 		end repeat
 		--
-		tell me to set targetAlbum to removePhotosFromAlbum(targetAlbum, photosToBeRemovedFromAlbum)
+		if not keepNoLongerPublishedPhotos of session then
+			tell me to set targetAlbum to removePhotosFromAlbum(targetAlbum, photosToBeRemovedFromAlbum)
+		end if
 	end tell
 	log message "remove() end"
 	set AppleScript's text item delimiters to ""
@@ -696,6 +702,7 @@ on updateSessionFile(sessionFile, session)
 		"ignoreByRegex=" & ignoreByRegex of session & linefeed & ¬
 		"hasErrors=" & hasErrors of session & linefeed & ¬
 		"keepOldPhotos=" & keepOldPhotos of session & linefeed & ¬
+		"keepNoLongerPublishedPhotos=" & keepNoLongerPublishedPhotos of session & linefeed & ¬
 		"errorMsg=" & errorMsg of session
 	set utf8Content to transform macroman text romanContent to UTF8
 	write utf8Content to sessionFile

src/main/lrphotos.lrdevplugin/PhotosPublishDialogSections.lua

@@ -94,22 +94,17 @@ function PhotosPublishDialogSections.sectionsForBottomOfDialog( f, _ )
         },
       },
       f:row {
-        --       f:spacer
-        --        width = share 'labelWidth'
-        --       },
-
-        --[[
-        f:static_text({
-          title = LOC("$$$/Photos/KeepOldPhotos=Keep out of date photos in albums:"),
-          width_in_chars = 25,
-        }),
-        ]]--
-
         f:checkbox {
           title = LOC "$$$/Photos/KeepOldPhotos=Keep out of date photos in albums.",
           value = bind 'keepOldPhotos',
         },
       },
+      f:row {
+        f:checkbox {
+          title = LOC "$$$/Photos/KeepNoLongerPublishedPhotos=Keep no longer published photos in albums.",
+          value = bind 'keepNoLongerPublishedPhotos',
+        },
+      },
     },
   }
 

src/main/lrphotos.lrdevplugin/PhotosPublishTask.lua

@@ -93,14 +93,15 @@ end
 --[[---------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------]]
-local function writeSessionFile(albumPath, ignoreAlbums, ignoreRegex, mode, keepOldPhotos)
+local function writeSessionFile(albumPath, ignoreAlbums, ignoreRegex, mode, keepOldPhotos, keepNoLongerPublishedPhotos)
     -- Write Lightroom input to a session.txt file for AppleScript later on
     logger.trace("sessionFile=" .. Utils.getSessionFile(albumPath))
     local f = assert(io.open(Utils.getSessionFile(albumPath), "w+"))
     f:write("mode=" .. mode ..  "\n")
     f:write("exportDone=false\n")
     f:write("albumName=" .. albumPath .. "\n")
     f:write("keepOldPhotos=" .. tostring(keepOldPhotos) .. "\n")
+    f:write("keepNoLongerPublishedPhotos=" .. tostring(keepNoLongerPublishedPhotos) .. "\n")
 
     if ignoreAlbums == true then
         f:write("ignoreByRegex=" .. ignoreRegex .. "\n")
@@ -421,7 +422,8 @@ function PhotosPublishTask.processRenderedPhotos(_, exportContext)
             exportContext.propertyTable.ignoreAlbums,
             exportContext.propertyTable.ignoreRegex,
             "publish",
-            exportContext.propertyTable.keepOldPhotos
+            exportContext.propertyTable.keepOldPhotos,
+            exportContext.propertyTable.keepNoLongerPublishedPhotos
     )
 
 
@@ -510,7 +512,14 @@ function PhotosPublishTask.deletePhotosFromPublishedCollection(publishSettings,
             return
         end
 
-    writeSessionFile(albumPath, publishSettings.ignoreAlbums, publishSettings.ignoreRegex, "remove", publishSettings.keepOldPhotos)
+    writeSessionFile(
+            albumPath,
+            publishSettings.ignoreAlbums,
+            publishSettings.ignoreRegex,
+            "remove",
+            publishSettings.keepOldPhotos,
+            publishSettings.keepNoLongerPublishedPhotos)
+
         local activeCatalog = LrApplication.activeCatalog()
         local catName = LrPathUtils.leafName(activeCatalog:getPath())
 

src/main/lrphotos.lrdevplugin/PhotosServiceProvider.lua

@@ -18,6 +18,7 @@ local PhotosServiceProvider = {
     { key = 'ignoreRegex', default = "^!|!$" },
     { key = 'rootFolder', default = "/" },
     { key = 'keepOldPhotos', default = true },
+    { key = 'keepNoLongerPublishedPhotos', default = false},
   },
   canExportVideo = true,
   sectionsForBottomOfDialog = PhotosPublishDialogSections.sectionsForBottomOfDialog,

src/main/lrphotos.lrdevplugin/TranslatedStrings_de.txt

@@ -59,3 +59,4 @@
 "$$$/Photos/PluginSettings=Plug-in Einstellungen"
 "$$$/Photos/CatalogName=Lightroom Katalog"
 "$$$/Photos/CatalogName/TruncateVersion=Entferne Version"
+"$$$/Photos/KeepNoLongerPublishedPhotos=Behalte nicht mehr publizierte Fotos in den Alben."

src/main/lrphotos.lrdevplugin/TranslatedStrings_en.txt

@@ -63,5 +63,6 @@
 "$$$/Photos/PluginSettings=Plug-in Settings"
 "$$$/Photos/CatalogName=Lightroom Catalog"
 "$$$/Photos/CatalogName/TruncateVersion=Truncate Version"
+"$$$/Photos/KeepNoLongerPublishedPhotos=Keep no longer published photos in albums."