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

refactor: Prepare filter preference flow

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-20 08:49:59 +07:00
parent 8922b5ecbf
commit c5a009f419
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 42 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

103
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View file

@ -50,7 +50,6 @@ import eu.kanade.tachiyomi.util.system.withIOContext
import eu.kanade.tachiyomi.util.system.withUIContext import eu.kanade.tachiyomi.util.system.withUIContext
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
@ -320,19 +319,15 @@ class LibraryPresenter(
* @param items the items to filter. * @param items the items to filter.
*/ */
private fun applyFilters(items: List<LibraryItem>): List<LibraryItem> { private fun applyFilters(items: List<LibraryItem>): List<LibraryItem> {
val filterDownloaded = preferences.filterDownloaded().get() val filterPrefs = ItemPreferences(
filterDownloaded = preferences.filterDownloaded().get(),
val filterUnread = preferences.filterUnread().get() filterUnread = preferences.filterUnread().get(),
filterCompleted = preferences.filterCompleted().get(),
val filterCompleted = preferences.filterCompleted().get() filterTracked = preferences.filterTracked().get(),
filterMangaType = preferences.filterMangaType().get(),
val filterTracked = preferences.filterTracked().get() filterContentType = preferences.filterContentType().get(),
filterBookmarked = preferences.filterBookmarked().get(),
val filterMangaType = preferences.filterMangaType().get() )
val filterContentType = preferences.filterContentType().get()
val filterBookmarked = preferences.filterBookmarked().get()
val showEmptyCategoriesWhileFiltering = preferences.showEmptyCategoriesWhileFiltering().get() val showEmptyCategoriesWhileFiltering = preferences.showEmptyCategoriesWhileFiltering().get()
@ -340,12 +335,12 @@ class LibraryPresenter(
val filtersOff = view?.isSubClass != true && val filtersOff = view?.isSubClass != true &&
( (
filterDownloaded == 0 && filterPrefs.filterDownloaded == 0 &&
filterUnread == 0 && filterPrefs.filterUnread == 0 &&
filterCompleted == 0 && filterPrefs.filterCompleted == 0 &&
filterTracked == 0 && filterPrefs.filterTracked == 0 &&
filterMangaType == 0 && filterPrefs.filterMangaType == 0 &&
filterContentType == 0 filterPrefs.filterContentType == 0
) )
hasActiveFilters = !filtersOff hasActiveFilters = !filtersOff
val missingCategorySet = categories.mapNotNull { it.id }.toMutableSet() val missingCategorySet = categories.mapNotNull { it.id }.toMutableSet()
@ -359,14 +354,8 @@ class LibraryPresenter(
return@f subItems.any { return@f subItems.any {
matchesFilters( matchesFilters(
it, it,
filterDownloaded, filterPrefs,
filterUnread,
filterCompleted,
filterTracked,
filterMangaType,
filterBookmarked,
filterTrackers, filterTrackers,
filterContentType,
) )
} }
} }
@ -380,14 +369,8 @@ class LibraryPresenter(
} }
val matches = matchesFilters( val matches = matchesFilters(
item, item,
filterDownloaded, filterPrefs,
filterUnread,
filterCompleted,
filterTracked,
filterMangaType,
filterBookmarked,
filterTrackers, filterTrackers,
filterContentType,
) )
if (matches) { if (matches) {
missingCategorySet.remove(item.manga.category) missingCategorySet.remove(item.manga.category)
@ -404,34 +387,28 @@ class LibraryPresenter(
private fun matchesFilters( private fun matchesFilters(
item: LibraryItem, item: LibraryItem,
filterDownloaded: Int, filterPrefs: ItemPreferences,
filterUnread: Int,
filterCompleted: Int,
filterTracked: Int,
filterMangaType: Int,
filterBookmarked: Int,
filterTrackers: String, filterTrackers: String,
filterContentType: Int,
): Boolean { ): Boolean {
(view as? FilteredLibraryController)?.let { (view as? FilteredLibraryController)?.let {
return matchesCustomFilters(item, it, filterTrackers) return matchesCustomFilters(item, it, filterTrackers)
} }
if (filterUnread == STATE_INCLUDE && item.manga.unread == 0) return false if (filterPrefs.filterUnread == STATE_INCLUDE && item.manga.unread == 0) return false
if (filterUnread == STATE_EXCLUDE && item.manga.unread > 0) return false if (filterPrefs.filterUnread == STATE_EXCLUDE && item.manga.unread > 0) return false
// Filter for unread chapters // Filter for unread chapters
if (filterUnread == 3 && !(item.manga.unread > 0 && !item.manga.hasRead)) return false if (filterPrefs.filterUnread == 3 && !(item.manga.unread > 0 && !item.manga.hasRead)) return false
if (filterUnread == 4 && !(item.manga.unread > 0 && item.manga.hasRead)) return false if (filterPrefs.filterUnread == 4 && !(item.manga.unread > 0 && item.manga.hasRead)) return false
if (filterBookmarked == STATE_INCLUDE && item.manga.bookmarkCount == 0) return false if (filterPrefs.filterBookmarked == STATE_INCLUDE && item.manga.bookmarkCount == 0) return false
if (filterBookmarked == STATE_EXCLUDE && item.manga.bookmarkCount > 0) return false if (filterPrefs.filterBookmarked == STATE_EXCLUDE && item.manga.bookmarkCount > 0) return false
if (filterMangaType > 0) { if (filterPrefs.filterMangaType > 0) {
if (if (filterMangaType == Manga.TYPE_MANHWA) { if (if (filterPrefs.filterMangaType == Manga.TYPE_MANHWA) {
item.manga.seriesType(sourceManager = sourceManager) !in arrayOf(filterMangaType, Manga.TYPE_WEBTOON) item.manga.seriesType(sourceManager = sourceManager) !in arrayOf(filterPrefs.filterMangaType, Manga.TYPE_WEBTOON)
} else { } else {
filterMangaType != item.manga.seriesType(sourceManager = sourceManager) filterPrefs.filterMangaType != item.manga.seriesType(sourceManager = sourceManager)
} }
) { ) {
return false return false
@ -439,24 +416,24 @@ class LibraryPresenter(
} }
// Filter for completed status of manga // Filter for completed status of manga
if (filterCompleted == STATE_INCLUDE && item.manga.status != SManga.COMPLETED) return false if (filterPrefs.filterCompleted == STATE_INCLUDE && item.manga.status != SManga.COMPLETED) return false
if (filterCompleted == STATE_EXCLUDE && item.manga.status == SManga.COMPLETED) return false if (filterPrefs.filterCompleted == STATE_EXCLUDE && item.manga.status == SManga.COMPLETED) return false
if (!matchesFilterTracking(item, filterTracked, filterTrackers)) return false if (!matchesFilterTracking(item, filterPrefs.filterTracked, filterTrackers)) return false
// Filter for downloaded manga // Filter for downloaded manga
if (filterDownloaded != STATE_IGNORE) { if (filterPrefs.filterDownloaded != STATE_IGNORE) {
val isDownloaded = when { val isDownloaded = when {
item.manga.isLocal() -> true item.manga.isLocal() -> true
item.downloadCount != -1 -> item.downloadCount > 0 item.downloadCount != -1 -> item.downloadCount > 0
else -> downloadManager.getDownloadCount(item.manga) > 0 else -> downloadManager.getDownloadCount(item.manga) > 0
} }
return if (filterDownloaded == STATE_INCLUDE) isDownloaded else !isDownloaded return if (filterPrefs.filterDownloaded == STATE_INCLUDE) isDownloaded else !isDownloaded
} }
// Filter for NSFW/SFW contents // Filter for NSFW/SFW contents
if (filterContentType == STATE_INCLUDE) return !item.manga.isLewd() if (filterPrefs.filterContentType == STATE_INCLUDE) return !item.manga.isLewd()
if (filterContentType == STATE_EXCLUDE) return item.manga.isLewd() if (filterPrefs.filterContentType == STATE_EXCLUDE) return item.manga.isLewd()
return true return true
} }
@ -1572,9 +1549,13 @@ class LibraryPresenter(
} }
} }
/*
@Immutable
data class ItemPreferences( data class ItemPreferences(
val filterDownloaded: Int,
val filterUnread: Int,
val filterCompleted: Int,
val filterTracked: Int,
val filterMangaType: Int,
val filterContentType: Int,
val filterBookmarked: Int,
) )
*/
} }