1 files changed, 24 insertions, 13 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 028116779..a06fa3b6e 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -22,7 +22,6 @@ import { AzureManager } from './ApiManagers/AzureManager';
 import { AcceptableMedia, Upload } from './SharedMediaTypes';
 import { Directory, clientPathToFile, filesDirectory, pathToDirectory, publicDirectory, serverPathToFile } from './SocketData';
 import { resolvedServerUrl } from './server_Initialization';
-
 import { Worker, isMainThread, parentPort } from 'worker_threads';
 
 // Create an array to store worker threads
@@ -55,7 +54,8 @@ if (isMainThread) {
             .then(img => 
                 sizes.forEach(({ width, suffix }) =>
                     img.resize({ w: width || img.bitmap.width })
-                       .write(InjectSize(outputPath, suffix) as `${string}.${string}`)
+                        .write(InjectSize(outputPath, suffix) as `${string}.${string}`)
+                        .catch(e => console.log("Jimp error:", e))
                 ))
             .catch(e => console.log('Error Jimp:', e))
             .finally(() => unlinkSource && unlinkSync(imgSourcePath));
@@ -343,15 +343,24 @@ export namespace DashUploadUtils {
         const outputPath = path.resolve(pathToDirectory(Directory.images), outputFileName);
         const sizes = imageResampleSizes(path.extname(outputFileName));
 
-        const imgReadStream = new Duplex();
-        imgReadStream.push(fs.readFileSync(imgSourcePath));
-        imgReadStream.push(null);
-        await Promise.all(
-            sizes.map(({ suffix }) => 
-                new Promise<unknown>(res =>
-                    imgReadStream.pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
-                )
-        )); // prettier-ignore
+        if (unlinkSource) {
+            const imgReadStream = new Duplex();
+            imgReadStream.push(fs.readFileSync(imgSourcePath));
+            imgReadStream.push(null);
+            await Promise.all(
+                sizes.map(({ suffix }) => 
+                    new Promise<unknown>(res =>
+                        imgReadStream.pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
+                    )
+            )); // prettier-ignore
+        } else {
+            await Promise.all(
+                sizes.map(({ suffix }) => 
+                    new Promise<unknown>(res =>
+                        request.get(imgSourcePath).pipe(createWriteStream(writtenFiles[suffix] = InjectSize(outputPath, suffix))).on('close', res)
+                    )
+            )); // prettier-ignore
+        }
 
         workerResample(imgSourcePath, outputPath, SizeSuffix.Original, unlinkSource);
         return writtenFiles;
@@ -450,7 +459,7 @@ export namespace DashUploadUtils {
         }
         const outputFile = filename || result.filename || '';
 
-        return UploadInspectedImage(result, outputFile, prefix);
+        return UploadInspectedImage(result, outputFile, prefix, isLocal().exec(source) ? true : false);
     };
 
     type md5 = 'md5';
@@ -568,7 +577,9 @@ export namespace DashUploadUtils {
         switch (category) {
             case 'image':
                 if (imageFormats.includes(format)) {
-                    const result = await UploadImage(filepath, basename(filepath));
+                    const outputName = basename(filepath);
+                    const extname = path.extname(originalFilename ?? '');
+                    const result = await UploadImage(filepath, outputName.endsWith(extname) ? outputName : outputName + extname, undefined);
                     return { source: file, result };
                 }
                 fs.unlink(filepath, () => {});