pass fileType info to metadata extracter
This commit is contained in:
parent
9912be071a
commit
9076735374
|
@ -11,7 +11,6 @@ import { generateThumbnail } from './thumbnailService';
|
||||||
import {
|
import {
|
||||||
getFileOriginalName,
|
getFileOriginalName,
|
||||||
getFileData,
|
getFileData,
|
||||||
getFileType,
|
|
||||||
FileTypeInfo,
|
FileTypeInfo,
|
||||||
} from './readFileService';
|
} from './readFileService';
|
||||||
import { encryptFiledata } from './encryptionService';
|
import { encryptFiledata } from './encryptionService';
|
||||||
|
@ -130,10 +129,9 @@ class UploadService {
|
||||||
async getFileMetadata(
|
async getFileMetadata(
|
||||||
worker: any,
|
worker: any,
|
||||||
rawFile: File,
|
rawFile: File,
|
||||||
collection: { id: number }
|
collection: Collection,
|
||||||
|
fileTypeInfo: FileTypeInfo
|
||||||
): Promise<MetadataObject> {
|
): Promise<MetadataObject> {
|
||||||
const fileTypeInfo = await getFileType(worker, rawFile);
|
|
||||||
|
|
||||||
const originalName = getFileOriginalName(rawFile);
|
const originalName = getFileOriginalName(rawFile);
|
||||||
const googleMetadata =
|
const googleMetadata =
|
||||||
this.metadataMap.get(
|
this.metadataMap.get(
|
||||||
|
|
|
@ -47,7 +47,8 @@ export default async function uploader(
|
||||||
metadata = await uploadService.getFileMetadata(
|
metadata = await uploadService.getFileMetadata(
|
||||||
worker,
|
worker,
|
||||||
rawFile,
|
rawFile,
|
||||||
collection
|
collection,
|
||||||
|
fileTypeInfo
|
||||||
);
|
);
|
||||||
|
|
||||||
if (fileAlreadyInCollection(existingFilesInCollection, metadata)) {
|
if (fileAlreadyInCollection(existingFilesInCollection, metadata)) {
|
||||||
|
|
Loading…
Reference in a new issue