From 87d0b95b39851d78372d534499c033b8d808c9a2 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Thu, 12 Jan 2023 16:12:13 -0800 Subject: [PATCH] Fix duplicate debug output Signed-off-by: James Ketrenos --- server/scanner.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/scanner.js b/server/scanner.js index cdf39f2..3c9d30c 100755 --- a/server/scanner.js +++ b/server/scanner.js @@ -316,7 +316,6 @@ const processBlock = async (items) => { let duplicate = insertHash.find(entry => entry.hash === asset.hash) || updateHash.find(entry => entry.hash === asset.hash); - let results = []; /* In addition to checking new entries, check the DB for old @@ -336,16 +335,16 @@ const processBlock = async (items) => { } else if (results[0].hash != asset.hash) { updateHash.push(asset); } else if (results[0].photoId != asset.id) { - duplicate = true; + duplicate = results[0]; } } if (duplicate) { setStatus("Duplicate asset: " + "'" + asset.album.path + asset.filename + "' is a copy of " + - "'" + results[0].path + results[0].filename + "'"); - if (asset.duplicate != results[0].photoId) { - asset.duplicate = results[0].photoId; + "'" + duplicate.album.path + duplicate.filename + "'"); + if (asset.duplicate != duplicate.photoId) { + asset.duplicate = duplicate.photoId; duplicates.push(asset); } return; /* Done processing this asset (DUPLICATE) */