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

Delete chapter when read even if already marked as read

Browse Source 
ReaderControls#useUpdateCurrentPageIndex:
On a page change the chapter update needs to be always queued since the deletion of downloaded chapters while reading logic is in the "ReaderService#updateChapter" function.
Thus, when the update is prevented here, this logic would never get triggered.

ReaderService#useUpdateChapter:
In case the read status or lastPageRead of a chapter did not change, the update was not triggered.
However, there might still be chapter downloads that need to be de deleted, which was never handled in such a case.
This commit is contained in:
schroda
2025-01-16 13:22:13 +01:00
parent ef08799fc0
commit a96bc2c1da
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/reader/services/ReaderControls.ts
View File

@@ -441,18 +441,10 @@ export class ReaderControls {
}
const actualPageIndex = endReached ? currentChapterUpToDate.pageCount - 1 : pageIndex;
const hasLastPageReadChanged = actualPageIndex !== currentChapterUpToDate.lastPageRead;
const isLastPage = actualPageIndex === currentChapterUpToDate.pageCount - 1;
const hasIsReadChanged = (isLastPage || endReached) && !currentChapterUpToDate.isRead;
const shouldUpdateChapter = hasLastPageReadChanged || hasIsReadChanged;
if (!shouldUpdateChapter) {
return;
}
updateChapter({
lastPageRead: hasLastPageReadChanged ? actualPageIndex : undefined,
lastPageRead: actualPageIndex,
isRead: isLastPage ? true : undefined,
});
};

42
src/modules/reader/services/ReaderService.ts
View File

@@ -153,24 +153,6 @@ export class ReaderService {
: [currentChapter],
);
const isUpdateRequired = chapterIdsToUpdate.some((id) => {
const chapterUpToDateData = getReaderChapterFromCache(id);
if (!chapterUpToDateData) {
return false;
}
return (
(patch.isRead !== undefined && patch.isRead !== chapterUpToDateData.isRead) ||
(patch.lastPageRead !== undefined &&
patch.lastPageRead !== chapterUpToDateData.lastPageRead) ||
(patch.isBookmarked !== undefined &&
patch.isBookmarked !== chapterUpToDateData.isBookmarked)
);
});
if (!isUpdateRequired) {
return;
}
const chapterIdsToDelete = getChapterIdsToDeleteForChapterUpdate(
currentChapter,
mangaChapters,
@@ -181,6 +163,26 @@ export class ReaderService {
shouldSkipDupChapters,
);
const isUpdateRequired =
!!chapterIdsToDelete.length ||
chapterIdsToUpdate.some((id) => {
const chapterUpToDateData = getReaderChapterFromCache(id);
if (!chapterUpToDateData) {
return false;
}
return (
(patch.isRead !== undefined && patch.isRead !== chapterUpToDateData.isRead) ||
(patch.lastPageRead !== undefined &&
patch.lastPageRead !== chapterUpToDateData.lastPageRead) ||
(patch.isBookmarked !== undefined &&
patch.isBookmarked !== chapterUpToDateData.isBookmarked)
);
});
if (!isUpdateRequired) {
return;
}
await requestManager
.updateChapters(
chapterIdsToUpdate,
@@ -197,9 +199,7 @@ export class ReaderService {
.response.catch(defaultPromiseErrorHandler('ReaderService::useUpdateChapter'));
};
ReaderService.getOrCreateChapterUpdateQueue(currentChapter.id).enqueue(`${currentChapter.id}`, () =>
update(),
);
ReaderService.getOrCreateChapterUpdateQueue(currentChapter.id).enqueue(`${currentChapter.id}`, update);
},
[
manga?.id,