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

Various bug fixes and code cleanup.

Browse Source
This commit is contained in:
NerdNumber9 2017-01-04 20:19:44 -05:00
parent 5c942460f9
commit e4f2bffbc2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/data/source/online/all/EHentai.kt
View File

@ -23,7 +23,6 @@ import uy.kohesive.injekt.injectLazy
import java.net.URLEncoder import java.net.URLEncoder
import java.util.* import java.util.*
import exh.ui.login.LoginActivity import exh.ui.login.LoginActivity
import timber.log.Timber
class EHentai(override val id: Int, class EHentai(override val id: Int,
val exh: Boolean, val exh: Boolean,
@ -37,9 +36,9 @@ class EHentai(override val id: Int,
override val baseUrl: String override val baseUrl: String
get() = if(exh) get() = if(exh)
"$schema://exhentai.org" "$schema://exhentai.org/"
else else
"http://g.e-hentai.org" "http://g.e-hentai.org/"
override val lang = "all" override val lang = "all"
override val supportsLatest = true override val supportsLatest = true
@ -110,7 +109,7 @@ class EHentai(override val id: Int,
private fun fetchChapterPage(chapter: Chapter, np: String, private fun fetchChapterPage(chapter: Chapter, np: String,
pastUrls: List<String> = emptyList()): Observable<List<String>> { pastUrls: List<String> = emptyList()): Observable<List<String>> {
val urls = ArrayList(pastUrls) val urls = ArrayList(pastUrls)
return chapterPageCall(chapter, np).flatMap { return chapterPageCall(np).flatMap {
val jsoup = it.asJsoup() val jsoup = it.asJsoup()
urls += parseChapterPage(jsoup) urls += parseChapterPage(jsoup)
val nextUrl = nextPageUrl(jsoup) val nextUrl = nextPageUrl(jsoup)
@ -127,8 +126,8 @@ class EHentai(override val id: Int,
Pair(it.child(0).attr("alt").toInt(), it.attr("href")) Pair(it.child(0).attr("alt").toInt(), it.attr("href"))
}.sortedBy(Pair<Int, String>::first).map { it.second } }.sortedBy(Pair<Int, String>::first).map { it.second }
} }
private fun chapterPageCall(chapter: Chapter, np: String) = client.newCall(chapterPageRequest(chapter, np)).asObservableSuccess() private fun chapterPageCall(np: String) = client.newCall(chapterPageRequest(np)).asObservableSuccess()
private fun chapterPageRequest(chapter: Chapter, np: String) = GET(np, headers) private fun chapterPageRequest(np: String) = GET(np, headers)
private fun nextPageUrl(element: Element): String? private fun nextPageUrl(element: Element): String?
= element.select("a[onclick=return false]").last()?.let { = element.select("a[onclick=return false]").last()?.let {