From c40ec25b85b66f45c7a0cffcd43ae117bb6cc849 Mon Sep 17 00:00:00 2001 From: Johannes Joens <34899572+jopejoe1@users.noreply.github.com> Date: Fri, 16 Apr 2021 02:29:56 +1200 Subject: [PATCH] Luscious fix images not loading (#6563) * Fix Images not loading * Update LusciousGenerator.kt --- .../kanade/tachiyomi/multisrc/luscious/Luscious.kt | 14 ++++++++------ .../multisrc/luscious/LusciousGenerator.kt | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt index 42f933951..f41b44224 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/Luscious.kt @@ -32,10 +32,10 @@ abstract class Luscious( override val name: String, override val baseUrl: String, override val lang: String ) : HttpSource() { - - //Based on Luscios single source extension form https://github.com/tachiyomiorg/tachiyomi-extensions/commit/aacf56d0c0ddb173372aac69d798ae998f178377 + + //Based on Luscios single source extension form https://github.com/tachiyomiorg/tachiyomi-extensions/commit/aacf56d0c0ddb173372aac69d798ae998f178377 //with modifiaction to make it support multisrc - + override val supportsLatest: Boolean = true private val apiBaseUrl: String = "$baseUrl/graphql/nobatch/" private val gson = Gson() @@ -214,7 +214,7 @@ abstract class Luscious( .let { it["data"]["picture"]["list"].asJsonObject } return data["items"].asJsonArray.mapIndexed { index, it -> - Page(index, imageUrl = it["url_to_original"].asString) + Page(index, imageUrl = it["thumbnails"][0]["url"].asString) } + if (data["info"]["total_pages"].asInt > 1) { // get 2nd page onwards (ITEMS_PER_PAGE until data["info"]["total_items"].asInt).chunked(ITEMS_PER_PAGE).mapIndexed { page, indices -> indices.map { Page(it, url = buildAlbumPicturesPageUrl(id, page + 2, sortPagesByOption)) } @@ -257,7 +257,7 @@ abstract class Luscious( val data = gson.fromJson(it.body()!!.string()).let { data -> data["data"]["picture"]["list"].asJsonObject } - data["items"].asJsonArray[page.index % 50].asJsonObject["url_to_original"].asString + data["items"].asJsonArray[page.index % 50].asJsonObject["thumbnails"][0]["url"].asString } } @@ -596,7 +596,9 @@ abstract class Luscious( has_next_page } items { - url_to_original + thumbnails { + url + } } } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt index c64921868..f1bc21bb8 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/luscious/LusciousGenerator.kt @@ -10,7 +10,7 @@ class LusciousGenerator : ThemeSourceGenerator { override val themeClass = "Luscious" - override val baseVersionCode: Int = 1 + override val baseVersionCode: Int = 2 override val sources = listOf( MultiLang("Luscious", "https://www.luscious.net", listOf("en","ja", "es", "it", "de", "fr", "zh", "ko", "other", "pt", "th"), isNsfw = true, className = "LusciousFactory", overrideVersionCode = 2),