Skip to content

Commit d7c5edf

Browse files
committed
Work in progress
1 parent 2105600 commit d7c5edf

10 files changed

Lines changed: 1051 additions & 373 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Changelog
22
## [20269999.99]
3+
### Fixed
4+
Associating an existing image with a new album would not upload image if it had been changed in LrC since first upload to Piwigo
35
### Added
4-
Updated Plugin-Manager screen
5-
6+
Fix #12 Feature request: Keyword removal by filtering when publising images to Piwigo
67

78
## [20260221.33] - 2026-02-21
89
### Fixed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Please see the [Wiki](https://github.com/Piwigo/PiwigoPublish-lrc-plugin/wiki) f
88

99
## Disclaimer
1010

11-
With the exception of JSON.lua, Copyright 2010-2017 Jeffrey Friedl, which is released under a Creative Commons CC-BY "Attribution" License: http://creativecommons.org/licenses/by/3.0/deed.en_US, this software is released under the GNU General Public License version 3 as published by the Free Software Foundation.
11+
With the exception of JSON.lua, Copyright 2010-2017 Jeffrey Friedl, which is released under a Creative Commons CC-BY "Attribution" License: http://creativecommons.org/licenses/by/3.0/deed.en_US, and md5.lua, Copyright (c) 2013 Enrique García Cota + Adam Baldwin + hanzao + Equi 4 Software which is released under an MIT license, this software is released under the GNU General Public License version 3 as published by the Free Software Foundation.
1212

1313
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
1414

@@ -30,6 +30,8 @@ This plugin was developed to allow me to continue publishing to Piwigo from LrC,
3030

3131
[Jeffrey Friedl for JSON.lua](http://regex.info/blog/lua/json)
3232

33+
[Enrique García Cota + Adam Baldwin + hanzao + Equi 4 Software for md5.lua](https://github.com/kikito/md5.lua)
34+
3335
[Bastian Machek with his Immich Plugin](https://github.com/bmachek/lrc-immich-plugin)
3436

3537
[Min Idzelis with his Immich Plugin](https://github.com/midzelis/mi.Immich.Publisher)

piwigoPublish.lrplugin/Init.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ _G.LrExportSettings = import "LrExportSettings"
4747

4848
-- Global requires
4949
_G.JSON = require "JSON"
50+
_G.md5 = require "md5"
5051
_G.utils = require "utils"
5152
_G.PiwigoAPI = require "PiwigoAPI"
5253
_G.PWImportService = require "PWImportService"

piwigoPublish.lrplugin/PWSendMetadata.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ local function SendMetadata()
107107
metaData = utils.getPhotoMetadata(publishSettings, lrPhoto)
108108
metaData.Remoteid = remoteId
109109

110+
-- get keyword filters from publishSettings and build include / exclude patterns
111+
110112
callStatus = PiwigoAPI.updateMetadata(publishSettings, lrPhoto, metaData)
111113
if not callStatus.status then
112114
LrDialogs.message("Unable to set metadata for uploaded photo - " .. callStatus.statusMsg)

piwigoPublish.lrplugin/PublishDialogSections.lua

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,6 @@ local function prefsDialog(f, propertyTable)
809809
height_in_lines = 3,
810810
},
811811
},
812-
813812
f:row {
814813
f:static_text {
815814
title = "Description: ",
@@ -828,54 +827,14 @@ local function prefsDialog(f, propertyTable)
828827
},
829828

830829
f:spacer { height = 2 },
830+
UIHelpers.createKeywordSettingsGroupBox(f, bind),
831831

832-
f:group_box {
833-
title = "Keyword Settings",
834-
font = "<system/bold>",
835-
fill_horizontal = 1,
836-
f:spacer { height = 2 },
837-
f:row {
838-
fill_horizontal = 1,
839-
f:static_text {
840-
title = "",
841-
alignment = 'right',
842-
width_in_chars = 7,
843-
},
844-
f:checkbox {
845-
font = "<system>",
846-
title = "Include Full Keyword Hierarchy",
847-
tooltip = "If checked, all keywords in a keyword hierarchy will be sent to Piwigo",
848-
value = bind 'KwFullHierarchy',
849-
}
850-
},
851-
852-
f:spacer { height = 2 },
853-
854-
f:row {
855-
fill_horizontal = 1,
856-
f:static_text {
857-
title = "",
858-
alignment = 'right',
859-
width_in_chars = 7,
860-
},
861-
f:checkbox {
862-
font = "<system>",
863-
title = "Include Keyword Synonyms",
864-
tooltip = "If checked, keyword synonyms will be sent to Piwigo",
865-
value = bind 'KwSynonyms',
866-
}
867-
},
868-
},
869832
f:spacer { height = 2 },
870833
f:group_box {
871834
title = "Other Settings",
872835
font = "<system/bold>",
873836
fill_horizontal = 1,
874837
f:spacer { height = 1 },
875-
876-
877-
878-
879838
f:row {
880839
fill_horizontal = 1,
881840
f:static_text {
@@ -890,8 +849,8 @@ local function prefsDialog(f, propertyTable)
890849
value = bind 'syncAlbumDescriptions',
891850
},
892851
},
893-
f:spacer { height = 1 },
894852

853+
f:spacer { height = 1 },
895854
f:row {
896855
fill_horizontal = 1,
897856
f:static_text {

piwigoPublish.lrplugin/PublishServiceProvider.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ return {
4040

4141
-- Piwigo supports .jpg, .jpeg, .png, .gif, .webp, .heic
4242
-- of these, LrC can only export JPEG and PNG, so we limit to those formats in the publish dialog.
43-
allowFileFormats = { "JPEG", "PNG", "TIFF"},
43+
allowFileFormats = { "JPEG", "PNG"},
4444

4545
allowColorSpaces = nil,
4646
canExportVideo = false,

0 commit comments

Comments
 (0)