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

use dex covers for everything (#7291)

Browse Source
This commit is contained in:
Carlos 2021-05-29 20:26:29 -04:00 committed by GitHub
parent 5adc6f44cc
commit 6822315dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangadex/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'MangaDex'
pkgNameSuffix = 'all.mangadex'
extClass = '.MangaDexFactory'
extVersionCode = 114
extVersionCode = 115
libVersion = '1.2'
containsNsfw = true
}

13
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MDConstants.kt
View File

@ -9,16 +9,15 @@ object MDConstants {
val uuidRegex =
Regex("[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}")
val mangaLimit = 25
val cdnUrl = "https://uploads.mangadex.org"
const val mangaLimit = 20
const val cdnUrl = "https://uploads.mangadex.org"
val apiUrl = "https://api.mangadex.org"
val apiMangaUrl = "$apiUrl/manga"
val atHomePostUrl = "https://api.mangadex.network/report"
const val apiUrl = "https://api.mangadex.org"
const val apiMangaUrl = "$apiUrl/manga"
const val apiCoverUrl = "$apiUrl/cover"
const val atHomePostUrl = "https://api.mangadex.network/report"
val whitespaceRegex = "\\s".toRegex()
const val coverApi = "https://coverapi.orell.dev/api/v1/mdaltimage/manga/{uuid}/cover"
const val mdAtHomeTokenLifespan = 5 * 60 * 1000
val dateFormatter = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss+SSS", Locale.US)

16
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
View File

@ -108,8 +108,22 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val hasMoreResults =
(mangaListResponse["limit"].int + mangaListResponse["offset"].int) < mangaListResponse["total"].int
val idsAndCoverIds = mangaListResponse["results"].array.map { mangaJson ->
val mangaId = mangaJson["data"].obj["id"].string
val coverId = mangaJson["relationships"].array.filter { relationship ->
relationship["type"].string.equals("cover_art", true)
}.map { relationship -> relationship["id"].string }.first()
Pair(mangaId, coverId)
}.toMap()
val results = runCatching {
helper.getBatchCoversUrl(idsAndCoverIds, client)
}.getOrNull()!!
val mangaList = mangaListResponse["results"].array.map {
helper.createBasicManga(it, client)
helper.createBasicManga(it, client).apply {
thumbnail_url = results[url.substringAfter("/manga/")]
}
}
return MangasPage(mangaList, hasMoreResults)

52
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt
View File

@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga
import okhttp3.CacheControl
import okhttp3.Headers
import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
import okhttp3.Request
import org.jsoup.parser.Parser
@ -128,14 +129,9 @@ class MangaDexHelper() {
val dexId = data["id"].string
val attr = data["attributes"].obj
val coverId = mangaJson["relationships"].array.filter { relationship ->
relationship["type"].string.equals("cover_art", true)
}.map { relationship -> relationship["id"].string }.firstOrNull()
return SManga.create().apply {
url = "/manga/$dexId"
title = cleanString(attr["title"]["en"].string)
thumbnail_url = createCoverUrl(dexId, coverId, client)
}
}
@ -187,7 +183,7 @@ class MangaDexHelper() {
val coverId = mangaJson["relationships"].array.filter { relationship ->
relationship["type"].string.equals("cover_art", true)
}.map { relationship -> relationship["id"].string }.firstOrNull()
}.map { relationship -> relationship["id"].string }.firstOrNull()!!
// get tag list
val tags = mdFilters.getTags()
@ -210,7 +206,7 @@ class MangaDexHelper() {
author = authorIds.mapNotNull { authorMap[it] }.joinToString(", ")
artist = artistIds.mapNotNull { authorMap[it] }.joinToString(", ")
status = getPublicationStatus(attr["publicationDemographic"].nullString)
thumbnail_url = createCoverUrl(dexId, coverId, client)
thumbnail_url = getCoverUrl(dexId, coverId, client)
genre = genreList.joinToString(", ")
}
} catch (e: Exception) {
@ -304,19 +300,33 @@ class MangaDexHelper() {
}
}
fun createCoverUrl(dexId: String, coverId: String?, client: OkHttpClient): String {
var coverUrl = MDConstants.coverApi.replace("{uuid}", dexId)
/* try {
if (coverId != null) {
val response =
client.newCall(GET("${MDConstants.apiMangaUrl}/$dexId/cover?ids[]=$coverId"))
.execute()
val coverJson = JsonParser.parseString(response.body!!.string()).obj
val firstRelationship =
coverJson.obj["results"].array.firstOrNull()!!.obj["data"]
.obj["attributes"].obj["fileName"]?.nullString?.let { fileName ->
coverUrl = "${MDConstants.cdnUrl}/covers/$dexId/$fileName"
*/
return coverUrl
private fun getCoverUrl(dexId: String, coverId: String, client: OkHttpClient): String {
val response =
client.newCall(GET("${MDConstants.apiCoverUrl}/$coverId"))
.execute()
val coverJson = JsonParser.parseString(response.body!!.string()).obj
val fileName =
coverJson.obj["data"].obj["attributes"].obj["fileName"]?.nullString!!
return "${MDConstants.cdnUrl}/covers/$dexId/$fileName"
}
fun getBatchCoversUrl(ids: Map<String, String>, client: OkHttpClient): Map<String, String> {
val url = MDConstants.apiCoverUrl.toHttpUrl().newBuilder().apply {
ids.values.forEach { coverArtId ->
addQueryParameter("ids[]", coverArtId)
}
addQueryParameter("limit", ids.size.toString())
}.build().toString()
val response = client.newCall(GET(url)).execute()
val coverJson = JsonParser.parseString(response.body!!.string()).obj
return coverJson.obj["results"].array.map { coverResult ->
val fileName = coverResult.obj["data"].obj["attributes"].obj["fileName"].string
val mangaId = coverResult.obj["relationships"].array.first { it["type"].string.equals("manga", true) }["id"].string
val url = "${MDConstants.cdnUrl}/covers/$mangaId/$fileName"
Pair(mangaId, url)
}.toMap()
}
}