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

Merge pull request #601 from ente-io/handle-file-permission-denied

Browse source 
better handle metadata extraction error
This commit is contained in:
Abhinav Kumar 2022-06-16 17:39:54 +05:30 committed by GitHub
parent ec2f0442ae 6386dc4475
commit 98e3965365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import { CustomError } from 'utils/error';
import { Collection } from 'types/collection';
import { EnteFile } from 'types/file';
import {
ElectronFile,
FileWithCollection,
MetadataAndFileTypeInfo,
MetadataAndFileTypeInfoMap,
@ -227,50 +228,20 @@ class UploadManager {
logUploadInfo(`extractMetadataFromFiles executed`);
UIService.reset(mediaFiles.length);
for (const { file, localID, collectionID } of mediaFiles) {
let fileTypeInfo = null;
let metadata = null;
try {
const { fileTypeInfo, metadata } = await (async () => {
if (file.size >= MAX_FILE_SIZE_SUPPORTED) {
logUploadInfo(
`${getFileNameSize(
file
)} rejected because of large size`
);
return { fileTypeInfo: null, metadata: null };
}
const fileTypeInfo = await UploadService.getFileType(
file
);
if (fileTypeInfo.fileType === FILE_TYPE.OTHERS) {
logUploadInfo(
`${getFileNameSize(
file
)} rejected because of unknown file format`
);
return { fileTypeInfo, metadata: null };
}
logUploadInfo(
` extracting ${getFileNameSize(file)} metadata`
);
const metadata =
(await UploadService.extractFileMetadata(
const result = await this.extractFileTypeAndMetadata(
file,
collectionID,
fileTypeInfo
)) || null;
return { fileTypeInfo, metadata };
})();
collectionID
);
fileTypeInfo = result.fileTypeInfo;
metadata = result.metadata;
logUploadInfo(
`metadata extraction successful${getFileNameSize(
file
)} `
);
this.metadataAndFileTypeInfoMap.set(localID, {
fileTypeInfo: fileTypeInfo && { ...fileTypeInfo },
metadata: metadata && { ...metadata },
});
UIService.increaseFileUploaded();
} catch (e) {
logError(e, 'metadata extraction failed for a file');
logUploadInfo(
@ -279,6 +250,11 @@ class UploadManager {
)} error: ${e.message}`
);
}
this.metadataAndFileTypeInfoMap.set(localID, {
fileTypeInfo: fileTypeInfo && { ...fileTypeInfo },
metadata: metadata && { ...metadata },
});
UIService.increaseFileUploaded();
}
} catch (e) {
logError(e, 'error extracting metadata');
@ -286,6 +262,36 @@ class UploadManager {
}
}
private async extractFileTypeAndMetadata(
file: File | ElectronFile,
collectionID: number
) {
if (file.size >= MAX_FILE_SIZE_SUPPORTED) {
logUploadInfo(
`${getFileNameSize(file)} rejected because of large size`
);
return { fileTypeInfo: null, metadata: null };
}
const fileTypeInfo = await UploadService.getFileType(file);
if (fileTypeInfo.fileType === FILE_TYPE.OTHERS) {
logUploadInfo(
`${getFileNameSize(
file
)} rejected because of unknown file format`
);
return { fileTypeInfo, metadata: null };
}
logUploadInfo(` extracting ${getFileNameSize(file)} metadata`);
const metadata =
(await UploadService.extractFileMetadata(
file,
collectionID,
fileTypeInfo
)) || null;
return { fileTypeInfo, metadata };
}
private async uploadMediaFiles(mediaFiles: FileWithCollection[]) {
logUploadInfo(`uploadMediaFiles called`);
this.filesToBeUploaded.push(...mediaFiles);