diff --git a/src/all/sudatchi/build.gradle b/src/all/sudatchi/build.gradle index 7a9c807e..36ab6115 100644 --- a/src/all/sudatchi/build.gradle +++ b/src/all/sudatchi/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Sudatchi' extClass = '.Sudatchi' - extVersionCode = 5 + extVersionCode = 4 isNsfw = true } diff --git a/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt b/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt index b4351e3b..2ad248b8 100644 --- a/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt +++ b/src/all/sudatchi/src/eu/kanade/tachiyomi/animeextension/all/sudatchi/Sudatchi.kt @@ -39,7 +39,7 @@ class Sudatchi : AnimeHttpSource(), ConfigurableAnimeSource { override val baseUrl = "https://sudatchi.com" - private val ipfsUrl = "https://ipfs.sudatchi.com" + private val ipfsUrl = "https://gboesk298le91ct41kibaonc7o.ingress.akashprovid.com" override val lang = "all" diff --git a/src/pt/animesgratis/build.gradle b/src/pt/animesgratis/build.gradle index 417aed25..dd3f6ea7 100644 --- a/src/pt/animesgratis/build.gradle +++ b/src/pt/animesgratis/build.gradle @@ -1,9 +1,9 @@ ext { - extName = 'Q1N' - extClass = '.Q1N' + extName = 'Bakashi' + extClass = '.Bakashi' themePkg = 'dooplay' - baseUrl = 'https://q1n.net' - overrideVersionCode = 15 + baseUrl = 'https://bakashi.tv' + overrideVersionCode = 14 } apply from: "$rootDir/common.gradle" diff --git a/src/pt/animesgratis/res/mipmap-hdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-hdpi/ic_launcher.png index 91f6d938..5ee4230c 100644 Binary files a/src/pt/animesgratis/res/mipmap-hdpi/ic_launcher.png and b/src/pt/animesgratis/res/mipmap-hdpi/ic_launcher.png differ diff --git a/src/pt/animesgratis/res/mipmap-mdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-mdpi/ic_launcher.png index 392d6816..5eec6c6e 100644 Binary files a/src/pt/animesgratis/res/mipmap-mdpi/ic_launcher.png and b/src/pt/animesgratis/res/mipmap-mdpi/ic_launcher.png differ diff --git a/src/pt/animesgratis/res/mipmap-xhdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-xhdpi/ic_launcher.png index ff245287..a110e38f 100644 Binary files a/src/pt/animesgratis/res/mipmap-xhdpi/ic_launcher.png and b/src/pt/animesgratis/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/src/pt/animesgratis/res/mipmap-xxhdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-xxhdpi/ic_launcher.png index 1e77cde1..15fd634a 100644 Binary files a/src/pt/animesgratis/res/mipmap-xxhdpi/ic_launcher.png and b/src/pt/animesgratis/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src/pt/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png b/src/pt/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png index dccceaa7..d8cc6dbe 100644 Binary files a/src/pt/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png and b/src/pt/animesgratis/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Bakashi.kt similarity index 82% rename from src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt rename to src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Bakashi.kt index ef9a0bb1..5f8d994d 100644 --- a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Q1N.kt +++ b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Bakashi.kt @@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.animeextension.pt.animesgratis import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.NoaExtractor import eu.kanade.tachiyomi.animeextension.pt.animesgratis.extractors.RuplayExtractor -import eu.kanade.tachiyomi.animesource.model.SAnime import eu.kanade.tachiyomi.animesource.model.SEpisode import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.bloggerextractor.BloggerExtractor @@ -21,10 +20,10 @@ import org.jsoup.nodes.Element import java.text.SimpleDateFormat import java.util.Locale -class Q1N : DooPlay( +class Bakashi : DooPlay( "pt-BR", - "Q1N", - "https://q1n.net", + "Bakashi", + "https://bakashi.net", ) { override val id: Long = 2969482460524685571L @@ -35,45 +34,12 @@ class Q1N : DooPlay( // ============================== Popular =============================== override fun popularAnimeSelector() = "div.items.featured article div.poster" - override fun popularAnimeRequest(page: Int) = GET("$baseUrl/a/", headers) - - // =============================== Latest =============================== - override val latestUpdatesPath = "e" + override fun popularAnimeRequest(page: Int) = GET("$baseUrl/animes/", headers) // =============================== Search =============================== override fun searchAnimeSelector() = "div.result-item article div.thumbnail > a" override fun searchAnimeFromElement(element: Element) = popularAnimeFromElement(element) - // =========================== Anime Details ============================ - override val additionalInfoSelector = "div.wp-content" - - override fun animeDetailsParse(document: Document): SAnime { - val doc = getRealAnimeDoc(document) - val sheader = doc.selectFirst("div.sheader")!! - return SAnime.create().apply { - setUrlWithoutDomain(doc.location()) - sheader.selectFirst("div.poster > img")!!.let { - thumbnail_url = it.getImageUrl() - title = it.attr("alt").ifEmpty { - sheader.selectFirst("div.data > h1")!!.text() - } - } - - genre = sheader.select("div.data div.sgeneros > a") - .eachText() - .joinToString() - - doc.selectFirst("div#info")?.let { info -> - description = buildString { - append(doc.getDescription()) - additionalInfoItems.forEach { - info.getInfo(it)?.let(::append) - } - } - } - } - } - // ============================== Episodes ============================== override fun getSeasonEpisodes(season: Element): List { val seasonName = season.selectFirst("span.se-t")?.text() @@ -128,7 +94,7 @@ class Q1N : DooPlay( "filemoon" in name -> filemoonExtractor.videosFromUrl(url) "mixdrop" in name -> mixDropExtractor.videoFromUrl(url) "streamtape" in name -> streamTapeExtractor.videosFromUrl(url) - "noa" in name -> noaExtractor.videosFromUrl(url) + "/noance/" in url || "/noa" in url || "/ao/" in url -> noaExtractor.videosFromUrl(url) "/player/" in url -> bloggerExtractor.videosFromUrl(url, headers) else -> emptyList() } @@ -169,7 +135,7 @@ class Q1N : DooPlay( // ============================= Utilities ============================== override fun getRealAnimeDoc(document: Document): Document { - if (!document.location().contains("/e/")) return document + if (!document.location().contains("/episodio/")) return document return document.selectFirst("div.pag_episodes div.item > a:has(i.fa-th)")?.let { client.newCall(GET(it.attr("href"), headers)).execute() diff --git a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt index 5bb5d42c..83b334d0 100644 --- a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt +++ b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/extractors/NoaExtractor.kt @@ -7,35 +7,19 @@ import okhttp3.OkHttpClient class NoaExtractor(private val client: OkHttpClient, private val headers: Headers) { fun videosFromUrl(url: String): List