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

Merge branch 'reuse-file-readers' into rename-type-MetadataObject-to-Metadata

Browse source
This commit is contained in:
Abhinav 2022-01-08 13:56:22 +05:30
parent 15a03a87b3 0e7ab5c886
commit 6abf883b3e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/ffmpegService.ts
View file

@ -30,7 +30,7 @@ class FFmpegService {
if (!this.ffmpeg) { if (!this.ffmpeg) {
await this.init(); await this.init();
} }
if (this.fileReader) { if (!this.fileReader) {
this.fileReader = new FileReader(); this.fileReader = new FileReader();
} }
if (this.isLoading) { if (this.isLoading) {

8
src/services/upload/readFileService.ts
View file

@ -24,12 +24,12 @@ export async function getFileData(worker, reader: FileReader, file: File) {
} }
export async function getFileType( export async function getFileType(
worker, reader: FileReader,
receivedFile: File receivedFile: File
): Promise<FileTypeInfo> { ): Promise<FileTypeInfo> {
try { try {
let fileType: FILE_TYPE; let fileType: FILE_TYPE;
const mimeType = await getMimeType(worker, receivedFile); const mimeType = await getMimeType(reader, receivedFile);
const typeParts = mimeType?.split('/'); const typeParts = mimeType?.split('/');
if (typeParts?.length !== 2) { if (typeParts?.length !== 2) {
throw Error(CustomError.TYPE_DETECTION_FAILED); throw Error(CustomError.TYPE_DETECTION_FAILED);
@ -76,9 +76,9 @@ export function getFileOriginalName(file: File) {
return originalName; 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); 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) { export async function getMimeTypeFromBlob(reader: FileReader, fileBlob: Blob) {

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

@ -54,7 +54,7 @@ export default async function uploader(
await sleep(TwoSecondInMillSeconds); await sleep(TwoSecondInMillSeconds);
return { fileUploadResult: FileUploadResults.TOO_LARGE }; return { fileUploadResult: FileUploadResults.TOO_LARGE };
} }
fileTypeInfo = await getFileType(worker, rawFile); fileTypeInfo = await getFileType(reader, rawFile);
if (fileTypeInfo.fileType === FILE_TYPE.OTHERS) { if (fileTypeInfo.fileType === FILE_TYPE.OTHERS) {
throw Error(CustomError.UNSUPPORTED_FILE_FORMAT); throw Error(CustomError.UNSUPPORTED_FILE_FORMAT);
} }