From 40302346834d19c003aeab4aa816de9e17e9c6f1 Mon Sep 17 00:00:00 2001 From: Khaled Date: Sat, 5 Apr 2025 22:56:48 +0600 Subject: [PATCH 001/134] [animeowl] fix: Quality preference match --- .../animeextension/en/animeowl/extractors/OwlExtractor.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt index 3d4c22a9..36a61eff 100644 --- a/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt +++ b/src/en/animeowl/src/eu/kanade/tachiyomi/animeextension/en/animeowl/extractors/OwlExtractor.kt @@ -49,7 +49,7 @@ class OwlExtractor(private val client: OkHttpClient, private val baseUrl: String noRedirectClient.newCall(GET("${stream.url}$jwt")).execute() .use { it.headers["Location"] }?.let { videoList.add( - Video(it, "${link.lang} Luffy:${stream.resolution}", it), + Video(it, "${link.lang} Luffy:${stream.resolution}p", it), ) } } @@ -83,7 +83,7 @@ class OwlExtractor(private val client: OkHttpClient, private val baseUrl: String return client.newCall(GET(url)).execute().let { it -> if (it.isSuccessful) { it.parseAs().url.let { - playlistUtils.extractFromHls(it, videoNameGen = { qty -> "$lang $server:$qty" }) + playlistUtils.extractFromHls(it, videoNameGen = { qty -> "$lang $server:${qty}p" }) } } else { emptyList() From 8d9e763dc4e089c46346b460feb66ba02c2ebe06 Mon Sep 17 00:00:00 2001 From: Cezary Date: Sun, 6 Apr 2025 20:41:23 +0200 Subject: [PATCH 002/134] fix(lib/lycoris&lulu) Repair decode json and work LuluStream (#810) * fix(lib/lycoris): fix parse json * fix(lib/lycoris): small changes * fix(lib/lycoris): small changes v2 * fix(lib/lycoris): small changes v3 * fix(lib/lycoris): small changes v4 * fix(lib/lycoris): small changes v5 * fix(lib/lycoris&lulu): big change v1 * fix(lib/lycoris&lulu): small change v2 * fix(lib/lycoris&lulu): small change v3 * fix(lib/lycoris&lulu&docchi): small change v4 * fix(pl/docchi): tiny change v1 * fix(lib/lulu): tiny change v2 --- .../lib/luluextractor/LuluExtractor.kt | 70 ++++---- .../lib/lycorisextractor/LycorisExtractor.kt | 153 +++++++++--------- src/pl/docchi/build.gradle | 2 +- .../animeextension/pl/docchi/Docchi.kt | 8 +- 4 files changed, 124 insertions(+), 109 deletions(-) diff --git a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt index afcd99bc..550ddae9 100644 --- a/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt +++ b/lib/lulu-extractor/src/main/java/eu/kanade/tachiyomi/lib/luluextractor/LuluExtractor.kt @@ -3,16 +3,18 @@ package eu.kanade.tachiyomi.lib.luluextractor import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.network.GET import okhttp3.Headers +import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.OkHttpClient import java.util.regex.Pattern -class LuluExtractor(private val client: OkHttpClient) { +class LuluExtractor(private val client: OkHttpClient, headers: Headers) { - private val headers = Headers.Builder() - .add("Referer", "https://luluvdo.com") + private val headers = headers.newBuilder() + .add("Referer", "https://luluvdo.com/") .add("Origin", "https://luluvdo.com") .build() + //Credit: https://github.com/skoruppa/docchi-stremio-addon/blob/main/app/players/lulustream.py fun videosFromUrl(url: String, prefix: String): List