From a93c575b059b0d836c3b5f8b4749f41bec2b4e1f Mon Sep 17 00:00:00 2001 From: Saud Fatayerji Date: Fri, 17 Nov 2023 16:11:06 +0300 Subject: [PATCH] Fixed compile errors from last commit --- server-node/src/routes/api/operations-controller.ts | 2 +- .../src/functions/splitPagesByPreset.ts | 4 ++-- shared-operations/src/functions/splitPdfByIndex.ts | 4 ++-- shared-operations/src/index.ts | 12 ++++++------ shared-operations/src/workflow/traverseOperations.ts | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server-node/src/routes/api/operations-controller.ts b/server-node/src/routes/api/operations-controller.ts index 62edc484..bf3bea70 100644 --- a/server-node/src/routes/api/operations-controller.ts +++ b/server-node/src/routes/api/operations-controller.ts @@ -54,7 +54,7 @@ registerEndpoint("/merge-pdfs", "", upload.any(), Operations.mergePDFs, Joi.obje files: Joi.array().items(PdfFileSchema).required(), }).required()); -registerEndpoint("/split-pdf", "_split", upload.single("file"), Operations.splitPDF, Joi.object({ +registerEndpoint("/split-pdf", "_split", upload.single("file"), Operations.splitPdfByIndex, Joi.object({ file: PdfFileSchema.required(), pageNumbers: Joi.string().required(), }).required()); diff --git a/shared-operations/src/functions/splitPagesByPreset.ts b/shared-operations/src/functions/splitPagesByPreset.ts index d0892dd6..5d96d647 100644 --- a/shared-operations/src/functions/splitPagesByPreset.ts +++ b/shared-operations/src/functions/splitPagesByPreset.ts @@ -4,12 +4,12 @@ import { splitPagesByIndex } from "./common/splitPagesByIndex.js"; import { detectEmptyPages } from "./common/detectEmptyPages.js"; import { detectQRCodePages } from "./common/detectQRCodePages.js"; -export type SplitOnParamsType = { +export type SplitPageByPresetParamsType = { file: PdfFile; type: "BAR_CODE"|"QR_CODE"|"BLANK_PAGE"; whiteThreashold?: number; } -export async function splitPagesByPreset(params: SplitOnParamsType): Promise { +export async function splitPagesByPreset(params: SplitPageByPresetParamsType): Promise { const { file, type, whiteThreashold } = params; console.log("File: ", file); diff --git a/shared-operations/src/functions/splitPdfByIndex.ts b/shared-operations/src/functions/splitPdfByIndex.ts index 0de29b0a..89aec409 100644 --- a/shared-operations/src/functions/splitPdfByIndex.ts +++ b/shared-operations/src/functions/splitPdfByIndex.ts @@ -3,11 +3,11 @@ import { PdfFile } from '../wrappers/PdfFile.js'; import { parsePageIndexSpecification } from './common/pageIndexesUtils' import { splitPagesByIndex } from './common/splitPagesByIndex.js'; -export type SplitPagesParamsType = { +export type SplitPdfByIndexParamsType = { file: PdfFile; pageIndexes: string | number[]; } -export async function splitPdfByIndex(params: SplitPagesParamsType): Promise { +export async function splitPdfByIndex(params: SplitPdfByIndexParamsType): Promise { const { file, pageIndexes } = params; const pdfLibDocument = await file.pdfLibDocument; diff --git a/shared-operations/src/index.ts b/shared-operations/src/index.ts index abde097c..6d37d9a2 100644 --- a/shared-operations/src/index.ts +++ b/shared-operations/src/index.ts @@ -7,8 +7,8 @@ import { rotatePages, RotateParamsType } from './functions/rotatePages'; import { scaleContent, ScaleContentParamsType} from './functions/scaleContent'; import { scalePage, ScalePageParamsType } from './functions/scalePage'; import { sortPagesWithPreset, SortPagesWithPresetParamsType } from './functions/sortPagesWithPreset' -import { splitOn, SplitOnParamsType } from './functions/splitOn'; -import { splitPDF, SplitPdfParamsType } from './functions/splitPDF'; +import { splitPagesByPreset, SplitPageByPresetParamsType } from './functions/splitPagesByPreset'; +import { splitPdfByIndex, SplitPdfByIndexParamsType } from './functions/splitPdfByIndex'; import { updateMetadata, UpdateMetadataParams } from "./functions/updateMetadata"; import { PdfFile } from "./wrappers/PdfFile"; @@ -25,8 +25,8 @@ const toExport = { scaleContent, scalePage, sortPagesWithPreset, - splitOn, - splitPDF, + splitPagesByPreset, + splitPdfByIndex, updateMetadata, } export default toExport; @@ -40,8 +40,8 @@ export type OperationsParametersBaseType = { scaleContent: ScaleContentParamsType; scalePage: ScalePageParamsType; sortPagesWithPreset: SortPagesWithPresetParamsType; - splitOn: SplitOnParamsType; - splitPDF: SplitPdfParamsType; + splitPagesByPreset: SplitPageByPresetParamsType; + splitPdfByIndex: SplitPdfByIndexParamsType; updateMetadata: UpdateMetadataParams; } diff --git a/shared-operations/src/workflow/traverseOperations.ts b/shared-operations/src/workflow/traverseOperations.ts index 8394f32f..c3580412 100644 --- a/shared-operations/src/workflow/traverseOperations.ts +++ b/shared-operations/src/workflow/traverseOperations.ts @@ -91,7 +91,7 @@ export async function * traverseOperations(operations: Action[], input: PdfFile[ case "split": // TODO: A split might break the done condition, it may count multiple times. Needs further testing! yield* oneToN(input, action, async (input) => { - const splitResult = await Operations.splitPDF({file: input, splitAfterPageArray: action.values["splitAfterPageArray"]}); + const splitResult = await Operations.splitPdfByIndex({file: input, pageIndexes: action.values["splitAfterPageArray"]}); for (let j = 0; j < splitResult.length; j++) { splitResult[j].filename = splitResult[j].filename + "_split" + j; } @@ -100,7 +100,7 @@ export async function * traverseOperations(operations: Action[], input: PdfFile[ break; case "splitOn": yield* oneToN(input, action, async (input) => { - const splitResult = await Operations.splitOn({file: input, type: action.values["type"], whiteThreashold: action.values["whiteThreashold"]}); + const splitResult = await Operations.splitPagesByPreset({file: input, type: action.values["type"], whiteThreashold: action.values["whiteThreashold"]}); for (let j = 0; j < splitResult.length; j++) { splitResult[j].filename = splitResult[j].filename + "_split" + j; }