massive changes to use mobx 6 which means not accessing props directly in @computed functions.

1 files changed, 16 insertions, 11 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 7765349ff..dd2a857d9 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -25,6 +25,7 @@ const ffmpeg = require('fluent-ffmpeg');
 const fs = require('fs');
 const requestImageSize = require('../client/util/request-image-size');
 const md5File = require('md5-file');
+const autorotate = require('jpeg-autorotate');
 
 export enum SizeSuffix {
     Small = '_s',
@@ -604,17 +605,21 @@ export namespace DashUploadUtils {
             sizes.filter(({ width }) => !width).map(({ suffix }) => 
                 new Promise<void>(res => createReadStream(sourcePath).pipe(createWriteStream(outputPath(suffix))).on('close', res))
         )); // prettier-ignore
-        return Jimp.read(sourcePath)
-            .then(async img => {
-                await Promise.all( sizes.filter(({ width }) => width)  .map(({ width, suffix }) => 
-                    img = img.resize(width, Jimp.AUTO).write(outputPath(suffix))
-                )); // prettier-ignore
-                return writtenFiles;
-            })
-            .catch(e => {
-                console.log('ERROR' + e);
-                return writtenFiles;
-            });
+
+        const fileIn = fs.readFileSync(sourcePath);
+        return autorotate.rotate(fileIn, { quality: 30 }).then(({ buffer }: { buffer: any }) =>
+            Jimp.read(buffer)
+                .then(async img => {
+                    await Promise.all( sizes.filter(({ width }) => width)  .map(({ width, suffix }) => 
+                        img = img.resize(width, Jimp.AUTO).write(outputPath(suffix))
+                    )); // prettier-ignore
+                    return writtenFiles;
+                })
+                .catch(e => {
+                    console.log('ERROR' + e);
+                    return writtenFiles;
+                })
+        );
     }
 
     /**