Draff/Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bato.to: Search Fix for #7120 (#7124)

Browse Source 
* Update build.gradle

* Update BatoTo.kt
This commit is contained in:
Johannes Joens 2021-05-21 01:15:26 +12:00 committed by GitHub
parent c21ff364b8
commit bbf5ee19df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/batoto/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'Bato.to' extName = 'Bato.to'
pkgNameSuffix = 'all.batoto' pkgNameSuffix = 'all.batoto'
extClass = '.BatoToFactory' extClass = '.BatoToFactory'
extVersionCode = 10 extVersionCode = 11
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

17
src/all/batoto/src/eu/kanade/tachiyomi/extension/all/batoto/BatoTo.kt
View File

@ -76,25 +76,18 @@ open class BatoTo(
return when { return when {
query.startsWith("ID:") -> { query.startsWith("ID:") -> {
val id = query.substringAfter("ID:") val id = query.substringAfter("ID:")
client.newCall(GET("https://bato.to/series/$id", headers)).asObservableSuccess() client.newCall(GET("$baseUrl/series/$id", headers)).asObservableSuccess()
.map { response -> .map { response ->
queryIDParse(response, id) queryIDParse(response, id)
} }
} }
query.isNotBlank() -> { query.isNotBlank() -> {
val url = "$baseUrl/search".toHttpUrlOrNull()!!.newBuilder() val url = "$baseUrl/search?word=$query&page=$page"
val letterFilter = filters.findInstance<LetterFilter>()!! client.newCall(GET(url, headers)).asObservableSuccess()
url.addQueryParameter("word", query)
url.addQueryParameter("page", "$page")
if (letterFilter.state){
url.addQueryParameter("mode", "letter")
}
client.newCall(GET(url.build().toString(), headers)).asObservableSuccess()
.map { response -> .map { response ->
queryParse(response) queryParse(response)
} }
} }
else -> { else -> {
val sortFilter = filters.findInstance<SortFilter>()!! val sortFilter = filters.findInstance<SortFilter>()!!
val reverseSortFilter = filters.findInstance<ReverseSortFilter>()!! val reverseSortFilter = filters.findInstance<ReverseSortFilter>()!!
@ -353,7 +346,7 @@ open class BatoTo(
override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used") override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
override fun getFilterList() = FilterList( override fun getFilterList() = FilterList(
LetterFilter(), //LetterFilter(),
Filter.Header("NOTE: Ignored if using text search!"), Filter.Header("NOTE: Ignored if using text search!"),
Filter.Separator(), Filter.Separator(),
SortFilter(getSortFilter(), 5), SortFilter(getSortFilter(), 5),
@ -747,6 +740,4 @@ open class BatoTo(
).filterNot { it.value == siteLang } ).filterNot { it.value == siteLang }
private inline fun <reified T> Iterable<*>.findInstance() = find { it is T } as? T private inline fun <reified T> Iterable<*>.findInstance() = find { it is T } as? T
// Old Filters
} }