From 7539f5c9fa8328332dd5e3b82a8dbf23d3960845 Mon Sep 17 00:00:00 2001 From: Abhinav-grd Date: Fri, 20 Aug 2021 12:23:38 +0530 Subject: [PATCH] remove exif file check and let exif library handle it and fail --- src/services/upload/exifService.ts | 12 +----------- src/services/upload/metadataService.ts | 6 +----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/services/upload/exifService.ts b/src/services/upload/exifService.ts index 82cc4aa2f..dba553509 100644 --- a/src/services/upload/exifService.ts +++ b/src/services/upload/exifService.ts @@ -5,7 +5,6 @@ import { NULL_LOCATION, Location } from './metadataService'; const SOUTH_DIRECTION = 'S'; const WEST_DIRECTION = 'W'; -const EXIF_HAVING_TYPES = new Set(['jpeg', 'jpg', 'tiff']); const CHUNK_SIZE_FOR_EXIF_READING = 4 * 1024 * 1024; interface ParsedEXIFData { location: Location; @@ -14,14 +13,9 @@ interface ParsedEXIFData { export async function getExifData( worker, - receivedFile: globalThis.File, - exactType: string + receivedFile: globalThis.File ): Promise { try { - if (!fileHasEXIF(exactType)) { - // files don't have exif - return { location: NULL_LOCATION, creationTime: null }; - } const fileChunk = await worker.getUint8ArrayView( receivedFile.slice(0, CHUNK_SIZE_FOR_EXIF_READING) ); @@ -39,10 +33,6 @@ export async function getExifData( } } -function fileHasEXIF(type) { - return EXIF_HAVING_TYPES.has(type); -} - function getUNIXTime(exifData: any) { const dateString: string = exifData.DateTimeOriginal || exifData.DateTime; if (!dateString || dateString === '0000:00:00 00:00:00') { diff --git a/src/services/upload/metadataService.ts b/src/services/upload/metadataService.ts index 21491daac..d45a7a657 100644 --- a/src/services/upload/metadataService.ts +++ b/src/services/upload/metadataService.ts @@ -32,11 +32,7 @@ export async function extractMetadata( receivedFile: globalThis.File, fileTypeInfo: FileTypeInfo ) { - const { location, creationTime } = await getExifData( - worker, - receivedFile, - fileTypeInfo.exactType - ); + const { location, creationTime } = await getExifData(worker, receivedFile); const extractedMetadata: MetadataObject = { title: receivedFile.name,