From 4e9a6ae9c9a5655e0f696b014cedab1eb68bb6ab Mon Sep 17 00:00:00 2001 From: Claudemirovsky <63046606+Claudemirovsky@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:12:13 -0300 Subject: [PATCH] CineVision: Some improvements (#843) * CineVision: Reduce requests amount on search * CineVision: add Streamlare extractor * CineVision: Remove useless headers * CineVision: bump version --- src/pt/cinevision/build.gradle | 2 +- .../pt/cinevision/CVConstants.kt | 3 --- .../pt/cinevision/CineVision.kt | 16 +++++------- .../extractors/StreamlareExtractor.kt | 26 +++++++++++++++++++ 4 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/extractors/StreamlareExtractor.kt diff --git a/src/pt/cinevision/build.gradle b/src/pt/cinevision/build.gradle index 8805dd694..4995bb929 100644 --- a/src/pt/cinevision/build.gradle +++ b/src/pt/cinevision/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'CineVision' pkgNameSuffix = 'pt.cinevision' extClass = '.CineVision' - extVersionCode = 1 + extVersionCode = 2 libVersion = '13' containsNsfw = true } diff --git a/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CVConstants.kt b/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CVConstants.kt index 6ca905925..ebce5e479 100644 --- a/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CVConstants.kt +++ b/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CVConstants.kt @@ -1,9 +1,6 @@ package eu.kanade.tachiyomi.animeextension.pt.cinevision object CVConstants { - const val ACCEPT_LANGUAGE = "pt-BR,pt;q=0.9,en-US;q=0.8,en;q=0.7" - const val USER_AGENT = "Mozilla/5.0 (Linux; Android 10; SM-A307GT Build/QP1A.190711.020;) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/103.0.5060.71 Mobile Safari/537.36" - const val PREFIX_SEARCH = "slug:" const val PREFERRED_QUALITY = "preferred_quality" diff --git a/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CineVision.kt b/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CineVision.kt index 0bf6a04a1..83bf4e9e2 100644 --- a/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CineVision.kt +++ b/src/pt/cinevision/src/eu/kanade/tachiyomi/animeextension/pt/cinevision/CineVision.kt @@ -4,6 +4,7 @@ import android.app.Application import android.content.SharedPreferences import androidx.preference.ListPreference import androidx.preference.PreferenceScreen +import eu.kanade.tachiyomi.animeextension.pt.cinevision.extractors.StreamlareExtractor import eu.kanade.tachiyomi.animeextension.pt.cinevision.extractors.VidmolyExtractor import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource import eu.kanade.tachiyomi.animesource.model.AnimeFilterList @@ -19,7 +20,6 @@ import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonPrimitive -import okhttp3.Headers import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response @@ -44,11 +44,6 @@ class CineVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() { override val client: OkHttpClient = network.client - override fun headersBuilder(): Headers.Builder = Headers.Builder() - .add("Referer", baseUrl) - .add("Accept-Language", CVConstants.ACCEPT_LANGUAGE) - .add("User-Agent", CVConstants.USER_AGENT) - private val preferences: SharedPreferences by lazy { Injekt.get().getSharedPreferences("source_$id", 0x0000) } @@ -129,10 +124,11 @@ class CineVision : ConfigurableAnimeSource, ParsedAnimeHttpSource() { ) val url = "https:" + json["embed_url"]!!.jsonPrimitive.content - // It may need more extractors, but i only saw it using vidmoly return when { "vidmoly.to" in url -> VidmolyExtractor(client).getVideoList(url, name) + "streamlare.com" in url -> + StreamlareExtractor(client).videosFromUrl(url, name) else -> emptyList