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

Dmzj: Pop up toast when encountering a non-existent chapter instead of just crashing. (#12998)

This commit is contained in:
Howard Wu 2022-08-16 00:52:16 +08:00 committed by GitHub
parent 1dd1cafc11
commit 976141a96e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 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'
pkgNameSuffix = 'zh.dmzj'
extClass = '.Dmzj'
extVersionCode = 30
extVersionCode = 31
}
apply from: "$rootDir/common.gradle"

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

@ -47,10 +47,11 @@ class Dmzj : ConfigurableSource, HttpSource() {
override val baseUrl = "https://m.dmzj.com"
private val v3apiUrl = "https://v3api.dmzj.com"
private val v3ChapterApiUrl = "https://nnv3api.muwai.com"
// v3api now shutdown the functionality to fetch manga detail and chapter list, so move these logic to v4api
private val v4apiUrl = "https://nnv4api.muwai.com" // https://v4api.dmzj1.com
private val apiUrl = "https://api.dmzj.com"
private val oldPageListApiUrl = "https://api.m.dmzj.com"
private val oldPageListApiUrl = "http://api.m.dmzj.com" // this domain has an expired certificate
private val webviewPageListApiUrl = "https://m.dmzj.com/chapinfo"
private val imageCDNUrl = "https://images.dmzj.com"
private val imageSmallCDNUrl = "https://imgsmall.dmzj.com"
@ -404,8 +405,13 @@ class Dmzj : ConfigurableSource, HttpSource() {
obj.getJSONObject("chapter").getJSONArray("page_url")
} catch (e: org.json.JSONException) {
// JSON data from api.m.dmzj.com may be incomplete, extract page_url list using regex
val extractPageList = extractPageListRegex.find(responseBody)!!.value
JSONObject("{$extractPageList}").getJSONArray("page_url")
val extractPageList = extractPageListRegex.find(responseBody)?.value
if (extractPageList != null) {
JSONObject("{$extractPageList}").getJSONArray("page_url")
} else {
// The responseBody content is a sentence, for example, "The comic does not exist".
throw Exception(responseBody)
}
}
} else {
throw Exception("can't parse response")
@ -630,7 +636,7 @@ class Dmzj : ConfigurableSource, HttpSource() {
private val extractComicIdFromWebpageRegex = Regex("""addSubscribe\((\d+)\)""")
private val checkComicIdIsNumericalRegex = Regex("""^\d+$""")
private val extractComicIdFromMangaUrlRegex = Regex("""(\d+)\.(json|html)""") // Get comic ID from manga.url
private val extractPageListRegex = Regex("""\"page_url\".+?\]""")
private val extractPageListRegex = Regex(""""page_url".+?]""")
private val ENTRIES_ARRAY = (1..10).map { i -> i.toString() }.toTypedArray()
const val PREFIX_ID_SEARCH = "id:"