diff --git a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt index 9553d5718..48a7b9daf 100644 --- a/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt +++ b/multisrc/overrides/madara/doujinhentai/src/DoujinHentai.kt @@ -58,7 +58,7 @@ class DoujinHentai : Madara("DoujinHentai", "https://doujinhentai.net", "es", Si override fun searchMangaNextPageSelector() = popularMangaNextPageSelector() override fun chapterListSelector() = "ul.main.version-chap > li.wp-manga-chapter:not(:last-child)" // removing empty li override val pageListParseSelector = "div#all > img.img-responsive" - + override fun getFilterList() = FilterList( Filter.Header("Solo funciona si la consulta está en blanco"), GenreSelectFilter() diff --git a/multisrc/overrides/madara/geassscanlator/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/geassscanlator/res/mipmap-hdpi/ic_launcher.png index ae7c0b37a..43bdfc3ed 100644 Binary files a/multisrc/overrides/madara/geassscanlator/res/mipmap-hdpi/ic_launcher.png and b/multisrc/overrides/madara/geassscanlator/res/mipmap-hdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/geassscanlator/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/geassscanlator/res/mipmap-mdpi/ic_launcher.png index c6e5995b7..4c9286c6b 100644 Binary files a/multisrc/overrides/madara/geassscanlator/res/mipmap-mdpi/ic_launcher.png and b/multisrc/overrides/madara/geassscanlator/res/mipmap-mdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/geassscanlator/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/geassscanlator/res/mipmap-xhdpi/ic_launcher.png index 9b2cca813..5ec8d2249 100644 Binary files a/multisrc/overrides/madara/geassscanlator/res/mipmap-xhdpi/ic_launcher.png and b/multisrc/overrides/madara/geassscanlator/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/geassscanlator/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/geassscanlator/res/mipmap-xxhdpi/ic_launcher.png index e36ffd1e7..65d2c1775 100644 Binary files a/multisrc/overrides/madara/geassscanlator/res/mipmap-xxhdpi/ic_launcher.png and b/multisrc/overrides/madara/geassscanlator/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/geassscanlator/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/geassscanlator/res/mipmap-xxxhdpi/ic_launcher.png index 305f0c2b5..3793a101a 100644 Binary files a/multisrc/overrides/madara/geassscanlator/res/mipmap-xxxhdpi/ic_launcher.png and b/multisrc/overrides/madara/geassscanlator/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/multisrc/overrides/madara/geassscanlator/res/web_hi_res_512.png b/multisrc/overrides/madara/geassscanlator/res/web_hi_res_512.png index 0033f2a0a..0e7c91b44 100644 Binary files a/multisrc/overrides/madara/geassscanlator/res/web_hi_res_512.png and b/multisrc/overrides/madara/geassscanlator/res/web_hi_res_512.png differ diff --git a/multisrc/overrides/madara/geassscanlator/src/GeassScanlator.kt b/multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt similarity index 84% rename from multisrc/overrides/madara/geassscanlator/src/GeassScanlator.kt rename to multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt index c93737f52..f1cb8265a 100644 --- a/multisrc/overrides/madara/geassscanlator/src/GeassScanlator.kt +++ b/multisrc/overrides/madara/geassscanlator/src/OkamishiScans.kt @@ -7,15 +7,15 @@ import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit -class GeassScanlator : Madara( - "Geass Scanlator", +class OkamishiScans : Madara( + "Okamishi Scans", "https://geassscan.net", "pt-BR", SimpleDateFormat("yyyy-MM-dd", Locale("pt", "BR")) ) { - // Website changed from WpMangaStream to Madara (again). - override val versionId: Int = 2 + // The scanlator changed their name. + override val id: Long = 1228448816486487111 override val client: OkHttpClient = super.client.newBuilder() .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) diff --git a/multisrc/overrides/madara/kitsuneniji/src/KitsuneNiji.kt b/multisrc/overrides/madara/kitsuneniji/src/KitsuneNiji.kt index 908190cef..6de3e8c54 100644 --- a/multisrc/overrides/madara/kitsuneniji/src/KitsuneNiji.kt +++ b/multisrc/overrides/madara/kitsuneniji/src/KitsuneNiji.kt @@ -18,4 +18,3 @@ class KitsuneNiji : Madara( .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) .build() } - diff --git a/multisrc/overrides/madara/tiempodewebeo/src/TiempoDeWebeo.kt b/multisrc/overrides/madara/tiempodewebeo/src/TiempoDeWebeo.kt index 0d350cc50..3b1d6eb7b 100644 --- a/multisrc/overrides/madara/tiempodewebeo/src/TiempoDeWebeo.kt +++ b/multisrc/overrides/madara/tiempodewebeo/src/TiempoDeWebeo.kt @@ -10,4 +10,3 @@ class TiempoDeWebeo : Madara( "es", SimpleDateFormat("dd/MM/yyyy", Locale("es")) ) - diff --git a/multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt b/multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt index 866c1e1fe..07f4c519e 100644 --- a/multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt +++ b/multisrc/overrides/madara/tonizutoon/src/TonizuToon.kt @@ -10,4 +10,3 @@ class TonizuToon : Madara( "tr", SimpleDateFormat("MMMMM d, yyyy", Locale("tr")) ) - diff --git a/multisrc/overrides/wpmangareader/alphascans/src/AlphaScans.kt b/multisrc/overrides/wpmangareader/alphascans/src/AlphaScans.kt index 1f08b0b30..20ba742f3 100644 --- a/multisrc/overrides/wpmangareader/alphascans/src/AlphaScans.kt +++ b/multisrc/overrides/wpmangareader/alphascans/src/AlphaScans.kt @@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.model.FilterList import eu.kanade.tachiyomi.source.model.MangasPage -import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga import rx.Observable diff --git a/multisrc/overrides/wpmangastream/geasshentai/src/GeassHentai.kt b/multisrc/overrides/wpmangastream/geasshentai/src/GeassHentai.kt new file mode 100644 index 000000000..46c2943d9 --- /dev/null +++ b/multisrc/overrides/wpmangastream/geasshentai/src/GeassHentai.kt @@ -0,0 +1,25 @@ +package eu.kanade.tachiyomi.extension.pt.geasshentai + +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 GeassHentai : WPMangaStream( + "Geass Hentai", + "https://geassscan.xyz", + "pt-BR", + dateFormat = SimpleDateFormat("MMMMM d, 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 085a31fcb..08dc28b82 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 @@ -91,7 +91,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Furio Scans", "https://furioscans.com", "pt-BR", overrideVersionCode = 4), SingleLang("GalaxyDegenScans", "https://gdstmp.site", "en", overrideVersionCode = 3), SingleLang("Gatemanga", "https://gatemanga.com", "ar", overrideVersionCode = 1), - SingleLang("Geass Scanlator", "https://geassscan.net", "pt-BR", overrideVersionCode = 3), SingleLang("Gemanga", "https://gemanga.com", "ar", overrideVersionCode = 1), SingleLang("Glory Scans", "https://gloryscan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2), SingleLang("Gogoscans", "https://www.gogoscans.com", "en"), @@ -327,6 +326,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Novels Town", "https://novelstown.cyou", "ar"), SingleLang("OTksScanlator", "https://otkscanlator.xyz", "pt-BR", isNsfw = true, className = "OtksScanlator"), SingleLang("Oh No Manga", "https://ohnomanga.com", "en", isNsfw = true), + SingleLang("Okamishi Scans", "https://geassscan.net", "pt-BR", pkgName = "geassscanlator", overrideVersionCode = 4), SingleLang("Olho da Lua", "https://olhodalua.xyz", "pt-BR", className = "OlhoDaLua", overrideVersionCode = 2), SingleLang("Origami Orpheans", "https://origami-orpheans.com.br", "pt-BR", overrideVersionCode = 3), SingleLang("Ow Scan", "https://owscan.com", "pt-BR", 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 9bc992265..0493a45d0 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,7 +53,8 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { SingleLang("Random Scans", "https://randomscans.xyz", "en"), SingleLang("Fênix Scanlator", "https://fenixscanlator.xyz", "pt-BR", className = "FenixScanlator", overrideVersionCode = 2), SingleLang("Phantom Scans", "https://phantomscans.com", "en", overrideVersionCode = 1), - SingleLang("Omega Scans", "https://omegascans.org", "en", isNsfw = true) + SingleLang("Omega Scans", "https://omegascans.org", "en", isNsfw = true), + SingleLang("Geass Hentai", "https://geassscan.xyz", "pt-BR", isNsfw = true, overrideVersionCode = 2) ) companion object {