From 23b07de66768d7364bb89fcd26c94a4dd5a9a343 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 28 Aug 2018 15:44:50 -0700 Subject: [PATCH] Support larger images Signed-off-by: James Ketrenos --- server/scanner.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/scanner.js b/server/scanner.js index e16f4fc..fdce9d6 100644 --- a/server/scanner.js +++ b/server/scanner.js @@ -255,7 +255,7 @@ function moveCorrupt(path, file) { if (path.indexOf(picturesPath) != 0) { path = picturesPath + path; } - + console.warn("Moving corrupt file '" + file + "' to " + path + "/corrupt"); return mkdirPromise(path + "/corrupt").then(function() { @@ -278,6 +278,12 @@ function triggerWatcher() { if (!processRunning && processQueue.length) { let lastMessage = moment(), toProcess = processQueue.length, processing = processQueue.splice(0); processRunning = true; + + /* Sort to newest files to be processed first */ + processing.sort(function(a, b) { + return b[2] - a[2]; + }); + return Promise.map(processing, function(entry) { var path = entry[0], file = entry[1], created = entry[2], albumId = entry[3]; @@ -304,7 +310,7 @@ function triggerWatcher() { dst = picturesPath + path + "/thumbs/" + file, image = sharp(src); - return image.metadata().then(function(metadata) { + return image.limitInputPixels(1073741824).metadata().then(function(metadata) { if (metadata.exif) { metadata.exif = exif(metadata.exif); delete metadata.exif.thumbnail;