From 0bfb7227affccdd90ad469f38eea83bf942992fd Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Thu, 6 Sep 2018 20:03:30 -0700 Subject: [PATCH] Top level path should be / and not empty Signed-off-by: James Ketrenos --- server/scanner.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/scanner.js b/server/scanner.js index e90db7c..91007b0 100644 --- a/server/scanner.js +++ b/server/scanner.js @@ -42,6 +42,9 @@ function scanDir(parent, path) { parent: parent || null }; + /* Ensure that top level images are placed into an album with a root path */ + replacements.path = replacements.path || "/"; + let query = "SELECT id FROM albums WHERE path=:path AND "; if (!parent) { query += "parentId IS NULL"; @@ -345,6 +348,9 @@ function triggerWatcher() { added: moment().format() }; + /* Ensure that top level images are placed into an album with a root path */ + replacements.path = replacements.path || "/"; + if (metadata.exif && metadata.exif.exif && metadata.exif.exif.DateTimeOriginal && !isNaN(metadata.exif.exif.DateTimeOriginal.valueOf())) { replacements.taken = moment(metadata.exif.exif.DateTimeOriginal).format(); replacements.modified = moment(metadata.exif.exif.DateTimeOriginal).format();