From 48d5e650ddc8caa8252561bbc91961f2f4677d6e Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 26 Oct 2021 16:06:59 -0400
Subject: added better exif parser module to server

---
 package-lock.json             | 5 +++++
 package.json                  | 1 +
 src/server/DashUploadUtils.ts | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 3aff3a549..128d6fba8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6092,6 +6092,11 @@
                 }
             }
         },
+        "exifr": {
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/exifr/-/exifr-7.1.3.tgz",
+            "integrity": "sha512-g/aje2noHivrRSLbAUtBPWFbxKdKhgj/xr1vATDdUXPOFYJlQ62Ft0oy+72V6XLIpDJfHs6gXLbBLAolqOXYRw=="
+        },
         "expand-brackets": {
             "version": "2.1.4",
             "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
diff --git a/package.json b/package.json
index 99c818062..4f12f01d6 100644
--- a/package.json
+++ b/package.json
@@ -164,6 +164,7 @@
         "depcheck": "^0.9.2",
         "equation-editor-react": "github:bobzel/equation-editor-react#useLocally",
         "exif": "^0.6.0",
+        "exifr": "^7.1.3",
         "express": "^4.16.4",
         "express-flash": "0.0.2",
         "express-session": "^1.17.0",
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 7b83d09ef..54b71e8ce 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -3,6 +3,7 @@ import { ExifImage } from 'exif';
 import { File } from 'formidable';
 import { createWriteStream, existsSync, readFileSync, rename, unlinkSync, writeFile } from 'fs';
 import * as path from 'path';
+import * as exifr from 'exifr';
 import { basename } from "path";
 import * as sharp from 'sharp';
 import { Stream } from 'stream';
@@ -342,7 +343,8 @@ export namespace DashUploadUtils {
                 resolve({ data, error: reason });
             });
         });
-        data && bufferConverterRec(data);
+        return { data: await exifr.parse(image) as any, error };
+        //data && bufferConverterRec(data);
         return { data, error };
     };
 
-- 
cgit v1.2.3-70-g09d2