INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Voe extractor (#2878)

Browse Source
This commit is contained in:
hollow 2024-02-05 22:48:53 +00:00 committed by GitHub
parent 5068d25516
commit 81bfc7db97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
41 changed files with 86 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/voe-extractor/build.gradle.kts
View File

@ -1,3 +1,7 @@
plugins { plugins {
id("lib-android") id("lib-android")
} }
dependencies {
implementation(project(":lib:playlist-utils"))
}

48
lib/voe-extractor/src/main/java/eu/kanade/tachiyomi/lib/voeextractor/VoeExtractor.kt
View File

@ -1,26 +1,44 @@
package eu.kanade.tachiyomi.lib.voeextractor package eu.kanade.tachiyomi.lib.voeextractor
import android.util.Base64
import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
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 kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import uy.kohesive.injekt.injectLazy
class VoeExtractor(private val client: OkHttpClient) { class VoeExtractor(private val client: OkHttpClient) {
fun videoFromUrl(url: String, quality: String? = null, prefix: String = ""): Video? {
val document = client.newCall(GET(url)).execute().asJsoup()
val script = document.selectFirst("script:containsData(const sources), script:containsData(var sources)")
?.data()
?: return null
val videoUrl = script.substringAfter("hls': '").substringBefore("'")
val resolution = script.substringAfter("video_height': ").substringBefore(",")
val qualityStr = when {
prefix.isNotEmpty() -> "$prefix${resolution}p"
else -> quality ?: "VoeCDN(${resolution}p)"
}
return Video(url, qualityStr, videoUrl)
}
fun videosFromUrl(url: String, quality: String? = null, prefix: String = ""): List<Video> { private val json: Json by injectLazy()
return videoFromUrl(url, quality, prefix)?.let(::listOf).orEmpty()
private val playlistUtils by lazy { PlaylistUtils(client) }
@Serializable
data class VideoLinkDTO(val file: String)
fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
val document = client.newCall(GET(url)).execute().asJsoup()
val script = document.selectFirst("script:containsData(const sources), script:containsData(var sources), script:containsData(wc0)")
?.data()
?: return emptyList()
val playlistUrl = when {
// Layout 1
script.contains("sources") -> {
script.substringAfter("hls': '").substringBefore("'")
}
// Layout 2
script.contains("wc0") -> {
val base64 = Regex("'.*'").find(script)!!.value
val decoded = Base64.decode(base64, Base64.DEFAULT).let(::String)
json.decodeFromString<VideoLinkDTO>(decoded).file
}
else -> return emptyList()
}
return playlistUtils.extractFromHls(playlistUrl,
videoNameGen = { quality -> "${prefix}Voe: $quality" }
)
} }
} }

2
multisrc/overrides/datalifeengine/wiflix/src/Wiflix.kt
View File

@ -86,7 +86,7 @@ class Wiflix : DataLifeEngine(
contains("streamvid.net") -> StreamHideVidExtractor(client).videosFromUrl(this) contains("streamvid.net") -> StreamHideVidExtractor(client).videosFromUrl(this)
contains("upstream.to") -> UpstreamExtractor(client).videosFromUrl(this) contains("upstream.to") -> UpstreamExtractor(client).videosFromUrl(this)
contains("streamdav.com") -> StreamDavExtractor(client).videosFromUrl(this) contains("streamdav.com") -> StreamDavExtractor(client).videosFromUrl(this)
contains("voe.sx") -> listOfNotNull(VoeExtractor(client).videoFromUrl(this)) contains("voe.sx") -> VoeExtractor(client).videosFromUrl(this)
else -> emptyList() else -> emptyList()
} }
} }

2
multisrc/overrides/dooplay/kinoking/src/Kinoking.kt
View File

