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

update logs

Browse source
This commit is contained in:
Abhinav 2022-06-23 18:56:35 +05:30
parent 0f5ced33d3
commit 14b743e0f7
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/services/upload/metadataService.ts
View file

@ -11,8 +11,6 @@ import {
} from 'types/upload'; } from 'types/upload';
import { NULL_EXTRACTED_METADATA, NULL_LOCATION } from 'constants/upload'; import { NULL_EXTRACTED_METADATA, NULL_LOCATION } from 'constants/upload';
import { getVideoMetadata } from './videoMetadataService'; import { getVideoMetadata } from './videoMetadataService';
import { getFileNameSize } from 'utils/upload';
import { logUploadInfo } from 'utils/upload';
import { import {
parseDateFromFusedDateString, parseDateFromFusedDateString,
getUnixTimeInMicroSeconds, getUnixTimeInMicroSeconds,
@ -39,15 +37,7 @@ export async function extractMetadata(
if (fileTypeInfo.fileType === FILE_TYPE.IMAGE) { if (fileTypeInfo.fileType === FILE_TYPE.IMAGE) {
extractedMetadata = await getExifData(receivedFile, fileTypeInfo); extractedMetadata = await getExifData(receivedFile, fileTypeInfo);
} else if (fileTypeInfo.fileType === FILE_TYPE.VIDEO) { } else if (fileTypeInfo.fileType === FILE_TYPE.VIDEO) {
logUploadInfo(
`getVideoMetadata called for ${getFileNameSize(receivedFile)}`
);
extractedMetadata = await getVideoMetadata(receivedFile); extractedMetadata = await getVideoMetadata(receivedFile);
logUploadInfo(
`videoMetadata successfully extracted ${getFileNameSize(
receivedFile
)}`
);
} }
const fileHash = await getFileHash(receivedFile); const fileHash = await getFileHash(receivedFile);

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

@ -231,6 +231,9 @@ class UploadManager {
let fileTypeInfo = null; let fileTypeInfo = null;
let metadata = null; let metadata = null;
try { try {
logUploadInfo(
`metadata extraction started ${getFileNameSize(file)} `
);
const result = await this.extractFileTypeAndMetadata( const result = await this.extractFileTypeAndMetadata(
file, file,
collectionID collectionID

11
src/services/upload/videoMetadataService.ts
View file

@ -2,11 +2,12 @@ import { NULL_EXTRACTED_METADATA } from 'constants/upload';
import ffmpegService from 'services/ffmpeg/ffmpegService'; import ffmpegService from 'services/ffmpeg/ffmpegService';
import { ElectronFile } from 'types/upload'; import { ElectronFile } from 'types/upload';
import { logError } from 'utils/sentry'; import { logError } from 'utils/sentry';
import { logUploadInfo } from 'utils/upload'; import { getFileNameSize, logUploadInfo } from 'utils/upload';
export async function getVideoMetadata(file: File | ElectronFile) { export async function getVideoMetadata(file: File | ElectronFile) {
let videoMetadata = NULL_EXTRACTED_METADATA; let videoMetadata = NULL_EXTRACTED_METADATA;
try { try {
logUploadInfo(`getVideoMetadata called for ${getFileNameSize(file)}`);
if (!(file instanceof File)) { if (!(file instanceof File)) {
logUploadInfo('get file blob for video metadata extraction'); logUploadInfo('get file blob for video metadata extraction');
file = new File([await file.blob()], file.name, { file = new File([await file.blob()], file.name, {
@ -17,8 +18,16 @@ export async function getVideoMetadata(file: File | ElectronFile) {
); );
} }
videoMetadata = await ffmpegService.extractMetadata(file); videoMetadata = await ffmpegService.extractMetadata(file);
logUploadInfo(
`videoMetadata successfully extracted ${getFileNameSize(file)}`
);
} catch (e) { } catch (e) {
logError(e, 'failed to get video metadata'); logError(e, 'failed to get video metadata');
logUploadInfo(
`videoMetadata extracted failed ${getFileNameSize(file)} ,${
e.message
} `
);
} }
return videoMetadata; return videoMetadata;