From 72fe14e618dd796b3f73e07ca017855f6f4b790a Mon Sep 17 00:00:00 2001 From: Secozzi <49240133+Secozzi@users.noreply.github.com> Date: Fri, 21 Jul 2023 10:01:34 +0000 Subject: [PATCH] feat(src/hi): New source YoMovies (#1935) --- .../lib/doodextractor/DoodExtractor.kt | 4 +- .../lib/mixdropextractor/MixDropExtractor.kt | 9 +- .../streamsbextractor/StreamSBExtractor.kt | 3 +- src/hi/yomovies/AndroidManifest.xml | 2 + src/hi/yomovies/build.gradle | 21 + .../yomovies/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3141 bytes .../yomovies/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1646 bytes .../yomovies/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4261 bytes .../res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 8022 bytes .../res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 11624 bytes src/hi/yomovies/res/web_hi_res_512.png | Bin 0 -> 63702 bytes .../animeextension/hi/yomovies/YoMovies.kt | 448 ++++++++++++++++++ .../yomovies/extractors/MovembedExtractor.kt | 84 ++++ .../extractors/SpeedostreamExtractor.kt | 36 ++ 14 files changed, 603 insertions(+), 4 deletions(-) create mode 100644 src/hi/yomovies/AndroidManifest.xml create mode 100644 src/hi/yomovies/build.gradle create mode 100644 src/hi/yomovies/res/mipmap-hdpi/ic_launcher.png create mode 100644 src/hi/yomovies/res/mipmap-mdpi/ic_launcher.png create mode 100644 src/hi/yomovies/res/mipmap-xhdpi/ic_launcher.png create mode 100644 src/hi/yomovies/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 src/hi/yomovies/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 src/hi/yomovies/res/web_hi_res_512.png create mode 100644 src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/YoMovies.kt create mode 100644 src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/MovembedExtractor.kt create mode 100644 src/hi/yomovies/src/eu/kanade/tachiyomi/animeextension/hi/yomovies/extractors/SpeedostreamExtractor.kt diff --git a/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt b/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt index 850c0703c..86ca8280b 100644 --- a/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt +++ b/lib/dood-extractor/src/main/java/eu/kanade/tachiyomi/lib/doodextractor/DoodExtractor.kt @@ -1,5 +1,6 @@ package eu.kanade.tachiyomi.lib.doodextractor +import eu.kanade.tachiyomi.animesource.model.Track import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.network.GET import okhttp3.Headers @@ -11,6 +12,7 @@ class DoodExtractor(private val client: OkHttpClient) { url: String, quality: String? = null, redirect: Boolean = true, + externalSubs: List = emptyList(), ): Video? { val newQuality = quality ?: ("Doodstream" + if (redirect) " mirror" else "") @@ -32,7 +34,7 @@ class DoodExtractor(private val client: OkHttpClient) { ), ).execute().body.string() val videoUrl = "$videoUrlStart$randomString?token=$token&expiry=$expiry" - Video(newUrl, newQuality, videoUrl, headers = doodHeaders(doodHost)) + Video(newUrl, newQuality, videoUrl, headers = doodHeaders(doodHost), subtitleTracks = externalSubs) }.getOrNull() } diff --git a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt index 7dbed40b2..ce169b86c 100644 --- a/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt +++ b/lib/mixdrop-extractor/src/main/java/eu/kanade/tachiyomi/lib/mixdropextractor/MixDropExtractor.kt @@ -10,7 +10,12 @@ import okhttp3.OkHttpClient import java.net.URLDecoder class MixDropExtractor(private val client: OkHttpClient) { - fun videoFromUrl(url: String, lang: String = "", prefix: String = ""): List