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

Comicabc: Fixes (#5089) 

Update baseUrl
Fix popularMangaSelector
Fix popularMangaFromElement
Fix latestUpdatesSelector
Fix mangaDetailsParse
Fix chapterListSelector
Fix pageListParse
This commit is contained in:
anenasa 2024-09-17 14:06:52 +08:00 committed by Draff
parent 5aa0cd2afa
commit d1b65b192f
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
2 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zh/comicabc/build.gradle
View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'Comicabc' extName = 'Comicabc'
extClass = '.Comicabc' extClass = '.Comicabc'
extVersionCode = 1 extVersionCode = 2
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

60
src/zh/comicabc/src/eu/kanade/tachiyomi/extension/zh/comicabc/Comicabc.kt
View File

@ -17,16 +17,16 @@ class Comicabc : ParsedHttpSource() {
override val name: String = "無限動漫" override val name: String = "無限動漫"
override val lang: String = "zh" override val lang: String = "zh"
override val supportsLatest: Boolean = true override val supportsLatest: Boolean = true
override val baseUrl: String = "https://www.comicabc.com" override val baseUrl: String = "https://www.8comic.com"
// Popular // Popular
override fun popularMangaRequest(page: Int) = GET("$baseUrl/comic/h-$page.html", headers) override fun popularMangaRequest(page: Int) = GET("$baseUrl/comic/h-$page.html", headers)
override fun popularMangaNextPageSelector(): String = "div.pager a span.mdi-skip-next" override fun popularMangaNextPageSelector(): String = "div.pager a span.mdi-skip-next"
override fun popularMangaSelector(): String = "div.default_row_width > div.col-2" override fun popularMangaSelector(): String = ".container .row a.comicpic_col6"
override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply { override fun popularMangaFromElement(element: Element): SManga = SManga.create().apply {
title = element.selectFirst("li.cat2_list_name")!!.text() title = element.selectFirst("li.nowraphide")!!.text()
setUrlWithoutDomain(element.selectFirst("a")!!.attr("abs:href")) setUrlWithoutDomain(element.attr("abs:href"))
thumbnail_url = element.selectFirst("img")!!.attr("abs:src") thumbnail_url = element.selectFirst("img")!!.attr("abs:src")
} }
@ -34,7 +34,7 @@ class Comicabc : ParsedHttpSource() {
override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/comic/u-$page.html", headers) override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/comic/u-$page.html", headers)
override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector() override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
override fun latestUpdatesSelector() = popularMangaSelector() override fun latestUpdatesSelector() = ".container .row .cat2_list a"
override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element) override fun latestUpdatesFromElement(element: Element) = popularMangaFromElement(element)
// Search // Search
@ -50,21 +50,21 @@ class Comicabc : ParsedHttpSource() {
// Details // Details
override fun mangaDetailsParse(document: Document): SManga = SManga.create().apply { override fun mangaDetailsParse(document: Document): SManga = SManga.create().apply {
title = document.selectFirst("div.item-top-content h3.item_name")!!.text() title = document.selectFirst(".item_content_box .h2")!!.text()
thumbnail_url = document.selectFirst("div.item-topbar img.item_cover")!!.attr("abs:src") thumbnail_url = document.selectFirst(".item-cover img")!!.attr("abs:src")
author = document.selectFirst("div.item-top-content > li:nth-of-type(3)")!!.ownText() author = document.selectFirst(".item_content_box .item-info-author")?.text()?.substringAfter("作者: ")
artist = author artist = author
description = document.selectFirst("div.item-top-content > li.item_info_detail")!!.text() description = document.selectFirst(".item_content_box .item_info_detail")?.text()
status = when { status = when (document.selectFirst(".item_content_box .item-info-status")?.text()) {
document.selectFirst("div.item_comic_eps_div")!!.text().contains("連載中") -> SManga.ONGOING "連載中" -> SManga.ONGOING
document.selectFirst("div.item_comic_eps_div")!!.text().contains("已完結") -> SManga.COMPLETED "已完結" -> SManga.COMPLETED
else -> SManga.UNKNOWN else -> SManga.UNKNOWN
} }
} }
// Chapters // Chapters
override fun chapterListSelector(): String = "div#div_li1 td > a" override fun chapterListSelector(): String = "#chapters a"
override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply {
val onclick = element.attr("onclick") val onclick = element.attr("onclick")
val comicId = onclick.substringAfter("cview('").substringBefore("-") val comicId = onclick.substringAfter("cview('").substringBefore("-")
@ -78,20 +78,20 @@ class Comicabc : ParsedHttpSource() {
// Pages // Pages
override fun pageListParse(response: Response): List<Page> = mutableListOf<Page>().apply { override fun pageListParse(response: Response): List<Page> {
val document = response.asJsoup() val document = response.asJsoup()
val url = response.request.url.toString() val url = response.request.url.toString()
val script = document.selectFirst("script:containsData(function request)")!!.data() val script = document.selectFirst("script:containsData(function request)")!!.data()
.replace("function ge(e){return document.getElementById(e);}", "") .replace("document.location", "\"$url\"")
.replace("ge\\(.*\\).src".toRegex(), "imageUrl") .replace("\$(\"#comics-pics\").html(xx);", "")
.replace("spp()", "") .substringBefore("\$(\"#pt,#ptb\")")
val quickJs = QuickJs.create() val quickJs = QuickJs.create()
val totalPage = quickJs.evaluate(nview + script.replace("document.location", "\"$url\"") + "ps") as Int val variableName = script.substringAfter("img s=\"").substringBefore("'")
for (i in 1..totalPage) { val images = quickJs.evaluate(nview + script + lazyloadx.format(variableName)) as Array<*>
val imageUrl = quickJs.evaluate(nview + script.replace("document.location", "\"$url-$i\"") + "imageUrl") as String
add(Page(i - 1, "", "https:$imageUrl"))
}
quickJs.close() quickJs.close()
return images.mapIndexed { index, it ->
Page(index, "", it.toString())
}
} }
override fun pageListParse(document: Document): List<Page> = throw UnsupportedOperationException() override fun pageListParse(document: Document): List<Page> = throw UnsupportedOperationException()
@ -99,8 +99,20 @@ class Comicabc : ParsedHttpSource() {
companion object { companion object {
// Functions required by script in pageListParse() // Functions required by script in pageListParse()
// Taken from https://www.comicabc.com/js/nview.js?20180806 // Taken from https://www.8comic.com/js/j.js?9989588541
const val nview = """function lc(l){if(l.length!=2 ) return l;var az="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";var a=l.substring(0,1);var b=l.substring(1,2);if(a=="Z") return 8000+az.indexOf(b);else return az.indexOf(a)*52+az.indexOf(b);} const val nview = """function lc(l){if(l.length!=2 ) return l;var az="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";var a=l.substring(0,1);var b=l.substring(1,2);if(a=="Z") return 8000+az.indexOf(b);else return az.indexOf(a)*52+az.indexOf(b);}
function nn(n){return n<10?'00'+n:n<100?'0'+n:n;}function mm(p){return (parseInt((p-1)/10)%10)+(((p-1)%10)*3)};""" function nn(n){return n<10?'00'+n:n<100?'0'+n:n;}function mm(p){return (parseInt((p-1)/10)%10)+(((p-1)%10)*3)};
function su(a,b,c){var e=(a+'').substring(b,b+c);return (e);}var y=46;"""
// Modified from https://www.8comic.com/js/lazyloadx.js?9989588541
const val lazyloadx = """src="%s"
var b=eval(src.substring(0,5));
var c=eval(src.substring(5,10));
var d=eval(src.substring(10,15));
var arr=[];
for(var i=1;i<=ps;i++){
arr.push('https://img'+su(b,0,1)+'.8comic.com/'+su(b,1,1)+'/' + ti + '/'+c+'/' + nn(i) + '_' + su(d,mm(i),3) + '.jpg');
}
arr"""
} }
} }