haho: fix for empty filters

This commit is contained in:
jmir1
2021-11-26 22:26:29 +01:00
parent 60d668cc83
commit 988dc7f788
2 changed files with 6 additions and 8 deletions

View File

@ -5,7 +5,7 @@ ext {
extName = 'haho.moe' extName = 'haho.moe'
pkgNameSuffix = 'en.hahomoe' pkgNameSuffix = 'en.hahomoe'
extClass = '.HahoMoe' extClass = '.HahoMoe'
extVersionCode = 6 extVersionCode = 7
libVersion = '12' libVersion = '12'
containsNsfw = true containsNsfw = true
} }

View File

@ -135,13 +135,11 @@ class HahoMoe : ParsedAnimeHttpSource() {
override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request { override fun searchAnimeRequest(page: Int, query: String, filters: AnimeFilterList): Request {
val (includedTags, blackListedTags, orderBy, ordering) = getSearchParameters(filters) val (includedTags, blackListedTags, orderBy, ordering) = getSearchParameters(filters)
val incTags = includedTags.joinToString(prefix = " genre:", separator = " genre:") val incTags = includedTags.ifEmpty { null }
val excTags = blackListedTags.joinToString(prefix = " -genre:", separator = " -genre:") ?.joinToString(prefix = "+genre:", separator = "+genre:") ?: ""
return when { val excTags = blackListedTags.ifEmpty { null }
(blackListedTags.isNotEmpty()) -> GET("$baseUrl/anime?q=title:$query$incTags$excTags&page=$page&s=$orderBy$ordering") ?.joinToString(prefix = "+-genre:", separator = "+-genre:") ?: ""
(includedTags.isNotEmpty()) -> GET("$baseUrl/anime?q=title:$query$incTags&page=$page&s=$orderBy$ordering") return GET("$baseUrl/anime?q=title:$query$incTags$excTags&page=$page&s=$orderBy$ordering")
else -> { GET("$baseUrl/anime?q=title:$query&page=$page&s=$orderBy$ordering") }
}
} }
override fun animeDetailsParse(document: Document): SAnime { override fun animeDetailsParse(document: Document): SAnime {
val anime = SAnime.create() val anime = SAnime.create()