diff --git a/multisrc/overrides/madara/akumanotenshi/src/AkumaNoTenshi.kt b/multisrc/overrides/madara/akumanotenshi/src/AkumaNoTenshi.kt deleted file mode 100644 index e8d319261..000000000 --- a/multisrc/overrides/madara/akumanotenshi/src/AkumaNoTenshi.kt +++ /dev/null @@ -1,20 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.akumanotenshi - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class AkumaNoTenshi : Madara( - "Akuma no Tenshi", - "https://akumanotenshi.com", - "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")), -) { - - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 2, TimeUnit.SECONDS) - .build() -} diff --git a/multisrc/overrides/madara/bananamecanica/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/bananamecanica/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index e00b6e558..000000000 Binary files a/multisrc/overrides/madara/bananamecanica/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/bananamecanica/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/bananamecanica/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 47d4dbb45..000000000 Binary files a/multisrc/overrides/madara/bananamecanica/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/bananamecanica/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/bananamecanica/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 048c22b8e..000000000 Binary files a/multisrc/overrides/madara/bananamecanica/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/bananamecanica/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/bananamecanica/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 50d0a508f..000000000 Binary files a/multisrc/overrides/madara/bananamecanica/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/bananamecanica/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/bananamecanica/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 550477588..000000000 Binary files a/multisrc/overrides/madara/bananamecanica/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/bananamecanica/res/web_hi_res_512.png b/multisrc/overrides/madara/bananamecanica/res/web_hi_res_512.png deleted file mode 100644 index 81bc8a329..000000000 Binary files a/multisrc/overrides/madara/bananamecanica/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt b/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt deleted file mode 100644 index d0bb90e2c..000000000 --- a/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt +++ /dev/null @@ -1,23 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.bananamecanica - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class BananaCitrica : Madara( - "Banana Cítrica", - "https://bananacitrica.com", - "pt-BR", - SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR")), -) { - - // Website changed their name. - override val id: Long = 4770070980248873010 - - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 2, TimeUnit.SECONDS) - .build() -} diff --git a/multisrc/overrides/madara/gekkouhentai/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/gekkouhentai/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index b0dca4f4e..000000000 Binary files a/multisrc/overrides/madara/gekkouhentai/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/gekkouhentai/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/gekkouhentai/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index faabc8f7e..000000000 Binary files a/multisrc/overrides/madara/gekkouhentai/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/gekkouhentai/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/gekkouhentai/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 37006ed1f..000000000 Binary files a/multisrc/overrides/madara/gekkouhentai/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/gekkouhentai/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/gekkouhentai/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index eeef504a2..000000000 Binary files a/multisrc/overrides/madara/gekkouhentai/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/gekkouhentai/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/gekkouhentai/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index a0b5d109b..000000000 Binary files a/multisrc/overrides/madara/gekkouhentai/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/gekkouhentai/res/web_hi_res_512.png b/multisrc/overrides/madara/gekkouhentai/res/web_hi_res_512.png deleted file mode 100644 index 8ec9354b4..000000000 Binary files a/multisrc/overrides/madara/gekkouhentai/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/gekkouhentai/src/GekkouHentai.kt b/multisrc/overrides/madara/gekkouhentai/src/GekkouHentai.kt deleted file mode 100644 index e037cf3e7..000000000 --- a/multisrc/overrides/madara/gekkouhentai/src/GekkouHentai.kt +++ /dev/null @@ -1,28 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.gekkouhentai - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class GekkouHentai : Madara( - "Gekkou Hentai", - "https://hentai.gekkouscans.com.br", - "pt-BR", - SimpleDateFormat("dd 'de' MMMMM 'de' YYYY", Locale("pt", "BR")), -) { - - // Theme changed from MMRCMS to Madara. - override val versionId: Int = 2 - - override val client: OkHttpClient = super.client.newBuilder() - .connectTimeout(1, TimeUnit.MINUTES) - .readTimeout(1, TimeUnit.MINUTES) - .writeTimeout(1, TimeUnit.MINUTES) - .rateLimit(1, 2, TimeUnit.SECONDS) - .build() - - override val useNewChapterEndpoint: Boolean = true -} diff --git a/multisrc/overrides/madara/ladyestelarscan/src/LadyEstelarScan.kt b/multisrc/overrides/madara/ladyestelarscan/src/LadyEstelarScan.kt deleted file mode 100644 index af4b8153d..000000000 --- a/multisrc/overrides/madara/ladyestelarscan/src/LadyEstelarScan.kt +++ /dev/null @@ -1,63 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.ladyestelarscan - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.asObservable -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import eu.kanade.tachiyomi.source.model.FilterList -import eu.kanade.tachiyomi.source.model.MangasPage -import okhttp3.Call -import okhttp3.OkHttpClient -import okhttp3.Response -import rx.Observable -import java.lang.IllegalStateException -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class LadyEstelarScan : Madara( - "Lady Estelar Scan", - "https://ladyestelarscan.com.br", - "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")), -) { - - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 2, TimeUnit.SECONDS) - .build() - - override val useNewChapterEndpoint = true - - override fun fetchPopularManga(page: Int): Observable { - return client.newCall(popularMangaRequest(page)) - .asObservableSuccessIgnoreCode(404) - .map(::popularMangaParse) - } - - override fun fetchLatestUpdates(page: Int): Observable { - return client.newCall(latestUpdatesRequest(page)) - .asObservableSuccessIgnoreCode(404) - .map(::latestUpdatesParse) - } - - override fun fetchSearchManga( - page: Int, - query: String, - filters: FilterList, - ): Observable { - return client.newCall(searchMangaRequest(page, query, filters)) - .asObservableSuccessIgnoreCode(404) - .map(::searchMangaParse) - } - - /** - * Their site have some issues and is returning 404 in some pages even if they exist. - */ - private fun Call.asObservableSuccessIgnoreCode(code: Int): Observable { - return asObservable().doOnNext { response -> - if (!response.isSuccessful && response.code != code) { - response.close() - throw IllegalStateException("HTTP error ${response.code}") - } - } - } -} diff --git a/multisrc/overrides/madara/taberumangas/src/TaberuMangas.kt b/multisrc/overrides/madara/taberumangas/src/TaberuMangas.kt deleted file mode 100644 index ae5e4232a..000000000 --- a/multisrc/overrides/madara/taberumangas/src/TaberuMangas.kt +++ /dev/null @@ -1,22 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.taberumangas - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class TaberuMangas : Madara( - "Taberu Mangás", - "https://taberu.org", - "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")), -) { - - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 2, TimeUnit.SECONDS) - .build() - - override val useNewChapterEndpoint = true -} diff --git a/multisrc/overrides/madara/vortcescan/src/VortceScan.kt b/multisrc/overrides/madara/vortcescan/src/VortceScan.kt deleted file mode 100644 index bfc19c29b..000000000 --- a/multisrc/overrides/madara/vortcescan/src/VortceScan.kt +++ /dev/null @@ -1,20 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.vortcescan - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class VortceScan : Madara( - "Vórtce Scan", - "https://vortcescan.com.br", - "pt-BR", - SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR")), -) { - - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 2, TimeUnit.SECONDS) - .build() -} diff --git a/multisrc/overrides/madara/zeroscan/src/ZeroScan.kt b/multisrc/overrides/madara/zeroscan/src/ZeroScan.kt deleted file mode 100644 index 0738403e3..000000000 --- a/multisrc/overrides/madara/zeroscan/src/ZeroScan.kt +++ /dev/null @@ -1,20 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.zeroscan - -import eu.kanade.tachiyomi.multisrc.madara.Madara -import eu.kanade.tachiyomi.network.interceptor.rateLimit -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class ZeroScan : Madara( - "Zero Scan", - "https://zeroscan.com.br", - "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")), -) { - - override val client: OkHttpClient = super.client.newBuilder() - .rateLimit(1, 2, TimeUnit.SECONDS) - .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 d495c4ca7..778a26630 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 @@ -26,7 +26,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Adonis Fansub", "https://manga.adonisfansub.com", "tr", overrideVersionCode = 1), SingleLang("Adult Webtoon", "https://adultwebtoon.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Akimangá", "https://akimanga.com", "pt-BR", isNsfw = true, className = "Akimanga"), - SingleLang("Akuma no Tenshi", "https://akumanotenshi.com", "pt-BR", className = "AkumaNoTenshi"), SingleLang("AkuManga", "https://akumanga.com", "en", isNsfw = true, overrideVersionCode = 2), SingleLang("Akuzenai Arts", "https://akuzenaiarts.org", "en"), SingleLang("AllPornComic", "https://allporncomic.com", "en", isNsfw = true), @@ -51,7 +50,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Azora", "https://azoramoon.com", "ar", isNsfw = false, overrideVersionCode = 7), SingleLang("Babel Wuxia", "https://babelwuxia.com", "en", overrideVersionCode = 1), SingleLang("Bakaman", "https://bakaman.net", "th", overrideVersionCode = 1), - SingleLang("Banana Cítrica", "https://bananacitrica.com", "pt-BR", isNsfw = true, pkgName = "bananamecanica", className = "BananaCitrica", overrideVersionCode = 4), SingleLang("Banana Manga", "https://bananamanga.net", "en", isNsfw = true), SingleLang("BarManga", "https://barmanga.com", "es"), SingleLang("BestManga", "https://bestmanga.club", "ru", overrideVersionCode = 1), @@ -116,7 +114,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("FreeWebtoonCoins", "https://freewebtooncoins.com", "en", overrideVersionCode = 1), SingleLang("GalaxyDegenScans", "https://gdscans.com", "en", overrideVersionCode = 4), SingleLang("Gatemanga", "https://gatemanga.com", "ar", overrideVersionCode = 1), - SingleLang("Gekkou Hentai", "https://hentai.gekkouscans.com.br", "pt-BR", isNsfw = true), SingleLang("Gekkou Scans", "https://gekkouscans.top", "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"), @@ -182,7 +179,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("KomikRame", "https://komikra.me", "id"), SingleLang("KSGroupScans", "https://ksgroupscans.com", "en"), SingleLang("Kun Manga", "https://kunmanga.com", "en", overrideVersionCode = 1), - SingleLang("Lady Estelar Scan", "https://ladyestelarscan.com.br", "pt-BR"), SingleLang("Lady Manga", "https://ladymanga.com", "en"), SingleLang("Lala Manga", "https://lalamanga.com", "en", isNsfw = true), SingleLang("Lara Manga", "https://laramanga.love", "en", overrideVersionCode = 1), @@ -450,7 +446,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Summanga", "https://summanga.com", "en", isNsfw = true), SingleLang("Sunshine Butterfly Scans", "https://sunshinebutterflyscan.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Sweet Time Scan", "https://sweetscan.net", "pt-BR", overrideVersionCode = 2), - SingleLang("Taberu Mangás", "https://taberu.org", "pt-BR", className = "TaberuMangas", isNsfw = true), SingleLang("Tankou Hentai", "https://tankouhentai.com", "pt-BR", isNsfw = true), SingleLang("TappyToon.Net", "https://tappytoon.net", "en", className = "Tappytoonnet"), SingleLang("Tatakae Scan", "https://tatakaescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2), @@ -480,7 +475,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Valkyrie Scan", "https://valkyriescan.com", "pt-BR", isNsfw = true), SingleLang("Ver Manhwas", "https://vermanhwa.es", "es", isNsfw = true, overrideVersionCode = 1), SingleLang("VinManga", "https://vinload.com", "en", isNsfw = true), - SingleLang("Vórtce Scan", "https://vortcescan.com.br", "pt-BR", className = "VortceScan"), SingleLang("Wakamics", "https://wakamics.net", "en"), SingleLang("Webdex Scans", "https://webdexscans.com", "en", isNsfw = false), SingleLang("Webtoon City", "https://webtooncity.com", "en", isNsfw = false), @@ -506,7 +500,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("YonaBar", "https://yonabar.com", "ar", isNsfw = true, overrideVersionCode = 2), SingleLang("Yuri Verso", "https://yuri.live", "pt-BR", overrideVersionCode = 3), SingleLang("Zandy no Fansub", "https://zandynofansub.aishiteru.org", "en"), - SingleLang("Zero Scan", "https://zeroscan.com.br", "pt-BR", isNsfw = true), SingleLang("ZinChanManga", "https://zinchanmanga.com", "en", isNsfw = true), SingleLang("ZinManga.top (unoriginal)", "https://zinmanga.top", "en", isNsfw = false, className = "ZinMangaTop"), SingleLang("Zinmanga", "https://zinmanga.com", "en", overrideVersionCode = 1),