fix(searching): fix filter-list param when doing search with some ext while doing: (#1006)
- Smart search - Suggestions
This commit is contained in:
parent
6c530e4fca
commit
87563a239c
4 changed files with 5 additions and 6 deletions
|
|
@ -180,7 +180,7 @@ private fun ColumnScope.FilterPage(
|
||||||
)
|
)
|
||||||
// SY <--
|
// SY <--
|
||||||
|
|
||||||
// KMY -->
|
// KMK -->
|
||||||
CategoriesFilter(
|
CategoriesFilter(
|
||||||
libraryPreferences = screenModel.libraryPreferences,
|
libraryPreferences = screenModel.libraryPreferences,
|
||||||
categories = categories,
|
categories = categories,
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.data.database.models.Track
|
||||||
import eu.kanade.tachiyomi.data.track.BaseTracker
|
import eu.kanade.tachiyomi.data.track.BaseTracker
|
||||||
import eu.kanade.tachiyomi.data.track.model.TrackMangaMetadata
|
import eu.kanade.tachiyomi.data.track.model.TrackMangaMetadata
|
||||||
import eu.kanade.tachiyomi.data.track.model.TrackSearch
|
import eu.kanade.tachiyomi.data.track.model.TrackSearch
|
||||||
import eu.kanade.tachiyomi.source.model.FilterList
|
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import exh.md.network.MangaDexAuthInterceptor
|
import exh.md.network.MangaDexAuthInterceptor
|
||||||
import exh.md.utils.FollowStatus
|
import exh.md.utils.FollowStatus
|
||||||
|
|
@ -149,7 +148,7 @@ class MdList(id: Long) : BaseTracker(id, "MDList") {
|
||||||
override suspend fun search(query: String): List<TrackSearch> {
|
override suspend fun search(query: String): List<TrackSearch> {
|
||||||
return withIOContext {
|
return withIOContext {
|
||||||
val mdex = mdex ?: throw MangaDexNotFoundException()
|
val mdex = mdex ?: throw MangaDexNotFoundException()
|
||||||
mdex.getSearchManga(1, query, FilterList())
|
mdex.getSearchManga(1, query, mdex.getFilterList())
|
||||||
.mangas
|
.mangas
|
||||||
.map {
|
.map {
|
||||||
toTrackSearch(mdex.getMangaDetails(it))
|
toTrackSearch(mdex.getMangaDetails(it))
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
package exh.smartsearch
|
package exh.smartsearch
|
||||||
|
|
||||||
import eu.kanade.tachiyomi.source.CatalogueSource
|
import eu.kanade.tachiyomi.source.CatalogueSource
|
||||||
import eu.kanade.tachiyomi.source.model.FilterList
|
|
||||||
import eu.kanade.tachiyomi.source.model.SManga
|
import eu.kanade.tachiyomi.source.model.SManga
|
||||||
import mihon.domain.manga.model.toDomainManga
|
import mihon.domain.manga.model.toDomainManga
|
||||||
import tachiyomi.domain.manga.model.Manga
|
import tachiyomi.domain.manga.model.Manga
|
||||||
|
|
@ -23,5 +22,5 @@ class SmartSourceSearchEngine(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun makeSearchAction(source: CatalogueSource): SearchAction<SManga> =
|
private fun makeSearchAction(source: CatalogueSource): SearchAction<SManga> =
|
||||||
{ query -> source.getSearchManga(1, query, FilterList()).mangas }
|
{ query -> source.getSearchManga(1, query, source.getFilterList()).mangas }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -185,10 +185,11 @@ interface CatalogueSource : Source {
|
||||||
if (words.isEmpty()) return
|
if (words.isEmpty()) return
|
||||||
|
|
||||||
coroutineScope {
|
coroutineScope {
|
||||||
|
val filterList = getFilterList()
|
||||||
words.map { keyword ->
|
words.map { keyword ->
|
||||||
launch {
|
launch {
|
||||||
runCatching {
|
runCatching {
|
||||||
getSearchManga(1, keyword.sanitize(), FilterList()).mangas
|
getSearchManga(1, keyword.sanitize(), filterList).mangas
|
||||||
}
|
}
|
||||||
.onSuccess { if (it.isNotEmpty()) pushResults(Pair(keyword, it), false) }
|
.onSuccess { if (it.isNotEmpty()) pushResults(Pair(keyword, it), false) }
|
||||||
.onFailure { e ->
|
.onFailure { e ->
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue