diff --git a/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt b/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt index 3001a7cff..2d2b48930 100644 --- a/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt +++ b/multisrc/overrides/fmreader/manhwa18/src/Manhwa18.kt @@ -77,8 +77,8 @@ class Manhwa18 : FMReader("Manhwa18", "https://manhwa18.com", "en") { name = element.attr("title") date_upload = SimpleDateFormat("dd/MM/yyyy", Locale.US).parse( - element.select(".chapter-time").text().substringAfter(" - ") - )?.time ?: 0L + element.select(".chapter-time").text().substringAfter(" - ") + )?.time ?: 0L chapter_number = element.attr("time").substringAfterLast(' ').toFloatOrNull() ?: -1f } } diff --git a/multisrc/overrides/hentaihand/hentaihand/src/HentaiHandFactory.kt b/multisrc/overrides/hentaihand/hentaihand/src/HentaiHandFactory.kt index f90d0a5df..8c86fdfbb 100644 --- a/multisrc/overrides/hentaihand/hentaihand/src/HentaiHandFactory.kt +++ b/multisrc/overrides/hentaihand/hentaihand/src/HentaiHandFactory.kt @@ -47,7 +47,7 @@ class HentaiHandFactory : SourceFactory { abstract class HentaiHandCommon( override val lang: String, hhLangId: List = emptyList(), - //altLangId: Int? = null + // altLangId: Int? = null ) : HentaiHand("HentaiHand", "https://hentaihand.com", lang, false, hhLangId) { override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor { authIntercept(it) } diff --git a/multisrc/overrides/hentaihand/nhentaicom/src/NHentaiComFactory.kt b/multisrc/overrides/hentaihand/nhentaicom/src/NHentaiComFactory.kt index 4d49e4189..0bc0f4976 100644 --- a/multisrc/overrides/hentaihand/nhentaicom/src/NHentaiComFactory.kt +++ b/multisrc/overrides/hentaihand/nhentaicom/src/NHentaiComFactory.kt @@ -47,7 +47,7 @@ class NHentaiComFactory : SourceFactory { abstract class NHentaiComCommon( override val lang: String, hhLangId: List = emptyList(), - //altLangId: Int? = null + // altLangId: Int? = null ) : HentaiHand("nHentai.com (unoriginal)", "https://nhentai.com", lang, false, hhLangId) { override val client: OkHttpClient = network.cloudflareClient.newBuilder() .addInterceptor { authIntercept(it) } diff --git a/multisrc/overrides/madara/aiinscan/src/AiinScan.kt b/multisrc/overrides/madara/aiinscan/src/AiinScan.kt index a4a90417e..49e6a5317 100644 --- a/multisrc/overrides/madara/aiinscan/src/AiinScan.kt +++ b/multisrc/overrides/madara/aiinscan/src/AiinScan.kt @@ -19,8 +19,4 @@ class AiinScan : Madara( .build() override val useNewChapterEndpoint: Boolean = true - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt b/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt index ec5fe08f8..6e2d9f9b0 100644 --- a/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt +++ b/multisrc/overrides/madara/animecenterscan/src/AnimeCenterScan.kt @@ -17,8 +17,4 @@ class AnimeCenterScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/arthurscan/src/ArthurScan.kt b/multisrc/overrides/madara/arthurscan/src/ArthurScan.kt index 8047cabc6..76635c12c 100644 --- a/multisrc/overrides/madara/arthurscan/src/ArthurScan.kt +++ b/multisrc/overrides/madara/arthurscan/src/ArthurScan.kt @@ -18,9 +18,5 @@ class ArthurScan : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt b/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt index 19a91ad4b..7905d8893 100644 --- a/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt +++ b/multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt @@ -21,7 +21,4 @@ class BananaCitrica : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt b/multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt index ee1b6348e..3c80758c6 100644 --- a/multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt +++ b/multisrc/overrides/madara/borutoexplorer/src/BorutoExplorer.kt @@ -17,8 +17,4 @@ class BorutoExplorer : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/cerisescans/src/CeriseScans.kt b/multisrc/overrides/madara/cerisescans/src/CeriseScans.kt index d6b384c40..b7f443491 100644 --- a/multisrc/overrides/madara/cerisescans/src/CeriseScans.kt +++ b/multisrc/overrides/madara/cerisescans/src/CeriseScans.kt @@ -17,8 +17,4 @@ class CeriseScans : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override fun popularMangaSelector() = "div.page-item-detail.manga" - - override val altName: String = "Nome alternativo: " } diff --git a/multisrc/overrides/madara/cronosscan/src/CronosScan.kt b/multisrc/overrides/madara/cronosscan/src/CronosScan.kt index ca29a3180..62bd492ff 100644 --- a/multisrc/overrides/madara/cronosscan/src/CronosScan.kt +++ b/multisrc/overrides/madara/cronosscan/src/CronosScan.kt @@ -17,8 +17,4 @@ class CronosScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/diskusscan/src/DiskusScan.kt b/multisrc/overrides/madara/diskusscan/src/DiskusScan.kt index 8e7b38e3e..3fe7473df 100644 --- a/multisrc/overrides/madara/diskusscan/src/DiskusScan.kt +++ b/multisrc/overrides/madara/diskusscan/src/DiskusScan.kt @@ -17,8 +17,4 @@ class DiskusScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/dreamunionscan/src/DreamUnionScan.kt b/multisrc/overrides/madara/dreamunionscan/src/DreamUnionScan.kt index b252b7c69..029d1938d 100644 --- a/multisrc/overrides/madara/dreamunionscan/src/DreamUnionScan.kt +++ b/multisrc/overrides/madara/dreamunionscan/src/DreamUnionScan.kt @@ -22,10 +22,6 @@ class DreamUnionScan : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" - private fun authWarningIntercept(chain: Interceptor.Chain): Response { val response = chain.proceed(chain.request()) diff --git a/multisrc/overrides/madara/dropescan/src/DropeScan.kt b/multisrc/overrides/madara/dropescan/src/DropeScan.kt index 8b2a9711c..ee1ba1e03 100644 --- a/multisrc/overrides/madara/dropescan/src/DropeScan.kt +++ b/multisrc/overrides/madara/dropescan/src/DropeScan.kt @@ -22,8 +22,6 @@ class DropeScan : Madara( override val useNewChapterEndpoint = true - override val altName = "Nome alternativo: " - override fun popularMangaRequest(page: Int): Request = GET("$baseUrl/manga/page/$page/?m_orderby=views", headers) diff --git a/multisrc/overrides/madara/finalscans/src/FinalScans.kt b/multisrc/overrides/madara/finalscans/src/FinalScans.kt index f02dff5b8..9824292a8 100644 --- a/multisrc/overrides/madara/finalscans/src/FinalScans.kt +++ b/multisrc/overrides/madara/finalscans/src/FinalScans.kt @@ -17,8 +17,4 @@ class FinalScans : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt b/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt index c9222ac99..89b53231e 100644 --- a/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt +++ b/multisrc/overrides/madara/fleurblanche/src/FleurBlanche.kt @@ -22,10 +22,6 @@ class FleurBlanche : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" - private fun authWarningIntercept(chain: Interceptor.Chain): Response { val response = chain.proceed(chain.request()) diff --git a/multisrc/overrides/madara/furioscans/src/FurioScans.kt b/multisrc/overrides/madara/furioscans/src/FurioScans.kt index 92b6190b7..5e24fb5b0 100644 --- a/multisrc/overrides/madara/furioscans/src/FurioScans.kt +++ b/multisrc/overrides/madara/furioscans/src/FurioScans.kt @@ -18,9 +18,5 @@ class FurioScans : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt b/multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt index ca160eb78..971ec2870 100644 --- a/multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt +++ b/multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt @@ -23,12 +23,6 @@ class OkamishiScans : Madara( override val useNewChapterEndpoint: Boolean = true - override val altName: String = "Nome alternativo: " - - override val mangaDetailsSelectorTitle: String = "div.post-title h1" - // Tags are full of garbage, so remove them. override val mangaDetailsSelectorTag: String = "" - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt b/multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt index e06903582..8f4783698 100644 --- a/multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt +++ b/multisrc/overrides/madara/hentaiteca/src/HentaiTeca.kt @@ -17,8 +17,4 @@ class HentaiTeca : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/huntersscan/src/HuntersScan.kt b/multisrc/overrides/madara/huntersscan/src/HuntersScan.kt index ff9a0f1ab..8ed8dd673 100644 --- a/multisrc/overrides/madara/huntersscan/src/HuntersScan.kt +++ b/multisrc/overrides/madara/huntersscan/src/HuntersScan.kt @@ -17,6 +17,4 @@ class HuntersScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " } diff --git a/multisrc/overrides/madara/imperfectcomics/src/ImperfectComics.kt b/multisrc/overrides/madara/imperfectcomics/src/ImperfectComics.kt index 36ec7d688..dadd513ed 100644 --- a/multisrc/overrides/madara/imperfectcomics/src/ImperfectComics.kt +++ b/multisrc/overrides/madara/imperfectcomics/src/ImperfectComics.kt @@ -38,7 +38,7 @@ class ImperfectComics : Madara("Imperfect Comics", "https://imperfectcomic.com", val chapterRegex = """input\[data-id=\"$chapterId\"(?:.|\n)*?(?=\})""".toRegex() val css = document.selectFirst("#wp-custom-css").html() - //Checking for chapter first to handle mirrored manga with specific un-mirrored chapters + // Checking for chapter first to handle mirrored manga with specific un-mirrored chapters val props = chapterRegex.find(css).let { cId -> cId?.value ?: mangaRegex.find(css).let { mId -> mId?.value ?: "" diff --git a/multisrc/overrides/madara/imperioscans/src/ImperioScans.kt b/multisrc/overrides/madara/imperioscans/src/ImperioScans.kt index 7a6095d33..3cc4cdf17 100644 --- a/multisrc/overrides/madara/imperioscans/src/ImperioScans.kt +++ b/multisrc/overrides/madara/imperioscans/src/ImperioScans.kt @@ -17,8 +17,4 @@ class ImperioScans : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt b/multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt index c390deab9..477c83931 100644 --- a/multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt +++ b/multisrc/overrides/madara/kamisamaexplorer/src/KamiSamaExplorer.kt @@ -17,8 +17,4 @@ class KamiSamaExplorer : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/limascans/src/LimaScans.kt b/multisrc/overrides/madara/limascans/src/LimaScans.kt index 11376c19c..96bca2ef1 100644 --- a/multisrc/overrides/madara/limascans/src/LimaScans.kt +++ b/multisrc/overrides/madara/limascans/src/LimaScans.kt @@ -21,10 +21,6 @@ class LimaScans : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" - override fun mangaDetailsRequest(manga: SManga): Request { return GET(baseUrl + manga.url.removePrefix("/v2"), headers) } diff --git a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt b/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt index b4b8a6a3b..1249fb595 100644 --- a/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt +++ b/multisrc/overrides/madara/mangaforfree/src/MangaForFreeFactory.kt @@ -25,7 +25,7 @@ class MangaForFreeALL : MangaForFree("MangaForFree.net", "https://mangaforfree.n abstract class MangaForFree( override val name: String, override val baseUrl: String, - override val lang: String + lang: String ) : Madara(name, baseUrl, lang) { override val client: OkHttpClient = super.client.newBuilder() diff --git a/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt b/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt index 6bb38765f..1c9dff8b4 100644 --- a/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt +++ b/multisrc/overrides/madara/manhwa18cc/src/Manhwa18CcFactory.kt @@ -29,7 +29,7 @@ class Manhwa18CcALL : Manhwa18Cc("Manhwa18.cc", "https://manhwa18.cc", "all") abstract class Manhwa18Cc( override val name: String, override val baseUrl: String, - override val lang: String + lang: String ) : Madara(name, baseUrl, lang) { override fun popularMangaSelector() = "div.manga-item" diff --git a/multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt b/multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt index f52b8b7fc..879ad1704 100644 --- a/multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt +++ b/multisrc/overrides/madara/minitwoscan/src/MiniTwoScan.kt @@ -17,8 +17,4 @@ class MiniTwoScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/miradscanlator/src/MiradScanlator.kt b/multisrc/overrides/madara/miradscanlator/src/MiradScanlator.kt index 40886db0a..555dc3016 100644 --- a/multisrc/overrides/madara/miradscanlator/src/MiradScanlator.kt +++ b/multisrc/overrides/madara/miradscanlator/src/MiradScanlator.kt @@ -17,8 +17,4 @@ class MiradScanlator : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt b/multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt index 4821b3dfd..68bb5b95b 100644 --- a/multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt +++ b/multisrc/overrides/madara/momonohanascan/src/MomoNoHanaScan.kt @@ -18,9 +18,5 @@ class MomoNoHanaScan : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/nekobreakerscan/src/NekoBreakerScan.kt b/multisrc/overrides/madara/nekobreakerscan/src/NekoBreakerScan.kt index 2b9e54a85..3f3fae2d0 100644 --- a/multisrc/overrides/madara/nekobreakerscan/src/NekoBreakerScan.kt +++ b/multisrc/overrides/madara/nekobreakerscan/src/NekoBreakerScan.kt @@ -17,8 +17,4 @@ class NekoBreakerScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/neoxscanlator/src/NeoxScanlator.kt b/multisrc/overrides/madara/neoxscanlator/src/NeoxScanlator.kt index dde2c88ee..9e9289293 100644 --- a/multisrc/overrides/madara/neoxscanlator/src/NeoxScanlator.kt +++ b/multisrc/overrides/madara/neoxscanlator/src/NeoxScanlator.kt @@ -44,8 +44,6 @@ class NeoxScanlator : override val altNameSelector = ".post-content_item:contains(Alternativo) .summary-content" - override val altName = "Nome alternativo: " - private val preferences: SharedPreferences by lazy { Injekt.get().getSharedPreferences("source_$id", 0x0000) } @@ -59,9 +57,6 @@ class NeoxScanlator : .add("Accept-Language", ACCEPT_LANGUAGE) .add("Referer", REFERER) - // Filter the novels in pure text format. - override fun popularMangaSelector() = "div.page-item-detail.manga" - override fun searchMangaParse(response: Response): MangasPage { val mangaPage = super.searchMangaParse(response) val filteredResult = mangaPage.mangas.filter { it.title.contains(NOVEL_REGEX).not() } diff --git a/multisrc/overrides/madara/ninjascan/src/NinjaScan.kt b/multisrc/overrides/madara/ninjascan/src/NinjaScan.kt index 370dcd601..5280f5eb4 100644 --- a/multisrc/overrides/madara/ninjascan/src/NinjaScan.kt +++ b/multisrc/overrides/madara/ninjascan/src/NinjaScan.kt @@ -17,8 +17,4 @@ class NinjaScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/olhodalua/src/OlhoDaLua.kt b/multisrc/overrides/madara/olhodalua/src/OlhoDaLua.kt index dc46131e9..e44312a20 100644 --- a/multisrc/overrides/madara/olhodalua/src/OlhoDaLua.kt +++ b/multisrc/overrides/madara/olhodalua/src/OlhoDaLua.kt @@ -18,9 +18,5 @@ class OlhoDaLua : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt b/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt index 003cdd66d..1419084ae 100644 --- a/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt +++ b/multisrc/overrides/madara/otksscanlator/src/OtksScanlator.kt @@ -17,8 +17,4 @@ class OtksScanlator : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/owscan/src/OwScan.kt b/multisrc/overrides/madara/owscan/src/OwScan.kt index 67c68f75e..a6abf3fb4 100644 --- a/multisrc/overrides/madara/owscan/src/OwScan.kt +++ b/multisrc/overrides/madara/owscan/src/OwScan.kt @@ -10,8 +10,4 @@ class OwScan : Madara("Ow Scan", "https://owscan.com", "pt-BR") { override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/pojokmanga/src/PojokManga.kt b/multisrc/overrides/madara/pojokmanga/src/PojokManga.kt index 34151948e..2707f699e 100644 --- a/multisrc/overrides/madara/pojokmanga/src/PojokManga.kt +++ b/multisrc/overrides/madara/pojokmanga/src/PojokManga.kt @@ -77,16 +77,16 @@ class PojokManga : Madara("Pojok Manga", "https://pojokmanga.com", "id", SimpleD ) override fun getFilterList() = FilterList( - AuthorFilter(), - ArtistFilter(), - YearFilter(), - StatusFilter(getStatusList()), - OrderByFilter(), - AdultContentFilter(), + AuthorFilter(authorFilterTitle), + ArtistFilter(artistFilterTitle), + YearFilter(yearFilterTitle), + StatusFilter(statusFilterTitle, getStatusList()), + OrderByFilter(orderByFilterTitle, orderByFilterOptions.zip(orderByFilterOptionsValues)), + AdultContentFilter(adultContentFilterTitle, adultContentFilterOptions), Filter.Separator(), - Filter.Header("Genres may not work for all sources"), - GenreConditionFilter(), - GenreList(getGenreList()), + Filter.Header(genreFilterHeader), + GenreConditionFilter(genreConditionFilterTitle, genreConditionFilterOptions), + GenreList(genreFilterTitle, getGenreList()), Filter.Separator(), Filter.Header("NOTE: cant be used with other filter!"), Filter.Header("$name Project List page"), diff --git a/multisrc/overrides/madara/prismascans/src/PrismaScans.kt b/multisrc/overrides/madara/prismascans/src/PrismaScans.kt index e3b97cb23..ecedb3329 100644 --- a/multisrc/overrides/madara/prismascans/src/PrismaScans.kt +++ b/multisrc/overrides/madara/prismascans/src/PrismaScans.kt @@ -18,9 +18,5 @@ class PrismaScans : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt b/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt index e79edf9e1..1ad146ea4 100644 --- a/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt +++ b/multisrc/overrides/madara/rachelscanlator/src/RachelScanlator.kt @@ -17,8 +17,4 @@ class RachelScanlator : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt b/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt index 292a5b8e5..1b4469a5c 100644 --- a/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt +++ b/multisrc/overrides/madara/reaperscans/src/ReaperScansFactory.kt @@ -19,12 +19,10 @@ class ReaperScansFactory : SourceFactory { abstract class ReaperScans( override val baseUrl: String, - override val lang: String, + lang: String, dateFormat: SimpleDateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US) ) : Madara("Reaper Scans", baseUrl, lang, dateFormat) { - override fun popularMangaSelector() = "div.page-item-detail.manga" - override fun chapterFromElement(element: Element): SChapter { val chapter = SChapter.create() @@ -53,8 +51,6 @@ class ReaperScansBr : ReaperScans("https://reaperscans.com.br", "pt-BR", SimpleD .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override fun chapterFromElement(element: Element): SChapter { val chapter = SChapter.create() with(element) { diff --git a/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt b/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt index 2889667c1..d740230b3 100644 --- a/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt +++ b/multisrc/overrides/madara/scanlatorhunters/src/ScanlatorHunters.kt @@ -18,9 +18,5 @@ class ScanlatorHunters : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/seaikouscans/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/seikouscans/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/seaikouscans/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/madara/seikouscans/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/seaikouscans/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/seikouscans/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/seaikouscans/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/madara/seikouscans/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/seaikouscans/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/seikouscans/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/seaikouscans/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/madara/seikouscans/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/seaikouscans/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/seikouscans/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/seaikouscans/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/madara/seikouscans/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/seaikouscans/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/seikouscans/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/seaikouscans/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/madara/seikouscans/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/seaikouscans/res/web_hi_res_512.png b/multisrc/overrides/madara/seikouscans/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/seaikouscans/res/web_hi_res_512.png rename to multisrc/overrides/madara/seikouscans/res/web_hi_res_512.png diff --git a/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt b/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt index 0ac28dbfe..b3c450b52 100644 --- a/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt +++ b/multisrc/overrides/madara/seikouscans/src/SeikouScans.kt @@ -18,9 +18,5 @@ class SeikouScans : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt b/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt index 6ca22b7e6..a39a9b2b8 100644 --- a/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt +++ b/multisrc/overrides/madara/sensainayuri/src/SensainaYuri.kt @@ -18,9 +18,5 @@ class SensainaYuri : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override val altName: String = "Nome alternativo: " - override val useNewChapterEndpoint = true - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/sinensis/src/Sinensis.kt b/multisrc/overrides/madara/sinensis/src/Sinensis.kt index a42a7e12b..d1e4556d2 100644 --- a/multisrc/overrides/madara/sinensis/src/Sinensis.kt +++ b/multisrc/overrides/madara/sinensis/src/Sinensis.kt @@ -17,8 +17,4 @@ class Sinensis : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/sodascan/src/SodaScan.kt b/multisrc/overrides/madara/sodascan/src/SodaScan.kt index 2346b9bc3..2d10ad8f7 100644 --- a/multisrc/overrides/madara/sodascan/src/SodaScan.kt +++ b/multisrc/overrides/madara/sodascan/src/SodaScan.kt @@ -17,8 +17,4 @@ class SodaScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/stagecomics/src/StageComics.kt b/multisrc/overrides/madara/stagecomics/src/StageComics.kt index 4c0f65e13..8a5682b90 100644 --- a/multisrc/overrides/madara/stagecomics/src/StageComics.kt +++ b/multisrc/overrides/madara/stagecomics/src/StageComics.kt @@ -20,8 +20,6 @@ class StageComics : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override fun popularMangaSelector() = "div.page-item-detail.manga" - override fun chapterFromElement(element: Element): SChapter { val parsedChapter = super.chapterFromElement(element) diff --git a/multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt b/multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt index e1a65d78e..2e8c43bbc 100644 --- a/multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt +++ b/multisrc/overrides/madara/sweettimescan/src/SweetTimeScan.kt @@ -21,8 +21,6 @@ class SweetTimeScan : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - override fun popularMangaSelector() = "div.page-item-detail.manga" - // The source has novels in text format, so we need to filter them. override fun searchMangaParse(response: Response): MangasPage { val mangaPage = super.searchMangaParse(response) diff --git a/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt b/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt index a97c8daf7..a1cc7b19e 100644 --- a/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt +++ b/multisrc/overrides/madara/tatakaescan/src/TatakaeScan.kt @@ -17,8 +17,4 @@ class TatakaeScan : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/visbellum/src/Visbellum.kt b/multisrc/overrides/madara/visbellum/src/Visbellum.kt index 279e2420b..67dcafe59 100644 --- a/multisrc/overrides/madara/visbellum/src/Visbellum.kt +++ b/multisrc/overrides/madara/visbellum/src/Visbellum.kt @@ -17,8 +17,4 @@ class Visbellum : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override val altName: String = "Nome alternativo: " - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/warqueenscan/src/WarQueenScan.kt b/multisrc/overrides/madara/warqueenscan/src/WarQueenScan.kt index af35bb464..304f1ae8b 100644 --- a/multisrc/overrides/madara/warqueenscan/src/WarQueenScan.kt +++ b/multisrc/overrides/madara/warqueenscan/src/WarQueenScan.kt @@ -20,6 +20,4 @@ class WarQueenScan : Madara( .readTimeout(1, TimeUnit.MINUTES) .writeTimeout(1, TimeUnit.MINUTES) .build() - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/madara/yugenmangas/src/YugenMangasFactory.kt b/multisrc/overrides/madara/yugenmangas/src/YugenMangasFactory.kt index 9bbd4ed40..9f842bb13 100644 --- a/multisrc/overrides/madara/yugenmangas/src/YugenMangasFactory.kt +++ b/multisrc/overrides/madara/yugenmangas/src/YugenMangasFactory.kt @@ -20,12 +20,10 @@ class YugenMangasFactory : SourceFactory { abstract class YugenMangas( override val baseUrl: String, - override val lang: String, + lang: String, dateFormat: SimpleDateFormat = SimpleDateFormat("MMMMM dd, yyyy", Locale.US) ) : Madara("YugenMangas", baseUrl, lang, dateFormat) { - override fun popularMangaSelector() = "div.page-item-detail.manga" - override fun chapterFromElement(element: Element): SChapter = SChapter.create().apply { name = element.selectFirst("a")!!.ownText() date_upload = parseChapterDate(element.selectFirst("span.chapter-release-date i")?.text()) @@ -53,7 +51,5 @@ class YugenMangasBr : YugenMangas( override fun headersBuilder(): Headers.Builder = Headers.Builder() .add("Referer", baseUrl) - override val altName: String = "Nomes alternativos: " - override val useNewChapterEndpoint: Boolean = true } diff --git a/multisrc/overrides/madara/yuriverso/src/YuriVerso.kt b/multisrc/overrides/madara/yuriverso/src/YuriVerso.kt index 0f878bbce..69a88b9da 100644 --- a/multisrc/overrides/madara/yuriverso/src/YuriVerso.kt +++ b/multisrc/overrides/madara/yuriverso/src/YuriVerso.kt @@ -17,6 +17,4 @@ class YuriVerso : Madara( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() - - override fun popularMangaSelector() = "div.page-item-detail.manga" } diff --git a/multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt b/multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt index 50bd8eb7d..b9d3b8e13 100644 --- a/multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt +++ b/multisrc/overrides/mangahub/mangafoxfun/src/MangaFoxFun.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangafoxfun import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaFoxFun : MangaHub( "MangaFox.fun", diff --git a/multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt b/multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt index 6e8a68044..78a79f140 100644 --- a/multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt +++ b/multisrc/overrides/mangahub/mangahereonl/src/MangaHereOnl.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangahereonl import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaHereOnl : MangaHub( "MangaHere.onl", diff --git a/multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt b/multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt index 88a569e38..7bb66d476 100644 --- a/multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt +++ b/multisrc/overrides/mangahub/mangahubio/src/MangaHubIo.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangahubio import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaHubIo : MangaHub( "MangaHub", diff --git a/multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt b/multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt index 2d3b43acb..4c933e6e2 100644 --- a/multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt +++ b/multisrc/overrides/mangahub/mangakakalotfun/src/MangakakalotFun.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangakakalotfun import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangakakalotFun : MangaHub( "Mangakakalot.fun", diff --git a/multisrc/overrides/mangahub/manganel/src/MangaNel.kt b/multisrc/overrides/mangahub/manganel/src/MangaNel.kt index e9a0ca17d..d90e4a279 100644 --- a/multisrc/overrides/mangahub/manganel/src/MangaNel.kt +++ b/multisrc/overrides/mangahub/manganel/src/MangaNel.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.manganel import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaNel : MangaHub( "MangaNel", diff --git a/multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt b/multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt index 98599439c..d7122e78f 100644 --- a/multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt +++ b/multisrc/overrides/mangahub/mangaonlinefun/src/MangaOnlineFun.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangaonlinefun import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaOnlineFun : MangaHub( "MangaOnline.fun", diff --git a/multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt b/multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt index 04877bd43..1a04ff65c 100644 --- a/multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt +++ b/multisrc/overrides/mangahub/mangapandaonl/src/MangaPandaOnl.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangapandaonl import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaPandaOnl : MangaHub( "MangaPanda.onl", diff --git a/multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt b/multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt index 9e887e8af..27ae77738 100644 --- a/multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt +++ b/multisrc/overrides/mangahub/mangareadersite/src/MangaReaderSite.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangareadersite import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaReaderSite : MangaHub( "MangaReader.site", diff --git a/multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt b/multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt index 2b2e61eca..313bf2720 100644 --- a/multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt +++ b/multisrc/overrides/mangahub/mangatoday/src/MangaToday.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangatoday import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaToday : MangaHub( "MangaToday", diff --git a/multisrc/overrides/mangahub/mangatownhub/src/MangaTownHub.kt b/multisrc/overrides/mangahub/mangatownhub/src/MangaTownHub.kt index 7e6d99e53..5c91ae38e 100644 --- a/multisrc/overrides/mangahub/mangatownhub/src/MangaTownHub.kt +++ b/multisrc/overrides/mangahub/mangatownhub/src/MangaTownHub.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.mangatownhub import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class MangaTownHub : MangaHub( "MangaTown (unoriginal)", diff --git a/multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt b/multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt index 495a481ef..af09a28db 100644 --- a/multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt +++ b/multisrc/overrides/mangahub/onemangaco/src/OneMangaCo.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.onemangaco import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class OneMangaCo : MangaHub( "1Manga.co", diff --git a/multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt b/multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt index dd82c31c1..a8aed6b94 100644 --- a/multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt +++ b/multisrc/overrides/mangahub/onemangainfo/src/OneMangaInfo.kt @@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.extension.en.onemangainfo import eu.kanade.tachiyomi.lib.ratelimit.SpecificHostRateLimitInterceptor import eu.kanade.tachiyomi.multisrc.mangahub.MangaHub import okhttp3.OkHttpClient -import java.util.concurrent.TimeUnit class OneMangaInfo : MangaHub( "OneManga.info", diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index b148279e8..5bb698ca0 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -36,7 +36,7 @@ import kotlin.random.Random abstract class Madara( override val name: String, override val baseUrl: String, - override val lang: String, + final override val lang: String, private val dateFormat: SimpleDateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US) ) : ParsedHttpSource() { @@ -59,7 +59,7 @@ abstract class Madara( // Popular Manga // exclude/filter bilibili manga from list - override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))" + override fun popularMangaSelector() = "div.page-item-detail.manga:not(:has(a[href*='bilibilicomics.com']))" open val popularMangaUrlSelector = "div.post-title a" @@ -222,42 +222,110 @@ abstract class Madara( return GET(url.toString(), headers) } - protected class AuthorFilter : Filter.Text("Author") - protected class ArtistFilter : Filter.Text("Artist") - protected class YearFilter : Filter.Text("Year of Released") - protected class StatusFilter(status: List) : Filter.Group("Status", status) + protected open val authorFilterTitle: String = when (lang) { + "pt-BR" -> "Autor" + else -> "Author" + } - protected class OrderByFilter : UriPartFilter( - "Order By", - arrayOf( - Pair("", "Latest", "A-Z", "Rating", + "Trending", "Most Views", "New" + ) + } + + protected val orderByFilterOptionsValues: Array = arrayOf( + "", "latest", "alphabet", "rating", "trending", "views", "new-manga" ) - protected class AdultContentFilter : UriPartFilter( - "Adult Content", - arrayOf( - Pair("All", ""), - Pair("None", "0"), - Pair("Only", "1") - ) + protected open val genreConditionFilterTitle: String = when (lang) { + "pt-BR" -> "Operador dos gêneros" + else -> "Genre condition" + } + + protected open val genreConditionFilterOptions: Array = when (lang) { + "pt-BR" -> arrayOf("OU", "E") + else -> arrayOf("OR", "AND") + } + + protected open val adultContentFilterTitle: String = when (lang) { + "pt-BR" -> "Conteúdo adulto" + else -> "Adult Content" + } + + protected open val adultContentFilterOptions: Array = when (lang) { + "pt-BR" -> arrayOf("Indiferente", "Nenhum", "Somente") + else -> arrayOf("All", "None", "Only") + } + + protected open val genreFilterHeader: String = when (lang) { + "pt-BR" -> "O filtro de gêneros pode não funcionar em algumas fontes" + else -> "Genres filter may not work for all sources" + } + + protected open val genreFilterTitle: String = when (lang) { + "pt-BR" -> "Gêneros" + else -> "Genres" + } + + protected open val genreFilterResetWarning: String = when (lang) { + "pt-BR" -> "Aperte redefinir para tentar carregar os gêneros" + else -> "Press reset to attempt to fetch genres" + } + + protected class AuthorFilter(title: String) : Filter.Text(title) + protected class ArtistFilter(title: String) : Filter.Text(title) + protected class YearFilter(title: String) : Filter.Text(title) + protected class StatusFilter(title: String, status: List) : + Filter.Group(title, status) + + protected class OrderByFilter(title: String, options: List>) : + UriPartFilter(title, options.toTypedArray()) + + protected class GenreConditionFilter(title: String, options: Array) : UriPartFilter( + title, + options.zip(arrayOf("", "1")).toTypedArray() ) - protected class GenreList(genres: List) : Filter.Group("Genres", genres) + protected class AdultContentFilter(title: String, options: Array) : UriPartFilter( + title, + options.zip(arrayOf("", "0", "1")).toTypedArray() + ) + + protected class GenreList(title: String, genres: List) : Filter.Group(title, genres) class Genre(name: String, val id: String = name) : Filter.CheckBox(name) private var genresList: List? = null @@ -266,28 +334,25 @@ abstract class Madara( // Filters are fetched immediately once an extension loads // We're only able to get filters after a loading the manga directory, and resetting // the filters is the only thing that seems to reinflate the view - return genresList ?: listOf(Genre("Press reset to attempt to fetch genres", "")) + return genresList ?: listOf(Genre(genreFilterResetWarning, "")) } override fun getFilterList() = FilterList( - AuthorFilter(), - ArtistFilter(), - YearFilter(), - StatusFilter(getStatusList()), - OrderByFilter(), - AdultContentFilter(), + AuthorFilter(authorFilterTitle), + ArtistFilter(artistFilterTitle), + YearFilter(yearFilterTitle), + StatusFilter(statusFilterTitle, getStatusList()), + OrderByFilter(orderByFilterTitle, orderByFilterOptions.zip(orderByFilterOptionsValues)), + AdultContentFilter(adultContentFilterTitle, adultContentFilterOptions), Filter.Separator(), - Filter.Header("Genres may not work for all sources"), - GenreConditionFilter(), - GenreList(getGenreList()) + Filter.Header(genreFilterHeader), + GenreConditionFilter(genreConditionFilterTitle, genreConditionFilterOptions), + GenreList(genreFilterTitle, getGenreList()) ) - protected fun getStatusList() = listOf( - Tag("end", "Completed"), - Tag("on-going", "Ongoing"), - Tag("canceled", "Canceled"), - Tag("on-hold", "On Hold") - ) + protected fun getStatusList() = statusFilterOptionsValues + .zip(statusFilterOptions) + .map { Tag(it.first, it.second) } open class UriPartFilter(displayName: String, private val vals: Array>) : Filter.Select(displayName, vals.map { it.first }.toTypedArray()) { @@ -318,6 +383,16 @@ abstract class Madara( // Manga Details Parse + protected val completedStatusList: Array = arrayOf( + "Completed", "Completo", "Concluído", "Concluido", "Terminé", "Hoàn Thành" + ) + + protected val ongoingStatusList: Array = arrayOf( + "OnGoing", "Продолжается", "Updating", "Em Lançamento", "Em andamento", "Em Andamento", + "En cours", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", "Devam ediyor", + "In Corso", "In Arrivo" + ) + override fun mangaDetailsParse(document: Document): SManga { val manga = SManga.create() with(document) { @@ -350,8 +425,8 @@ abstract class Madara( manga.status = when (it.text()) { // I don't know what's the corresponding for COMPLETED and LICENSED // There's no support for "Canceled" or "On Hold" - "Completed", "Completo", "Concluído", "Concluido", "Terminé", "Hoàn Thành" -> SManga.COMPLETED - "OnGoing", "Продолжается", "Updating", "Em Lançamento", "Em andamento", "Em Andamento", "En cours", "Ativo", "Lançando", "Đang Tiến Hành", "Devam Ediyor", "Devam ediyor", "In Corso", "In Arrivo" -> SManga.ONGOING + in completedStatusList -> SManga.COMPLETED + in ongoingStatusList -> SManga.ONGOING else -> SManga.UNKNOWN } } @@ -392,7 +467,7 @@ abstract class Madara( } // Manga Details Selector - open val mangaDetailsSelectorTitle = "div.post-title h3" + open val mangaDetailsSelectorTitle = "div.post-title h3, div.post-title h1" open val mangaDetailsSelectorAuthor = "div.author-content > a" open val mangaDetailsSelectorArtist = "div.artist-content > a" open val mangaDetailsSelectorStatus = "div.summary-content" @@ -403,7 +478,10 @@ abstract class Madara( open val seriesTypeSelector = ".post-content_item:contains(Type) .summary-content" open val altNameSelector = ".post-content_item:contains(Alt) .summary-content" - open val altName = "Alternative Name" + ": " + open val altName = when (lang) { + "pt-BR" -> "Nomes alternativos: " + else -> "Alternative Names: " + } open val updatingRegex = "Updating|Atualizando".toRegex(RegexOption.IGNORE_CASE) public fun String.notUpdating(): Boolean { @@ -619,7 +697,7 @@ abstract class Madara( return GET(page.imageUrl!!, headers.newBuilder().set("Referer", page.url).build()) } - override fun imageUrlParse(document: Document) = throw UnsupportedOperationException("Not used") + override fun imageUrlParse(document: Document) = "" /** * Set it to false if you want to disable the extension reporting the view count 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 a9f03c7d3..898647eb0 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 @@ -10,7 +10,7 @@ class MadaraGenerator : ThemeSourceGenerator { override val themeClass = "Madara" - override val baseVersionCode: Int = 15 + override val baseVersionCode: Int = 16 override val sources = listOf( MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 9),