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

<Manhuagui>: <regexp syntax error> Add the backslashes to escape '\}' back. (#3926) 

* Add the backslashes to escape '\}' back.

* Fix manga.genre format in mangaDetailsParse() to display multiple multiple genre separately.
This commit is contained in:
Oldwangtouchtouchdoge 2020-07-28 02:53:32 +08:00 committed by GitHub
parent 5cf25b6c47
commit cdcaaabaa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'ManHuaGui' extName = 'ManHuaGui'
pkgNameSuffix = 'zh.manhuagui' pkgNameSuffix = 'zh.manhuagui'
extClass = '.Manhuagui' extClass = '.Manhuagui'
extVersionCode = 3 extVersionCode = 4
libVersion = '1.2' libVersion = '1.2'
} }

8
src/zh/manhuagui/src/eu/kanade/tachiyomi/extension/zh/manhuagui/Manhuagui.kt
View File

@ -224,7 +224,7 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
manga.description = document.select("div#intro-all").text().trim() manga.description = document.select("div#intro-all").text().trim()
manga.thumbnail_url = document.select("p.hcover > img").attr("abs:src") manga.thumbnail_url = document.select("p.hcover > img").attr("abs:src")
manga.artist = document.select("span:contains(漫画作者) > a , span:contains(漫畫作者) > a").text().trim() manga.artist = document.select("span:contains(漫画作者) > a , span:contains(漫畫作者) > a").text().trim()
manga.genre = document.select("span:contains(漫画剧情) > a , span:contains(漫畫劇情) > a").text().trim() manga.genre = document.select("span:contains(漫画剧情) > a , span:contains(漫畫劇情) > a").text().trim().replace(" ", ", ")
manga.status = when (document.select("div.book-detail > ul.detail-list > li.status > span > span").first().text()) { manga.status = when (document.select("div.book-detail > ul.detail-list > li.status > span > span").first().text()) {
"连载中" -> SManga.ONGOING "连载中" -> SManga.ONGOING
"已完结" -> SManga.COMPLETED "已完结" -> SManga.COMPLETED
@ -252,13 +252,15 @@ class Manhuagui : ConfigurableSource, ParsedHttpSource() {
error("R18作品显示开关未开启或未生效") // "R18 setting didn't enabled or became effective" error("R18作品显示开关未开启或未生效") // "R18 setting didn't enabled or became effective"
val html = document.html() val html = document.html()
val re = Regex("""window\[".*?"](\(.*\)\s*\{[\s\S]+}\s*\(.*\))""") // These "\" can't be remove: \}
val re = Regex("""window\[".*?"\](\(.*\)\s*\{[\s\S]+\}\s*\(.*\))""")
val imgCode = re.find(html)?.groups?.get(1)?.value val imgCode = re.find(html)?.groups?.get(1)?.value
val imgDecode = Duktape.create().use { val imgDecode = Duktape.create().use {
it.evaluate(jsDecodeFunc + imgCode) as String it.evaluate(jsDecodeFunc + imgCode) as String
} }
val re2 = Regex("""\{.*}""") // \}
val re2 = Regex("""\{.*\}""")
val imgJsonStr = re2.find(imgDecode)?.groups?.get(0)?.value val imgJsonStr = re2.find(imgDecode)?.groups?.get(0)?.value
val imageJson: Comic = gson.fromJson(imgJsonStr, Comic::class.java) val imageJson: Comic = gson.fromJson(imgJsonStr, Comic::class.java)