From 82140a7e396f9e0227092f90e72b1f70433e8a5d Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Wed, 5 May 2021 10:13:35 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A9=20Tweaking=20filters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/workers/extractCovers.worker.ts | 6 ++-- src/server/utils/fs.utils.ts | 32 ++++++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/client/workers/extractCovers.worker.ts b/src/client/workers/extractCovers.worker.ts index 0545204..2b0a58b 100644 --- a/src/client/workers/extractCovers.worker.ts +++ b/src/client/workers/extractCovers.worker.ts @@ -21,7 +21,7 @@ export const greet = async ( }; const fileObjects = await walkFolder("./comics"); - const extractedDataPromises = _.map(fileObjects, async (fileObject) => { +{ if (SUPPORTED_COMIC_ARCHIVES.includes(fileObject.extension)) { return await extractCoverFromComicBookArchive({ ...targetOptions, @@ -30,7 +30,5 @@ export const greet = async ( }); } }); - Promise.all(extractedDataPromises).then((data) => { - console.log(data); - }); + }; diff --git a/src/server/utils/fs.utils.ts b/src/server/utils/fs.utils.ts index 09d4bc9..a1ba504 100644 --- a/src/server/utils/fs.utils.ts +++ b/src/server/utils/fs.utils.ts @@ -149,17 +149,6 @@ export const unrar = async ( } }; -export const extractMetadataFromImage = async ( - imageFilePath: string, -): Promise => { - const image = await sharp(imageFilePath) - .metadata() - .then(function (metadata) { - return metadata; - }); - return image; -}; - export const unzip = async ( extractionOptions: IExtractionOptions, walkedFolder: IFolderData, @@ -227,7 +216,7 @@ export const extractArchive = async ( return { message: "File format not supported, yet.", errorCode: "90", - data: "asda", + data: `${extractionOptions}`, }; } }; @@ -255,10 +244,11 @@ export const getCovers = async ( case "single": return await extractArchive(options, walkedFolders[0]); default: + logger.error("Unknown extraction mode selected."); return { - message: "File format not supported, yet.", + message: "Unknown extraction mode selected.", errorCode: "90", - data: "asda", + data: `${options}`, }; } }; @@ -285,6 +275,9 @@ export const walkFolder = async (folder: string): Promise => { return result; }; +const filterNonComicBookExtensions = (entities) => { + return entities.filter((entity) => entity.extname) +} export const explodePath = (filePath: string): IExplodedPathResponse => { const exploded = filePath.split("/"); const fileName = remove(exploded, (item) => { @@ -311,3 +304,14 @@ const constructPaths = ( walkedFolder.extension, }; }; + +export const extractMetadataFromImage = async ( + imageFilePath: string, +): Promise => { + const image = await sharp(imageFilePath) + .metadata() + .then(function (metadata) { + return metadata; + }); + return image; +};