wrap converters in promises

C4illin · May 25, 2024 · a41e5d8 · a41e5d8
1 parent 7a9def5
commit a41e5d8
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 57 deletions.
diff --git a/src/converters/ffmpeg.ts b/src/converters/ffmpeg.ts
@@ -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");
+    });
   });
 }
diff --git a/src/converters/graphicsmagick.ts b/src/converters/graphicsmagick.ts
@@ -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");
+      },
+    );
+  });
 }
diff --git a/src/converters/sharp.ts → src/converters/old.sharp.ts b/src/converters/sharp.ts → src/converters/old.sharp.ts
diff --git a/src/converters/pandoc.ts b/src/converters/pandoc.ts
@@ -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");
+      },
+    );
+  });
 }
diff --git a/src/converters/vips.ts b/src/converters/vips.ts
@@ -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");
+    });
+  });
 }
diff --git a/src/index.tsx b/src/index.tsx
@@ -824,7 +824,7 @@ const app = new Elysia()
       );
     },
   )
-  .get(
+  .post(
     "/progress/:jobId",
     async ({ jwt, set, params, redirect, cookie: { auth, job_id } }) => {
       if (!auth?.value) {
@@ -877,6 +877,7 @@ const app = new Elysia()
             <thead>
               <tr>
                 <th>Converted File Name</th>
+                <th>Status</th>
                 <th>View</th>
                 <th>Download</th>
               </tr>
@@ -886,6 +887,7 @@ const app = new Elysia()
                 // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
                 <tr>
                   <td>{file.output_file_name}</td>
+                  <td>{file.status}</td>
                   <td>
                     <a href={`/download/${outputPath}${file.output_file_name}`}>
                       View

diff --git a/src/public/results.js b/src/public/results.js
@@ -16,12 +16,10 @@ const main = document.querySelector("main");
 const progressElem = document.querySelector("progress");
 
 const refreshData = () => {
-  console.log("Refreshing data...");
-  console.log(progressElem.value);
-  console.log(progressElem.max);
-
   if (progressElem.value !== progressElem.max) {
-    fetch(`/progress/${jobId}`)
+    fetch(`/progress/${jobId}`, {
+      method: "POST",
+    })
       .then((res) => res.text())
       .then((html) => {
         main.innerHTML = html;

diff --git a/src/public/script.js b/src/public/script.js
@@ -3,7 +3,7 @@ const fileInput = document.querySelector('input[type="file"]');
 const fileNames = [];
 let fileType;
 
-const selectElem = document.querySelector("select[name='convert_to']");
+const selectContainer = document.querySelector("form > article");
 
 // const convertFromSelect = document.querySelector("select[name='convert_from']");
 
@@ -46,9 +46,9 @@ fileInput.addEventListener("change", (e) => {
           "Content-Type": "application/json",
         },
       })
-        .then((res) => res.text()) // Convert the response to text
+        .then((res) => res.text())
         .then((html) => {
-          selectElem.outerHTML = html; // Set the HTML
+          selectContainer.innerHTML = html;
         })
         .catch((err) => console.log(err));
     }