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

feat: convert to JPEG instead and fix export name

Browse source
This commit is contained in:
httpjamesm 2023-11-18 20:16:57 -05:00
parent 454283298f
commit d0e89a32dc
No known key found for this signature in database
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/photos/src/components/PhotoViewer/ImageEditorOverlay/index.tsx
View file

@ -43,7 +43,11 @@ import { AppContext } from 'pages/_app';
import { getEditorCloseConfirmationMessage } from 'utils/ui';
import { logError } from 'utils/sentry';
import { getFileType } from 'services/typeDetectionService';
import { downloadUsingAnchor, isHEICFileFromFileName } from 'utils/file';
import {
downloadUsingAnchor,
getFileNameWithoutExtension,
isHEICFileFromFileName,
} from 'utils/file';
import { convertHEIC } from 'services/wasmHeicConverter/wasmHEICConverterClient';
interface IProps {
@ -297,9 +301,9 @@ const ImageEditorOverlay = (props: IProps) => {
const initConvertHEIC = async () => {
setCanvasLoading(true);
let pngFile: Blob;
let newFileBlob: Blob;
try {
pngFile = await convertHEICToRenderableFormat();
newFileBlob = await convertHEICToRenderableFormat();
} catch (e) {
logError(e, 'initConvertHEIC failed');
return;
@ -307,10 +311,17 @@ const ImageEditorOverlay = (props: IProps) => {
setCanvasLoading(false);
}
// create url from pngFile
const url = URL.createObjectURL(pngFile);
// create url from newFileBlob
const url = URL.createObjectURL(newFileBlob);
setFileURL(url);
// rename props.file.metadata.title with new JPEG extension for export
const fileName = getFileNameWithoutExtension(props.file.metadata.title);
const newFileName = `${fileName}.jpg`;
props.file.metadata.title = newFileName;
return url;
};
@ -321,7 +332,7 @@ const ImageEditorOverlay = (props: IProps) => {
throw Error('no original file URL');
}
return await convertHEIC(fileBlob, 'PNG');
return await convertHEIC(fileBlob, 'JPEG');
};
const getEditedFile = async () => {