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

[ZH-Dmzj] Fix #7382, leaking support for multiple chapter lists. (#7387) 

* [ZH-Dmzj] Fix #7382, leaking support for multiple chapter lists.

* Add empty chapter list check.
This commit is contained in:
Oldwangtouchtouchdoge 2021-06-03 18:21:12 +08:00 committed by GitHub
parent 2fb79d4a2c
commit 897a5d94ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ ext {
extName = 'Dmzj' extName = 'Dmzj'
pkgNameSuffix = 'zh.dmzj' pkgNameSuffix = 'zh.dmzj'
extClass = '.Dmzj' extClass = '.Dmzj'
extVersionCode = 18 extVersionCode = 19
libVersion = '1.2' libVersion = '1.2'
} }

26
src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/Dmzj.kt
View File

@ -322,19 +322,25 @@ class Dmzj : ConfigurableSource, HttpSource() {
if (response.request.url.toString().startsWith(v4apiUrl)) { if (response.request.url.toString().startsWith(v4apiUrl)) {
val pb = ProtoBuf.decodeFromByteArray<ComicDetailResponse>(decryptProtobufData(responseBody)) val pb = ProtoBuf.decodeFromByteArray<ComicDetailResponse>(decryptProtobufData(responseBody))
val mangaPBData = pb.Data val mangaPBData = pb.Data
val chapterPBData = mangaPBData.Chapters[0] // v4api can contain multiple series of chapters.
for (i in chapterPBData.Data.indices) { if (mangaPBData.Chapters.isEmpty()) {
val chapter = chapterPBData.Data[i] throw Exception("empty chapter list")
ret.add( }
SChapter.create().apply { mangaPBData.Chapters.forEach { chapterList ->
name = chapter.ChapterTitle for (i in chapterList.Data.indices) {
date_upload = chapter.Updatetime * 1000 val chapter = chapterList.Data[i]
url = "${mangaPBData.Id}/${chapter.ChapterId}" ret.add(
} SChapter.create().apply {
) name = "${chapterList.Title}: ${chapter.ChapterTitle}"
date_upload = chapter.Updatetime * 1000
url = "${mangaPBData.Id}/${chapter.ChapterId}"
}
)
}
} }
} else { } else {
// get chapter info from old api // get chapter info from old api
// Old api may only contain one series of chapters
val obj = JSONObject(responseBody) val obj = JSONObject(responseBody)
val chaptersList = obj.getJSONObject("data").getJSONArray("list") val chaptersList = obj.getJSONObject("data").getJSONArray("list")
for (i in 0 until chaptersList.length()) { for (i in 0 until chaptersList.length()) {

6
src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/protobuf/V4apiComicDetailResponse.kt
View File

@ -24,8 +24,8 @@ data class ComicDetailInfoResponse(
@ProtoNumber(5) val IsDmzj: Int? = null, @ProtoNumber(5) val IsDmzj: Int? = null,
@ProtoNumber(6) val Cover: String, @ProtoNumber(6) val Cover: String,
@ProtoNumber(7) val Description: String, @ProtoNumber(7) val Description: String,
@ProtoNumber(8) val LastUpdatetime: Long, @ProtoNumber(8) val LastUpdatetime: Long? = null,
@ProtoNumber(9) val LastUpdateChapterName: String, @ProtoNumber(9) val LastUpdateChapterName: String? = null,
@ProtoNumber(10) val Copyright: Int? = null, @ProtoNumber(10) val Copyright: Int? = null,
@ProtoNumber(11) val FirstLetter: String? = null, @ProtoNumber(11) val FirstLetter: String? = null,
@ProtoNumber(12) val ComicPy: String? = null, @ProtoNumber(12) val ComicPy: String? = null,
@ -34,7 +34,7 @@ data class ComicDetailInfoResponse(
@ProtoNumber(15) val HitNum: Int? = null, @ProtoNumber(15) val HitNum: Int? = null,
@ProtoNumber(16) val Uid: Int? = null, @ProtoNumber(16) val Uid: Int? = null,
@ProtoNumber(17) val IsLock: Int? = null, @ProtoNumber(17) val IsLock: Int? = null,
@ProtoNumber(18) val LastUpdateChapterId: Int, @ProtoNumber(18) val LastUpdateChapterId: Int? = null,
@ProtoNumber(19) val TypesTypes: List<ComicDetailTypeItemResponse> = emptyList(), @ProtoNumber(19) val TypesTypes: List<ComicDetailTypeItemResponse> = emptyList(),
@ProtoNumber(20) val Status: List<ComicDetailTypeItemResponse> = emptyList(), @ProtoNumber(20) val Status: List<ComicDetailTypeItemResponse> = emptyList(),
@ProtoNumber(21) val Authors: List<ComicDetailTypeItemResponse> = emptyList(), @ProtoNumber(21) val Authors: List<ComicDetailTypeItemResponse> = emptyList(),