Simon/ConvertX
1
0
Fork 0
mirror of https://github.com/C4illin/ConvertX.git synced 2026-03-03 03:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: change order of parameters in ExecFileFn type

Browse Source
This commit is contained in:
Jörg Krzeslak
2025-07-24 19:33:55 +02:00
parent eac22d53d3
commit af68498494
24 changed files with 36 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/converters/assimp.ts
View File

@@ -121,7 +121,7 @@ export async function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile("assimp", ["export", filePath, targetPath], options, (error, stdout, stderr) => {
execFile("assimp", ["export", filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

2
src/converters/calibre.ts
View File

@@ -67,7 +67,7 @@ export async function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile("ebook-convert", [filePath, targetPath], options, (error, stdout, stderr) => {
execFile("ebook-convert", [filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

29
src/converters/dvisvgm.ts
View File

@@ -30,25 +30,20 @@ export function convert(
}
return new Promise((resolve, reject) => {
execFile(
"dvisvgm",
[...inputArgs, filePath, "-o", targetPath],
options,
(error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}
execFile("dvisvgm", [...inputArgs, filePath, "-o", targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}
if (stdout) {
console.log(`stdout: ${stdout}`);
}
if (stdout) {
console.log(`stdout: ${stdout}`);
}
if (stderr) {
console.error(`stderr: ${stderr}`);
}
if (stderr) {
console.error(`stderr: ${stderr}`);
}
resolve("Done");
},
);
resolve("Done");
});
});
}

1
src/converters/ffmpeg.ts
View File

@@ -735,7 +735,6 @@ export async function convert(
execFile(
"ffmpeg",
[...ffmpegArgs, "-i", filePath, ...extraArgs, targetPath],
options,
(error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);

2
src/converters/graphicsmagick.ts
View File

@@ -318,7 +318,7 @@ export function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile("gm", ["convert", filePath, targetPath], options, (error, stdout, stderr) => {
execFile("gm", ["convert", filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

1
src/converters/imagemagick.ts
View File

@@ -472,7 +472,6 @@ export function convert(
execFile(
"magick",
[...inputArgs, filePath, ...outputArgs, targetPath],
options,
(error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);

2
src/converters/inkscape.ts
View File

@@ -37,7 +37,7 @@ export function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile("inkscape", [filePath, "-o", targetPath], options, (error, stdout, stderr) => {
execFile("inkscape", [filePath, "-o", targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

2
src/converters/libheif.ts
View File

@@ -19,7 +19,7 @@ export function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile("heif-convert", [filePath, targetPath], options, (error, stdout, stderr) => {
execFile("heif-convert", [filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

2
src/converters/libjxl.ts
View File

@@ -31,7 +31,7 @@ export function convert(
}
return new Promise((resolve, reject) => {
execFile(tool, [filePath, targetPath], options, (error, stdout, stderr) => {
execFile(tool, [filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

2
src/converters/libreoffice.ts
View File

@@ -158,7 +158,7 @@ export function convert(
}
return new Promise((resolve, reject) => {
execFile("soffice", args, options, (error, stdout, stderr) => {
execFile("soffice", args, (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

2
src/converters/msgconvert.ts
View File

@@ -25,7 +25,7 @@ export function convert(
// We need to use --outfile to specify the target path
const args = ["--outfile", targetPath, filePath];
execFile("msgconvert", args, options, (error, stdout, stderr) => {
execFile("msgconvert", args, (error, stdout, stderr) => {
if (error) {
reject(new Error(`msgconvert failed: ${error.message}`));
return;

2
src/converters/pandoc.ts
View File

@@ -144,7 +144,7 @@ export function convert(
args.push("-o", targetPath);
return new Promise((resolve, reject) => {
execFile("pandoc", args, options, (error, stdout, stderr) => {
execFile("pandoc", args, (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

29
src/converters/potrace.ts
View File

@@ -31,25 +31,20 @@ export function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile(
"potrace",
[filePath, "-o", targetPath, "-b", convertTo],
options,
(error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}
execFile("potrace", [filePath, "-o", targetPath, "-b", convertTo], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}
if (stdout) {
console.log(`stdout: ${stdout}`);
}
if (stdout) {
console.log(`stdout: ${stdout}`);
}
if (stderr) {
console.error(`stderr: ${stderr}`);
}
if (stderr) {
console.error(`stderr: ${stderr}`);
}
resolve("Done");
},
);
resolve("Done");
});
});
}

2
src/converters/resvg.ts
View File

@@ -19,7 +19,7 @@ export function convert(
execFile: ExecFileFn = execFileOriginal, // to make it mockable
): Promise<string> {
return new Promise((resolve, reject) => {
execFile("resvg", [filePath, targetPath], options, (error, stdout, stderr) => {
execFile("resvg", [filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

2
src/converters/types.ts
View File

@@ -1,8 +1,8 @@
export type ExecFileFn = (
cmd: string,
args: string[],
options: import("child_process").ExecFileOptions | unknown | undefined | null,
callback: (err: Error | null, stdout: string, stderr: string) => void,
options?: import("child_process").ExecFileOptions,
) => void;
export type ConvertFnWithExecFile = (

2
src/converters/vips.ts
View File

@@ -120,7 +120,7 @@ export function convert(
}
return new Promise((resolve, reject) => {
execFile("vips", [action, filePath, targetPath], options, (error, stdout, stderr) => {
execFile("vips", [action, filePath, targetPath], (error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);
}

1
src/converters/xelatex.ts
View File

@@ -25,7 +25,6 @@ export function convert(
execFile(
"latexmk",
["-xelatex", "-interaction=nonstopmode", `-output-directory=${outputPath}`, filePath],
options,
(error, stdout, stderr) => {
if (error) {
reject(`error: ${error}`);

3
tests/converters/dvisvgm.test.ts
View File

@@ -42,7 +42,6 @@ test("convert respects eps filetype", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);
@@ -69,7 +68,6 @@ test("convert respects pdf filetype", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);
@@ -96,7 +94,6 @@ test("convert respects svgz conversion target type", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);

1
tests/converters/ffmpeg.test.ts
View File

@@ -6,7 +6,6 @@ let calls: string[][] = [];
function mockExecFile(
_cmd: string,
args: string[],
options: unknown,
callback: (err: Error | null, stdout: string, stderr: string) => void,
) {
calls.push(args);

4
tests/converters/helpers/converters.ts
View File

@@ -13,7 +13,6 @@ export async function runConvertSuccessTest(convertFn: ConvertFnWithExecFile) {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
callback(null, "Fake stdout", "");
@@ -31,7 +30,6 @@ export async function runConvertFailTest(convertFn: ConvertFnWithExecFile) {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
callback(new Error("Test error"), "", "");
@@ -53,7 +51,6 @@ export async function runConvertLogsStderror(convertFn: ConvertFnWithExecFile) {
const mockExecFile = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: Error | null, stdout: string, stderr: string) => void,
) => {
callback(null, "", "Fake stderr");
@@ -82,7 +79,6 @@ export async function runConvertLogsStderrorAndStdout(convertFn: ConvertFnWithEx
const mockExecFile = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: Error | null, stdout: string, stderr: string) => void,
) => {
callback(null, "Fake stdout", "Fake stderr");

4
tests/converters/imagemagick.test.ts
View File

@@ -42,7 +42,6 @@ test("convert respects ico conversion target type", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);
@@ -78,7 +77,6 @@ test("convert respects ico conversion target type with svg as input filetype", a
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);
@@ -116,7 +114,6 @@ test("convert respects ico conversion target type with emf as input filetype", a
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);
@@ -158,7 +155,6 @@ test("convert respects emf as input filetype", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);

2
tests/converters/libjxl.test.ts
View File

@@ -42,7 +42,6 @@ test("convert uses djxl with input filetype being jxl", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
command = _cmd;
@@ -69,7 +68,6 @@ test("convert uses cjxl with output filetype being jxl", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
command = _cmd;

3
tests/converters/msgconvert.test.ts
View File

@@ -7,7 +7,6 @@ test("convert rejects conversion if input filetype is not msg and output type is
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
callback(null, "Fake stdout", "");
@@ -26,7 +25,6 @@ test("convert rejects conversion on error", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
callback(new Error("Test error"), "", "");
@@ -50,7 +48,6 @@ test("convert logs stderr as warning", async () => {
const mockExecFile = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: Error | null, stdout: string, stderr: string) => void,
) => {
callback(null, "", "Fake stderr");

2
tests/converters/vips.test.ts
View File

@@ -42,7 +42,6 @@ test("convert uses action pdfload with filetype being pdf", async () => {
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);
@@ -69,7 +68,6 @@ test("convert uses action copy with filetype being anything but pdf", async () =
const mockExecFile: ExecFileFn = (
_cmd: string,
_args: string[],
options: unknown,
callback: (err: ExecFileException | null, stdout: string, stderr: string) => void,
) => {
calls.push(_args);