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

Merge pull request #669 from ente-io/better-file-type-error-log

Browse source 
better handle file type detection error
This commit is contained in:
Abhinav Kumar 2022-07-26 17:53:55 +05:30 committed by GitHub
parent fea076c0fa fbdd9b21e7
commit d7ae196e27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/services/typeDetectionService.ts
View file

@ -64,22 +64,30 @@ export async function getFileType(
}
async function extractFileType(file: File) {
const fileChunkBlob = file.slice(0, CHUNK_SIZE_FOR_TYPE_DETECTION);
return getFileTypeFromBlob(fileChunkBlob);
const fileBlobChunk = file.slice(0, CHUNK_SIZE_FOR_TYPE_DETECTION);
const fileDataChunk = await getUint8ArrayView(fileBlobChunk);
return getFileTypeFromBuffer(fileDataChunk);
}
async function extractElectronFileType(file: ElectronFile) {
const stream = await file.stream();
const reader = stream.getReader();
const { value } = await reader.read();
const fileTypeResult = await FileType.fromBuffer(value);
return fileTypeResult;
const { value: fileDataChunk } = await reader.read();
return getFileTypeFromBuffer(fileDataChunk);
}
async function getFileTypeFromBlob(fileBlob: Blob) {
async function getFileTypeFromBuffer(buffer: Uint8Array) {
try {
const initialFiledata = await getUint8ArrayView(fileBlob);
return await FileType.fromBuffer(initialFiledata);
const result = await FileType.fromBuffer(buffer);
if (!result.mime) {
logError(
Error('mimetype missing from file type result'),
CustomError.TYPE_DETECTION_FAILED,
{ result }
);
throw Error(CustomError.TYPE_DETECTION_FAILED);
}
return result;
} catch (e) {
throw Error(CustomError.TYPE_DETECTION_FAILED);
}