ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fetch chapter pages everytime unless chapter is downloaded (#439)

Browse Source 
In case the chapter is not downloaded, the chapters pages have to be always fetched, since there is a possibility, that the chapter data is so old, that the available pages data is outdated.
This commit is contained in:
schroda
2023-11-04 22:40:21 +01:00
committed by GitHub
parent a6cc757d50
commit 2c35808ee4
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/screens/Reader.tsx
View File

@@ -118,6 +118,7 @@ export function Reader() {
const { data: chapterData, loading: isChapterLoading } = requestManager.useGetMangaChapter(mangaId, chapterIndex, { const { data: chapterData, loading: isChapterLoading } = requestManager.useGetMangaChapter(mangaId, chapterIndex, {
skip: isChapterLoaded, skip: isChapterLoaded,
}); });
const [arePagesUpdated, setArePagesUpdated] = useState(false);
const getLoadedChapter = () => { const getLoadedChapter = () => {
const isAChapterLoaded = loadedChapter.current; const isAChapterLoaded = loadedChapter.current;
@@ -127,6 +128,10 @@ export function Reader() {
return loadedChapter.current; return loadedChapter.current;
} }
if (arePagesUpdated) {
setArePagesUpdated(false);
}
if (chapterData?.chapter) { if (chapterData?.chapter) {
return chapterData.chapter; return chapterData.chapter;
} }
@@ -136,15 +141,21 @@ export function Reader() {
loadedChapter.current = getLoadedChapter(); loadedChapter.current = getLoadedChapter();
const chapter = loadedChapter.current ?? initialChapter; const chapter = loadedChapter.current ?? initialChapter;
const [fetchPages, { loading: areChapterPagesLoading }] = requestManager.useGetChapterPagesFetch(chapter.id); const [fetchPages] = requestManager.useGetChapterPagesFetch(chapter.id);
useEffect(() => { useEffect(() => {
if (!isChapterLoading && chapter.pageCount === -1) { const reCheckPages = !chapter.isDownloaded || chapter.pageCount === -1;
fetchPages(); const shouldFetchPages = !isChapterLoading && reCheckPages;
if (shouldFetchPages) {
fetchPages().then(() => setArePagesUpdated(true));
}
if (!reCheckPages && !arePagesUpdated) {
setArePagesUpdated(true);
} }
}, [chapter.id]); }, [chapter.id]);
const isLoading = isChapterLoading || areChapterPagesLoading || chapter.pageCount === -1; const isLoading = isChapterLoading || !arePagesUpdated;
const [wasLastPageReadSet, setWasLastPageReadSet] = useState(false); const [wasLastPageReadSet, setWasLastPageReadSet] = useState(false);
const [curPage, setCurPage] = useState<number>(0); const [curPage, setCurPage] = useState<number>(0);
const [pageToScrollTo, setPageToScrollTo] = useState<number | undefined>(undefined); const [pageToScrollTo, setPageToScrollTo] = useState<number | undefined>(undefined);
@@ -276,8 +287,7 @@ export function Reader() {
} }
}, [chapter.sourceOrder, manga.id, settings.skipDupChapters]); }, [chapter.sourceOrder, manga.id, settings.skipDupChapters]);
// return spinner while chpater data is loading if (isLoading) {
if (chapter.pageCount === -1) {
return ( return (
<Box <Box
sx={{ sx={{