From 7d05f193fe51649d30048b1270f352fb8457bba0 Mon Sep 17 00:00:00 2001 From: Riztard Lanthorn Date: Mon, 24 May 2021 20:01:45 +0700 Subject: [PATCH] Kiryuu: use new url, move factory/multisrc (#7128) * Kiryuu: use new url, move factory - change to kiryuu.id url - move multisrc from wpmangastream to wpmangareader - fix indent in wpmangareader generator * fix conflict * fix 2 --- .../kiryuu/additional.gradle.kts | 4 ++ .../kiryuu/res/mipmap-hdpi/ic_launcher.png | Bin .../kiryuu/res/mipmap-mdpi/ic_launcher.png | Bin .../kiryuu/res/mipmap-xhdpi/ic_launcher.png | Bin .../kiryuu/res/mipmap-xxhdpi/ic_launcher.png | Bin .../kiryuu/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../kiryuu/res/web_hi_res_512.png | Bin .../kiryuu/src/Kiryuu.kt | 12 +----- .../wpmangareader/WPMangaReaderGenerator.kt | 39 +++++++++--------- .../wpmangastream/WPMangaStreamGenerator.kt | 1 - 10 files changed, 26 insertions(+), 30 deletions(-) create mode 100644 multisrc/overrides/wpmangareader/kiryuu/additional.gradle.kts rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/res/web_hi_res_512.png (100%) rename multisrc/overrides/{wpmangastream => wpmangareader}/kiryuu/src/Kiryuu.kt (52%) diff --git a/multisrc/overrides/wpmangareader/kiryuu/additional.gradle.kts b/multisrc/overrides/wpmangareader/kiryuu/additional.gradle.kts new file mode 100644 index 000000000..10beb8157 --- /dev/null +++ b/multisrc/overrides/wpmangareader/kiryuu/additional.gradle.kts @@ -0,0 +1,4 @@ + +dependencies { + implementation project(':lib-ratelimit') +} diff --git a/multisrc/overrides/wpmangastream/kiryuu/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/kiryuu/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangastream/kiryuu/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/kiryuu/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangastream/kiryuu/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/kiryuu/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangastream/kiryuu/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/kiryuu/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangastream/kiryuu/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/kiryuu/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangastream/kiryuu/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/kiryuu/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangastream/kiryuu/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/kiryuu/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangastream/kiryuu/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/kiryuu/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangastream/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/wpmangastream/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/kiryuu/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/wpmangastream/kiryuu/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/kiryuu/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/wpmangastream/kiryuu/res/web_hi_res_512.png rename to multisrc/overrides/wpmangareader/kiryuu/res/web_hi_res_512.png diff --git a/multisrc/overrides/wpmangastream/kiryuu/src/Kiryuu.kt b/multisrc/overrides/wpmangareader/kiryuu/src/Kiryuu.kt similarity index 52% rename from multisrc/overrides/wpmangastream/kiryuu/src/Kiryuu.kt rename to multisrc/overrides/wpmangareader/kiryuu/src/Kiryuu.kt index 79907b075..02a0e95d7 100644 --- a/multisrc/overrides/wpmangastream/kiryuu/src/Kiryuu.kt +++ b/multisrc/overrides/wpmangareader/kiryuu/src/Kiryuu.kt @@ -1,13 +1,11 @@ package eu.kanade.tachiyomi.extension.id.kiryuu import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream -import eu.kanade.tachiyomi.source.model.Page +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import okhttp3.OkHttpClient -import org.jsoup.nodes.Document import java.util.concurrent.TimeUnit -class Kiryuu : WPMangaStream("Kiryuu", "https://kiryuu.co", "id") { +class Kiryuu : WPMangaReader("Kiryuu", "https://kiryuu.id", "id") { // Formerly "Kiryuu (WP Manga Stream)" override val id = 3639673976007021338 @@ -18,10 +16,4 @@ class Kiryuu : WPMangaStream("Kiryuu", "https://kiryuu.co", "id") { .readTimeout(30, TimeUnit.SECONDS) .addNetworkInterceptor(rateLimitInterceptor) .build() - - override fun pageListParse(document: Document): List { - return document.select("div#readerarea img").map { it.attr("abs:src") } - .filterNot { it.substringAfterLast("/").contains(Regex("""(filerun|photothumb\.db)""")) } - .mapIndexed { i, image -> Page(i, "", image) } - } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt index aacaa9462..97c81eea1 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt @@ -13,25 +13,26 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { override val sources = listOf( - SingleLang("KomikMama", "https://komikmama.net", "id"), - SingleLang("MangaKita", "https://mangakita.net", "id"), - SingleLang("Ngomik", "https://ngomik.net", "id"), - SingleLang("Sekaikomik", "https://www.sekaikomik.fun", "id", isNsfw = true, overrideVersionCode = 4), - SingleLang("Davey Scans", "https://daveyscans.com/", "id"), - SingleLang("Mangasusu", "https://mangasusu.co.in", "id", isNsfw = true), - SingleLang("TurkToon", "https://turktoon.com", "tr"), - SingleLang("Gecenin Lordu", "https://geceninlordu.com/", "tr", overrideVersionCode = 1), - SingleLang("Flame Scans", "https://flamescans.org", "en", overrideVersionCode = 2), - SingleLang("A Pair of 2+", "https://pairof2.com", "en", className = "APairOf2"), - SingleLang("PMScans", "https://reader.pmscans.com", "en"), - SingleLang("Skull Scans", "https://www.skullscans.com", "en"), - SingleLang("Luminous Scans", "https://www.luminousscans.com", "en"), - SingleLang("Azure Scans", "https://azuremanga.com", "en"), - SingleLang("Seafoam Scans", "https://seafoamscans.com", "en"), - SingleLang("GS Nation", "https://gs-nation.fr", "fr", overrideVersionCode = 1), - SingleLang("YugenMangas", "https://yugenmangas.com", "es"), - SingleLang("DragonTranslation", "https://dragontranslation.com", "es", isNsfw = true) - ) + SingleLang("Kiryuu", "https://kiryuu.id", "id"), + SingleLang("KomikMama", "https://komikmama.net", "id"), + SingleLang("MangaKita", "https://mangakita.net", "id"), + SingleLang("Ngomik", "https://ngomik.net", "id"), + SingleLang("Sekaikomik", "https://www.sekaikomik.fun", "id", isNsfw = true, overrideVersionCode = 4), + SingleLang("Davey Scans", "https://daveyscans.com/", "id"), + SingleLang("Mangasusu", "https://mangasusu.co.in", "id", isNsfw = true), + SingleLang("TurkToon", "https://turktoon.com", "tr"), + SingleLang("Gecenin Lordu", "https://geceninlordu.com/", "tr", overrideVersionCode = 1), + SingleLang("Flame Scans", "https://flamescans.org", "en", overrideVersionCode = 2), + SingleLang("A Pair of 2+", "https://pairof2.com", "en", className = "APairOf2"), + SingleLang("PMScans", "https://reader.pmscans.com", "en"), + SingleLang("Skull Scans", "https://www.skullscans.com", "en"), + SingleLang("Luminous Scans", "https://www.luminousscans.com", "en"), + SingleLang("Azure Scans", "https://azuremanga.com", "en"), + SingleLang("Seafoam Scans", "https://seafoamscans.com", "en"), + SingleLang("GS Nation", "https://gs-nation.fr", "fr", overrideVersionCode = 1), + SingleLang("YugenMangas", "https://yugenmangas.com", "es"), + SingleLang("DragonTranslation", "https://dragontranslation.com", "es", isNsfw = true) + ) companion object { @JvmStatic 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 8f01ccdc7..990461e9f 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 @@ -33,7 +33,6 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { SingleLang("KomikRu", "https://komikru.com", "id"), SingleLang("GURU Komik", "https://gurukomik.com", "id"), SingleLang("Shea Manga", "https://sheamanga.my.id", "id"), - SingleLang("Kiryuu", "https://kiryuu.co", "id"), SingleLang("Komik AV", "https://komikav.com", "id"), SingleLang("Komik Cast", "https://komikcast.com", "id", overrideVersionCode = 3), // make it from v0 to v3 to force update user who still use old standalone ext, they will need to migrate SingleLang("West Manga", "https://westmanga.info", "id"),