From e6b34e2b2d9c9059f3455eea47642379f1878ab0 Mon Sep 17 00:00:00 2001 From: Vetle Ledaal Date: Mon, 28 Jul 2025 12:42:08 +0200 Subject: [PATCH] Jiangzaitoon: update domain, fix blurry thumbnails (#9815) * Jiangzaitoon: update domain, fix blurry thumbnails Madara was also updated to allow overriding `String.getSrcSetImage()`, not bumping. * guard against malformed srcset candiate * remove duplicate trim --- .../tachiyomi/multisrc/madara/Madara.kt | 2 +- src/tr/jiangzaitoon/build.gradle | 4 +-- .../extension/tr/jiangzaitoon/Jiangzaitoon.kt | 25 ++++++++++++++++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index 2df823e80..9c4898921 100644 --- a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -788,7 +788,7 @@ abstract class Madara( /** * Get the best image quality available from srcset */ - protected fun String.getSrcSetImage(): String? { + protected open fun String.getSrcSetImage(): String? { return this.split(" ") .filter(URL_REGEX::matches) .maxOfOrNull(String::toString) diff --git a/src/tr/jiangzaitoon/build.gradle b/src/tr/jiangzaitoon/build.gradle index cbe6567c3..4cb16f2cf 100644 --- a/src/tr/jiangzaitoon/build.gradle +++ b/src/tr/jiangzaitoon/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Jiangzaitoon' extClass = '.Jiangzaitoon' themePkg = 'madara' - baseUrl = 'https://jiangzaitoon.wtf' - overrideVersionCode = 11 + baseUrl = 'https://jiangzaitoon.lgbt' + overrideVersionCode = 12 isNsfw = true } diff --git a/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt b/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt index 68fd7fcee..ae23762e6 100644 --- a/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt +++ b/src/tr/jiangzaitoon/src/eu/kanade/tachiyomi/extension/tr/jiangzaitoon/Jiangzaitoon.kt @@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit class Jiangzaitoon : Madara( "Jiangzaitoon", - "https://jiangzaitoon.wtf", + "https://jiangzaitoon.lgbt", "tr", SimpleDateFormat("d MMM yyy", Locale("tr")), ) { @@ -22,4 +22,27 @@ class Jiangzaitoon : Madara( } override val chapterUrlSelector = "> a" + + override fun String.getSrcSetImage(): String? { + /* Assumption: URL is absolute + * Assumption: descriptor is always in width + */ + return this + .split(",") + .mapNotNull { candidate -> + candidate + .trim() + .split(" ", limit = 2) + .takeIf { it.size == 2 } + ?.let { (url, desc) -> + desc + .takeIf { it.endsWith("w") } + ?.removeSuffix("w") + ?.toIntOrNull() + ?.let { size -> url to size } + } + } + .maxByOrNull { it.second } + ?.first + } }