1 files changed, 20 insertions, 6 deletions
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 4870d218b..eaaac4e6d 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -70,7 +70,14 @@ export namespace DashUploadUtils {
         // make a list of paths to create the ordered text file for ffmpeg
         const filePathsText = filePaths.map(filePath => `file '${filePath}'`).join('\n');
         // write the text file to the file system
-        writeFile(textFilePath, filePathsText, err => console.log(err));
+        await new Promise<void>((res, reject) =>
+            writeFile(textFilePath, filePathsText, err => {
+                if (err) {
+                    reject();
+                    console.log(err);
+                } else res();
+            })
+        );
 
         // make output file name based on timestamp
         const outputFileName = `output-${Utils.GenerateGuid()}.mp4`;
@@ -86,7 +93,10 @@ export namespace DashUploadUtils {
                 .outputOptions('-c copy')
                 //.videoCodec("copy")
                 .save(outputFilePath)
-                .on('error', reject)
+                .on('error', (err: any) => {
+                    console.log(err);
+                    reject();
+                })
                 .on('end', resolve);
         });
 
@@ -171,9 +181,10 @@ export namespace DashUploadUtils {
         });
     }
 
-    export async function upload(file: File): Promise<Upload.FileResponse> {
+    export async function upload(file: File, overwriteGuid?: string): Promise<Upload.FileResponse> {
         const { type, path, name } = file;
         const types = type?.split('/') ?? [];
+        uploadProgress.set(overwriteGuid ?? name, 'uploading'); // If the client sent a guid it uses to track upload progress, use that guid. Otherwise, use the file's name. 
 
         const category = types[0];
         let format = `.${types[1]}`;
@@ -195,6 +206,7 @@ export namespace DashUploadUtils {
                             .videoCodec('copy') // this will copy the data instead of reencode it
                             .save(file.path.replace('.mkv', '.mp4'))
                             .on('end', res)
+                            .on('error', (e: any) => console.log(e))
                     );
                     file.path = file.path.replace('.mkv', '.mp4');
                     format = '.mp4';
@@ -224,7 +236,7 @@ export namespace DashUploadUtils {
                         return { source: file, result: { name: 'Unsupported video format', message: `Could not upload unsupported file (${name}). Please convert to an .mp4` } };
                     }
                 }
-                if (videoFormats.includes(format)) {
+                if (videoFormats.includes(format) || format.includes('.webm')) {
                     return MoveParsedFile(file, Directory.videos);
                 }
                 fs.unlink(path, () => {});
@@ -398,7 +410,9 @@ export namespace DashUploadUtils {
         // Use the request library to parse out file level image information in the headers
         const { headers } = await new Promise<any>((resolve, reject) => {
             return request.head(resolvedUrl, (error, res) => (error ? reject(error) : resolve(res)));
-        }).catch(e => console.log(e));
+        }).catch(e => {
+            console.log('Error processing headers: ', e);
+        });
 
         try {
             // Compute the native width and height ofthe image with an npm module
@@ -499,7 +513,7 @@ export namespace DashUploadUtils {
 
     const parseExifData = async (source: string) => {
         const image = await request.get(source, { encoding: null });
-        const { data, error } = await new Promise(resolve => {
+        const { data, error } = await new Promise<{ data: any; error: any }>(resolve => {
             new ExifImage({ image }, (error, data) => {
                 let reason: Opt<string> = undefined;
                 if (error) {