Merge branch 'master' into collaboration-sarah

1 files changed, 4 insertions, 2 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 070d49ec3..eaaac4e6d 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -181,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]}`;
@@ -205,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';
@@ -234,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, () => {});