beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

uploadService getFileMetadata to better name extractFileMetadata to avoid confusion with getFileMetadataAndFileTypeInfo

Browse source
This commit is contained in:
Abhinav 2022-02-13 16:48:42 +05:30
parent ccd730cf9f
commit 04f4fd14e3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/upload/fileService.ts
View file

@ -40,7 +40,7 @@ export async function readFile(
}; };
} }
export async function getFileMetadata( export async function extractFileMetadata(
parsedMetadataJSONMap: ParsedMetadataJSONMap, parsedMetadataJSONMap: ParsedMetadataJSONMap,
rawFile: File, rawFile: File,
collectionID: number, collectionID: number,

2
src/services/upload/uploadManager.ts
View file

@ -166,7 +166,7 @@ class UploadManager {
return { fileTypeInfo, metadata: null }; return { fileTypeInfo, metadata: null };
} }
const metadata = const metadata =
(await UploadService.getFileMetadata( (await UploadService.extractFileMetadata(
file, file,
collectionID, collectionID,
fileTypeInfo fileTypeInfo

6
src/services/upload/uploadService.ts
View file

@ -1,7 +1,7 @@
import { Collection } from 'types/collection'; import { Collection } from 'types/collection';
import { logError } from 'utils/sentry'; import { logError } from 'utils/sentry';
import UploadHttpClient from './uploadHttpClient'; import UploadHttpClient from './uploadHttpClient';
import { getFileMetadata } from './fileService'; import { extractFileMetadata } from './fileService';
import { getFileType } from './readFileService'; import { getFileType } from './readFileService';
import { handleUploadError } from 'utils/error'; import { handleUploadError } from 'utils/error';
import { import {
@ -83,12 +83,12 @@ class UploadService {
: await readFile(worker, reader, fileTypeInfo, file); : await readFile(worker, reader, fileTypeInfo, file);
} }
async getFileMetadata( async extractFileMetadata(
file: File, file: File,
collectionID: number, collectionID: number,
fileTypeInfo: FileTypeInfo fileTypeInfo: FileTypeInfo
): Promise<Metadata> { ): Promise<Metadata> {
return getFileMetadata( return extractFileMetadata(
this.parsedMetadataJSONMap, this.parsedMetadataJSONMap,
file, file,
collectionID, collectionID,