@ -92,7 +92,7 @@ class Kinoking : DooPlay(
doodExtractor.videosFromUrl(link, quality, redirect) doodExtractor.videosFromUrl(link, quality, redirect)
} }
link.contains("https://voe.sx") && hosterSelection.contains("voe") -> { link.contains("https://voe.sx") && hosterSelection.contains("voe") -> {
voeExtractor.videosFromUrl(link, "Voe") voeExtractor.videosFromUrl(link)
} }
link.contains("filehosted") && hosterSelection.contains("filehosted") -> { link.contains("filehosted") && hosterSelection.contains("filehosted") -> {
listOf(Video(link, "Filehosted", link)) listOf(Video(link, "Filehosted", link))

3
multisrc/overrides/dooplay/multimovies/src/extractors/AutoEmbedExtractor.kt
View File

@ -758,8 +758,7 @@ class AutoEmbedExtractor(private val client: OkHttpClient) {
MixDropExtractor(client).videoFromUrl(videoUrl, prefix = prefix) MixDropExtractor(client).videoFromUrl(videoUrl, prefix = prefix)
} }
videoUrl.contains("https://voe") -> { videoUrl.contains("https://voe") -> {
VoeExtractor(client).videoFromUrl(videoUrl, server.name) VoeExtractor(client).videosFromUrl(videoUrl)
?.let(::listOf)
} }
videoUrl.contains("rabbitstream") -> { videoUrl.contains("rabbitstream") -> {
RabbitStreamExtractor(client).videosFromUrl(videoUrl, headers = videoHeaders, prefix = prefix) RabbitStreamExtractor(client).videosFromUrl(videoUrl, headers = videoHeaders, prefix = prefix)

2
src/ar/anime4up/src/eu/kanade/tachiyomi/animeextension/ar/anime4up/Anime4Up.kt
View File

@ -178,7 +178,7 @@ class Anime4Up : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
url.contains("ok.ru") -> okruExtractor.videosFromUrl(url) url.contains("ok.ru") -> okruExtractor.videosFromUrl(url)
url.contains("mp4upload") -> mp4uploadExtractor.videosFromUrl(url, headers) url.contains("mp4upload") -> mp4uploadExtractor.videosFromUrl(url, headers)
url.contains("uqload") -> uqloadExtractor.videosFromUrl(url) url.contains("uqload") -> uqloadExtractor.videosFromUrl(url)
url.contains("voe") -> voeExtractor.videoFromUrl(url)?.let(::listOf) url.contains("voe") -> voeExtractor.videosFromUrl(url)
url.contains("shared") -> sharedExtractor.videosFromUrl(url)?.let(::listOf) url.contains("shared") -> sharedExtractor.videosFromUrl(url)?.let(::listOf)
DOOD_REGEX.containsMatchIn(url) -> doodExtractor.videosFromUrl(url, "Dood mirror") DOOD_REGEX.containsMatchIn(url) -> doodExtractor.videosFromUrl(url, "Dood mirror")
VIDBOM_REGEX.containsMatchIn(url) -> vidbomExtractor.videosFromUrl(url) VIDBOM_REGEX.containsMatchIn(url) -> vidbomExtractor.videosFromUrl(url)

2
src/ar/arabseed/src/eu/kanade/tachiyomi/animeextension/ar/arabseed/ArabSeed.kt
View File

@ -113,7 +113,7 @@ class ArabSeed : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} }
"dood" in url -> doodExtractor.videosFromUrl(url) "dood" in url -> doodExtractor.videosFromUrl(url)
"fviplions" in url || "wish" in url -> streamwishExtractor.videosFromUrl(url) "fviplions" in url || "wish" in url -> streamwishExtractor.videosFromUrl(url)
"voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf) "voe.sx" in url -> voeExtractor.videosFromUrl(url)
else -> null else -> null
} ?: emptyList() } ?: emptyList()
} }

3
src/ar/okanime/src/eu/kanade/tachiyomi/animeextension/ar/okanime/Okanime.kt
View File

