diff --git a/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt b/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt index f9735def..4afa8d95 100644 --- a/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt +++ b/lib/fireplayer-extractor/src/main/java/eu/kanade/tachiyomi/lib/fireplayerextractor/FireplayerExtractor.kt @@ -36,6 +36,7 @@ class FireplayerExtractor( val script = doc.selectFirst("script:containsData(eval):containsData(p,a,c,k,e,d)")?.data() + ?.replace(Regex("[\\u00E0-\\u00FC]"), "-") // Fix a bug in JsUnpacker with accents ?.let(JsUnpacker::unpackAndCombine) ?: doc.selectFirst("script:containsData(FirePlayer)")?.data() diff --git a/src/pt/pobreflix/build.gradle b/src/pt/pobreflix/build.gradle index ec1d8eb7..5b4d764a 100644 --- a/src/pt/pobreflix/build.gradle +++ b/src/pt/pobreflix/build.gradle @@ -2,8 +2,8 @@ ext { extName = 'Pobreflix' extClass = '.Pobreflix' themePkg = 'dooplay' - baseUrl = 'https://pobreflix1.art' - overrideVersionCode = 10 + baseUrl = 'https://pobreflix.global' + overrideVersionCode = 11 isNsfw = true } @@ -11,6 +11,7 @@ apply from: "$rootDir/common.gradle" dependencies { implementation(project(":lib:filemoon-extractor")) + implementation(project(":lib:fireplayer-extractor")) implementation(project(":lib:streamwish-extractor")) implementation(project(":lib:streamtape-extractor")) implementation(project(":lib:playlist-utils")) diff --git a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt index 30783608..c1159018 100644 --- a/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt +++ b/src/pt/pobreflix/src/eu/kanade/tachiyomi/animeextension/pt/pobreflix/Pobreflix.kt @@ -1,23 +1,25 @@ package eu.kanade.tachiyomi.animeextension.pt.pobreflix import android.util.Base64 -import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.FireplayerExtractor import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.MyStreamExtractor +import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.PlayerFlixExtractor import eu.kanade.tachiyomi.animeextension.pt.pobreflix.extractors.SuperFlixExtractor import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor +import eu.kanade.tachiyomi.lib.fireplayerextractor.FireplayerExtractor import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor import eu.kanade.tachiyomi.multisrc.dooplay.DooPlay import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.util.asJsoup +import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.Response class Pobreflix : DooPlay( "pt-BR", "Pobreflix", - "https://pobreflix1.art", + "https://pobreflix.global", ) { // ============================== Popular =============================== override fun popularAnimeSelector() = "div.featured div.poster" @@ -26,53 +28,52 @@ class Pobreflix : DooPlay( override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/series/page/$page/", headers) // ============================ Video Links ============================= - private val embedplayerExtractor by lazy { FireplayerExtractor(client) } - private val brbeastExtractor by lazy { FireplayerExtractor(client, "https://brbeast.com") } - private val superembedsExtractor by lazy { FireplayerExtractor(client, "https://superembeds.com/") } + private val fireplayerExtractor by lazy { FireplayerExtractor(client) } private val filemoonExtractor by lazy { FilemoonExtractor(client) } private val mystreamExtractor by lazy { MyStreamExtractor(client, headers) } private val streamtapeExtractor by lazy { StreamTapeExtractor(client) } private val streamwishExtractor by lazy { StreamWishExtractor(client, headers) } + private val playerflixExtractor by lazy { PlayerFlixExtractor(client, headers, ::genericExtractor) } private val superflixExtractor by lazy { SuperFlixExtractor(client, headers, ::genericExtractor) } private val supercdnExtractor by lazy { SuperFlixExtractor(client, headers, ::genericExtractor, "https://supercdn.org") } override fun videoListParse(response: Response): List