diff --git a/README.md b/README.md index 18edc1c..b4904b8 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,13 @@ The publish process… * sets tag __LR:<name of LR catalog file>__ * writes Photos.app IDs to Lightroom metadata field __Photos ID__ +When creating a new publishing service, there are three predefined options which are not default by Adobe: +* Quality for JPEGs is 85% not 60% +* Person info will NOT be removed from metadata +* Location info will NOT be removed from metadata + +Of course, you may change these settings for your service definition. + ### Re-Publishing The re-publishing process… * puts re-published photos into the same albums as their predecessors. @@ -37,7 +44,9 @@ Examples: * /Holidays in Spain The album __Holidays in Spain__ will be created directly under __My Albums__ * /2021/Holidays in Spain -The album __Holidays in Spain__ will be created in the folder __2021__ +The album __Holidays in Spain__ will be created in the folder __2021__ + +Remarks: As the slash is used as directory separator you can not use it for a name of an album. The __Ignore Albums by Regex__ is used to define albums which are ignored during republishing. During re-publishing, the updated photos go into all albums where their predecessors are in. For technical reason, diff --git a/src/main/lua/lrphotos.lrdevplugin/Logger.lua b/src/main/lua/lrphotos.lrdevplugin/Logger.lua index f22177d..525cab3 100644 --- a/src/main/lua/lrphotos.lrdevplugin/Logger.lua +++ b/src/main/lua/lrphotos.lrdevplugin/Logger.lua @@ -5,7 +5,7 @@ local LrLogger = import("LrLogger") local _logger = LrLogger("PhotosServiceProvider") _logger:enable("logfile") -local enabled = true +local enabled = false ------------------------------------------------------------------------------- local logger = {} ------------------------------------------------------------------------------- diff --git a/src/main/lua/lrphotos.lrdevplugin/PhotosPublishDialogSections.lua b/src/main/lua/lrphotos.lrdevplugin/PhotosPublishDialogSections.lua index 00ddcd5..8b1065d 100755 --- a/src/main/lua/lrphotos.lrdevplugin/PhotosPublishDialogSections.lua +++ b/src/main/lua/lrphotos.lrdevplugin/PhotosPublishDialogSections.lua @@ -22,7 +22,7 @@ function PhotosPublishDialogSections.sectionsForBottomOfDialog( f, _ ) -- }, f:checkbox { - title = LOC '$$$/PhotoExportService/UseAlbum=Use Album:', + title = LOC '$$$/PhotosExportService/UseAlbum=Use Album:', value = bind 'useAlbum', }, @@ -32,7 +32,7 @@ function PhotosPublishDialogSections.sectionsForBottomOfDialog( f, _ ) f:row { f:radio_button { - title = LOC "$$$Photos/UseOneAlbumForService=Use one album for all collections", + title = LOC "$$$/Photos/UseOneAlbumForService=Use one album for all collections", value = bind 'albumBy', -- all of the buttons bound to the same key checked_value = 'service', enabled = bind 'useAlbum', @@ -47,7 +47,7 @@ function PhotosPublishDialogSections.sectionsForBottomOfDialog( f, _ ) }, f:row{ f:radio_button { - title = LOC "$$$Photos/UseCollectionNameAsAlbum=Use collection name as album", + title = LOC "$$$/Photos/UseCollectionNameAsAlbum=Use collection name as album", value = bind 'albumBy', checked_value = 'collection', enabled = bind 'useAlbum', diff --git a/src/main/lua/lrphotos.lrdevplugin/PhotosPublishTask.lua b/src/main/lua/lrphotos.lrdevplugin/PhotosPublishTask.lua index 3bae444..824e23b 100755 --- a/src/main/lua/lrphotos.lrdevplugin/PhotosPublishTask.lua +++ b/src/main/lua/lrphotos.lrdevplugin/PhotosPublishTask.lua @@ -234,3 +234,13 @@ function PhotosPublishTask.deletePhotosFromPublishedCollection(publishSettings, end end +function PhotosPublishTask.startDialog( propertyTable ) + + -- Clear login if it's a new connection. + -- LrMobdebug.on() + if not propertyTable.LR_editingExistingPublishConnection then + propertyTable.LR_jpeg_quality=0.85 + propertyTable.LR_removeLocationMetadata=false + propertyTable.LR_removeFaceMetadata=false + end +end \ No newline at end of file diff --git a/src/main/lua/lrphotos.lrdevplugin/PhotosServiceProvider.lua b/src/main/lua/lrphotos.lrdevplugin/PhotosServiceProvider.lua index ac20b56..4a95fc1 100755 --- a/src/main/lua/lrphotos.lrdevplugin/PhotosServiceProvider.lua +++ b/src/main/lua/lrphotos.lrdevplugin/PhotosServiceProvider.lua @@ -27,6 +27,7 @@ local PhotosServiceProvider = { viewForCollectionSettings = PhotosPublishTask.viewForCollectionSettings, viewForCollectionSetSettings = PhotosPublishTask.viewForCollectionSetSettings, deletePhotosFromPublishedCollection= PhotosPublishTask.deletePhotosFromPublishedCollection, + startDialog=PhotosPublishTask.startDialog, supportsIncrementalPublish = 'only', small_icon = 'photos_small.png', publish_fallbackNameBinding = 'fullname', diff --git a/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_de.txt b/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_de.txt index 704e0b2..5d9ffb0 100644 --- a/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_de.txt +++ b/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_de.txt @@ -13,7 +13,7 @@ "$$$/Photos/DeletingCollectionAndContents=Löschen Fotosatz ^[^1^]" "$$$/Photos/NotSupported=LRPhotos wird nicht unter Windows unterstützt." "$$$/Photos/NotSupported/Subtext=Die Applikation Fotos existiert nur auf dem Mac." -"$$$Photos/UseOneAlbumForService=Verwende ein Album für alle Sammlungen" -"$$$Photos/UseCollectionNameAsAlbum=Verwende Sammlungsname als Album" +"$$$/Photos/UseOneAlbumForService=Verwende ein Album für alle Sammlungen" +"$$$/Photos/UseCollectionNameAsAlbum=Verwende Sammlungsname als Album" "$$$/Photos/Error/AlbumPath=Album Pfad ist ungültig." "$$$/Photos/Error/AlbumPathSub=Der Name des Albums \"^1\" ist ungültig. Der Name muss mit einem \"/\" anfangen, aber er darf NICHT mit einem \"/\" enden." \ No newline at end of file diff --git a/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_en.txt b/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_en.txt index 4bea124..f0a9bc6 100644 --- a/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_en.txt +++ b/src/main/lua/lrphotos.lrdevplugin/TranslatedStrings_en.txt @@ -13,7 +13,7 @@ "$$$/Photos/DeletingCollectionAndContents=Deleting photoset ^[^1^]" "$$$/Photos/NotSupported=LRPhotos is not supported on Windows." "$$$/Photos/NotSupported/Subtext=Photos.app only exists on Mac." -"$$$Photos/UseOneAlbumForService=Use one album for all collections" -"$$$Photos/UseCollectionNameAsAlbum=Use collection name as album" +"$$$/Photos/UseOneAlbumForService=Use one album for all collections" +"$$$/Photos/UseCollectionNameAsAlbum=Use collection name as album" "$$$/Photos/Error/AlbumPath=Album path is not valid." "$$$/Photos/Error/AlbumPathSub=The name of the album \"^1\" has not a valid from. The name must start with a \"/\" but may NOT end with a \"/\"." \ No newline at end of file diff --git a/target/LRPhotos1.0.0.0_mac.zip b/target/LRPhotos1.0.0.0_mac.zip index 93fafa5..c070d01 100644 Binary files a/target/LRPhotos1.0.0.0_mac.zip and b/target/LRPhotos1.0.0.0_mac.zip differ