github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Trigger new search on source filter change

Browse source 
Fixes #9724
Could be cleaned more though.
This commit is contained in:
arkon 2023-07-16 22:19:33 -04:00
parent ca789dca0e
commit c7f0a54a37
5 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt
View file

@ -27,7 +27,7 @@ class MigrateSearchScreen(private val mangaId: Long) : Screen() {
fromSourceId = dialogState.manga?.source,
navigateUp = navigator::pop,
onChangeSearchQuery = screenModel::updateSearchQuery,
onSearch = screenModel::search,
onSearch = { screenModel.search() },
getManga = { screenModel.getManga(it) },
onChangeSearchFilter = screenModel::setSourceFilter,
onToggleResults = screenModel::toggleFilterResults,

9
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreenModel.kt
View file

@ -18,12 +18,13 @@ class MigrateSearchScreenModel(
init {
coroutineScope.launch {
val manga = getManga.await(mangaId)!!
mutableState.update {
it.copy(fromSourceId = manga.source, searchQuery = manga.title)
it.copy(
fromSourceId = manga.source,
searchQuery = manga.title,
)
}
search(manga.title)
search()
}
}

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchScreen.kt
View file

@ -59,7 +59,7 @@ class GlobalSearchScreen(
state = state,
navigateUp = navigator::pop,
onChangeSearchQuery = screenModel::updateSearchQuery,
onSearch = screenModel::search,
onSearch = { screenModel.search() },
getManga = { screenModel.getManga(it) },
onChangeSearchFilter = screenModel::setSourceFilter,
onToggleResults = screenModel::toggleFilterResults,

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchScreenModel.kt
View file

@ -10,7 +10,7 @@ class GlobalSearchScreenModel(
init {
extensionFilter = initialExtensionFilter
if (initialQuery.isNotBlank() || !initialExtensionFilter.isNullOrBlank()) {
search(initialQuery)
search()
}
}

78
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/SearchScreenModel.kt
View file

@ -39,10 +39,11 @@ abstract class SearchScreenModel(
private val coroutineDispatcher = Executors.newFixedThreadPool(5).asCoroutineDispatcher()
private var searchJob: Job? = null
protected var query: String? = null
protected var extensionFilter: String? = null
private val sources by lazy { getSelectedSources() }
private var lastQuery: String? = null
private var lastSourceFilter: SourceFilter? = null
protected var extensionFilter: String? = null
protected val pinnedSources = sourcePreferences.pinnedSources().get()
private val sortComparator = { map: Map<CatalogueSource, SearchItemResult> ->
@ -95,72 +96,67 @@ abstract class SearchScreenModel(
}
fun updateSearchQuery(query: String?) {
mutableState.update {
it.copy(searchQuery = query)
}
}
fun getItems(): Map<CatalogueSource, SearchItemResult> {
return mutableState.value.items
mutableState.update { it.copy(searchQuery = query) }
}
fun setSourceFilter(filter: SourceFilter) {
mutableState.update { it.copy(sourceFilter = filter) }
search()
}
fun toggleFilterResults() {
mutableState.update {
it.copy(onlyShowHasResults = !it.onlyShowHasResults)
}
mutableState.update { it.copy(onlyShowHasResults = !it.onlyShowHasResults) }
}
fun search(query: String) {
if (this.query == query) return
fun search() {
val query = state.value.searchQuery
val sourceFilter = state.value.sourceFilter
this.query = query
if (query.isNullOrBlank()) return
if (this.lastQuery == query && this.lastSourceFilter == sourceFilter) return
this.lastQuery = query
this.lastSourceFilter = sourceFilter
searchJob?.cancel()
val initialItems = getSelectedSources().associateWith { SearchItemResult.Loading }
updateItems(initialItems)
searchJob = ioCoroutineScope.launch {
sources
.map { source ->
async {
try {
val page = withContext(coroutineDispatcher) {
source.fetchSearchManga(1, query, source.getFilterList()).awaitSingle()
}
sources.map { source ->
async {
try {
val page = withContext(coroutineDispatcher) {
source.fetchSearchManga(1, query, source.getFilterList()).awaitSingle()
}
val titles = page.mangas.map {
networkToLocalManga.await(it.toDomainManga(source.id))
}
val titles = page.mangas.map {
networkToLocalManga.await(it.toDomainManga(source.id))
}
getAndUpdateItems { items ->
val mutableMap = items.toMutableMap()
mutableMap[source] = SearchItemResult.Success(titles)
mutableMap.toSortedMap(sortComparator(mutableMap))
}
} catch (e: Exception) {
getAndUpdateItems { items ->
val mutableMap = items.toMutableMap()
mutableMap[source] = SearchItemResult.Error(e)
mutableMap.toSortedMap(sortComparator(mutableMap))
}
getAndUpdateItems { items ->
val mutableMap = items.toMutableMap()
mutableMap[source] = SearchItemResult.Success(titles)
mutableMap.toSortedMap(sortComparator(mutableMap))
}
} catch (e: Exception) {
getAndUpdateItems { items ->
val mutableMap = items.toMutableMap()
mutableMap[source] = SearchItemResult.Error(e)
mutableMap.toSortedMap(sortComparator(mutableMap))
}
}
}
}
.awaitAll()
}
}
private fun updateItems(items: Map<CatalogueSource, SearchItemResult>) {
mutableState.update {
it.copy(items = items)
}
mutableState.update { it.copy(items = items) }
}
private fun getAndUpdateItems(function: (Map<CatalogueSource, SearchItemResult>) -> Map<CatalogueSource, SearchItemResult>) {
updateItems(function(getItems()))
updateItems(function(state.value.items))
}
@Immutable