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

Tencent comics migration and adding locked chapters (#8572) 

* Add lock for paywalled chapters

* Migration to kotlinx.serialization
This commit is contained in:
Arraiment 2021-08-16 18:09:47 +08:00 committed by GitHub
parent 486db23175
commit 6dde6d877a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zh/tencentcomics/build.gradle
View File

@ -1,11 +1,12 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
apply plugin: 'kotlinx-serialization'
ext { ext {
extName = 'Tencent Comics (ac.qq.com)' extName = 'Tencent Comics (ac.qq.com)'
pkgNameSuffix = 'zh.tencentcomics' pkgNameSuffix = 'zh.tencentcomics'
extClass = '.TencentComics' extClass = '.TencentComics'
extVersionCode = 1 extVersionCode = 2
libVersion = '1.2' libVersion = '1.2'
} }

25
src/zh/tencentcomics/src/eu/kanade/tachiyomi/extension/zh/tencentcomics/TencentComics.kt
View File

@ -12,13 +12,18 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.boolean
import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import org.json.JSONObject
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
class TencentComics : ParsedHttpSource() { class TencentComics : ParsedHttpSource() {
@ -35,16 +40,22 @@ class TencentComics : ParsedHttpSource() {
override val client: OkHttpClient = network.cloudflareClient override val client: OkHttpClient = network.cloudflareClient
private val json: Json by injectLazy()
override fun chapterListSelector(): String = "ul.chapter-wrap-list.reverse > li > a" override fun chapterListSelector(): String = "ul.chapter-wrap-list.reverse > li > a"
override fun chapterFromElement(element: Element): SChapter { override fun chapterFromElement(element: Element): SChapter {
return SChapter.create().apply { return SChapter.create().apply {
url = element.attr("href").trim() url = element.attr("href").trim()
name = element.text().trim() name = (if (element.isLockedChapter()) "\uD83D\uDD12 " else "") + element.text().trim()
chapter_number = element.attr("data-seq").toFloat() chapter_number = element.attr("data-seq").toFloat()
} }
} }
private fun Element.isLockedChapter(): Boolean {
return this.selectFirst("div.lock") != null
}
override fun popularMangaSelector(): String = "ul.ret-search-list.clearfix > li" override fun popularMangaSelector(): String = "ul.ret-search-list.clearfix > li"
override fun popularMangaFromElement(element: Element): SManga { override fun popularMangaFromElement(element: Element): SManga {
@ -135,13 +146,13 @@ class TencentComics : ParsedHttpSource() {
val raw = html.substringAfterLast("var DATA =").substringBefore("PRELOAD_NUM").trim().replace(Regex("^\'|\',$"), "") val raw = html.substringAfterLast("var DATA =").substringBefore("PRELOAD_NUM").trim().replace(Regex("^\'|\',$"), "")
val decodePrefix = "var raw = \"$raw\"; var nonce = $nonce" val decodePrefix = "var raw = \"$raw\"; var nonce = $nonce"
val full = duktape.evaluate(decodePrefix + jsDecodeFunction).toString() val full = duktape.evaluate(decodePrefix + jsDecodeFunction).toString()
val chapterData = JSONObject(String(Base64.decode(full, Base64.DEFAULT))) val chapterData = json.parseToJsonElement(String(Base64.decode(full, Base64.DEFAULT))).jsonObject
if (!chapterData.getJSONObject("chapter").getBoolean("canRead")) throw Exception("[此章节为付费内容]") if (!chapterData["chapter"]!!.jsonObject["canRead"]!!.jsonPrimitive.boolean) throw Exception("[此章节为付费内容]")
val pictures = chapterData.getJSONArray("picture") val pictures = chapterData["picture"]!!.jsonArray
for (i in 0 until pictures.length()) { for (i in 0 until pictures.size) {
pages.add(Page(i, "", pictures.getJSONObject(i).getString("url"))) pages.add(Page(i, "", pictures[i].jsonObject["url"]!!.jsonPrimitive.content))
} }
return pages return pages
} }