diff --git a/src/pt/animesgratis/build.gradle b/src/pt/animesgratis/build.gradle index 98fe94e7..dd3f6ea7 100644 --- a/src/pt/animesgratis/build.gradle +++ b/src/pt/animesgratis/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.Bakashi' themePkg = 'dooplay' baseUrl = 'https://bakashi.tv' - overrideVersionCode = 13 + 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 64569bfb..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 3dd37e28..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 b7983ef9..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 9a21504c..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 4bb9c4c9..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/Bakashi.kt b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Bakashi.kt index 8cfa029e..5f8d994d 100644 --- a/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Bakashi.kt +++ b/src/pt/animesgratis/src/eu/kanade/tachiyomi/animeextension/pt/animesgratis/Bakashi.kt @@ -23,7 +23,7 @@ import java.util.Locale class Bakashi : DooPlay( "pt-BR", "Bakashi", - "https://bakashi.tv", + "https://bakashi.net", ) { override val id: Long = 2969482460524685571L @@ -94,7 +94,7 @@ class Bakashi : DooPlay( "filemoon" in name -> filemoonExtractor.videosFromUrl(url) "mixdrop" in name -> mixDropExtractor.videoFromUrl(url) "streamtape" in name -> streamTapeExtractor.videosFromUrl(url) - "/noance/" in url || "/noa" in url -> noaExtractor.videosFromUrl(url) + "/noance/" in url || "/noa" in url || "/ao/" in url -> noaExtractor.videosFromUrl(url) "/player/" in url -> bloggerExtractor.videosFromUrl(url, headers) else -> emptyList() } @@ -104,7 +104,7 @@ class Bakashi : DooPlay( val playerId = player.attr("data-nume") val iframe = player.root().selectFirst("div#source-player-$playerId iframe") - return iframe?.attr("src")?.takeIf(String::isNotBlank) + return iframe?.tryGetAttr("data-litespeed-src", "src")?.takeIf(String::isNotBlank) ?.let { when { it.contains("/aviso/") -> @@ -143,6 +143,11 @@ class Bakashi : DooPlay( } ?: document } + private fun Element.tryGetAttr(vararg attributeKeys: String): String? { + val attributeKey = attributeKeys.first { hasAttr(it) } + return attributeKey?.let { attr(attributeKey) } + } + override fun List