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

Fix html parse (#10771)

This commit is contained in:
Mori Yuki 2022-02-09 19:12:56 +08:00 committed by GitHub
parent 8b18e2f12e
commit d9fe2a5cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'CopyManga' extName = 'CopyManga'
pkgNameSuffix = 'zh.copymanga' pkgNameSuffix = 'zh.copymanga'
extClass = '.CopyManga' extClass = '.CopyManga'
extVersionCode = 23 extVersionCode = 24
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

41
src/zh/copymanga/src/eu/kanade/tachiyomi/extension/zh/copymanga/CopyManga.kt
View File

@ -349,14 +349,15 @@ class CopyManga : ConfigurableSource, HttpSource() {
private fun parseSearchMangaWithFilterOrPopularOrLatestResponse(response: Response): MangasPage { private fun parseSearchMangaWithFilterOrPopularOrLatestResponse(response: Response): MangasPage {
val document = response.asJsoup() val document = response.asJsoup()
val mangas = document.select("div.exemptComicList div.exemptComicItem").map { element -> val mangas = document.select("div.exemptComicList div.exemptComic-box").first().attr("list")
mangaFromPage(element)
} val comicArray = JSONArray(mangas)
// There is always a next pager, so use itemCount to check. XD // There is always a next pager, so use itemCount to check. XD
val hasNextPage = mangas.size == popularLatestPageSize val hasNextPage = comicArray.length() == popularLatestPageSize
val ret = mangaListFromJsonArray(comicArray)
return MangasPage(mangas, hasNextPage) return MangasPage(ret, hasNextPage)
} }
private fun parseSearchMangaResponseAsJson(response: Response): MangasPage { private fun parseSearchMangaResponseAsJson(response: Response): MangasPage {
@ -368,7 +369,14 @@ class CopyManga : ConfigurableSource, HttpSource() {
return MangasPage(listOf(), false) return MangasPage(listOf(), false)
} }
val ret = mangaListFromJsonArray(comicArray)
return MangasPage(ret, comicArray.length() == searchPageSize)
}
private fun mangaListFromJsonArray(comicArray: JSONArray): ArrayList<SManga> {
val ret = ArrayList<SManga>(comicArray.length()) val ret = ArrayList<SManga>(comicArray.length())
for (i in 0 until comicArray.length()) { for (i in 0 until comicArray.length()) {
val obj = comicArray.getJSONObject(i) val obj = comicArray.getJSONObject(i)
val authorArray = obj.getJSONArray("author") val authorArray = obj.getJSONArray("author")
@ -392,28 +400,7 @@ class CopyManga : ConfigurableSource, HttpSource() {
) )
} }
return MangasPage(ret, comicArray.length() == searchPageSize) return ret
}
private fun mangaFromPage(element: Element): SManga {
val manga = SManga.create()
element.select("div.exemptComicItem-img > a > img").first().let {
var picture = it.attr("data-src")
if (preferences.getBoolean(CHANGE_CDN_OVERSEAS, false)) {
picture = replaceToMirror2.replace(picture, "mirror2.mangafunc.fun:443")
picture = replaceToMirror.replace(picture, "mirror.mangafunc.fun:443")
}
manga.thumbnail_url = picture
}
element.select("div.exemptComicItem-txt > a").first().let {
manga.setUrlWithoutDomain(it.attr("href"))
var _title: String = it.select("p").first().text().trim()
if (preferences.getBoolean(SHOW_Simplified_Chinese_TITLE_PREF, false)) {
_title = ChineseUtils.toSimplified(_title)
}
manga.title = _title
}
return manga
} }
private fun fillChapters(chapterGroup: JSONObject, retChapter: ArrayList<SChapter>, comicPathWord: String?) { private fun fillChapters(chapterGroup: JSONObject, retChapter: ArrayList<SChapter>, comicPathWord: String?) {