@ -171,8 +171,7 @@ class Okanime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
okruExtractor.videosFromUrl(url) okruExtractor.videosFromUrl(url)
} }
"voe.sx" in url && selection.contains("Voe") -> { "voe.sx" in url && selection.contains("Voe") -> {
voeExtractor.videoFromUrl(url, "VoeSX ($quality)") voeExtractor.videosFromUrl(url)
?.let(::listOf)
} }
VID_BOM_DOMAINS.any(url::contains) && selection.contains("VidBom") -> { VID_BOM_DOMAINS.any(url::contains) && selection.contains("VidBom") -> {
vidBomExtractor.videosFromUrl(url) vidBomExtractor.videosFromUrl(url)

5
src/de/aniflix/src/eu/kanade/tachiyomi/animeextension/de/aniflix/Aniflix.kt
View File

@ -197,10 +197,7 @@ class Aniflix : ConfigurableAnimeSource, AnimeHttpSource() {
} }
} }
link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> { link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
val video = VoeExtractor(client).videoFromUrl(link, quality) videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(${stream.lang}) "))
if (video != null) {
videoList.add(video)
}
} }
link.contains("https://streamlare") && hosterSelection?.contains("slare") == true -> { link.contains("https://streamlare") && hosterSelection?.contains("slare") == true -> {
videoList.addAll(StreamlareExtractor(client).videosFromUrl(link, suffix = stream.lang ?: "Unknown language")) videoList.addAll(StreamlareExtractor(client).videosFromUrl(link, suffix = stream.lang ?: "Unknown language"))

2
src/de/animebase/src/eu/kanade/tachiyomi/animeextension/de/animebase/AnimeBase.kt
View File

@ -221,7 +221,7 @@ class AnimeBase : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val url = hosterSettings.get(hoster)!! + urlpart val url = hosterSettings.get(hoster)!! + urlpart
return when (hoster) { return when (hoster) {
"Streamwish" -> streamWishExtractor.videosFromUrl(url) "Streamwish" -> streamWishExtractor.videosFromUrl(url)
"Voe.SX" -> voeExtractor.videoFromUrl(url)?.let(::listOf) "Voe.SX" -> voeExtractor.videosFromUrl(url)
"VTube", "Lulustream" -> unpackerExtractor.videosFromUrl(url, hoster) "VTube", "Lulustream" -> unpackerExtractor.videosFromUrl(url, hoster)
"VidGuard" -> vidguardExtractor.videosFromUrl(url) "VidGuard" -> vidguardExtractor.videosFromUrl(url)
else -> null else -> null

80
src/de/animeloads/src/eu/kanade/tachiyomi/animeextension/de/animeloads/AnimeLoads.kt
View File

@ -229,15 +229,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val link = client.newCall(GET(decode)).execute().request.url.toString() val link = client.newCall(GET(decode)).execute().request.url.toString()
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Sub" videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Sub) "))
val video = try {
VoeExtractor(client).videoFromUrl(link, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -267,15 +259,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} else { } else {
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Sub" videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Sub) "))
val video = try {
VoeExtractor(client).videoFromUrl(leaveurl, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -358,15 +342,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val link = client.newCall(GET(decode)).execute().request.url.toString() val link = client.newCall(GET(decode)).execute().request.url.toString()
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Sub" videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Sub) "))
val video = try {
VoeExtractor(client).videoFromUrl(link, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -396,15 +372,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} else { } else {
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Sub" videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Sub) "))
val video = try {
VoeExtractor(client).videoFromUrl(leaveurl, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -549,15 +517,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val link = client.newCall(GET(decode)).execute().request.url.toString() val link = client.newCall(GET(decode)).execute().request.url.toString()
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Dub" videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Dub) "))
val video = try {
VoeExtractor(client).videoFromUrl(link, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -587,15 +547,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} else { } else {
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Dub" videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Dub) "))
val video = try {
VoeExtractor(client).videoFromUrl(leaveurl, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -678,15 +630,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val link = client.newCall(GET(decode)).execute().request.url.toString() val link = client.newCall(GET(decode)).execute().request.url.toString()
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Dub" videoList.addAll(VoeExtractor(client).videosFromUrl(link, "(Deutsch Dub) "))
val video = try {
VoeExtractor(client).videoFromUrl(link, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {
@ -716,15 +660,7 @@ class AnimeLoads : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} else { } else {
when { when {
hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> { hoster.contains("voesx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe Deutsch Dub" videoList.addAll(VoeExtractor(client).videosFromUrl(leaveurl, "(Deutsch Dub) "))
val video = try {
VoeExtractor(client).videoFromUrl(leaveurl, quality)
} catch (e: Exception) {
null
}
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> { hoster.contains("streamtapecom") && hosterSelection?.contains("stape") == true -> {

13
src/de/animetoast/src/eu/kanade/tachiyomi/animeextension/de/animetoast/AnimeToast.kt
View File

@ -151,12 +151,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
link.contains("https://voe.sx") && hosterSelection?.contains( link.contains("https://voe.sx") && hosterSelection?.contains(
"voe", "voe",
) == true -> { ) == true -> {
val quality = "Voe" videoList.addAll(VoeExtractor(client).videosFromUrl(link))
val video =
VoeExtractor(client).videoFromUrl(link, quality)
if (video != null) {
videoList.add(video)
}
} }
} }
} }
@ -217,11 +212,7 @@ class AnimeToast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val link = element.select("a").attr("abs:href") val link = element.select("a").attr("abs:href")
when { when {
link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> { link.contains("https://voe.sx") && hosterSelection?.contains("voe") == true -> {
val quality = "Voe" videoList.addAll(VoeExtractor(client).videosFromUrl(link))
val video = VoeExtractor(client).videoFromUrl(link, quality)
if (video != null) {
videoList.add(video)
}
} }
} }
} }

6
src/de/aniworld/src/eu/kanade/tachiyomi/animeextension/de/aniworld/AniWorld.kt
View File

@ -238,15 +238,11 @@ class AniWorld : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
if (hosterSelection != null) { if (hosterSelection != null) {
when { when {
hoster.contains("VOE") && hosterSelection.contains(AWConstants.NAME_VOE) -> { hoster.contains("VOE") && hosterSelection.contains(AWConstants.NAME_VOE) -> {
val quality = "Voe $language"
var url = redirectInterceptor.newCall(GET(redirectgs)).execute().request.url.toString() var url = redirectInterceptor.newCall(GET(redirectgs)).execute().request.url.toString()
if (url.contains("payload") || url.contains(redirectgs)) { if (url.contains("payload") || url.contains(redirectgs)) {
url = recapbypass(jsInterceptor, redirectgs) url = recapbypass(jsInterceptor, redirectgs)
} }
val video = VoeExtractor(client).videoFromUrl(url, quality) videoList.addAll(VoeExtractor(client).videosFromUrl(url, "($language) "))
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("Doodstream") && hosterSelection.contains(AWConstants.NAME_DOOD) -> { hoster.contains("Doodstream") && hosterSelection.contains(AWConstants.NAME_DOOD) -> {

10
src/de/cineclix/src/eu/kanade/tachiyomi/animeextension/de/cineclix/CineClix.kt
View File

@ -206,10 +206,7 @@ class CineClix : ConfigurableAnimeSource, AnimeHttpSource() {
} }
} }
host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> { host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> {
val video = VoeExtractor(client).videoFromUrl(eUrl) videoList.addAll(VoeExtractor(client).videosFromUrl(eUrl))
if (video != null) {
videoList.add(video)
}
} }
} }
} }
@ -246,10 +243,7 @@ class CineClix : ConfigurableAnimeSource, AnimeHttpSource() {
} }
} }
host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> { host.contains("VOE.SX") && hosterSelection?.contains("voe") == true -> {
val video = VoeExtractor(client).videoFromUrl(fUrl) videoList.addAll(VoeExtractor(client).videosFromUrl(fUrl))
if (video != null) {
videoList.add(video)
}
} }
} }
} }

3
src/de/filmpalast/src/eu/kanade/tachiyomi/animeextension/de/filmpalast/FilmPalast.kt
View File

@ -88,8 +88,7 @@ class FilmPalast : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} }
when { when {
url.contains("https://voe.sx") && hosterSelection.contains("voe") -> url.contains("https://voe.sx") && hosterSelection.contains("voe") ->
VoeExtractor(client).videoFromUrl(url, "Voe") VoeExtractor(client).videosFromUrl(url)
?.let(::listOf)
url.contains("https://upstream.to") && hosterSelection.contains("up") -> url.contains("https://upstream.to") && hosterSelection.contains("up") ->
UpstreamExtractor(client).videoFromUrl(url) UpstreamExtractor(client).videoFromUrl(url)

5
src/de/kool/src/eu/kanade/tachiyomi/animeextension/de/kool/Kool.kt
View File

@ -388,10 +388,7 @@ class Kool : ConfigurableAnimeSource, AnimeHttpSource() {
item.jsonObject["url"]!!.jsonPrimitive.content.contains("https://voe") || item.jsonObject["url"]!!.jsonPrimitive.content.contains("https://voe") ||
item.jsonObject["url"]!!.jsonPrimitive.content.contains("scatch176duplicities") && hosterSelection?.contains("voe") == true -> { item.jsonObject["url"]!!.jsonPrimitive.content.contains("scatch176duplicities") && hosterSelection?.contains("voe") == true -> {
val videoUrl = item.jsonObject["url"]!!.jsonPrimitive.content val videoUrl = item.jsonObject["url"]!!.jsonPrimitive.content
val video = VoeExtractor(client).videoFromUrl(videoUrl) videoList.addAll(VoeExtractor(client).videosFromUrl(videoUrl))
if (video != null) {
videoList.add(video)
}
} }
item.jsonObject["url"]!!.jsonPrimitive.content.contains("https://clipboard") && hosterSelection?.contains("clip") == true -> { item.jsonObject["url"]!!.jsonPrimitive.content.contains("https://clipboard") && hosterSelection?.contains("clip") == true -> {
val videoUrl = item.jsonObject["url"]!!.jsonPrimitive.content val videoUrl = item.jsonObject["url"]!!.jsonPrimitive.content

30
src/de/movie4k/src/eu/kanade/tachiyomi/animeextension/de/movie4k/Movie4k.kt
View File

@ -221,20 +221,7 @@ class Movie4k : ConfigurableAnimeSource, AnimeHttpSource() {
link.contains("//voe.sx") || link.contains("//launchreliantcleaverriver") || link.contains("//voe.sx") || link.contains("//launchreliantcleaverriver") ||
link.contains("//fraudclatterflyingcar") || link.contains("//fraudclatterflyingcar") ||
link.contains("//uptodatefinishconferenceroom") || link.contains("//realfinanceblogcenter") && hosterSelection?.contains("voe") == true -> { link.contains("//uptodatefinishconferenceroom") || link.contains("//realfinanceblogcenter") && hosterSelection?.contains("voe") == true -> {
if (!link.contains("https:")) { videoList.addAll(VoeExtractor(client).videosFromUrl(if (link.contains("https:")) link else "https:$link"))
val url = "https:$link"
val quality = "Voe"
val video = VoeExtractor(client).videoFromUrl(url, quality)
if (video != null) {
videoList.add(video)
}
} else {
val quality = "Voe"
val video = VoeExtractor(client).videoFromUrl(link, quality)
if (video != null) {
videoList.add(video)
}
}
} }
} }
} }
@ -317,20 +304,7 @@ class Movie4k : ConfigurableAnimeSource, AnimeHttpSource() {
link.contains("//voe.sx") || link.contains("//launchreliantcleaverriver") || link.contains("//voe.sx") || link.contains("//launchreliantcleaverriver") ||
link.contains("//fraudclatterflyingcar") || link.contains("//fraudclatterflyingcar") ||
link.contains("//uptodatefinishconferenceroom") || link.contains("//realfinanceblogcenter") && hosterSelection?.contains("voe") == true -> { link.contains("//uptodatefinishconferenceroom") || link.contains("//realfinanceblogcenter") && hosterSelection?.contains("voe") == true -> {
if (!link.contains("https:")) { videoList.addAll(VoeExtractor(client).videosFromUrl(if (link.contains("https:")) link else "https:$link"))
val url = "https:$link"
val quality = "Voe"
val video = VoeExtractor(client).videoFromUrl(url, quality)
if (video != null) {
videoList.add(video)
}
} else {
val quality = "Voe"
val video = VoeExtractor(client).videoFromUrl(link, quality)
if (video != null) {
videoList.add(video)
}
}
} }
} }
} }

