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

R18 during search option for Mangadex fixed chapter date (#198)

Browse Source 
* add r18 drop down option during search

* fix missing date on chapters
This commit is contained in:
Carlos 2018-02-17 06:57:31 -05:00 committed by inorichi
parent 37dc44ee8a
commit 965b1028ed
2 changed files with 9 additions and 9 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 = 4 extVersionCode = 5
extVersionSuffix = 4 extVersionSuffix = 5
libVersion = '1.2' libVersion = '1.2'
} }

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

@ -96,11 +96,10 @@ open class Mangadex(override val lang: String, private val internalLang: String,
filters.forEach { filter -> filters.forEach { filter ->
when (filter) { when (filter) {
is R18 -> { is R18 -> {
return when { return when (filter.state) {
filter.isExcluded() -> clientBuilder(NO_R18) 1 -> clientBuilder(ONLY_R18)
filter.isIncluded() -> clientBuilder(ONLY_R18) 2 -> clientBuilder(NO_R18)
else -> clientBuilder(ALL) else -> clientBuilder(ALL)
} }
} }
} }
@ -169,7 +168,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
override fun chapterFromElement(element: Element): SChapter { override fun chapterFromElement(element: Element): SChapter {
val urlElement = element.select("td:eq(0)").first() val urlElement = element.select("td:eq(0)").first()
val dateElement = element.select("td:eq(6)").first() val dateElement = element.select("td:eq(5)").first()
val scanlatorElement = element.select("td:eq(2)").first() val scanlatorElement = element.select("td:eq(2)").first()
val chapter = SChapter.create() val chapter = SChapter.create()
@ -222,14 +221,14 @@ open class Mangadex(override val lang: String, private val internalLang: String,
private class TextField(name: String, val key: String) : Filter.Text(name) private class TextField(name: String, val key: String) : Filter.Text(name)
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(name: String) : Filter.TriState(name) 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 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")) 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("Show R18+"), R18(),
GenreList(getGenreList()), GenreList(getGenreList()),
ByLetter(listOf(Letters())) ByLetter(listOf(Letters()))
) )
@ -279,6 +278,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
) )
companion object { companion object {
//this number matches to the cookie
const val NO_R18 = 0 const val NO_R18 = 0
const val ALL = 1 const val ALL = 1
const val ONLY_R18 = 2 const val ONLY_R18 = 2