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

mangadex: remove search by letter since it was removed from mangadex (#304)

This commit is contained in:
Carlos 2018-04-18 08:23:54 -04:00 committed by GitHub
parent bd35a411eb
commit d9f31622f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/all/mangadex/build.gradle
View File

@ -5,8 +5,8 @@ ext {
appName = 'Tachiyomi: MangaDex' appName = 'Tachiyomi: MangaDex'
pkgNameSuffix = "all.mangadex" pkgNameSuffix = "all.mangadex"
extClass = '.MangadexFactory' extClass = '.MangadexFactory'
extVersionCode = 19 extVersionCode = 20
extVersionSuffix = 19 extVersionSuffix = 20
libVersion = '1.2' libVersion = '1.2'
} }

21
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
View File

@ -130,16 +130,6 @@ open class Mangadex(override val lang: String, private val internalLang: String,
} }
} }
} }
//do browse by letter if set
val byLetter = filters.find { it is ByLetter }
if (byLetter != null && (byLetter as ByLetter).state.first().state != 0) {
val s = byLetter.state.first().values[byLetter.state.first().state]
val pageStr = if (page != 1) (((page - 1) * 100)).toString() else "0"
val url = HttpUrl.parse("$baseUrl/titles/")!!.newBuilder().addPathSegment(s).addPathSegment(pageStr)
return GET(url.toString(), headers)
} else {
//do traditional search //do traditional search
val url = HttpUrl.parse("$baseUrl/?page=search")!!.newBuilder().addQueryParameter("p", page.toString()).addQueryParameter("title", query) val url = HttpUrl.parse("$baseUrl/?page=search")!!.newBuilder().addQueryParameter("p", page.toString()).addQueryParameter("title", query)
filters.forEach { filter -> filters.forEach { filter ->
@ -147,10 +137,12 @@ open class Mangadex(override val lang: String, private val internalLang: String,
is TextField -> url.addQueryParameter(filter.key, filter.state) is TextField -> url.addQueryParameter(filter.key, filter.state)
} }
} }
if (genres.isNotEmpty()) url.addQueryParameter("genres", genres.joinToString(",")) if (genres.isNotEmpty()) {
url.addQueryParameter("genres", genres.joinToString(","))
}
return GET(url.toString(), headers) return GET(url.toString(), headers)
}
} }
override fun searchMangaSelector() = "div.col-sm-6" override fun searchMangaSelector() = "div.col-sm-6"
@ -321,15 +313,12 @@ open class Mangadex(override val lang: String, private val internalLang: String,
private class Genre(val id: String, name: String) : Filter.CheckBox(name) private class Genre(val id: String, name: String) : Filter.CheckBox(name)
private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres) private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
private class R18 : Filter.Select<String>("R18+", arrayOf("Show all", "Show only", "Show none")) private class R18 : Filter.Select<String>("R18+", arrayOf("Show all", "Show only", "Show none"))
private class ByLetter(letters: List<Letters>) : Filter.Group<Letters>("Browse by Letter only", letters)
private class Letters : Filter.Select<String>("Letter", arrayOf("", "~", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"))
override fun getFilterList() = FilterList( override fun getFilterList() = FilterList(
TextField("Author", "author"), TextField("Author", "author"),
TextField("Artist", "artist"), TextField("Artist", "artist"),
R18(), R18(),
GenreList(getGenreList()), GenreList(getGenreList())
ByLetter(listOf(Letters()))
) )