diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle index 73714be11..6f8831a90 100644 --- a/src/es/animeflv/build.gradle +++ b/src/es/animeflv/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'AnimeFLV' pkgNameSuffix = 'es.animeflv' extClass = '.AnimeFlv' - extVersionCode = 21 + extVersionCode = 22 libVersion = '12' } diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt index fcf6eaf47..afc15fe31 100644 --- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt +++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/AnimeFlv.kt @@ -37,7 +37,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val lang = "es" - override val supportsLatest = true + override val supportsLatest = false override val client: OkHttpClient = network.cloudflareClient diff --git a/src/es/animeonlineninja/build.gradle b/src/es/animeonlineninja/build.gradle index 127de95b7..bb1fda9a2 100644 --- a/src/es/animeonlineninja/build.gradle +++ b/src/es/animeonlineninja/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'AnimeonlineNinja' pkgNameSuffix = 'es.animeonlineninja' extClass = '.AnimeonlineNinja' - extVersionCode = 1 + extVersionCode = 2 libVersion = '12' } diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt index 9d96d0c0b..082ce19cb 100644 --- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt +++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/AnimeonlineNinja.kt @@ -9,6 +9,7 @@ import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.FembedE import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.JsUnpacker import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.StreamSBExtractor import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.StreamTapeExtractor +import eu.kanade.tachiyomi.animeextension.es.animeonlineninja.extractors.uploadExtractor import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList import eu.kanade.tachiyomi.animesource.model.SAnime @@ -150,9 +151,11 @@ class AnimeonlineNinja : ConfigurableAnimeSource, ParsedAnimeHttpSource() { } serverUrl.contains("mixdrop") && lang.contains(langSelect) -> { val jsE = client.newCall(GET(serverUrl)).execute().asJsoup().selectFirst("script:containsData(eval)").data() - val url = "http:" + JsUnpacker(jsE).unpack().toString().substringAfter("MDCore.wurl=\"").substringBefore("\"") - if (!url.contains("\$(document).ready(function(){});")) { - videos.add(Video(url, "$lang MixDrop", url, null)) + if (jsE.contains("MDCore")) { + val url = "http:" + JsUnpacker(jsE).unpack().toString().substringAfter("MDCore.wurl=\"").substringBefore("\"") + if (!url.contains("\$(document).ready(function(){});")) { + videos.add(Video(url, "$lang MixDrop", url, null)) + } } } serverUrl.contains("wolfstream") && lang.contains(langSelect) -> { @@ -160,6 +163,11 @@ class AnimeonlineNinja : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val url = jsE.substringAfter("{file:\"").substringBefore("\"") videos.add(Video(url, "$lang WolfStream", url, null)) } + serverUrl.contains("uqload") && lang.contains(langSelect) -> { + val headers = headers.newBuilder().add("referer", "https://uqload.com/").build() + val video = uploadExtractor(client).videofromurl(serverUrl, headers, lang) + videos.add(video) + } } return videos @@ -207,11 +215,12 @@ class AnimeonlineNinja : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override fun animeDetailsParse(document: Document): SAnime { val anime = SAnime.create() anime.title = document.select("div.sheader div.data h1").text() - anime.genre = document.select("div.sheader div.data div.sgeneros a").joinToString { - if (!it.text().lowercase().contains("anime")) { - it.text() - } else { + val uselessTags = listOf("supergoku", "younime", "zonamixs", "monoschinos", "otakustv", "Hanaojara", "series flv", "zenkimex", "Crunchyroll") + anime.genre = document.select("div.sheader div.data div.sgeneros a").joinToString("") { + if (it.text() in uselessTags || it.text().lowercase().contains("anime")) { "" + } else { + it.text() + ", " } } anime.description = document.select("div.wp-content p").joinToString { it.text() } diff --git a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt index 11f3f3ccb..ecef3c6c5 100644 --- a/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt +++ b/src/es/animeonlineninja/src/eu/kanade/tachiyomi/animeextension/es/animeonlineninja/extractors/FembedExtractor.kt @@ -6,7 +6,7 @@ import org.jsoup.Connection import org.jsoup.Jsoup class FembedExtractor { - fun videosFromUrl(url: String, lang: String): List