1 files changed, 44 insertions, 42 deletions
diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 0ee0a34df..217c88107 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -260,48 +260,50 @@ export default class UploadManager extends ApiManager {
                   }
             });
 
-            register({
-                  method: Method.POST,
-                  subscription: "/uploadURI",
-                  secureHandler: ({ req, res }) => {
-                        const uri = req.body.uri;
-                        const filename = req.body.name;
-                        const origSuffix = req.body.nosuffix ? SizeSuffix.None : SizeSuffix.Original;
-                        const deleteFiles = req.body.replaceRootFilename;
-                        if (!uri || !filename) {
-                              res.status(401).send("incorrect parameters specified");
-                              return;
-                        }
-                        if (deleteFiles) {
-                              const path = serverPathToFile(Directory.images, "");
-                              const regex = new RegExp(`${deleteFiles}.*`);
-                              fs.readdirSync(path).filter((f: any) => regex.test(f)).map((f: any) => fs.unlinkSync(path + f));
-                        }
-                        return imageDataUri.outputFile(uri, serverPathToFile(Directory.images, InjectSize(filename, origSuffix))).then((savedName: string) => {
-                              const ext = extname(savedName).toLowerCase();
-                              const { pngs, jpgs } = AcceptableMedia;
-                              const resizers = !origSuffix ? [{ resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: "_m" }] : [
-                                    { resizer: sharp().resize(100, undefined, { withoutEnlargement: true }), suffix: "_s" },
-                                    { resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: "_m" },
-                                    { resizer: sharp().resize(900, undefined, { withoutEnlargement: true }), suffix: "_l" },
-                              ];
-                              let isImage = false;
-                              if (pngs.includes(ext)) {
-                                    resizers.forEach(element => {
-                                          element.resizer = element.resizer.png();
-                                    });
-                                    isImage = true;
-                              } else if (jpgs.includes(ext)) {
-                                    resizers.forEach(element => {
-                                          element.resizer = element.resizer.jpeg();
-                                    });
-                                    isImage = true;
-                              }
-                              if (isImage) {
-                                    resizers.forEach(resizer => {
-                                          const path = serverPathToFile(Directory.images, filename + resizer.suffix + ext);
-                                          createReadStream(savedName).pipe(resizer.resizer).pipe(createWriteStream(path));
-                                    });
+        register({
+            method: Method.POST,
+            subscription: "/uploadURI",
+            secureHandler: ({ req, res }) => {
+                const uri = req.body.uri;
+                const filename = req.body.name;
+                const origSuffix = req.body.nosuffix ? SizeSuffix.None : SizeSuffix.Original;
+                const deleteFiles = req.body.replaceRootFilename;
+                if (!uri || !filename) {
+                    res.status(401).send("incorrect parameters specified");
+                    return;
+                }
+                if (deleteFiles) {
+                    const path = serverPathToFile(Directory.images, "");
+                    const regex = new RegExp(`${deleteFiles}.*`);
+                    fs.readdirSync(path).filter((f: any) => regex.test(f)).map((f: any) => fs.unlinkSync(path + f));
+                }
+                return imageDataUri.outputFile(uri, serverPathToFile(Directory.images, InjectSize(filename, origSuffix))).then((savedName: string) => {
+                    const ext = extname(savedName).toLowerCase();
+                    const { pngs, jpgs } = AcceptableMedia;
+                    const resizers = !origSuffix ? [{ resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Medium }] : [
+                        { resizer: sharp().resize(100, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Small },
+                        { resizer: sharp().resize(400, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Medium },
+                        { resizer: sharp().resize(900, undefined, { withoutEnlargement: true }), suffix: SizeSuffix.Large },
+                    ];
+                    let isImage = false;
+                    if (pngs.includes(ext)) {
+                        resizers.forEach(element => {
+                            element.resizer = element.resizer.png();
+                        });
+                        isImage = true;
+                    } else if (jpgs.includes(ext)) {
+                        resizers.forEach(element => {
+                            element.resizer = element.resizer.jpeg();
+                        });
+                        isImage = true;
+                    }
+                    if (isImage) {
+                        resizers.forEach(resizer => {
+                            const path = serverPathToFile(Directory.images, InjectSize(filename, resizer.suffix) + ext);
+                            createReadStream(savedName).on("error", e => console.log("Resizing read:" + e))
+                                .pipe(resizer.resizer)
+                                .pipe(createWriteStream(path).on("error", e => console.log("Resizing write: " + e)));
+                        });
 
                               }
                               res.send(clientPathToFile(Directory.images, filename + ext));