From 12a7dca56ad3f0f58ef72712fead76e099894cf5 Mon Sep 17 00:00:00 2001 From: Johannes Joens <34899572+jopejoe1@users.noreply.github.com> Date: Wed, 7 Apr 2021 03:37:28 +1200 Subject: [PATCH] Added Madara sources, Moved Reset Scans (#6441) * Update MadaraGenerator.kt * Update WPMangaStreamGenerator.kt * Delete multisrc/overrides/wpmangastream/resetscans/src directory * Update MadaraGenerator.kt * changed to https on sites that support it * Added Version Ovveride * changes to https shojou hearts * Added https to managrave --- .../overrides/madara/mangarave/src/MangaRave.kt | 2 +- .../madara/shoujohearts/src/ShoujoHearts.kt | 2 +- .../wpmangastream/resetscans/src/ResetScans.kt | 16 ---------------- .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 10 +++++++--- .../wpmangastream/WPMangaStreamGenerator.kt | 1 - 5 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 multisrc/overrides/wpmangastream/resetscans/src/ResetScans.kt diff --git a/multisrc/overrides/madara/mangarave/src/MangaRave.kt b/multisrc/overrides/madara/mangarave/src/MangaRave.kt index 177c44239..4f6653922 100644 --- a/multisrc/overrides/madara/mangarave/src/MangaRave.kt +++ b/multisrc/overrides/madara/mangarave/src/MangaRave.kt @@ -4,4 +4,4 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara import java.text.SimpleDateFormat import java.util.Locale -class MangaRave : Madara("MangaRave", "http://www.mangarave.com", "en", SimpleDateFormat("MMM-dd-yy", Locale.US)) +class MangaRave : Madara("MangaRave", "https://www.mangarave.com", "en", SimpleDateFormat("MMM-dd-yy", Locale.US)) diff --git a/multisrc/overrides/madara/shoujohearts/src/ShoujoHearts.kt b/multisrc/overrides/madara/shoujohearts/src/ShoujoHearts.kt index 48c199a07..56005ad19 100644 --- a/multisrc/overrides/madara/shoujohearts/src/ShoujoHearts.kt +++ b/multisrc/overrides/madara/shoujohearts/src/ShoujoHearts.kt @@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.network.POST import okhttp3.CacheControl import okhttp3.Request -class ShoujoHearts : Madara("ShoujoHearts", "http://shoujohearts.com", "en") { +class ShoujoHearts : Madara("ShoujoHearts", "https://shoujohearts.com", "en") { override fun popularMangaRequest(page: Int): Request = POST("$baseUrl/reader/wp-admin/admin-ajax.php", formHeaders, formBuilder(page, true).build(), CacheControl.FORCE_NETWORK) diff --git a/multisrc/overrides/wpmangastream/resetscans/src/ResetScans.kt b/multisrc/overrides/wpmangastream/resetscans/src/ResetScans.kt deleted file mode 100644 index b56417bad..000000000 --- a/multisrc/overrides/wpmangastream/resetscans/src/ResetScans.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.resetscans - -import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor -import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit - -class ResetScans : WPMangaStream("Reset Scans", "https://reset-scans.com", "en") { - private val rateLimitInterceptor = RateLimitInterceptor(4) - - override val client: OkHttpClient = network.cloudflareClient.newBuilder() - .connectTimeout(10, TimeUnit.SECONDS) - .readTimeout(30, TimeUnit.SECONDS) - .addNetworkInterceptor(rateLimitInterceptor) - .build() -} 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 d22cb2191..aaf3f8eff 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 @@ -113,7 +113,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Manga-Online.co", "https://www.manga-online.co", "th", className = "MangaOnlineCo"), SingleLang("Mangas Origines", "https://mangas-origines.fr", "fr" , true), SingleLang("Manga Diyari", "https://mangadiyari.com", "tr"), - SingleLang("MangaRave", "http://www.mangarave.com", "en"), + SingleLang("MangaRave", "https://www.mangarave.com", "en", overrideVersionCode = 1), SingleLang("ManhwaLive", "https://manhwa.live", "en", overrideVersionCode = 1), SingleLang("Manga Read", "https://mangaread.co", "en"), SingleLang("MangaRead.org", "https://www.mangaread.org", "en", className = "MangaReadOrg"), @@ -200,7 +200,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Sekte Doujin", "https://sektedoujin.xyz", "id", isNsfw = true), SingleLang("Shield Manga", "https://shieldmanga.club", "en", overrideVersionCode = 1), SingleLang("Shinzoo Scan", "https://shinzooscan.xyz", "pt-BR", overrideVersionCode = 1), - SingleLang("ShoujoHearts", "http://shoujohearts.com", "en"), + SingleLang("ShoujoHearts", "https://shoujohearts.com", "en", overrideVersionCode = 1), SingleLang("SISI GELAP", "https://sisigelap.club/", "id"), SingleLang("SiXiang Scans", "http://www.sixiangscans.com", "en"), SingleLang("Siyahmelek", "https://siyahmelek.com", "tr", isNsfw = true, overrideVersionCode = 1), @@ -248,7 +248,11 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Imperfect Comics", "https://imperfectcomic.com", "en"), SingleLang("Ookamii Manga", "https://manga.ookamii.xyz/", "en"), SingleLang("Mortals Groove", "https://mortalsgroove.com", "en"), - SingleLang("Cervo Scanlator", "https://cervoscan.xyz", "pt-BR") + SingleLang("Cervo Scanlator", "https://cervoscan.xyz", "pt-BR"), + SingleLang("Comic Star", "https://comicstar.org", "en"), + SingleLang("Reset Scans", "https://reset-scans.com", "en", overrideVersionCode = 2), + SingleLang("XuN Scans", "https://reader.xunscans.xyz", "en"), + SingleLang("Sani-Go", "https://sani-go.net", "ar", className = "SaniGo"), ) companion object { 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 64d3e9427..c985c1257 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 @@ -12,7 +12,6 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 3 override val sources = listOf( - SingleLang("Reset Scans", "https://reset-scans.com", "en"), SingleLang("KlanKomik", "https://klankomik.com", "id"), SingleLang("ChiOtaku", "https://chiotaku.com", "id"), SingleLang("MangaShiro", "https://mangashiro.co", "id"),