diff --git a/multisrc/overrides/madara/fenixscanlator/src/FenixScanlator.kt b/multisrc/overrides/madara/fenixscanlator/src/FenixScanlator.kt deleted file mode 100644 index fa04a565f..000000000 --- a/multisrc/overrides/madara/fenixscanlator/src/FenixScanlator.kt +++ /dev/null @@ -1,88 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.fenixscanlator - -import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor -import eu.kanade.tachiyomi.multisrc.madara.Madara -import okhttp3.OkHttpClient -import java.text.SimpleDateFormat -import java.util.Locale -import java.util.concurrent.TimeUnit - -class FenixScanlator : Madara( - "Fênix Scanlator", - "https://fenixscanlator.xyz", - "pt-BR", - SimpleDateFormat("dd 'de' MMMMM 'de' yyyy", Locale("pt", "BR")) -) { - - override val client: OkHttpClient = super.client.newBuilder() - .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) - .build() - - // [...document.querySelectorAll('input[name="genre[]"]')] - // .map(x => `Genre("${document.querySelector('label[for=' + x.id + ']').innerHTML.trim()}", "${x.value}")`) - // .join(',\n') - override fun getGenreList(): List = listOf( - Genre("Action", "action"), - Genre("Adult", "adult"), - Genre("Adventure", "adventure"), - Genre("Anime", "anime"), - Genre("Cartoon", "cartoon"), - Genre("Comedy", "comedy"), - Genre("Comic", "comic"), - Genre("Cooking", "cooking"), - Genre("Delinquentes", "delinquentes"), - Genre("Detective", "detective"), - Genre("Doujinshi", "doujinshi"), - Genre("Drama", "drama"), - Genre("Ecchi", "ecchi"), - Genre("Fantasmas", "fantasmas"), - Genre("Fantasy", "fantasy"), - Genre("Gastronomia", "gastronomia"), - Genre("Gender Bender", "gender-bender"), - Genre("Harem", "harem"), - Genre("Historical", "historical"), - Genre("Horror", "horror"), - Genre("Isekai", "isekai"), - Genre("Josei", "josei"), - Genre("Live action", "live-action"), - Genre("Long Strip", "long-strip"), - Genre("Magia", "magia"), - Genre("Manga", "manga"), - Genre("Manhua", "manhua"), - Genre("Manhwa", "manhwa"), - Genre("Martial Arts", "martial-arts"), - Genre("Mature", "mature"), - Genre("Mecha", "mecha"), - Genre("Medicina", "medicina"), - Genre("Monstros", "monstros"), - Genre("Mystery", "mystery"), - Genre("One shot", "one-shot"), - Genre("Pós-Apocalíptico", "pos-apocaliptico"), - Genre("Psychological", "psychological"), - Genre("Realidade Virtual", "realidade-virtual"), - Genre("Reencarnação", "reencarnacao"), - Genre("Romance", "romance"), - Genre("School Life", "school-life"), - Genre("Sci-fi", "sci-fi"), - Genre("Seinen", "seinen"), - Genre("Shoujo", "shoujo"), - Genre("Shoujo Ai", "shoujo-ai"), - Genre("Shounen", "shounen"), - Genre("Shounen Ai", "shounen-ai"), - Genre("Slice of Life", "slice-of-life"), - Genre("Smut", "smut"), - Genre("Sobrevivência", "sobrevivencia"), - Genre("Soft Yaoi", "soft-yaoi"), - Genre("Soft Yuri", "soft-yuri"), - Genre("Sports", "sports"), - Genre("Super Herói", "super-heroi"), - Genre("Supernatural", "supernatural"), - Genre("Thriller", "thriller"), - Genre("Tragedy", "tragedy"), - Genre("Vídeo Games", "video-games"), - Genre("Web Comic", "web-comic"), - Genre("Webtoon", "webtoon"), - Genre("Yaoi", "yaoi"), - Genre("Yuri", "yuri") - ) -} diff --git a/multisrc/overrides/madara/fenixscanlator/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/fenixscanlator/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/fenixscanlator/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/fenixscanlator/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/fenixscanlator/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/fenixscanlator/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/fenixscanlator/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/fenixscanlator/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/fenixscanlator/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/fenixscanlator/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangastream/fenixscanlator/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/fenixscanlator/res/web_hi_res_512.png b/multisrc/overrides/wpmangastream/fenixscanlator/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/fenixscanlator/res/web_hi_res_512.png rename to multisrc/overrides/wpmangastream/fenixscanlator/res/web_hi_res_512.png diff --git a/multisrc/overrides/wpmangastream/fenixscanlator/src/FenixScanlator.kt b/multisrc/overrides/wpmangastream/fenixscanlator/src/FenixScanlator.kt new file mode 100644 index 000000000..3fde331b9 --- /dev/null +++ b/multisrc/overrides/wpmangastream/fenixscanlator/src/FenixScanlator.kt @@ -0,0 +1,25 @@ +package eu.kanade.tachiyomi.extension.pt.fenixscanlator + +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangastream.WPMangaStream +import okhttp3.OkHttpClient +import java.text.SimpleDateFormat +import java.util.Locale +import java.util.concurrent.TimeUnit + +class FenixScanlator : WPMangaStream( + "Fênix Scanlator", + "https://fenixscanlator.xyz", + "pt-BR", + SimpleDateFormat("MMMMM dd, yyyy", Locale("pt", "BR")) +) { + + // Source changed from Madara to WpMangaStream. + override val versionId: Int = 2 + + override val client: OkHttpClient = super.client.newBuilder() + .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) + .build() + + override val altName: String = "Nome alternativo: " +} 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 ae9143965..6d5fa6f10 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 @@ -88,7 +88,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Fug Manga", "https://fugmanga.net", "ar"), SingleLang("Fukushuu no Yuusha", "https://fny-scantrad.com", "fr", overrideVersionCode = 2), SingleLang("Furio Scans", "https://furioscans.com", "pt-BR", overrideVersionCode = 4), - SingleLang("Fênix Scanlator", "https://fenixscanlator.xyz", "pt-BR", pkgName = "fenixscanlator", className = "FenixScanlator", overrideVersionCode = 2), SingleLang("GalaxyDegenScans", "https://gdegenscans.xyz/", "en", overrideVersionCode = 1), SingleLang("Gatemanga", "https://gatemanga.com", "ar"), SingleLang("Geass Hentai", "https://geasshentai.xyz", "pt-BR", isNsfw = true, overrideVersionCode = 1), 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 7b935e8bd..9ba6373b0 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 @@ -53,6 +53,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { SingleLang("Hakai Scan", "http://hakaiscan.xyz", "pt-BR", isNsfw = true), SingleLang("Batoto Scans", "https://batotoscans.com", "en", isNsfw = true), SingleLang("Random Scans", "https://randomscans.xyz", "en"), + SingleLang("Fênix Scanlator", "https://fenixscanlator.xyz", "pt-BR", className = "FenixScanlator", overrideVersionCode = 2) ) companion object {