6
src/de/serienstream/src/eu/kanade/tachiyomi/animeextension/de/serienstream/Serienstream.kt
View File

@ -233,12 +233,8 @@ class Serienstream : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
if (hosterSelection != null) { if (hosterSelection != null) {
when { when {
hoster.contains("VOE") && hosterSelection.contains(SConstants.NAME_VOE) -> { hoster.contains("VOE") && hosterSelection.contains(SConstants.NAME_VOE) -> {
val quality = "Voe $language"
val url = client.newCall(GET(redirectgs)).execute().request.url.toString() val url = client.newCall(GET(redirectgs)).execute().request.url.toString()
val video = VoeExtractor(client).videoFromUrl(url, quality) videoList.addAll(VoeExtractor(client).videosFromUrl(url, "($language) "))
if (video != null) {
videoList.add(video)
}
} }
hoster.contains("Doodstream") && hosterSelection.contains(SConstants.NAME_DOOD) -> { hoster.contains("Doodstream") && hosterSelection.contains(SConstants.NAME_DOOD) -> {

2
src/es/animefenix/src/eu/kanade/tachiyomi/animeextension/es/animefenix/Animefenix.kt
View File

@ -159,7 +159,7 @@ class Animefenix : ConfigurableAnimeSource, AnimeHttpSource() {
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val video = amazonExtractor(baseUrl + url.substringAfter("..")) val video = amazonExtractor(baseUrl + url.substringAfter(".."))

2
src/es/animemovil/src/eu/kanade/tachiyomi/animeextension/es/animemovil/AnimeMovil.kt
View File

@ -234,7 +234,7 @@ class AnimeMovil : ConfigurableAnimeSource, AnimeHttpSource() {
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
} }
if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) { if (embedUrl.contains("filemoon") || embedUrl.contains("moonplayer")) {
FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:").also(videoList::addAll) FilemoonExtractor(client).videosFromUrl(url, prefix = "Filemoon:").also(videoList::addAll)

2
src/es/asialiveaction/src/eu/kanade/tachiyomi/animeextension/es/asialiveaction/AsiaLiveAction.kt
View File

@ -159,7 +159,7 @@ class AsiaLiveAction : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaCh.kt
View File

@ -161,7 +161,7 @@ class CuevanaCh(override val name: String, override val baseUrl: String) : Confi
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/es/cuevana/src/eu/kanade/tachiyomi/animeextension/es/cuevana/CuevanaEu.kt
View File

@ -220,7 +220,7 @@ class CuevanaEu(override val name: String, override val baseUrl: String) : Confi
OkruExtractor(client).videosFromUrl(url, prefix, true).also(videoList::addAll) OkruExtractor(client).videosFromUrl(url, prefix, true).also(videoList::addAll)
} }
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
} }
if (embedUrl.contains("streamtape")) { if (embedUrl.contains("streamtape")) {
StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) } StreamTapeExtractor(client).videoFromUrl(url, "$prefix StreamTape")?.let { videoList.add(it) }

2
src/es/doramasflix/src/eu/kanade/tachiyomi/animeextension/es/doramasflix/Doramasflix.kt
View File

@ -372,7 +372,7 @@ class Doramasflix : ConfigurableAnimeSource, AnimeHttpSource() {
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/es/ennovelas/src/eu/kanade/tachiyomi/animeextension/es/ennovelas/EnNovelas.kt
View File

@ -163,7 +163,7 @@ class EnNovelas : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} }
if (link.contains("voe")) { if (link.contains("voe")) {
try { try {
VoeExtractor(client).videoFromUrl(link, "Voex")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(link).also(videoList::addAll)
} catch (_: Exception) {} } catch (_: Exception) {}
} }
if (link.contains("vudeo")) { if (link.contains("vudeo")) {

2
src/es/gnula/src/eu/kanade/tachiyomi/animeextension/es/gnula/Gnula.kt
View File

@ -215,7 +215,7 @@ class Gnula : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
View File

@ -220,7 +220,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
} }
} }
server.contains("voe") -> { server.contains("voe") -> {
val video = VoeExtractor(client).videosFromUrl(url, if (isLatino) "VOE Latino" else if (isSub) "VOE Subtitulado" else "VOE Castellano") val video = VoeExtractor(client).videosFromUrl(url, if (isLatino) "(Latino) " else if (isSub) "(Subtitulado) " else "(Castellano) ")
videoList.addAll(video) videoList.addAll(video)
} }
server.contains("filemoon") -> { server.contains("filemoon") -> {

3
src/es/hentaila/src/eu/kanade/tachiyomi/animeextension/es/hentaila/Hentaila.kt
View File

@ -212,8 +212,7 @@ class Hentaila : ConfigurableAnimeSource, AnimeHttpSource() {
videoList.addAll(StreamWishExtractor(client, headers).videosFromUrl(urlServer, videoNameGen = { "StreamWish:$it" })) videoList.addAll(StreamWishExtractor(client, headers).videosFromUrl(urlServer, videoNameGen = { "StreamWish:$it" }))
} }
"voe" -> { "voe" -> {
val video = VoeExtractor(client).videoFromUrl(urlServer, prefix = "Voe:") videoList.addAll(VoeExtractor(client).videosFromUrl(urlServer))
if (video != null) videoList.add(video)
} }
"arc" -> { "arc" -> {
val videoUrl = urlServer.substringAfter("#") val videoUrl = urlServer.substringAfter("#")

2
src/es/metroseries/src/eu/kanade/tachiyomi/animeextension/es/metroseries/MetroSeries.kt
View File

@ -227,7 +227,7 @@ class MetroSeries : ConfigurableAnimeSource, AnimeHttpSource() {
YourUploadExtractor(client).videoFromUrl(src, headers).let { videoList.addAll(it) } YourUploadExtractor(client).videoFromUrl(src, headers).let { videoList.addAll(it) }
} }
if (src.contains("voe")) { if (src.contains("voe")) {
VoeExtractor(client).videoFromUrl(src)?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(src).also(videoList::addAll)
} }
if (src.contains("wishembed") || src.contains("streamwish") || src.contains("wish")) { if (src.contains("wishembed") || src.contains("streamwish") || src.contains("wish")) {
StreamWishExtractor(client, headers).videosFromUrl(src) { "StreamWish:$it" }.also(videoList::addAll) StreamWishExtractor(client, headers).videosFromUrl(src) { "StreamWish:$it" }.also(videoList::addAll)

2
src/es/mundodonghua/src/eu/kanade/tachiyomi/animeextension/es/mundodonghua/MundoDonghua.kt
View File

@ -106,7 +106,7 @@ class MundoDonghua : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
if (unpack.contains("amagi_tab")) { if (unpack.contains("amagi_tab")) {
fetchUrls(unpack).map { url -> fetchUrls(unpack).map { url ->
try { try {
VoeExtractor(client).videoFromUrl(url, "VoeCDN")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
} catch (_: Exception) {} } catch (_: Exception) {}
} }
} }

2
src/es/pelisforte/src/eu/kanade/tachiyomi/animeextension/es/pelisforte/PelisForte.kt
View File

@ -180,7 +180,7 @@ open class PelisForte : ConfigurableAnimeSource, AnimeHttpSource() {
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "${prefix}Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
} }
if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) { if (embedUrl.contains("ok.ru") || embedUrl.contains("okru")) {
OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll) OkruExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)

2
src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplushd.kt
View File

@ -171,7 +171,7 @@ open class Pelisplushd(override val name: String, override val baseUrl: String)
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusph.kt
View File

@ -152,7 +152,7 @@ class Pelisplusph(override val name: String, override val baseUrl: String) : Pel
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "$prefix Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url, prefix).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/es/pelisplushd/src/eu/kanade/tachiyomi/animeextension/es/pelisplushd/Pelisplusto.kt
View File

@ -177,7 +177,7 @@ class Pelisplusto(override val name: String, override val baseUrl: String) : Pel
val embedUrl = url.lowercase() val embedUrl = url.lowercase()
try { try {
if (embedUrl.contains("voe")) { if (embedUrl.contains("voe")) {
VoeExtractor(client).videoFromUrl(url, prefix = "Voe:")?.let { videoList.add(it) } VoeExtractor(client).videosFromUrl(url).also(videoList::addAll)
} }
if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) { if ((embedUrl.contains("amazon") || embedUrl.contains("amz")) && !embedUrl.contains("disable")) {
val body = client.newCall(GET(url)).execute().asJsoup() val body = client.newCall(GET(url)).execute().asJsoup()

2
src/fr/empirestreaming/src/eu/kanade/tachiyomi/animeextension/fr/empirestreaming/EmpireStreaming.kt
View File

@ -170,7 +170,7 @@ class EmpireStreaming : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
return when (hoster) { return when (hoster) {
"doodstream" -> DoodExtractor(client).videosFromUrl(url) "doodstream" -> DoodExtractor(client).videosFromUrl(url)
"voe" -> VoeExtractor(client).videoFromUrl(url)?.let(::listOf) "voe" -> VoeExtractor(client).videosFromUrl(url)
"Eplayer" -> EplayerExtractor(client).videosFromUrl(url) "Eplayer" -> EplayerExtractor(client).videosFromUrl(url)
else -> null else -> null
} ?: emptyList() } ?: emptyList()

2
src/fr/otakufr/src/eu/kanade/tachiyomi/animeextension/fr/otakufr/OtakuFR.kt
View File

@ -186,7 +186,7 @@ class OtakuFR : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
host.contains("sendvid.com") -> sendvidExtractor.videosFromUrl(host) host.contains("sendvid.com") -> sendvidExtractor.videosFromUrl(host)
host.contains("ok.ru") -> okruExtractor.videosFromUrl(host) host.contains("ok.ru") -> okruExtractor.videosFromUrl(host)
host.contains("upstream") -> upstreamExtractor.videosFromUrl(host) host.contains("upstream") -> upstreamExtractor.videosFromUrl(host)
host.startsWith("https://voe") -> voeExtractor.videoFromUrl(host, quality = "Voe")?.let(::listOf) ?: emptyList() host.startsWith("https://voe") -> voeExtractor.videosFromUrl(host)
else -> emptyList() else -> emptyList()
} }
} }

2
src/it/toonitalia/src/eu/kanade/tachiyomi/animeextension/it/toonitalia/Toonitalia.kt
View File

@ -195,7 +195,7 @@ class Toonitalia : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
private fun extractVideos(url: String): List<Video> = private fun extractVideos(url: String): List<Video> =
when { when {
"https://voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf) "https://voe.sx" in url -> voeExtractor.videosFromUrl(url)
"https://streamtape" in url -> streamTapeExtractor.videoFromUrl(url)?.let(::listOf) "https://streamtape" in url -> streamTapeExtractor.videoFromUrl(url)?.let(::listOf)
"https://maxstream" in url -> maxStreamExtractor.videosFromUrl(url) "https://maxstream" in url -> maxStreamExtractor.videosFromUrl(url)
"https://streamz" in url || "streamz.cc" in url -> { "https://streamz" in url || "streamz.cc" in url -> {

2
src/tr/animeler/src/eu/kanade/tachiyomi/animeextension/tr/animeler/Animeler.kt
View File

@ -277,7 +277,7 @@ class Animeler : AnimeHttpSource(), ConfigurableAnimeSource {
"sibnet" in url -> sibnetExtractor.videosFromUrl(url) "sibnet" in url -> sibnetExtractor.videosFromUrl(url)
"streamlare" in url -> streamlareExtractor.videosFromUrl(url) "streamlare" in url -> streamlareExtractor.videosFromUrl(url)
"uqload" in url -> uqloadExtractor.videosFromUrl(url) "uqload" in url -> uqloadExtractor.videosFromUrl(url)
"voe." in url -> voeExtractor.videoFromUrl(url)?.let(::listOf) "voe." in url -> voeExtractor.videosFromUrl(url)
"vudeo." in url -> vudeoExtractor.videosFromUrl(url) "vudeo." in url -> vudeoExtractor.videosFromUrl(url)
else -> null else -> null
} ?: emptyList() } ?: emptyList()

2
src/tr/anizm/src/eu/kanade/tachiyomi/animeextension/tr/anizm/Anizm.kt
View File

@ -263,7 +263,7 @@ class Anizm : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
gdrivePlayerExtractor.videosFromUrl(newUrl, "GdrivePlayer", headers) gdrivePlayerExtractor.videosFromUrl(newUrl, "GdrivePlayer", headers)
} }
"uqload" in url -> uqloadExtractor.videosFromUrl(url) "uqload" in url -> uqloadExtractor.videosFromUrl(url)
"voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf) "voe.sx" in url -> voeExtractor.videosFromUrl(url)
"anizmplayer.com" in url -> aincradExtractor.videosFromUrl(url) "anizmplayer.com" in url -> aincradExtractor.videosFromUrl(url)
else -> null else -> null
} ?: emptyList() } ?: emptyList()

