From 625554808a53d9ad20d77303f935472b6c5b5907 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Wed, 5 May 2021 18:01:54 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=9A=20Wiring=20up=20extractComicCover?= =?UTF-8?q?=20call=20with=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/actions/fileops.actions.tsx | 6 ++++-- src/client/workers/extractCovers.worker.ts | 20 ++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/client/actions/fileops.actions.tsx b/src/client/actions/fileops.actions.tsx index 8d7112f..2eab146 100644 --- a/src/client/actions/fileops.actions.tsx +++ b/src/client/actions/fileops.actions.tsx @@ -1,9 +1,9 @@ import axios from "axios"; -import { IFolderData } from "../shared/interfaces/comicinfo.interfaces"; import { IExtractComicBookCoverErrorResponse, IExtractedComicBookCoverFile, IExtractionOptions, + IFolderData, } from "../../server/interfaces/folder.interface"; import { FS_API_BASE_URI } from "../constants/endpoints"; @@ -25,6 +25,7 @@ export async function walkFolder(path: string): Promise> { export async function extractCoverFromComicBookArchive( options: IExtractionOptions, + walkedFolders: Array, ): Promise< | IExtractedComicBookCoverFile | IExtractedComicBookCoverFile[] @@ -34,7 +35,8 @@ export async function extractCoverFromComicBookArchive( url: FS_API_BASE_URI + "getComicCovers", method: "POST", data: { - ...options, + options, + walkedFolders, }, }); } diff --git a/src/client/workers/extractCovers.worker.ts b/src/client/workers/extractCovers.worker.ts index 2b0a58b..e1af6e5 100644 --- a/src/client/workers/extractCovers.worker.ts +++ b/src/client/workers/extractCovers.worker.ts @@ -2,9 +2,7 @@ import { walkFolder, extractCoverFromComicBookArchive, } from "../actions/fileops.actions"; -import { SUPPORTED_COMIC_ARCHIVES } from "../constants/importer.config"; import { IExtractedComicBookCoverFile } from "../../server/interfaces/folder.interface"; -import _ from "lodash"; export const greet = async ( path: string, @@ -13,6 +11,7 @@ export const greet = async ( sourceFolder: path, extractTarget: "all", targetExtractionFolder: "./userdata/expanded", + extractionMode: "bulk", }; const pagingConfig = { @@ -21,14 +20,11 @@ export const greet = async ( }; const fileObjects = await walkFolder("./comics"); -{ - if (SUPPORTED_COMIC_ARCHIVES.includes(fileObject.extension)) { - return await extractCoverFromComicBookArchive({ - ...targetOptions, - paginationOptions: pagingConfig, - folderDetails: fileObject, - }); - } - }); - + return await extractCoverFromComicBookArchive( + { + ...targetOptions, + paginationOptions: pagingConfig, + }, + fileObjects, + ); };