From f2658d0619df35c3981517891334a7befe503878 Mon Sep 17 00:00:00 2001 From: beerpsi <92439990+beerpiss@users.noreply.github.com> Date: Wed, 24 Jan 2024 01:43:02 +0700 Subject: [PATCH] Remove Reaper Scans (Turkish) (#540) --- .../{ReaperScansFactory.kt => ReaperScans.kt} | 43 ++++--------------- .../multisrc/madara/MadaraGenerator.kt | 4 +- 2 files changed, 11 insertions(+), 36 deletions(-) rename multisrc/overrides/madara/reaperscans/src/{ReaperScansFactory.kt => ReaperScans.kt} (58%) diff --git a/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt b/multisrc/overrides/madara/reaperscans/src/ReaperScans.kt similarity index 58% rename from multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt rename to multisrc/overrides/madara/reaperscans/src/ReaperScans.kt index 8f0707466..a06e8fe00 100644 --- a/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt +++ b/multisrc/overrides/madara/reaperscans/src/ReaperScans.kt @@ -1,25 +1,20 @@ -package eu.kanade.tachiyomi.extension.all.reaperscans +package eu.kanade.tachiyomi.extension.fr.reaperscans import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.model.SChapter import okhttp3.HttpUrl.Companion.toHttpUrl import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -class ReaperScansFactory : SourceFactory { - override fun createSources() = listOf( - ReaperScansTr(), - ReaperScansFr(), - ) -} - -abstract class ReaperScans( - override val baseUrl: String, - lang: String, - dateFormat: SimpleDateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US), -) : Madara("Reaper Scans", baseUrl, lang, dateFormat) { +class ReaperScans : Madara( + "Reaper Scans", + "https://reaperscans.fr", + "fr", + SimpleDateFormat("dd/MM/yyyy", Locale.US), +) { + // Migrated from WpMangaReader to Madara. + override val versionId = 2 override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { val urlElement = element.selectFirst(chapterUrlSelector)!! @@ -37,23 +32,3 @@ abstract class ReaperScans( setUrlWithoutDomain(fixedUrl) } } - -class ReaperScansTr : ReaperScans( - "https://reaperscanstr.com", - "tr", - SimpleDateFormat("MMMMM dd, yyyy", Locale("tr")), -) { - - // Tags are useless as they are just SEO keywords. - override val mangaDetailsSelectorTag = "" -} - -class ReaperScansFr : ReaperScans( - "https://reaperscans.fr", - "fr", - SimpleDateFormat("dd/MM/yyyy", Locale.US), -) { - - // Migrated from WpMangaReader to Madara. - override val versionId = 2 -} 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 f98752984..d246e98dd 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 @@ -15,7 +15,6 @@ class MadaraGenerator : ThemeSourceGenerator { override val sources = listOf( MultiLang("MangaForFree.net", "https://mangaforfree.net", listOf("en", "ko", "all"), isNsfw = true, className = "MangaForFreeFactory", pkgName = "mangaforfree", overrideVersionCode = 1), MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc", overrideVersionCode = 4), - MultiLang("Reaper Scans", "https://reaperscans.com", listOf("fr", "tr"), className = "ReaperScansFactory", pkgName = "reaperscans", overrideVersionCode = 12), SingleLang("1st Kiss-Manga (unoriginal)", "https://1stkiss-manga.com", "en", className = "FirstKissDashManga"), SingleLang("1st Manhwa", "https://1stmanhwa.com", "en", isNsfw = true, className = "FirstManhwa"), SingleLang("1stKissManga.blog", "https://1stkissmanga.blog", "en", isNsfw = true, className = "FirstKissMangaBlog"), @@ -198,6 +197,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Lolicon", "https://lolicon.mobi", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Lord Manga", "https://lordmanga.com", "en"), SingleLang("Luffy Manga", "https://luffymanga.com", "en"), + SingleLang("Lura Toon", "https://luratoon.com", "pt-BR", overrideVersionCode = 7, pkgName = "randomscan", className = "LuraToon"), SingleLang("LuxManga", "https://luxmanga.net", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("MadaraDex", "https://madaradex.org", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Maid Scan", "https://maidscan.com.br", "pt-BR"), @@ -415,13 +415,13 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("RagnarokScan", "https://ragnarokscan.com", "es", overrideVersionCode = 1), SingleLang("Raijin Scans", "https://raijinscans.fr", "fr"), SingleLang("Rainbow Fairy Scan", "https://rainbowfairyscan.com", "pt-BR"), - SingleLang("Lura Toon", "https://luratoon.com", "pt-BR", overrideVersionCode = 7, pkgName = "randomscan", className = "LuraToon"), SingleLang("RawDEX", "https://rawdex.net", "ko", isNsfw = true, overrideVersionCode = 1), SingleLang("ReadAdult", "https://readadult.net", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("ReaderGen", "https://fr.readergen.fr", "fr"), SingleLang("ReadFreeComics", "https://readfreecomics.com", "en"), SingleLang("ReadMangaFree", "https://readmangafree.net", "en", isNsfw = true), SingleLang("ReadManhua", "https://readmanhua.net", "en", overrideVersionCode = 2), + SingleLang("Reaper Scans", "https://reaperscans.fr", "fr"), SingleLang("Reset Scans", "https://reset-scans.us", "en"), SingleLang("Rh2PlusManga", "https://www.rh2plusmanga.com", "th", isNsfw = true, overrideVersionCode = 5), SingleLang("RichtoScan", "https://richtoscan.com", "es"),