wrap converters in promises

This commit is contained in:
C4illin 2024-05-25 18:09:28 +02:00
parent 7a9def556d
commit a41e5d8c99
8 changed files with 70 additions and 57 deletions

View file

@ -772,7 +772,7 @@ export async function convert(
targetPath: string,
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
options?: any,
) {
): Promise<string> {
// let command = "ffmpeg";
// these are containers that can contain multiple formats
@ -807,17 +807,21 @@ export async function convert(
const command = `ffmpeg -i "${filePath}" "${targetPath}"`;
return exec(command, (error, stdout, stderr) => {
if (error) {
return error;
}
return new Promise((resolve, reject) => {
exec(command, (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("success");
});
});
}

View file

@ -315,21 +315,25 @@ export function convert(
targetPath: string,
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
options?: any,
) {
return exec(
`gm convert "${filePath}" "${targetPath}"`,
(error, stdout, stderr) => {
if (error) {
return error;
}
): Promise<string> {
return new Promise((resolve, reject) => {
exec(
`gm convert "${filePath}" "${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("success");
},
);
});
}

View file

@ -126,21 +126,25 @@ export function convert(
targetPath: string,
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
options?: any,
) {
return exec(
`pandoc "${filePath}" -f ${fileType} -t ${convertTo} -o "${targetPath}"`,
(error, stdout, stderr) => {
if (error) {
return error;
}
): Promise<string> {
return new Promise((resolve, reject) => {
exec(
`pandoc "${filePath}" -f ${fileType} -t ${convertTo} -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("success");
},
);
});
}

View file

@ -96,7 +96,7 @@ export function convert(
targetPath: string,
// biome-ignore lint/suspicious/noExplicitAny: <explanation>
options?: any,
) {
): Promise<string> {
// if (fileType === "svg") {
// const scale = options.scale || 1;
// const metadata = await sharp(filePath).metadata();
@ -114,11 +114,10 @@ export function convert(
// .toFile(targetPath);
// }
return exec(
`vips copy ${filePath} ${targetPath}`,
(error, stdout, stderr) => {
return new Promise((resolve, reject) => {
exec(`vips copy ${filePath} ${targetPath}`, (error, stdout, stderr) => {
if (error) {
return error;
reject(`error: ${error}`);
}
if (stdout) {
@ -128,6 +127,8 @@ export function convert(
if (stderr) {
console.error(`stderr: ${stderr}`);
}
},
);
resolve("success");
});
});
}