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

use heicConversionService

Browse source
This commit is contained in:
Abhinav 2022-10-15 00:42:42 +05:30
parent c901fcc14e
commit a2faa87b2c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/services/upload/thumbnailService.ts
View file

@ -7,8 +7,8 @@ import { convertBytesToHumanReadable } from 'utils/file/size';
import { isExactTypeHEIC } from 'utils/file'; import { isExactTypeHEIC } from 'utils/file';
import { ElectronFile, FileTypeInfo } from 'types/upload'; import { ElectronFile, FileTypeInfo } from 'types/upload';
import { getUint8ArrayView } from '../readerService'; import { getUint8ArrayView } from '../readerService';
import HEICConverter from 'services/heicConverter/heicConverterService';
import { getFileNameSize, addLogLine } from 'utils/logging'; import { getFileNameSize, addLogLine } from 'utils/logging';
import HeicConversionService from 'services/heicConversionService';
const MAX_THUMBNAIL_DIMENSION = 720; const MAX_THUMBNAIL_DIMENSION = 720;
const MIN_COMPRESSION_PERCENTAGE_SIZE_DIFF = 10; const MIN_COMPRESSION_PERCENTAGE_SIZE_DIFF = 10;
@ -108,7 +108,7 @@ export async function generateImageThumbnail(file: File, isHEIC: boolean) {
if (isHEIC) { if (isHEIC) {
addLogLine(`HEICConverter called for ${getFileNameSize(file)}`); addLogLine(`HEICConverter called for ${getFileNameSize(file)}`);
file = new File([await HEICConverter.convert(file)], file.name); file = new File([await HeicConversionService.convert(file)], file.name);
addLogLine(`${getFileNameSize(file)} successfully converted`); addLogLine(`${getFileNameSize(file)} successfully converted`);
} }
let image = new Image(); let image = new Image();

4
src/utils/file/index.ts
View file

@ -21,7 +21,7 @@ import {
FILE_TYPE, FILE_TYPE,
} from 'constants/file'; } from 'constants/file';
import PublicCollectionDownloadManager from 'services/publicCollectionDownloadManager'; import PublicCollectionDownloadManager from 'services/publicCollectionDownloadManager';
import ElectronHEICConverter from 'services/electron/heicConvert'; import heicConversionService from 'services/heicConversionService';
import ffmpegService from 'services/ffmpeg/ffmpegService'; import ffmpegService from 'services/ffmpeg/ffmpegService';
import { NEW_FILE_MAGIC_METADATA, VISIBILITY_STATE } from 'types/magicMetadata'; import { NEW_FILE_MAGIC_METADATA, VISIBILITY_STATE } from 'types/magicMetadata';
import { IsArchived, updateMagicMetadataProps } from 'utils/magicMetadata'; import { IsArchived, updateMagicMetadataProps } from 'utils/magicMetadata';
@ -343,7 +343,7 @@ async function getRenderableImage(fileName: string, imageBlob: Blob) {
imageBlob.size imageBlob.size
)}` )}`
); );
const convertedImageBlob = await ElectronHEICConverter.convert( const convertedImageBlob = await heicConversionService.convert(
imageBlob imageBlob
); );