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

move isSourceLoaded check to checkExifAvailable

Browse source
This commit is contained in:
Abhinav 2022-11-29 18:45:04 +05:30
parent 1b5a628552
commit eed19808cc
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/components/PhotoViewer/index.tsx
View file

@ -311,8 +311,7 @@ function PhotoViewer(props: Iprops) {
if (
!currItem ||
!exifCopy?.current?.value === null ||
exifCopy?.current?.key === currItem.src ||
!currItem.isSourceLoaded
exifCopy?.current?.key === currItem.src
) {
return;
}
@ -325,8 +324,7 @@ function PhotoViewer(props: Iprops) {
if (
!currItem ||
!exifCopy?.current?.value === null ||
exifCopy?.current?.key === currItem.src ||
!currItem.isSourceLoaded
exifCopy?.current?.key === currItem.src
) {
return;
}
@ -424,22 +422,24 @@ function PhotoViewer(props: Iprops) {
return;
}
try {
console.log('starting processing');
exifExtractionInProgress.current = file.src;
const imageBlob = await (await fetch(file.src)).blob();
const exifData = (await exifr.parse(imageBlob)) as Record<
string,
any
>;
console.log({ exifData });
console.log(exifExtractionInProgress, file.src);
if (exifExtractionInProgress.current === file.src) {
if (exifData) {
console.log('set extracted metadata');
setExif({ key: file.src, value: exifData });
} else {
console.log("doesn't have metadata");
setExif({ key: file.src, value: null });
if (file.isSourceLoaded) {
console.log('starting processing');
exifExtractionInProgress.current = file.src;
const imageBlob = await (await fetch(file.src)).blob();
const exifData = (await exifr.parse(imageBlob)) as Record<
string,
any
>;
console.log({ exifData });
console.log(exifExtractionInProgress, file.src);
if (exifExtractionInProgress.current === file.src) {
if (exifData) {
console.log('set extracted metadata');
setExif({ key: file.src, value: exifData });
} else {
console.log("doesn't have metadata");
setExif({ key: file.src, value: null });
}
}
}
} finally {