2
src/tr/tranimeizle/src/eu/kanade/tachiyomi/animeextension/tr/tranimeizle/TRAnimeIzle.kt
View File

@ -250,7 +250,7 @@ class TRAnimeIzle : ParsedAnimeHttpSource(), ConfigurableAnimeSource {
"sendvid.com" in url -> sendvidExtractor.videosFromUrl(url) "sendvid.com" in url -> sendvidExtractor.videosFromUrl(url)
"video.sibnet" in url -> sibnetExtractor.videosFromUrl(url) "video.sibnet" in url -> sibnetExtractor.videosFromUrl(url)
"streamlare.com" in url -> streamlareExtractor.videosFromUrl(url) "streamlare.com" in url -> streamlareExtractor.videosFromUrl(url)
"voe.sx" in url -> voeExtractor.videoFromUrl(url)?.let(::listOf) ?: emptyList() "voe.sx" in url -> voeExtractor.videosFromUrl(url)
"//vudeo." in url -> vudeoExtractor.videosFromUrl(url) "//vudeo." in url -> vudeoExtractor.videosFromUrl(url)
"yourupload.com" in url -> { "yourupload.com" in url -> {
yourUploadExtractor.videoFromUrl(url, headers) yourUploadExtractor.videoFromUrl(url, headers)

2
src/tr/turkanime/src/eu/kanade/tachiyomi/animeextension/tr/turkanime/TurkAnime.kt
View File

@ -308,7 +308,7 @@ class TurkAnime : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
VkExtractor(client, headers).videosFromUrl(vkUrl, prefix = "$subber: ") VkExtractor(client, headers).videosFromUrl(vkUrl, prefix = "$subber: ")
} }
"VOE" -> { "VOE" -> {
VoeExtractor(client).videoFromUrl(hosterLink, "$subber: VOE")?.let(::listOf) VoeExtractor(client).videosFromUrl(hosterLink, "($subber) ")
} }
"VTUBE" -> { "VTUBE" -> {
VTubeExtractor(client, headers).videosFromUrl(hosterLink, baseUrl, prefix = "$subber: ") VTubeExtractor(client, headers).videosFromUrl(hosterLink, baseUrl, prefix = "$subber: ")