From eea542f91deafc34e5f9d2b95c18caa8ef463e19 Mon Sep 17 00:00:00 2001 From: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com> Date: Sun, 27 Aug 2023 15:16:37 -0300 Subject: [PATCH] Add one Madara source and fix another (#17700) Add one Madara source and fix another. --- .../madara/cerisescans/src/CeriseScan.kt | 36 +++++++++++++++++++ .../src/GhostScan.kt} | 10 +++--- .../multisrc/madara/MadaraGenerator.kt | 3 +- 3 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 multisrc/overrides/madara/cerisescans/src/CeriseScan.kt rename multisrc/overrides/madara/{cerisescans/src/CeriseScans.kt => ghostscan/src/GhostScan.kt} (68%) diff --git a/multisrc/overrides/madara/cerisescans/src/CeriseScan.kt b/multisrc/overrides/madara/cerisescans/src/CeriseScan.kt new file mode 100644 index 000000000..39ec165fc --- /dev/null +++ b/multisrc/overrides/madara/cerisescans/src/CeriseScan.kt @@ -0,0 +1,36 @@ +package eu.kanade.tachiyomi.extension.pt.cerisescans + +import eu.kanade.tachiyomi.multisrc.madara.Madara +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.network.interceptor.rateLimit +import eu.kanade.tachiyomi.source.model.SManga +import okhttp3.OkHttpClient +import okhttp3.Request +import java.text.SimpleDateFormat +import java.util.Locale +import java.util.concurrent.TimeUnit + +class CeriseScan : Madara( + "Cerise Scan", + "https://cerisescan.com/home1", + "pt-BR", + SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR")), +) { + + // Name changed from 'Cerise Scans' to 'Cerise Scan' + override val id: Long = 8629915907358523454 + + override val client: OkHttpClient = super.client.newBuilder() + .rateLimit(1, 2, TimeUnit.SECONDS) + .build() + + override val useNewChapterEndpoint = true + + override fun mangaDetailsRequest(manga: SManga): Request { + return GET(baseUrl + manga.url.removePrefix("/home1"), headers) + } + + override fun chapterListRequest(manga: SManga): Request { + return GET(baseUrl + manga.url.removePrefix("/home1"), headers) + } +} diff --git a/multisrc/overrides/madara/cerisescans/src/CeriseScans.kt b/multisrc/overrides/madara/ghostscan/src/GhostScan.kt similarity index 68% rename from multisrc/overrides/madara/cerisescans/src/CeriseScans.kt rename to multisrc/overrides/madara/ghostscan/src/GhostScan.kt index 53d0ebbce..577fac127 100644 --- a/multisrc/overrides/madara/cerisescans/src/CeriseScans.kt +++ b/multisrc/overrides/madara/ghostscan/src/GhostScan.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.extension.pt.cerisescans +package eu.kanade.tachiyomi.extension.pt.ghostscan import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.interceptor.rateLimit @@ -7,11 +7,11 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -class CeriseScans : Madara( - "Cerise Scans", - "https://cerisescans.com", +class GhostScan : Madara( + "Ghost Scan", + "https://ghostscan.com.br", "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")), + SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR")), ) { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index c826d9706..84399526e 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -70,7 +70,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("CAT-translator", "https://cats-translator.com/manga", "th", className = "CatTranslator", overrideVersionCode = 2), SingleLang("Cat300", "https://cat300.com", "th", isNsfw = true, className = "Cat300", overrideVersionCode = 1), SingleLang("CatOnHeadTranslations", "https://catonhead.com", "en", overrideVersionCode = 2), - SingleLang("Cerise Scans", "https://cerisescans.com", "pt-BR", overrideVersionCode = 5), + SingleLang("Cerise Scan", "https://cerisescan.com/home1", "pt-BR", isNsfw = true, overrideVersionCode = 6), SingleLang("Chibi Manga", "https://www.cmreader.info", "en", overrideVersionCode = 1), SingleLang("Clover Manga", "https://clover-manga.com", "tr", overrideVersionCode = 2), SingleLang("Coco Rip", "https://cocorip.net", "es"), @@ -130,6 +130,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("GeassToon", "https://geasstoon.com", "tr"), SingleLang("Gekkou Hentai", "https://hentai.gekkouscans.com.br", "pt-BR", isNsfw = true), SingleLang("Gekkou Scans", "https://gekkou.com.br", "pt-BR", isNsfw = true, pkgName = "gekkouscan"), + SingleLang("Ghost Scan", "https://ghostscan.com.br", "pt-BR", isNsfw = true), SingleLang("Girls Love Manga!", "https://glmanga.com", "en", isNsfw = true, className = "GirlsLoveManga"), SingleLang("Glory Manga", "https://glorymanga.com", "tr"), SingleLang("Good Girls Scan", "https://goodgirls.moe", "en", isNsfw = true),