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

fix url (#5502)

Browse Source
This commit is contained in:
OncePunchedMan 2021-01-21 11:43:50 +00:00 committed by GitHub
parent 7735005682
commit e9ec0421b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ ext {
extName = 'Dmzj' extName = 'Dmzj'
pkgNameSuffix = 'zh.dmzj' pkgNameSuffix = 'zh.dmzj'
extClass = '.Dmzj' extClass = '.Dmzj'
extVersionCode = 12 extVersionCode = 13
libVersion = '1.2' libVersion = '1.2'
} }

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

@ -24,10 +24,10 @@ class Dmzj : HttpSource() {
override val lang = "zh" override val lang = "zh"
override val supportsLatest = true override val supportsLatest = true
override val name = "动漫之家" override val name = "动漫之家"
override val baseUrl = "http://v3api.dmzj.com" override val baseUrl = "https://v3api.dmzj1.com"
private fun cleanUrl(url: String) = if (url.startsWith("//")) private fun cleanUrl(url: String) = if (url.startsWith("//"))
"http:$url" "https:$url"
else url else url
private fun myGet(url: String) = GET(url) private fun myGet(url: String) = GET(url)
@ -85,17 +85,17 @@ class Dmzj : HttpSource() {
return MangasPage(ret, arr.length() != 0) return MangasPage(ret, arr.length() != 0)
} }
override fun popularMangaRequest(page: Int) = myGet("http://v2.api.dmzj.com/classify/0/0/${page - 1}.json") override fun popularMangaRequest(page: Int) = myGet("$baseUrl/classify/0/0/${page - 1}.json")
override fun popularMangaParse(response: Response) = searchMangaParse(response) override fun popularMangaParse(response: Response) = searchMangaParse(response)
override fun latestUpdatesRequest(page: Int) = myGet("http://v2.api.dmzj.com/classify/0/1/${page - 1}.json") override fun latestUpdatesRequest(page: Int) = myGet("$baseUrl/classify/0/1/${page - 1}.json")
override fun latestUpdatesParse(response: Response): MangasPage = searchMangaParse(response) override fun latestUpdatesParse(response: Response): MangasPage = searchMangaParse(response)
override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request { override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
if (query != "") { if (query != "") {
val uri = Uri.parse("http://s.acg.dmzj.com/comicsum/search.php").buildUpon() val uri = Uri.parse("http://s.acg.dmzj1.com/comicsum/search.php").buildUpon()
uri.appendQueryParameter("s", query) uri.appendQueryParameter("s", query)
return myGet(uri.toString()) return myGet(uri.toString())
} else { } else {
@ -110,7 +110,7 @@ class Dmzj : HttpSource() {
val order = filters.filterIsInstance<SortFilter>().joinToString("") { (it as UriPartFilter).toUriPart() } val order = filters.filterIsInstance<SortFilter>().joinToString("") { (it as UriPartFilter).toUriPart() }
return myGet("http://v2.api.dmzj.com/classify/$params/$order/${page - 1}.json") return myGet("$baseUrl/classify/$params/$order/${page - 1}.json")
} }
} }
@ -167,7 +167,7 @@ class Dmzj : HttpSource() {
SChapter.create().apply { SChapter.create().apply {
name = "$prefix: ${chapter.getString("chapter_title")}" name = "$prefix: ${chapter.getString("chapter_title")}"
date_upload = chapter.getString("updatetime").toLong() * 1000 // milliseconds date_upload = chapter.getString("updatetime").toLong() * 1000 // milliseconds
url = "https://api.m.dmzj.com/comic/chapter/$cid/${chapter.getString("chapter_id")}.html" url = "https://api.m.dmzj1.com/comic/chapter/$cid/${chapter.getString("chapter_id")}.html"
} }
) )
} }
@ -186,6 +186,7 @@ class Dmzj : HttpSource() {
// example url: http://v3api.dmzj.com/chapter/44253/101852.json // example url: http://v3api.dmzj.com/chapter/44253/101852.json
val url = response.request().url().toString() val url = response.request().url().toString()
.replace("api.m", "v3api") .replace("api.m", "v3api")
.replace("dmzj", "dmzj1")
.replace("comic/", "") .replace("comic/", "")
.replace(".html", ".json") .replace(".html", ".json")
val obj = client.newCall(GET(url, headers)).execute().let { JSONObject(it.body()!!.string()) } val obj = client.newCall(GET(url, headers)).execute().let { JSONObject(it.body()!!.string()) }
@ -310,7 +311,7 @@ class Dmzj : HttpSource() {
// Headers // Headers
override fun headersBuilder() = override fun headersBuilder() =
super.headersBuilder().add("Referer", "http://www.dmzj.com/")!! super.headersBuilder().add("Referer", "https://www.dmzj1.com/")!!
private open class UriPartFilter( private open class UriPartFilter(
displayName: String, displayName: String,