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

reduce filteredData concurrency to 1

Browse source
This commit is contained in:
Abhinav 2023-01-19 17:19:12 +05:30
parent c283bda998
commit 9b76011171
1 changed files with 94 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
src/components/PhotoFrame.tsx
View file

@ -1,6 +1,6 @@
import { GalleryContext } from 'pages/gallery'; import { GalleryContext } from 'pages/gallery';
import PreviewCard from './pages/gallery/PreviewCard'; import PreviewCard from './pages/gallery/PreviewCard';
import React, { useContext, useEffect, useState } from 'react'; import React, { useContext, useEffect, useRef, useState } from 'react';
import { EnteFile } from 'types/file'; import { EnteFile } from 'types/file';
import { styled } from '@mui/material'; import { styled } from '@mui/material';
import DownloadManager from 'services/downloadManager'; import DownloadManager from 'services/downloadManager';
@ -114,81 +114,105 @@ const PhotoFrame = ({
const router = useRouter(); const router = useRouter();
const [isSourceLoaded, setIsSourceLoaded] = useState(false); const [isSourceLoaded, setIsSourceLoaded] = useState(false);
const filteredData = useMemo(() => { const updateInProgress = useRef(false);
const idSet = new Set(); const updateRequired = useRef(false);
const user: User = getData(LS_KEYS.USER);
return files const [filteredData, setFilteredData] = useState<EnteFile[]>([]);
.map((item, index) => ({
...item,
dataIndex: index,
w: window.innerWidth,
h: window.innerHeight,
title: item.pubMagicMetadata?.data.caption,
}))
.filter((item) => {
if (
deletedFileIds?.has(item.id) &&
activeCollection !== TRASH_SECTION
) {
return false;
}
if (
search?.date &&
!isSameDayAnyYear(search.date)(
new Date(item.metadata.creationTime / 1000)
)
) {
return false;
}
if (
search?.location &&
!isInsideBox(
{
latitude: item.metadata.latitude,
longitude: item.metadata.longitude,
},
search.location
)
) {
return false;
}
if (
!isDeduplicating &&
activeCollection === ALL_SECTION &&
(IsArchived(item) ||
archivedCollections?.has(item.collectionID))
) {
return false;
}
if (activeCollection === ARCHIVE_SECTION && !IsArchived(item)) {
return false;
}
if (isSharedFile(user, item) && !isSharedCollection) { useEffect(() => {
return false; const main = () => {
} if (updateInProgress.current) {
if (activeCollection === TRASH_SECTION && !item.isTrashed) { updateRequired.current = true;
return false; return;
} }
if (activeCollection !== TRASH_SECTION && item.isTrashed) { updateInProgress.current = true;
return false; const idSet = new Set();
} const user: User = getData(LS_KEYS.USER);
if (!idSet.has(item.id)) {
const filteredData = files
.map((item, index) => ({
...item,
dataIndex: index,
w: window.innerWidth,
h: window.innerHeight,
title: item.pubMagicMetadata?.data.caption,
}))
.filter((item) => {
if ( if (
activeCollection === ALL_SECTION || deletedFileIds?.has(item.id) &&
activeCollection === ARCHIVE_SECTION || activeCollection !== TRASH_SECTION
activeCollection === TRASH_SECTION ||
activeCollection === item.collectionID ||
isInSearchMode
) { ) {
idSet.add(item.id); return false;
return true; }
if (
search?.date &&
!isSameDayAnyYear(search.date)(
new Date(item.metadata.creationTime / 1000)
)
) {
return false;
}
if (
search?.location &&
!isInsideBox(
{
latitude: item.metadata.latitude,
longitude: item.metadata.longitude,
},
search.location
)
) {
return false;
}
if (
!isDeduplicating &&
activeCollection === ALL_SECTION &&
(IsArchived(item) ||
archivedCollections?.has(item.collectionID))
) {
return false;
}
if (
activeCollection === ARCHIVE_SECTION &&
!IsArchived(item)
) {
return false;
}
if (isSharedFile(user, item) && !isSharedCollection) {
return false;
}
if (activeCollection === TRASH_SECTION && !item.isTrashed) {
return false;
}
if (activeCollection !== TRASH_SECTION && item.isTrashed) {
return false;
}
if (!idSet.has(item.id)) {
if (
activeCollection === ALL_SECTION ||
activeCollection === ARCHIVE_SECTION ||
activeCollection === TRASH_SECTION ||
activeCollection === item.collectionID ||
isInSearchMode
) {
idSet.add(item.id);
return true;
}
return false;
} }
return false; return false;
} });
return false; setFilteredData(filteredData);
}); updateInProgress.current = false;
if (updateRequired.current) {
updateRequired.current = false;
setTimeout(() => {
main();
}, 0);
}
};
main();
}, [ }, [
files, files,
deletedFileIds, deletedFileIds,