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

revert: Revert get library manga with flow

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2024-06-19 17:11:35 +07:00
parent 6a2704ff11
commit 50d6f7293d
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View file

@ -1384,7 +1384,7 @@ open class LibraryController(
private fun onRefresh() {
showCategories(false)
presenter.getLibrary(true)
presenter.getLibrary()
destroyActionModeIfNeeded()
}
@ -1796,7 +1796,7 @@ open class LibraryController(
val category = (adapter.getItem(position) as? LibraryHeaderItem)?.category ?: return
if (!category.isDynamic) {
ManageCategoryDialog(category) {
presenter.getLibrary(true)
presenter.getLibrary()
}.showDialog(router)
}
}

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

@ -95,7 +95,7 @@ class LibraryPresenter(
private val updateChapter: UpdateChapters by injectLazy()
private val updateManga: UpdateManga by injectLazy()
private var libraryManga: List<LibraryManga> = emptyList()
//private var libraryManga: List<LibraryManga> = emptyList()
private val context = preferences.context
private val viewContext
@ -181,12 +181,18 @@ class LibraryPresenter(
lastLibraryItems = null
lastAllLibraryItems = null
}
/*
presenterScope.launch {
getLibraryManga.subscribe().collectLatest {
libraryManga = it.apply { if (groupType > BY_DEFAULT) { distinctBy { it.id } } }
getLibrary(false)
getLibrary()
}
}
*/
getLibrary()
if (!preferences.showLibrarySearchSuggestions().isSet()) {
DelayedLibrarySuggestionsJob.setupTask(context, true)
} else if (preferences.showLibrarySearchSuggestions().get() &&
@ -210,7 +216,7 @@ class LibraryPresenter(
}
/** Get favorited manga for library and sort and filter it */
fun getLibrary(forceFetch: Boolean = true) {
fun getLibrary() {
presenterScope.launch {
if (categories.isEmpty()) {
val dbCategories = getCategories.await()
@ -220,7 +226,7 @@ class LibraryPresenter(
categories = lastCategories ?: getCategories.await().toMutableList()
}
val (library, hiddenItems) = withIOContext { getLibraryFromDB(forceFetch) }
val (library, hiddenItems) = withIOContext { getLibraryFromDB() }
setDownloadCount(library)
setUnreadBadge(library)
setSourceLanguage(library)
@ -776,11 +782,10 @@ class LibraryPresenter(
*
* @return an list of all the manga in a itemized form.
*/
private suspend fun getLibraryFromDB(forceFetch: Boolean = false): Pair<List<LibraryItem>, List<LibraryItem>> {
private suspend fun getLibraryFromDB(): Pair<List<LibraryItem>, List<LibraryItem>> {
removeArticles = preferences.removeArticles().get()
val categories = getCategories.await().toMutableList()
if (forceFetch)
libraryManga = getLibraryManga.await().apply { if (groupType > BY_DEFAULT) { distinctBy { it.id } } }
val libraryManga = getLibraryManga.await().apply { if (groupType > BY_DEFAULT) { distinctBy { it.id } } }
val showAll = showAllCategories
val hiddenItems = mutableListOf<LibraryItem>()