aboutsummaryrefslogtreecommitdiff
path: root/src/server/DashUploadUtils.ts
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/DashUploadUtils.ts')
-rw-r--r--src/server/DashUploadUtils.ts7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 7b83d09ef..f13580865 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';
@@ -331,7 +332,7 @@ export namespace DashUploadUtils {
}
};
- const parseExifData = async (source: string): Promise<Upload.EnrichedExifData> => {
+ const parseExifData = async (source: string) => {
const image = await request.get(source, { encoding: null });
const { data, error } = await new Promise(resolve => {
new ExifImage({ image }, (error, data) => {
@@ -342,8 +343,8 @@ export namespace DashUploadUtils {
resolve({ data, error: reason });
});
});
- data && bufferConverterRec(data);
- return { data, error };
+ //data && bufferConverterRec(data);
+ return { data: await exifr.parse(image), error };
};
const { pngs, jpgs, webps, tiffs } = AcceptableMedia;