From 0e49a80eea94bda5bffad1aad14ff0d1695481e3 Mon Sep 17 00:00:00 2001 From: petit Date: Fri, 9 Aug 2024 11:55:40 +0200 Subject: [PATCH 1/6] FrAnime Fix --- lib/vidmoly-extractor/build.gradle.kts | 7 ++++ .../lib/vidmolyextractor/VidMolyExtractor.kt | 40 +++++++++++++++++++ src/fr/franime/AndroidManifest.xml | 20 +++++----- src/fr/franime/build.gradle | 3 +- .../animeextension/fr/franime/FrAnime.kt | 16 +++++--- .../fr/franime/dto/FrAnimeDto.kt | 2 +- 6 files changed, 71 insertions(+), 17 deletions(-) create mode 100644 lib/vidmoly-extractor/build.gradle.kts create mode 100644 lib/vidmoly-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidmolyextractor/VidMolyExtractor.kt diff --git a/lib/vidmoly-extractor/build.gradle.kts b/lib/vidmoly-extractor/build.gradle.kts new file mode 100644 index 00000000..a503203d --- /dev/null +++ b/lib/vidmoly-extractor/build.gradle.kts @@ -0,0 +1,7 @@ +plugins { + id("lib-android") +} + +dependencies { + implementation(project(":lib:playlist-utils")) +} \ No newline at end of file diff --git a/lib/vidmoly-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidmolyextractor/VidMolyExtractor.kt b/lib/vidmoly-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidmolyextractor/VidMolyExtractor.kt new file mode 100644 index 00000000..745f6b5b --- /dev/null +++ b/lib/vidmoly-extractor/src/main/java/eu/kanade/tachiyomi/lib/vidmolyextractor/VidMolyExtractor.kt @@ -0,0 +1,40 @@ +package eu.kanade.tachiyomi.lib.vidmolyextractor + +import eu.kanade.tachiyomi.animesource.model.Video +import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils +import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.util.asJsoup +import okhttp3.Headers +import okhttp3.OkHttpClient +import okhttp3.internal.EMPTY_HEADERS + +class VidMolyExtractor(private val client: OkHttpClient, headers: Headers = EMPTY_HEADERS) { + + private val baseUrl = "https://vidmoly.to" + + private val playlistUtils by lazy { PlaylistUtils(client) } + + private val headers: Headers = headers.newBuilder() + .set("Origin", baseUrl) + .set("Referer", "$baseUrl/") + .build() + + private val sourcesRegex = Regex("sources: (.*?]),") + private val urlsRegex = Regex("""file:"(.*?)"""") + + fun videosFromUrl(url: String, prefix: String = ""): List