From 78830fcfa3994c07036b666e0a0cda3af3a5f471 Mon Sep 17 00:00:00 2001 From: Alessandro Jean Date: Sun, 9 Jan 2022 13:28:59 -0300 Subject: [PATCH] Move TT from Madara to WpMangaReader. (#10400) --- .../src/TsundokuTraducoes.kt | 25 ------------------ .../flamescans/src/FlameScans.kt | 12 ++++----- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../tsundokutraducoes/res/web_hi_res_512.png | Bin .../src/TsundokuTraducoes.kt | 24 +++++++++++++++++ .../asurascans/src/AsuraScans.kt | 10 +++---- .../multisrc/madara/MadaraGenerator.kt | 3 +-- .../wpmangareader/WPMangaReaderGenerator.kt | 1 + 12 files changed, 37 insertions(+), 38 deletions(-) delete mode 100644 multisrc/overrides/madara/tsundokutraducoes/src/TsundokuTraducoes.kt rename multisrc/overrides/{madara => wpmangareader}/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => wpmangareader}/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => wpmangareader}/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => wpmangareader}/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => wpmangareader}/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename multisrc/overrides/{madara => wpmangareader}/tsundokutraducoes/res/web_hi_res_512.png (100%) create mode 100644 multisrc/overrides/wpmangareader/tsundokutraducoes/src/TsundokuTraducoes.kt diff --git a/multisrc/overrides/madara/tsundokutraducoes/src/TsundokuTraducoes.kt b/multisrc/overrides/madara/tsundokutraducoes/src/TsundokuTraducoes.kt deleted file mode 100644 index 1cfea0991..000000000 --- a/multisrc/overrides/madara/tsundokutraducoes/src/TsundokuTraducoes.kt +++ /dev/null @@ -1,25 +0,0 @@ -package eu.kanade.tachiyomi.extension.pt.tsundokutraducoes - -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 TsundokuTraducoes : Madara( - "Tsundoku Traduções", - "https://tsundokutraducoes.com.br", - "pt-BR", - SimpleDateFormat("dd/MM/yyyy", Locale("pt", "BR")) -) { - - // Hardcode the id because the language code was wrong. - override val id: Long = 3941383635597527601 - - 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/wpmangareader/flamescans/src/FlameScans.kt b/multisrc/overrides/wpmangareader/flamescans/src/FlameScans.kt index 61ecf1ef1..929a17601 100644 --- a/multisrc/overrides/wpmangareader/flamescans/src/FlameScans.kt +++ b/multisrc/overrides/wpmangareader/flamescans/src/FlameScans.kt @@ -36,12 +36,12 @@ open class FlameScans( mangaUrlDirectory: String, dateFormat: SimpleDateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.US) ) : WPMangaReader( - "Flame Scans", - baseUrl, - lang, - mangaUrlDirectory = mangaUrlDirectory, - dateFormat = dateFormat - ), + "Flame Scans", + baseUrl, + lang, + mangaUrlDirectory = mangaUrlDirectory, + dateFormat = dateFormat +), ConfigurableSource { private val preferences: SharedPreferences by lazy { diff --git a/multisrc/overrides/madara/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-hdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-mdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-xhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-xxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from multisrc/overrides/madara/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png rename to multisrc/overrides/wpmangareader/tsundokutraducoes/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/multisrc/overrides/madara/tsundokutraducoes/res/web_hi_res_512.png b/multisrc/overrides/wpmangareader/tsundokutraducoes/res/web_hi_res_512.png similarity index 100% rename from multisrc/overrides/madara/tsundokutraducoes/res/web_hi_res_512.png rename to multisrc/overrides/wpmangareader/tsundokutraducoes/res/web_hi_res_512.png diff --git a/multisrc/overrides/wpmangareader/tsundokutraducoes/src/TsundokuTraducoes.kt b/multisrc/overrides/wpmangareader/tsundokutraducoes/src/TsundokuTraducoes.kt new file mode 100644 index 000000000..c130ef620 --- /dev/null +++ b/multisrc/overrides/wpmangareader/tsundokutraducoes/src/TsundokuTraducoes.kt @@ -0,0 +1,24 @@ +package eu.kanade.tachiyomi.extension.pt.tsundokutraducoes + +import eu.kanade.tachiyomi.lib.ratelimit.RateLimitInterceptor +import eu.kanade.tachiyomi.multisrc.wpmangareader.WPMangaReader +import okhttp3.OkHttpClient +import java.text.SimpleDateFormat +import java.util.Locale +import java.util.concurrent.TimeUnit + +class TsundokuTraducoes : WPMangaReader( + "Tsundoku Traduções", + "https://tsundokutraducoes.com.br", + "pt-BR", + dateFormat = SimpleDateFormat("MMMMM d, yyyy", Locale("pt", "BR")) +) { + + override val client: OkHttpClient = network.cloudflareClient.newBuilder() + .addNetworkInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS)) + .build() + + override val altName = "Nome alternativo: " + + override fun searchMangaSelector() = ".utao .uta .imgu, .listupd .bs .bsx:not(:has(span.novelabel)), .listo .bs .bsx:not(:has(span.novelabel))" +} diff --git a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt index ff7fbbae5..39f56f103 100644 --- a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt +++ b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt @@ -23,11 +23,11 @@ open class AsuraScans( override val lang: String, dateFormat: SimpleDateFormat ) : WPMangaStream( - "Asura Scans", - baseUrl, - lang, - dateFormat - ), + "Asura Scans", + baseUrl, + lang, + dateFormat +), ConfigurableSource { private val preferences: SharedPreferences by lazy { 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 9ac5552b6..3bffe317d 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 @@ -399,7 +399,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Top Manhua", "https://topmanhua.com", "en", overrideVersionCode = 1), SingleLang("TreeManga", "https://treemanga.com", "en", overrideVersionCode = 1), SingleLang("TritiniaScans", "https://tritinia.com", "en", overrideVersionCode = 1), - SingleLang("Tsundoku Traduções", "https://tsundokutraducoes.com.br", "pt-BR", pkgName = "tsundokutraducoes", className = "TsundokuTraducoes", overrideVersionCode = 3), SingleLang("TuManga.net", "https://tumanga.net", "es", className = "TuMangaNet"), SingleLang("Twilight Scans", "https://twilightscans.com", "en", overrideVersionCode = 1), SingleLang("Türkçe Manga", "https://turkcemanga.com", "tr", className = "TurkceManga", overrideVersionCode = 2), @@ -414,7 +413,7 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("War Queen Scan", "https://wqscan.com", "pt-BR", overrideVersionCode = 6), SingleLang("WebNovel", "https://webnovel.live", "en", className = "WebNovelLive", overrideVersionCode = 3), SingleLang("WebToon18", "http://webtoon18.net", "en", isNsfw = true, overrideVersionCode = 2), - SingleLang("WebToon69", "https://webtoon69.com", "en", isNsfw = true, overrideVersionCode =1), + SingleLang("WebToon69", "https://webtoon69.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("WebToonily", "https://webtoonily.com", "en", isNsfw = true, overrideVersionCode = 1), SingleLang("Webtoon Hatti", "https://webtoonhatti.com", "tr", overrideVersionCode = 1), SingleLang("WebtoonScan", "https://webtoonscan.com", "en", isNsfw = true), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt index d95adf372..d76909c5f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt @@ -46,6 +46,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { SingleLang("YANP Fansub", "https://yanpfansub.com", "pt-BR", isNsfw = true), SingleLang("World Romance Translation", "https://wrt.my.id", "id", overrideVersionCode = 6), SingleLang("Ozul Scans", "https://ozulscans.com", "ar"), + SingleLang("Tsundoku Traduções", "https://tsundokutraducoes.com.br", "pt-BR", className = "TsundokuTraducoes", overrideVersionCode = 8) ) companion object {