null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Scanlator filter not working properly

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-08-10 10:29:52 +07:00
parent 0e2c336a37
commit 7e1b532f83
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
6 changed files with 70 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
View file

@ -186,17 +186,12 @@ class MangaDetailsPresenter(
private suspend fun getChapters() {
val chapters = getChapter.awaitAll(manga.id!!, isScanlatorFiltered()).map { it.toModel() }
allChapters = if (!isScanlatorFiltered()) chapters else getChapter.awaitAll(manga.id!!, false).map { it.toModel() }
// Find downloaded chapters
setDownloadedChapters(chapters)
allChapterScanlators =
if (!isScanlatorFiltered()) {
chapters.flatMap { ChapterUtil.getScanlators(it.chapter.scanlator) }
} else {
getAvailableScanlators.await(manga.id!!)
}.toSet()
// Store the last emission
allChapters = if (!isScanlatorFiltered()) chapters else getChapter.awaitAll(manga.id!!, false).map { it.toModel() }
allChapterScanlators = allChapters.mapNotNull { it.chapter.scanlator }.toSet()
this.chapters = applyChapterFilters(chapters)
}

8
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersSortBottomSheet.kt
View file

@ -166,11 +166,9 @@ class ChaptersSortBottomSheet(controller: MangaDetailsController) :
binding.filterGroupsButton.setOnClickListener {
val scanlators = presenter.allChapterScanlators.toList()
val filteredScanlators =
(
presenter.manga.filtered_scanlators?.let { ChapterUtil.getScanlators(it) }
?.toMutableSet()
?: mutableSetOf()
)
presenter.manga.filtered_scanlators?.let { ChapterUtil.getScanlators(it) }.orEmpty()
.filter { it in scanlators }
.toMutableSet()
val preselected = scanlators.map { it in filteredScanlators }.toBooleanArray()
var alertDialog: AlertDialog? = null
activity.materialAlertDialog()

5
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterSourceSync.kt
View file

@ -206,10 +206,7 @@ private fun List<Chapter>.filterChaptersByScanlators(manga: Manga): List<Chapter
if (manga.filtered_scanlators == null) return this
return this.filter { chapter ->
ChapterUtil.getScanlators(chapter.scanlator)
.none { group ->
ChapterUtil.getScanlators(manga.filtered_scanlators).contains(group)
}
!ChapterUtil.getScanlators(manga.filtered_scanlators).contains(chapter.scanlator)
}
}

2
app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterUtil.kt
View file

@ -156,7 +156,7 @@ class ChapterUtil {
return chapters.size > 20
}
const val scanlatorSeparator = " & "
const val scanlatorSeparator = " [.] "
fun getScanlators(scanlators: String?): List<String> {
if (scanlators.isNullOrBlank()) return emptyList()