From 58fc4fac5cf949c17a53b0e90ef8a4e5d7eea43d Mon Sep 17 00:00:00 2001 From: Dan Ribbens Date: Sun, 19 Jan 2020 17:52:37 -0500 Subject: [PATCH] fixes issue with the image resizer --- src/uploads/images/imageResizer.js | 18 ++++++++++++------ src/uploads/requestHandlers.js | 1 - 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/uploads/images/imageResizer.js b/src/uploads/images/imageResizer.js index f491fbf2e9..c4c80e6e02 100644 --- a/src/uploads/images/imageResizer.js +++ b/src/uploads/images/imageResizer.js @@ -11,12 +11,19 @@ function getOutputImageName(sourceImage, size) { return `${filenameWithoutExtension}-${size.width}x${size.height}.${extension}`; } +/** + * Resize images according to image desired width and height and return sizes + * @param config + * @param uploadConfig + * @param file + * @returns String[] + */ export async function resizeAndSave(config, uploadConfig, file) { const sourceImage = `${config.staticDir}/${file.name}`; + let sizes; try { const dimensions = await sizeOf(sourceImage); - console.log('ook'); - return await Promise.all(uploadConfig.imageSizes + sizes = uploadConfig.imageSizes .filter(desiredSize => desiredSize.width < dimensions.width) .map(async (desiredSize) => { const outputImageName = getOutputImageName(sourceImage, desiredSize); @@ -28,11 +35,10 @@ export async function resizeAndSave(config, uploadConfig, file) { .toFile(outputImageName); console.log({ ...desiredSize }); return { ...desiredSize }; - })); + }); } catch (e) { console.log('error in resize and save', e.message); } - return []; - // console.log(outputSizes); - // return outputSizes; + + return Promise.all(sizes); } diff --git a/src/uploads/requestHandlers.js b/src/uploads/requestHandlers.js index e1bdeb750d..7445d70c62 100644 --- a/src/uploads/requestHandlers.js +++ b/src/uploads/requestHandlers.js @@ -78,7 +78,6 @@ const upload = async (req, res, next, config) => { } const handlerData = await fileTypeHandler(config, req.uploadConfig, req.files.file); - // const handlerData = {}; req.model.create({ ...req.body,