From d49d78fb206e683f7ac69896e484376bcbe9e3fb Mon Sep 17 00:00:00 2001 From: Mike <51273546+SnakeDoc83@users.noreply.github.com> Date: Tue, 30 Jan 2024 21:59:52 -0500 Subject: [PATCH] Prune Madara part 1 (#817) --- .../madara/archerscans/src/ArcheRScans.kt | 9 --- .../madara/astrallibrary/src/AstralLibrary.kt | 17 ----- .../overrides/madara/bluesolo/src/BlueSolo.kt | 9 --- .../coffeemangatop/src/CoffeeMangaTop.kt | 64 ------------------- .../src/FirstKissMangaBlog.kt | 9 --- .../src/FirstKissMangaClub.kt | 16 ----- .../src/ThreeSixtyFiveManga.kt | 10 --- .../multisrc/madara/MadaraGenerator.kt | 10 --- 8 files changed, 144 deletions(-) delete mode 100644 multisrc/overrides/madara/archerscans/src/ArcheRScans.kt delete mode 100644 multisrc/overrides/madara/astrallibrary/src/AstralLibrary.kt delete mode 100644 multisrc/overrides/madara/bluesolo/src/BlueSolo.kt delete mode 100644 multisrc/overrides/madara/coffeemangatop/src/CoffeeMangaTop.kt delete mode 100644 multisrc/overrides/madara/firstkissmangablog/src/FirstKissMangaBlog.kt delete mode 100644 multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt delete mode 100644 multisrc/overrides/madara/threesixtyfivemanga/src/ThreeSixtyFiveManga.kt diff --git a/multisrc/overrides/madara/archerscans/src/ArcheRScans.kt b/multisrc/overrides/madara/archerscans/src/ArcheRScans.kt deleted file mode 100644 index aa0cca8ed..000000000 --- a/multisrc/overrides/madara/archerscans/src/ArcheRScans.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.archerscans - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class ArcheRScans : Madara("ArcheR Scans", "https://www.archerscans.com", "en") { - override val useNewChapterEndpoint = false - - override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/" -} diff --git a/multisrc/overrides/madara/astrallibrary/src/AstralLibrary.kt b/multisrc/overrides/madara/astrallibrary/src/AstralLibrary.kt deleted file mode 100644 index 290560d34..000000000 --- a/multisrc/overrides/madara/astrallibrary/src/AstralLibrary.kt +++ /dev/null @@ -1,17 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.astrallibrary - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.GET -import okhttp3.Request -import java.text.SimpleDateFormat -import java.util.Locale - -class AstralLibrary : Madara("Astral Library", "https://www.astrallibrary.net", "en", SimpleDateFormat("d MMM", Locale.US)) { - override fun popularMangaRequest(page: Int): Request { - return GET("$baseUrl/manga-tag/manga/?m_orderby=views&page=$page", headers) - } - - override fun latestUpdatesRequest(page: Int): Request { - return GET("$baseUrl/manga-tag/manga/?m_orderby=latest&page=$page", headers) - } -} diff --git a/multisrc/overrides/madara/bluesolo/src/BlueSolo.kt b/multisrc/overrides/madara/bluesolo/src/BlueSolo.kt deleted file mode 100644 index 03b1e65c4..000000000 --- a/multisrc/overrides/madara/bluesolo/src/BlueSolo.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.kanade.tachiyomi.extension.fr.bluesolo - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import java.text.SimpleDateFormat -import java.util.Locale - -class BlueSolo : Madara("Blue Solo", "https://www1.bluesolo.org", "fr", dateFormat = SimpleDateFormat("d MMMM yyyy", Locale.FRENCH)) { - override val mangaDetailsSelectorStatus = "div.summary-heading:contains(Statut) + .summary-content" -} diff --git a/multisrc/overrides/madara/coffeemangatop/src/CoffeeMangaTop.kt b/multisrc/overrides/madara/coffeemangatop/src/CoffeeMangaTop.kt deleted file mode 100644 index 76b8b2ae0..000000000 --- a/multisrc/overrides/madara/coffeemangatop/src/CoffeeMangaTop.kt +++ /dev/null @@ -1,64 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.coffeemangatop - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.GET -import eu.kanade.tachiyomi.source.model.Page -import eu.kanade.tachiyomi.source.model.SChapter -import eu.kanade.tachiyomi.util.asJsoup -import okhttp3.Request -import okhttp3.Response -import org.jsoup.nodes.Document -import java.text.SimpleDateFormat -import java.util.Locale - -class CoffeeMangaTop : Madara( - "CoffeeManga.top (unoriginal)", - "https://coffeemanga.top", - "en", - dateFormat = SimpleDateFormat("MMM dd, HH:mm", Locale.ENGLISH), -) { - override val useNewChapterEndpoint = false - - override fun searchPage(page: Int): String = "search?page=$page" - - override fun popularMangaRequest(page: Int): Request = - GET("$baseUrl/popular-manga?page=$page", headers) - - override fun latestUpdatesRequest(page: Int): Request = - GET("$baseUrl/latest-manga?page=$page", headers) - - // Copied from IsekaiScan.top (unoriginal) - override fun chapterListParse(response: Response): List { - val document = response.asJsoup() - val chaptersWrapper = document.select("div[id^=manga-chapters-holder]") - - var chapterElements = document.select(chapterListSelector()) - - if (chapterElements.isEmpty() && !chaptersWrapper.isNullOrEmpty()) { - val mangaId = chaptersWrapper.attr("data-id") - val xhrHeaders = headersBuilder() - .add("X-Requested-With", "XMLHttpRequest") - .build() - val xhrRequest = GET("$baseUrl/ajax-list-chapter?mangaID=$mangaId", xhrHeaders) - val xhrResponse = client.newCall(xhrRequest).execute() - - chapterElements = xhrResponse.asJsoup().select(chapterListSelector()) - xhrResponse.close() - } - - countViews(document) - return chapterElements.map(::chapterFromElement) - } - - // Copied from IsekaiScan.top (unoriginal) - override fun pageListParse(document: Document): List { - val stringArray = document.select("p#arraydata").text().split(",").toTypedArray() - return stringArray.mapIndexed { index, url -> - Page( - index, - document.location(), - url, - ) - } - } -} diff --git a/multisrc/overrides/madara/firstkissmangablog/src/FirstKissMangaBlog.kt b/multisrc/overrides/madara/firstkissmangablog/src/FirstKissMangaBlog.kt deleted file mode 100644 index 2ec33b61a..000000000 --- a/multisrc/overrides/madara/firstkissmangablog/src/FirstKissMangaBlog.kt +++ /dev/null @@ -1,9 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.firstkissmangablog - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class FirstKissMangaBlog : Madara("1stKissManga.blog", "https://1stkissmanga.blog", "en") { - override val useNewChapterEndpoint = false - - override fun searchPage(page: Int): String = if (page == 1) "" else "page/$page/" -} diff --git a/multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt b/multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt deleted file mode 100644 index 1f9e3d3b8..000000000 --- a/multisrc/overrides/madara/firstkissmangaclub/src/FirstKissMangaClub.kt +++ /dev/null @@ -1,16 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.firstkissmangaclub - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import java.util.concurrent.TimeUnit - -class FirstKissMangaClub : Madara( - "1stKissManga.Club", - "https://1stkissmanga.club", - "en", -) { - - override val client = super.client.newBuilder() - .rateLimit(1, 3, TimeUnit.SECONDS) - .build() -} diff --git a/multisrc/overrides/madara/threesixtyfivemanga/src/ThreeSixtyFiveManga.kt b/multisrc/overrides/madara/threesixtyfivemanga/src/ThreeSixtyFiveManga.kt deleted file mode 100644 index 0d375b494..000000000 --- a/multisrc/overrides/madara/threesixtyfivemanga/src/ThreeSixtyFiveManga.kt +++ /dev/null @@ -1,10 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.threesixtyfivemanga - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.GET -import okhttp3.Request - -class ThreeSixtyFiveManga : Madara("365Manga", "https://365manga.com", "en") { - override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=views", headers) - override fun latestUpdatesRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=latest", headers) -} 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 46175981f..7b76b99eb 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 @@ -17,15 +17,11 @@ class MadaraGenerator : ThemeSourceGenerator { MultiLang("Manhwa18.cc", "https://manhwa18.cc", listOf("en", "ko", "all"), isNsfw = true, className = "Manhwa18CcFactory", pkgName = "manhwa18cc", overrideVersionCode = 4), 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"), - SingleLang("1stKissManga.Club", "https://1stkissmanga.club", "en", className = "FirstKissMangaClub", overrideVersionCode = 2), SingleLang("1stKissManga.tv", "https://1stkissmanga.tv", "en", isNsfw = true, className = "FirstKissMangaTv"), SingleLang("247Manga", "https://247manga.com", "en", className = "Manga247", overrideVersionCode = 1), - SingleLang("365Manga", "https://365manga.com", "en", className = "ThreeSixtyFiveManga", overrideVersionCode = 1), SingleLang("Adonis Fansub", "https://manga.adonisfansub.com", "tr", overrideVersionCode = 1), SingleLang("Adult Webtoon", "https://adultwebtoon.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Akimangá", "https://akimanga.com", "pt-BR", isNsfw = true, className = "Akimanga"), - SingleLang("Akuzenai Arts", "https://akuzenaiarts.org", "en"), SingleLang("AllPornComic", "https://allporncomic.com", "en", isNsfw = true), SingleLang("Amuy", "https://apenasmaisumyaoi.com", "pt-BR", isNsfw = true, overrideVersionCode = 1), SingleLang("Anikiga", "https://anikiga.com", "tr"), @@ -38,14 +34,11 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("AQUA Scans", "https://aquascans.com", "en", className = "ManhwaWorld", overrideVersionCode = 1), SingleLang("ArazNovel", "https://www.araznovel.com", "tr", overrideVersionCode = 3), SingleLang("Arcanescans", "https://arcanescans.com", "en"), - SingleLang("ArcheR Scans", "https://www.archerscans.com", "en"), SingleLang("Arthur Scan", "https://arthurscan.xyz", "pt-BR", overrideVersionCode = 4), - SingleLang("Astral Library", "https://www.astrallibrary.net", "en", overrideVersionCode = 2), SingleLang("Astral-Manga", "https://astral-manga.fr", "fr", className = "AstralManga"), SingleLang("Astrum Scans", "https://astrumscans.xyz", "pt-BR", isNsfw = true), SingleLang("Asura Scans.us (unoriginal)", "https://asurascans.us", "en", className = "AsuraScansUs"), SingleLang("Atlantis Scan", "https://scansatlanticos.com", "es", isNsfw = true), - SingleLang("AZManhwa", "https://azmanhwa.net", "en"), SingleLang("Azora", "https://azoramoon.com", "ar", overrideVersionCode = 7), SingleLang("Babel Wuxia", "https://babelwuxia.com", "en", overrideVersionCode = 1), SingleLang("Bakaman", "https://bakaman.net", "th", overrideVersionCode = 1), @@ -54,8 +47,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("BestManga", "https://bestmanga.club", "ru", overrideVersionCode = 1), SingleLang("BestManhua", "https://bestmanhua.com", "en", overrideVersionCode = 2), SingleLang("BirdToon", "https://birdtoon.net", "id", isNsfw = true), - SingleLang("BlogManga", "https://blogmanga.net", "en"), - SingleLang("Blue Solo", "https://www1.bluesolo.org", "fr", isNsfw = true), SingleLang("BokugenTranslation", "https://bokugents.com", "es", overrideVersionCode = 1), SingleLang("Boruto Explorer", "https://leitor.borutoexplorer.com.br", "pt-BR", overrideVersionCode = 1), SingleLang("BoysLove", "https://boyslove.me", "en", isNsfw = true, overrideVersionCode = 3), @@ -68,7 +59,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Clover Manga", "https://clover-manga.com", "tr", overrideVersionCode = 2), SingleLang("Coco Rip", "https://cocorip.net", "es"), SingleLang("Coffee Manga", "https://coffeemanga.io", "en", overrideVersionCode = 2), - SingleLang("CoffeeManga.top (unoriginal)", "https://coffeemanga.top", "en", isNsfw = true, className = "CoffeeMangaTop"), SingleLang("Colored Manga", "https://coloredmanga.com", "en", overrideVersionCode = 2), SingleLang("Comic Scans", "https://www.comicscans.org", "en"), SingleLang("Comics Valley", "https://comicsvalley.com", "hi", isNsfw = true, overrideVersionCode = 1),