jketreno/ketr.photos
1
0
Fork 0
Code Issues 1 Activity

Top level path should be / and not empty

Browse Source 
Signed-off-by: James Ketrenos <james_git@ketrenos.com>
This commit is contained in:
James Ketr 2018-09-06 20:03:30 -07:00
parent 3614a90ae3
commit 0bfb7227af
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/scanner.js
View File

@ -42,6 +42,9 @@ function scanDir(parent, path) {
parent: parent || null 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 "; let query = "SELECT id FROM albums WHERE path=:path AND ";
if (!parent) { if (!parent) {
query += "parentId IS NULL"; query += "parentId IS NULL";
@ -345,6 +348,9 @@ function triggerWatcher() {
added: moment().format() 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())) { 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.taken = moment(metadata.exif.exif.DateTimeOriginal).format();
replacements.modified = moment(metadata.exif.exif.DateTimeOriginal).format(); replacements.modified = moment(metadata.exif.exif.DateTimeOriginal).format();