From 1543a284876fc301774027aded20b2efd4b51ac1 Mon Sep 17 00:00:00 2001 From: Alessandro Jean Date: Fri, 30 Jul 2021 13:48:16 -0300 Subject: [PATCH] Fix wrong chapter images URL at WPMangaStream. (#8325) --- .../kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt | 4 +++- .../multisrc/wpmangastream/WPMangaStreamGenerator.kt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt index 3cabff18a..64da1a333 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt @@ -15,6 +15,7 @@ import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonPrimitive import okhttp3.Headers +import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.OkHttpClient import okhttp3.Request @@ -284,10 +285,11 @@ abstract class WPMangaStream( val imageListJson = imageListRegex.find(docString)!!.destructured.toList()[0] val imageList = json.parseToJsonElement(imageListJson).jsonArray + val baseResolver = baseUrl.toHttpUrl() val scriptPages = imageList.mapIndexed { i, jsonEl -> val imageUrl = jsonEl.jsonPrimitive.content - Page(i, "", if (imageUrl.startsWith(baseUrl)) imageUrl else baseUrl + imageUrl) + Page(i, "", baseResolver.resolve(imageUrl).toString()) } if (htmlPages.size < scriptPages.size) { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt index 9c9004f2d..27cb51ae5 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt @@ -9,7 +9,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaStream" - override val baseVersionCode: Int = 8 + override val baseVersionCode: Int = 9 override val sources = listOf( SingleLang("Asura Scans", "https://www.asurascans.com", "en", overrideVersionCode = 5),