From a66063a85706e3807106e56afa1da22d426cd4c3 Mon Sep 17 00:00:00 2001 From: Russell Cloran Date: Fri, 1 Mar 2024 12:10:45 -0800 Subject: [PATCH 1/2] Add observation UUID logging in uploadPhoto --- lr-inaturalist-publish.lrdevplugin/Upload.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lr-inaturalist-publish.lrdevplugin/Upload.lua b/lr-inaturalist-publish.lrdevplugin/Upload.lua index 5129e7a..c3a7f3c 100644 --- a/lr-inaturalist-publish.lrdevplugin/Upload.lua +++ b/lr-inaturalist-publish.lrdevplugin/Upload.lua @@ -51,6 +51,7 @@ local function uploadPhoto(api, observations, rendition, path, exportSettings) local observationUUID = rendition.photo:getPropertyForPlugin(_PLUGIN, MetadataConst.ObservationUUID) if observationUUID and observations[observationUUID] then + logger:tracef("Updating observation %s", observationUUID) -- There's already an observation that was created this session. It's -- faster to add an observation photo than upload photo then update the -- observation. @@ -68,6 +69,7 @@ local function uploadPhoto(api, observations, rendition, path, exportSettings) -- this obs yet this session. -- In either case, POST /observations with local_photos set is safe. In -- the latter case it will be added to the list of observation_photos. + logger:tracef("Creating photo and observation with UUID %s", observationUUID) local photo = api:createPhoto(path) LrFileUtils.delete(path) local observation = updateObservation(photo.to_observation, rendition.photo, exportSettings) @@ -75,6 +77,7 @@ local function uploadPhoto(api, observations, rendition, path, exportSettings) -- include the photo ID observation.local_photos = { [0] = { photo.id } } observation = api:createObservation(observation) + logger:tracef("createObservation returned UUID: %s", observation.uuid) return photo, observation end From 376e1248459f22a0fc10640be735389da850c002 Mon Sep 17 00:00:00 2001 From: Russell Cloran Date: Fri, 1 Mar 2024 12:11:18 -0800 Subject: [PATCH 2/2] Properly handle CR in RandomWin UUID parsing Fixes #15 --- lr-inaturalist-publish.lrdevplugin/RandomWin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lr-inaturalist-publish.lrdevplugin/RandomWin.lua b/lr-inaturalist-publish.lrdevplugin/RandomWin.lua index cb6513f..60fcc30 100644 --- a/lr-inaturalist-publish.lrdevplugin/RandomWin.lua +++ b/lr-inaturalist-publish.lrdevplugin/RandomWin.lua @@ -43,7 +43,7 @@ end local function getUUIDs() local vbs = LrPathUtils.child(_PLUGIN.path, "uuid.vbs") local output = execWithOutput('cscript /NoLogo "' .. vbs .. '"') - for line in output:gmatch("([^\n]+)\n") do + for line in output:gmatch("([^\r\n]+)\r?\n") do if not isUUID(line) then return false end