AlmightyHak/extensions-source
2
0
Fork 2
Code Issues 296 Pull requests 6 Projects Releases Packages Wiki Activity Actions

PelisForte fixes

Browse source 
Closes #411
This commit is contained in:
imper1aldev 2024-12-09 00:27:12 -06:00
parent c22c2ee09a
commit a37ec6c2b2
2 changed files with 66 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/es/pelisforte/build.gradle
View file

@ -1,7 +1,7 @@
ext { ext {
extName = 'PelisForte' extName = 'PelisForte'
extClass = '.PelisForte' extClass = '.PelisForte'
extVersionCode = 16 extVersionCode = 17
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"
@ -21,4 +21,5 @@ dependencies {
implementation(project(':lib:playlist-utils')) implementation(project(':lib:playlist-utils'))
implementation(project(':lib:streamlare-extractor')) implementation(project(':lib:streamlare-extractor'))
implementation(project(':lib:okru-extractor')) implementation(project(':lib:okru-extractor'))
implementation(project(':lib:vidguard-extractor'))
} }

136
src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
View file

@ -23,10 +23,12 @@ import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor import eu.kanade.tachiyomi.lib.upstreamextractor.UpstreamExtractor
import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor import eu.kanade.tachiyomi.lib.uqloadextractor.UqloadExtractor
import eu.kanade.tachiyomi.lib.vidguardextractor.VidGuardExtractor
import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor import eu.kanade.tachiyomi.lib.voeextractor.VoeExtractor
import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor import eu.kanade.tachiyomi.lib.youruploadextractor.YourUploadExtractor
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import eu.kanade.tachiyomi.util.parallelCatchingFlatMapBlocking
import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
@ -62,6 +64,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
"YourUpload", "Voe", "Mp4Upload", "Doodstream", "YourUpload", "Voe", "Mp4Upload", "Doodstream",
"Upload", "BurstCloud", "Upstream", "StreamTape", "Upload", "BurstCloud", "Upstream", "StreamTape",
"Fastream", "Filemoon", "StreamWish", "Okru", "Fastream", "Filemoon", "StreamWish", "Okru",
"VidGuard",
) )
} }
@ -149,83 +152,70 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
override fun videoListParse(response: Response): List<Video> { override fun videoListParse(response: Response): List<Video> {
val document = response.asJsoup() val document = response.asJsoup()
val videoList = mutableListOf<Video>() return document.select(".video-player iframe").parallelCatchingFlatMapBlocking {
document.select(".video-player iframe").forEach { val id = it.parent()?.attr("id")
try { val idTab = document.selectFirst("[href=\"#$id\"]")?.closest(".lrt")?.attr("id")
val id = it.parent()?.attr("id") val lang = document.select("[tab=$idTab]").text()
val idTab = document.selectFirst("[href=\"#$id\"]")?.closest(".lrt")?.attr("id") val src = it.attr("src").ifEmpty { it.attr("data-src") }
val lang = document.select("[tab=$idTab]").text() val key = src.substringAfter("/?h=")
val src = it.attr("src").ifEmpty { it.attr("data-src") } val player = "https://${src.toHttpUrl().host}/r.php?h=$key"
val key = src.substringAfter("/?h=")
val player = "https://${src.toHttpUrl().host}/r.php?h=$key"
val prefix = when {
lang.contains("Latino", true) -> "[LAT]"
lang.contains("Subtitulado", true) -> "[SUB]"
lang.contains("Castellano", true) -> "[CAST]"
else -> ""
}
val locationsDdh = client.newCall(GET(player, headers = headers.newBuilder().add("referer", src).build()))
.execute().networkResponse.toString()
fetchUrls(locationsDdh).forEach { val prefix = when {
serverVideoResolver(it, prefix, src).also(videoList::addAll) lang.contains("Latino", true) -> "[LAT]"
} lang.contains("Subtitulado", true) -> "[SUB]"
} catch (_: Exception) {} lang.contains("Castellano", true) -> "[CAST]"
else -> ""
}
val locationsDdh = client.newCall(
GET(player, headers = headers.newBuilder().add("referer", src).build()),
).execute().networkResponse.toString()
fetchUrls(locationsDdh).flatMap { serverVideoResolver(it, prefix) }
} }
return videoList
} }
private fun serverVideoResolver(url: String, prefix: String = "", referer: String = ""): List<Video> { /*--------------------------------Video extractors------------------------------------*/
val videoList = mutableListOf<Video>() private val voeExtractor by lazy { VoeExtractor(client) }
val embedUrl = url.lowercase() private val okruExtractor by lazy { OkruExtractor(client) }
try { private val filemoonExtractor by lazy { FilemoonExtractor(client) }
if (embedUrl.contains("voe")) { private val uqloadExtractor by lazy { UqloadExtractor(client) }
VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll) private val mp4uploadExtractor by lazy { Mp4uploadExtractor(client) }
private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
private val doodExtractor by lazy { DoodExtractor(client) }
private val streamlareExtractor by lazy { StreamlareExtractor(client) }
private val yourUploadExtractor by lazy { YourUploadExtractor(client) }
private val burstCloudExtractor by lazy { BurstCloudExtractor(client) }
private val fastreamExtractor by lazy { FastreamExtractor(client, headers) }
private val upstreamExtractor by lazy { UpstreamExtractor(client) }
private val streamTapeExtractor by lazy { StreamTapeExtractor(client) }
private val vidGuardExtractor by lazy { VidGuardExtractor(client) }
private fun serverVideoResolver(url: String, prefix: String = ""): List<Video> {
return runCatching {
when {
arrayOf("voe").any(url) -> voeExtractor.videosFromUrl(url, "$prefix ")
arrayOf("ok.ru", "okru").any(url) -> okruExtractor.videosFromUrl(url, prefix)
arrayOf("filemoon", "moonplayer").any(url) -> filemoonExtractor.videosFromUrl(url, prefix = "$prefix Filemoon:")
arrayOf("uqload").any(url) -> uqloadExtractor.videosFromUrl(url, prefix)
arrayOf("mp4upload").any(url) -> mp4uploadExtractor.videosFromUrl(url, headers, prefix = "$prefix ")
arrayOf("wishembed", "streamwish", "strwish", "wish").any(url) -> {
streamWishExtractor.videosFromUrl(url, videoNameGen = { "$prefix StreamWish:$it" })
}
arrayOf("doodstream", "dood.", "ds2play", "doods.").any(url) -> {
val url2 = url.replace("https://doodstream.com/e/", "https://d0000d.com/e/")
doodExtractor.videosFromUrl(url2, "$prefix DoodStream")
}
arrayOf("streamlare").any(url) -> streamlareExtractor.videosFromUrl(url, prefix)
arrayOf("yourupload", "upload").any(url) -> yourUploadExtractor.videoFromUrl(url, headers = headers, prefix = "$prefix ")
arrayOf("burstcloud", "burst").any(url) -> burstCloudExtractor.videoFromUrl(url, headers = headers, prefix = "$prefix ")
arrayOf("fastream").any(url) -> fastreamExtractor.videosFromUrl(url, prefix = "$prefix Fastream:")
arrayOf("upstream").any(url) -> upstreamExtractor.videosFromUrl(url, prefix = "$prefix ")
arrayOf("streamtape", "stp", "stape").any(url) -> streamTapeExtractor.videosFromUrl(url, quality = "$prefix StreamTape")
arrayOf("vembed", "guard", "listeamed", "bembed", "vgfplay").any(url) -> vidGuardExtractor.videosFromUrl(url, prefix = "$prefix ")
else -> emptyList()
} }
if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) { }.getOrNull() ?: emptyList()
OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
}
if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
FilemoonExtractor(client).videosFromUrl(url, prefix = "${prefix}Filemoon").also(videoList::addAll)
}
if (embedUrl.contains("uqload")) {
UqloadExtractor(client).videosFromUrl(url, prefix = prefix).also(videoList::addAll)
}
if (embedUrl.contains("mp4upload")) {
Mp4uploadExtractor(client).videosFromUrl(url, headers, prefix = prefix).let { videoList.addAll(it) }
}
if (embedUrl.contains("wishembed") || embedUrl.contains("streamwish") ||
embedUrl.contains("strwish") || embedUrl.contains("wish")
) {
val docHeaders = headers.newBuilder()
.add("Referer", referer)
.build()
StreamWishExtractor(client, docHeaders).videosFromUrl(url, videoNameGen = { "${prefix}StreamWish:$it" }).also(videoList::addAll)
}
if (embedUrl.contains("doodstream") || embedUrl.contains("dood.")) {
DoodExtractor(client).videoFromUrl(url, "${prefix}DoodStream", false)?.let { videoList.add(it) }
}
if (embedUrl.contains("streamlare")) {
StreamlareExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
}
if (embedUrl.contains("yourupload")) {
YourUploadExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
}
if (embedUrl.contains("burstcloud") || embedUrl.contains("burst")) {
BurstCloudExtractor(client).videoFromUrl(url, headers = headers, prefix = prefix).let { videoList.addAll(it) }
}
if (embedUrl.contains("fastream")) {
FastreamExtractor(client, headers).videosFromUrl(url, prefix = "${prefix}Fastream:").also(videoList::addAll)
}
if (embedUrl.contains("upstream")) {
UpstreamExtractor(client).videosFromUrl(url, prefix = prefix).let { videoList.addAll(it) }
}
if (embedUrl.contains("streamtape")) {
StreamTapeExtractor(client).videoFromUrl(url, quality = "${prefix}StreamTape")?.let { videoList.add(it) }
}
} catch (_: Exception) {
}
return videoList
} }
override fun List<Video>.sort(): List<Video> { override fun List<Video>.sort(): List<Video> {
@ -278,6 +268,8 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
fun toUriPart() = vals[state].second fun toUriPart() = vals[state].second
} }
private fun Array<String>.any(url: String): Boolean = this.any { url.contains(it, ignoreCase = true) }
override fun setupPreferenceScreen(screen: PreferenceScreen) { override fun setupPreferenceScreen(screen: PreferenceScreen) {
ListPreference(screen.context).apply { ListPreference(screen.context).apply {
key = PREF_LANGUAGE_KEY key = PREF_LANGUAGE_KEY