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

Merge pull request #831 from ente-io/fix-file-info-issues

Browse source 
Fix file info issues
This commit is contained in:
Abhinav Kumar 2022-12-16 17:10:35 +05:30 committed by GitHub
parent 619a69e747 4c0e208def
commit 9ebaefeb12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/PhotoViewer/FileInfo/RenderFileName.tsx
View file

@ -9,7 +9,7 @@ import {
import { FlexWrapper } from 'components/Container'; import { FlexWrapper } from 'components/Container';
import { logError } from 'utils/sentry'; import { logError } from 'utils/sentry';
import { FILE_TYPE } from 'constants/file'; import { FILE_TYPE } from 'constants/file';
import { PhotoOutlined, VideoFileOutlined } from '@mui/icons-material'; import { PhotoOutlined, VideocamOutlined } from '@mui/icons-material';
import InfoItem from './InfoItem'; import InfoItem from './InfoItem';
import { makeHumanReadableStorage } from 'utils/billing'; import { makeHumanReadableStorage } from 'utils/billing';
import Box from '@mui/material/Box'; import Box from '@mui/material/Box';
@ -98,10 +98,10 @@ export function RenderFileName({
<> <>
<InfoItem <InfoItem
icon={ icon={
file.metadata.fileType === FILE_TYPE.IMAGE ? ( file.metadata.fileType === FILE_TYPE.VIDEO ? (
<PhotoOutlined /> <VideocamOutlined />
) : ( ) : (
<VideoFileOutlined /> <PhotoOutlined />
) )
} }
title={getFileTitle(filename, extension)} title={getFileTitle(filename, extension)}

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

@ -9,7 +9,11 @@ import {
import { EnteFile } from 'types/file'; import { EnteFile } from 'types/file';
import constants from 'utils/strings/constants'; import constants from 'utils/strings/constants';
import exifr from 'exifr'; import exifr from 'exifr';
import { downloadFile, copyFileToClipboard } from 'utils/file'; import {
downloadFile,
copyFileToClipboard,
getFileExtension,
} from 'utils/file';
import { livePhotoBtnHTML } from 'components/LivePhotoBtn'; import { livePhotoBtnHTML } from 'components/LivePhotoBtn';
import { logError } from 'utils/sentry'; import { logError } from 'utils/sentry';
@ -307,6 +311,11 @@ function PhotoViewer(props: Iprops) {
}); });
photoSwipe.listen('beforeChange', () => { photoSwipe.listen('beforeChange', () => {
const currItem = photoSwipe?.currItem as EnteFile; const currItem = photoSwipe?.currItem as EnteFile;
updateFavButton(currItem);
if (currItem.metadata.fileType !== FILE_TYPE.IMAGE) {
setExif({ key: currItem.src, value: null });
return;
}
if ( if (
!currItem || !currItem ||
!exifCopy?.current?.value === null || !exifCopy?.current?.value === null ||
@ -316,10 +325,13 @@ function PhotoViewer(props: Iprops) {
} }
setExif({ key: currItem.src, value: undefined }); setExif({ key: currItem.src, value: undefined });
checkExifAvailable(currItem); checkExifAvailable(currItem);
updateFavButton(currItem);
}); });
photoSwipe.listen('resize', () => { photoSwipe.listen('resize', () => {
const currItem = photoSwipe?.currItem as EnteFile; const currItem = photoSwipe?.currItem as EnteFile;
if (currItem.metadata.fileType !== FILE_TYPE.IMAGE) {
setExif({ key: currItem.src, value: null });
return;
}
if ( if (
!currItem || !currItem ||
!exifCopy?.current?.value === null || !exifCopy?.current?.value === null ||
@ -440,7 +452,9 @@ function PhotoViewer(props: Iprops) {
exifExtractionInProgress.current = null; exifExtractionInProgress.current = null;
} }
} catch (e) { } catch (e) {
logError(e, 'exifr parsing failed'); setExif({ key: file.src, value: null });
const fileExtension = getFileExtension(file.metadata.title);
logError(e, 'exifr parsing failed', { extension: fileExtension });
} }
}; };