From ee02a35ac00ff60338c7104067c27d955e8792d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Pe=C3=B1a=20Y=20Lillo?= <80992641+Diegopyl1209@users.noreply.github.com> Date: Fri, 4 Mar 2022 09:58:25 -0600 Subject: [PATCH] Add DUB option [AnimeFLV] (#386) --- src/es/animeflv/build.gradle | 2 +- .../animeextension/es/animeflv/AnimeFlv.kt | 18 ++++++++++++++++++ .../es/animeflv/extractors/FembedExtractor.kt | 5 +++-- .../es/animeflv/extractors/OkruExtractor.kt | 4 ++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/es/animeflv/build.gradle b/src/es/animeflv/build.gradle index d7dff40ce..fd2807506 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 = 12 + extVersionCode = 13 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 2fa383c87..3f6a8f961 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 @@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.animeextension.es.animeflv import android.app.Application import android.content.SharedPreferences +import android.util.Log import androidx.preference.ListPreference import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.animeextension.es.animeflv.extractors.FembedExtractor @@ -108,6 +109,7 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() { val data = script.data().substringAfter("var videos = ").substringBefore(";") val jsonObject = json.decodeFromString(data) val sub = jsonObject["SUB"]!! + val lat = jsonObject["LAT"]!! if (sub !is JsonNull) { for (server in sub.jsonArray) { val url = server.jsonObject["code"]!!.jsonPrimitive.content.replace("\\/", "/") @@ -138,6 +140,22 @@ class AnimeFlv : ConfigurableAnimeSource, ParsedAnimeHttpSource() { } } } + if (lat !is JsonNull) { + for (server in lat.jsonArray) { + val url = server.jsonObject["code"]!!.jsonPrimitive.content.replace("\\/", "/") + val quality = server.jsonObject["title"]!!.jsonPrimitive.content + + if (quality == "Fembed") { + val videos = FembedExtractor().videosFromUrl(url, "DUB: ") + videoList.addAll(videos) + } + + if (quality == "Okru") { + val videos = OkruExtractor(client).videosFromUrl(url, "DUB: ") + videoList.addAll(videos) + } + } + } } } return videoList diff --git a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt index 7855086cf..7ab6d64a9 100644 --- a/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt +++ b/src/es/animeflv/src/eu/kanade/tachiyomi/animeextension/es/animeflv/extractors/FembedExtractor.kt @@ -6,17 +6,18 @@ import org.jsoup.Connection import org.jsoup.Jsoup class FembedExtractor { - fun videosFromUrl(url: String): List