From 9076735374250f583f01c15f1fd5df56d637fa2b Mon Sep 17 00:00:00 2001 From: Abhinav-grd Date: Thu, 19 Aug 2021 08:55:11 +0530 Subject: [PATCH] pass fileType info to metadata extracter --- src/services/upload/uploadService.ts | 6 ++---- src/services/upload/uploader.ts | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/services/upload/uploadService.ts b/src/services/upload/uploadService.ts index 838f3aec0..f86610cca 100644 --- a/src/services/upload/uploadService.ts +++ b/src/services/upload/uploadService.ts @@ -11,7 +11,6 @@ import { generateThumbnail } from './thumbnailService'; import { getFileOriginalName, getFileData, - getFileType, FileTypeInfo, } from './readFileService'; import { encryptFiledata } from './encryptionService'; @@ -130,10 +129,9 @@ class UploadService { async getFileMetadata( worker: any, rawFile: File, - collection: { id: number } + collection: Collection, + fileTypeInfo: FileTypeInfo ): Promise { - const fileTypeInfo = await getFileType(worker, rawFile); - const originalName = getFileOriginalName(rawFile); const googleMetadata = this.metadataMap.get( diff --git a/src/services/upload/uploader.ts b/src/services/upload/uploader.ts index aab2111d3..d84659720 100644 --- a/src/services/upload/uploader.ts +++ b/src/services/upload/uploader.ts @@ -47,7 +47,8 @@ export default async function uploader( metadata = await uploadService.getFileMetadata( worker, rawFile, - collection + collection, + fileTypeInfo ); if (fileAlreadyInCollection(existingFilesInCollection, metadata)) {