test: change order of parameters in ExecFileFn type

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

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}`);
}

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}`);
}

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");
});
});
}

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}`);

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}`);
}

View file

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

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}`);
}

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}`);
}

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}`);
}

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}`);
}

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;

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}`);
}

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");
});
});
}

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}`);
}

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 = (

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}`);
}

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}`);