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

[Fix] TMO (#2137) 

[Fix] TMO
This commit is contained in:
happywillow0 2020-01-27 14:59:21 -05:00 committed by arkon
parent 0e7c499506
commit 5d04eb51c2
2 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/es/tumangaonline/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: TuMangaOnline'
pkgNameSuffix = 'es.tumangaonline'
extClass = '.TuMangaOnline'
extVersionCode = 18
extVersionCode = 19
libVersion = '1.2'
}

42
src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt
View File

@ -232,8 +232,7 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
private fun oneShotChapterListSelector() = "div.chapter-list-element > ul.list-group li.list-group-item"
private fun oneShotChapterFromElement(element: Element, chapterurl: String, chapteridselector: String) = SChapter.create().apply {
val button = element.select("div.row > .text-right > [$chapteridselector]") //button
url = "$chapterurl#${button.attr(chapteridselector)}"
setUrlWithoutDomain(element.select("div.row > .text-right > a").attr("href"))
name = "One Shot"
scanlator = element.select("div.col-md-6.text-truncate")?.text()
date_upload = element.select("span.badge.badge-primary.p-2").first()?.text()?.let { parseChapterDate(it) } ?: 0
@ -242,8 +241,7 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
private fun regularChapterListSelector() = "div.chapters > ul.list-group li.p-0.list-group-item"
private fun regularChapterFromElement(element: Element, chname: String, number: Float, chapterurl: String, chapteridselector: String) = SChapter.create().apply {
val button = element.select("div.row > .text-right > [$chapteridselector]") //button
url = "$chapterurl#${button.attr(chapteridselector)}"
setUrlWithoutDomain(element.select("div.row > .text-right > a").attr("href"))
name = chname
chapter_number = number
scanlator = element.select("div.col-md-6.text-truncate")?.text()
@ -253,48 +251,18 @@ class TuMangaOnline : ConfigurableSource, ParsedHttpSource() {
private fun parseChapterDate(date: String): Long = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(date).time
override fun pageListRequest(chapter: SChapter): Request {
val (chapterURL, chapterID) = chapter.url.split("#")
val response = client.newCall(GET(chapterURL, headers)).execute()
val document = response.asJsoup()
val csrfToken = document.select("meta[name=csrf-token]").attr("content")
val script = document.select("script:containsData($scriptselector)").html()
val functionID = script.substringAfter("addEventListener").substringAfter("preventDefault();").substringBefore("(").trim().removePrefix("_")
val function = script.substringAfter("function _$functionID(").substringBefore("});")
val urlGoto = function.substringAfter("url: '").substringBefore("'")
val uploadID = function.substringAfter("replace('").substringBefore("'")
val goto = urlGoto.replace(uploadID,chapterID)
val method = function.substringAfter("type: '").substringBefore("'")
val getHeaders = headersBuilder()
.add("User-Agent", userAgent)
.add("Referer", chapterURL)
.add("X-CSRF-TOKEN",csrfToken)
.add("X-Requested-With","XMLHttpRequest")
.add(functionID,functionID)
.build()
val formBody = when (method) {
"GET" -> null
"POST" -> FormBody.Builder().build()
else -> throw UnsupportedOperationException("Unknown method. Open help ticket")
}
val url = getBuilder(goto,getHeaders,formBody,method).substringBeforeLast("/") + "/${getPageMethod()}"
// Getting /cascade instead of /paginated can get all pages at once
val headers = headersBuilder()
.add("User-Agent", userAgent)
.add("Referer", chapterURL)
.add("Referer", "$baseUrl/library/manga/")
.build()
val url = getBuilder(baseUrl + chapter.url,headers,null,"GET").substringBeforeLast("/") + "/${getPageMethod()}"
return GET(url, headers)
}
override fun pageListParse(document: Document): List<Page> = mutableListOf<Page>().apply {
if (getPageMethod()=="cascade") {
val style = document.select("style:containsData(height)").html()
val hiddenClass = style.substringAfter("._").substringBefore("{")
document.select( " .img-container > .viewer-img:not(._$hiddenClass)").forEach {
document.select( " .img-container > .viewer-img").filterNot { it.attr("id") in style }.forEach {
add(Page(size, "", it.attr("src")))
}
} else {