Merge branch 'master' into eleanor-gptdraw

1 files changed, 9 insertions, 6 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 1e55a885a..351351ca5 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-use-before-define */
 import axios from 'axios';
 import { exec, spawn } from 'child_process';
 import { green, red } from 'colors';
@@ -47,7 +48,8 @@ if (isMainThread) {
 
     async function workerResampleImage(message: { imgSourcePath: string; outputPath: string; origSuffix: string; unlinkSource: boolean }) {
         const { imgSourcePath, outputPath, origSuffix, unlinkSource } = message;
-        const sizes = !origSuffix ? [{ width: 400, suffix: SizeSuffix.Medium }] : DashUploadUtils.imageResampleSizes(path.extname(imgSourcePath));
+        const extension = path.extname(imgSourcePath);
+        const sizes = !origSuffix ? [{ width: 400, suffix: SizeSuffix.Medium }] : DashUploadUtils.imageResampleSizes(extension === '.xml' ? '.png' : extension);
         // prettier-ignore
         Jimp.read(imgSourcePath)
             .then(img => 
@@ -60,7 +62,7 @@ if (isMainThread) {
     }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const requestImageSize = require('../client/util/request-image-size');
 
 export enum SizeSuffix {
@@ -369,7 +371,8 @@ export namespace DashUploadUtils {
      */
     export const UploadInspectedImage = async (metadata: Upload.InspectionResults, filename: string, prefix = '', cleanUp = true): Promise<Upload.ImageInformation> => {
         const { requestable, source, ...remaining } = metadata;
-        const resolved = filename || `${prefix}upload_${Utils.GenerateGuid()}.${remaining.contentType.split('/')[1].toLowerCase()}`;
+        const dfltSuffix = remaining.contentType.split('/')[1].toLowerCase();
+        const resolved = filename || `${prefix}upload_${Utils.GenerateGuid()}.${dfltSuffix === 'xml' ? 'jpg' : dfltSuffix}`;
         const { images } = Directory;
         const information: Upload.ImageInformation = {
             accessPaths: {
@@ -400,10 +403,10 @@ export namespace DashUploadUtils {
                 writtenFiles = {};
             }
         } else {
-            const unlinkSrcWhenFinished = isLocal().test(source) && cleanUp;
+            const unlinkSrcWhenFinished = cleanUp; // isLocal().test(source) && cleanUp;
             try {
                 writtenFiles = await outputResizedImages(metadata.source, resolved, unlinkSrcWhenFinished);
-            } catch (e) {
+            } catch {
                 // input is a blob or other, try reading it to create a metadata source file.
                 const reqSource = request(metadata.source);
                 const readStream: Stream = reqSource instanceof Promise ? await reqSource : reqSource;
@@ -415,7 +418,7 @@ export namespace DashUploadUtils {
                         .on('error', () => rej());
                 });
                 writtenFiles = await outputResizedImages(readSource, resolved, unlinkSrcWhenFinished);
-                fs.unlink(readSource, err => console.log("Couldn't unlink temporary image file:" + readSource, err));
+                //fs.unlink(readSource, err => console.log("Couldn't unlink temporary image file:" + readSource, err));
             }
         }
         Array.from(Object.keys(writtenFiles)).forEach(suffix => {