yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update reader chapter list filtering to handle not downloaded/bookmarked (closes #5107)

Browse Source
This commit is contained in:
arkon 2021-05-23 11:27:52 -04:00
parent 974275a429
commit ce9fb2f1fe
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
View File

@ -96,28 +96,22 @@ class ReaderPresenter(
val selectedChapter = dbChapters.find { it.id == chapterId } val selectedChapter = dbChapters.find { it.id == chapterId }
?: error("Requested chapter of id $chapterId not found in chapter list") ?: error("Requested chapter of id $chapterId not found in chapter list")
val chaptersForReader = val chaptersForReader = when {
if (preferences.skipRead() || preferences.skipFiltered()) { (preferences.skipRead() || preferences.skipFiltered()) -> {
val list = dbChapters val list = dbChapters.filterNot {
.filter { when {
if (preferences.skipRead() && it.read) { preferences.skipRead() && it.read -> true
return@filter false preferences.skipFiltered() -> {
} else if (preferences.skipFiltered()) { (manga.readFilter == Manga.CHAPTER_SHOW_READ && !it.read) ||
if (
(manga.readFilter == Manga.CHAPTER_SHOW_READ && !it.read) ||
(manga.readFilter == Manga.CHAPTER_SHOW_UNREAD && it.read) || (manga.readFilter == Manga.CHAPTER_SHOW_UNREAD && it.read) ||
( (manga.downloadedFilter == Manga.CHAPTER_SHOW_DOWNLOADED && !downloadManager.isChapterDownloaded(it, manga)) ||
manga.downloadedFilter == Manga.CHAPTER_SHOW_DOWNLOADED && (manga.downloadedFilter == Manga.CHAPTER_SHOW_NOT_DOWNLOADED && downloadManager.isChapterDownloaded(it, manga)) ||
!downloadManager.isChapterDownloaded(it, manga) (manga.bookmarkedFilter == Manga.CHAPTER_SHOW_BOOKMARKED && !it.bookmark) ||
) || (manga.bookmarkedFilter == Manga.CHAPTER_SHOW_NOT_BOOKMARKED && it.bookmark)
(manga.bookmarkedFilter == Manga.CHAPTER_SHOW_BOOKMARKED && !it.bookmark)
) {
return@filter false
}
} }
else -> false
true
} }
}
.toMutableList() .toMutableList()
val find = list.find { it.id == chapterId } val find = list.find { it.id == chapterId }
@ -125,9 +119,9 @@ class ReaderPresenter(
list.add(selectedChapter) list.add(selectedChapter)
} }
list list
} else {
dbChapters
} }
else -> dbChapters
}
when (manga.sorting) { when (manga.sorting) {
Manga.CHAPTER_SORTING_SOURCE -> ChapterLoadBySource().get(chaptersForReader) Manga.CHAPTER_SORTING_SOURCE -> ChapterLoadBySource().get(chaptersForReader)