1 files changed, 18 insertions, 16 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index bff60568b..337bb812f 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -44,7 +44,7 @@ function isLocal() {
     return /Dash-Web[0-9]*[\\\/]src[\\\/]server[\\\/]public[\\\/](.*)/;
 }
 
-function usingAzure(){
+function usingAzure() {
     return process.env.USE_AZURE === 'true';
 }
 
@@ -143,7 +143,6 @@ export namespace DashUploadUtils {
 
     export function uploadYoutube(videoId: string): Promise<Upload.FileResponse> {
         return new Promise<Upload.FileResponse<Upload.FileInformation>>((res, rej) => {
-            console.log('Uploading YouTube video: ' + videoId);
             const name = videoId;
             const path = name.replace(/^-/, '__') + '.mp4';
             const finalPath = serverPathToFile(Directory.videos, path);
@@ -194,7 +193,7 @@ export namespace DashUploadUtils {
         const isAzureOn = usingAzure();
         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. 
+        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]}`;
@@ -490,13 +489,13 @@ export namespace DashUploadUtils {
 
     /**
      * UploadInspectedImage() takes an image with its metadata. If Azure is being used, this method will call the Azure function
-     * to execute the resizing. If Azure is not used, the function will begin to resize the image. 
-     * 
+     * to execute the resizing. If Azure is not used, the function will begin to resize the image.
+     *
      * @param metadata metadata object from InspectImage()
      * @param filename the name of the file
      * @param prefix the prefix to use, which will be set to '' if none is provided.
      * @param cleanUp a boolean indicating if the files should be deleted after upload. True by default.
-     * @returns the accessPaths for the resized files. 
+     * @returns the accessPaths for the resized files.
      */
     export const UploadInspectedImage = async (metadata: Upload.InspectionResults, filename?: string, prefix = '', cleanUp = true): Promise<Upload.ImageInformation> => {
         const { requestable, source, ...remaining } = metadata;
@@ -504,23 +503,26 @@ export namespace DashUploadUtils {
         const { images } = Directory;
         const information: Upload.ImageInformation = {
             accessPaths: {
-                agnostic: usingAzure() ? {
-                    client: BLOBSTORE_URL + `/${filename}`,
-                    server: BLOBSTORE_URL + `/${filename}`
-                } : getAccessPaths(images, resolved)
+                agnostic: usingAzure()
+                    ? {
+                          client: BLOBSTORE_URL + `/${resolved}`,
+                          server: BLOBSTORE_URL + `/${resolved}`,
+                      }
+                    : getAccessPaths(images, resolved),
             },
             ...metadata,
         };
-        let writtenFiles: { [suffix: string] : string};
+        let writtenFiles: { [suffix: string]: string };
 
         if (usingAzure()) {
             if (!RESIZE_FUNCTION_URL) {
-                throw new Error("Resize function URL not provided.");
+                throw new Error('Resize function URL not provided.');
             }
 
             try {
                 const response = await axios.post(RESIZE_FUNCTION_URL, {
-                    url: requestable
+                    url: requestable,
+                    filename: resolved,
                 });
                 writtenFiles = response.data.writtenFiles;
             } catch (err) {
@@ -576,8 +578,8 @@ export namespace DashUploadUtils {
 
     /**
      * outputResizedImages takes in a readable stream and resizes the images according to the sizes defined at the top of this file.
-     * 
-     * The new images will be saved to the server with the corresponding prefixes. 
+     *
+     * The new images will be saved to the server with the corresponding prefixes.
      * @param streamProvider a Stream of the image to process, taken from the /parsed_files location
      * @param outputFileName the basename (No suffix) of the outputted file.
      * @param outputDirectory the directory to output to, usually Directory.Images
@@ -608,7 +610,7 @@ export namespace DashUploadUtils {
         return [
             { suffix: SizeSuffix.Original },
             ...Object.values(DashUploadUtils.Sizes).map(({ suffix, width }) => {
-                let initial: sharp.Sharp | undefined = sharp().resize(width, undefined, { withoutEnlargement: true });
+                let initial: sharp.Sharp | undefined = sharp({ failOnError: false }).resize(width, undefined, { withoutEnlargement: true });
                 if (pngs.includes(ext)) {
                     initial = initial.png(pngOptions);
                 } else if (jpgs.includes(ext)) {