Merge branch 'reuse-file-readers' into rename-type-MetadataObject-to-Metadata
This commit is contained in:
commit
6abf883b3e
|
@ -30,7 +30,7 @@ class FFmpegService {
|
|||
if (!this.ffmpeg) {
|
||||
await this.init();
|
||||
}
|
||||
if (this.fileReader) {
|
||||
if (!this.fileReader) {
|
||||
this.fileReader = new FileReader();
|
||||
}
|
||||
if (this.isLoading) {
|
||||
|
|
|
@ -24,12 +24,12 @@ export async function getFileData(worker, reader: FileReader, file: File) {
|
|||
}
|
||||
|
||||
export async function getFileType(
|
||||
worker,
|
||||
reader: FileReader,
|
||||
receivedFile: File
|
||||
): Promise<FileTypeInfo> {
|
||||
try {
|
||||
let fileType: FILE_TYPE;
|
||||
const mimeType = await getMimeType(worker, receivedFile);
|
||||
const mimeType = await getMimeType(reader, receivedFile);
|
||||
const typeParts = mimeType?.split('/');
|
||||
if (typeParts?.length !== 2) {
|
||||
throw Error(CustomError.TYPE_DETECTION_FAILED);
|
||||
|
@ -76,9 +76,9 @@ export function getFileOriginalName(file: File) {
|
|||
return originalName;
|
||||
}
|
||||
|
||||
async function getMimeType(worker, file: File) {
|
||||
async function getMimeType(reader: FileReader, file: File) {
|
||||
const fileChunkBlob = file.slice(0, CHUNK_SIZE_FOR_TYPE_DETECTION);
|
||||
return getMimeTypeFromBlob(worker, fileChunkBlob);
|
||||
return getMimeTypeFromBlob(reader, fileChunkBlob);
|
||||
}
|
||||
|
||||
export async function getMimeTypeFromBlob(reader: FileReader, fileBlob: Blob) {
|
||||
|
|
|
@ -54,7 +54,7 @@ export default async function uploader(
|
|||
await sleep(TwoSecondInMillSeconds);
|
||||
return { fileUploadResult: FileUploadResults.TOO_LARGE };
|
||||
}
|
||||
fileTypeInfo = await getFileType(worker, rawFile);
|
||||
fileTypeInfo = await getFileType(reader, rawFile);
|
||||
if (fileTypeInfo.fileType === FILE_TYPE.OTHERS) {
|
||||
throw Error(CustomError.UNSUPPORTED_FILE_FORMAT);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue