From ba2ba44dc4f5749eab22828fe9b07985e1cc9dae Mon Sep 17 00:00:00 2001
From: SonoPG <38359416+PGgamer2@users.noreply.github.com>
Date: Wed, 5 Feb 2025 23:01:07 +0100
Subject: [PATCH] fix(it/animeunity): Fix video streams URLs (#621)
* Fix AnimeUnity video streams URLs
The video streams URLs have been moved from JS to a single m3u8 file, this commit adapts to the change. The subtitles seem to have disappeared entirely, so I've left them commented.
* Update Years filter
* Bump AnimeUnity extVersionCode
---
src/it/animeunity/build.gradle | 2 +-
.../it/animeunity/AnimeUnity.kt | 47 +++++++++----------
.../it/animeunity/AnimeUnityFilters.kt | 2 +-
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/it/animeunity/build.gradle b/src/it/animeunity/build.gradle
index e012e198..475d532b 100644
--- a/src/it/animeunity/build.gradle
+++ b/src/it/animeunity/build.gradle
@@ -1,7 +1,7 @@
ext {
extName = 'AnimeUnity'
extClass = '.AnimeUnity'
- extVersionCode = 8
+ extVersionCode = 9
}
apply from: "$rootDir/common.gradle"
diff --git a/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt b/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt
index b2d4a1bd..00f59d3d 100644
--- a/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt
+++ b/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnity.kt
@@ -10,7 +10,6 @@ import eu.kanade.tachiyomi.animesource.model.AnimeFilterList
import eu.kanade.tachiyomi.animesource.model.AnimesPage
import eu.kanade.tachiyomi.animesource.model.SAnime
import eu.kanade.tachiyomi.animesource.model.SEpisode
-import eu.kanade.tachiyomi.animesource.model.Track
import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.animesource.online.AnimeHttpSource
import eu.kanade.tachiyomi.network.GET
@@ -38,7 +37,7 @@ class AnimeUnity :
// TODO: Check frequency of url changes to potentially
// add back overridable baseurl preference
- override val baseUrl = "https://www.animeunity.to"
+ override val baseUrl = "https://www.animeunity.so"
override val lang = "it"
@@ -366,42 +365,42 @@ class AnimeUnity :
.asJsoup()
val scripts = iframe.select("script")
val script = scripts.find { it.data().contains("masterPlaylist") }!!.data().replace("\n", "\t")
- var playlistUrl = Regex("""url: ?'(.*?)'""").find(script)!!.groupValues[1]
- val filename = playlistUrl.slice(playlistUrl.lastIndexOf("/") + 1 until playlistUrl.length)
- if (!filename.endsWith(".m3u8")) {
- playlistUrl = playlistUrl.replace(filename, filename + ".m3u8")
- }
+ val playlistUrl = Regex("""url: ?'(.*?)'""").find(script)!!.groupValues[1]
val expires = Regex("""'expires': ?'(\d+)'""").find(script)!!.groupValues[1]
val token = Regex("""'token': ?'([\w-]+)'""").find(script)!!.groupValues[1]
- // Get subtitles
- val masterPlUrl = "$playlistUrl?token=$token&expires=$expires&n=1"
+
+ val masterPlUrl = buildString {
+ append(playlistUrl)
+ append(if (playlistUrl.contains('?')) '&' else '?')
+ append("h=1&token=")
+ append(token)
+ append("&expires=")
+ append(expires)
+ }
val masterPl =
client
.newCall(GET(masterPlUrl))
.execute()
.body
.string()
- val subList =
+
+ // Subtitles are nowhere to be seen... I'm leaving this regex for future reference
+ /*val subList =
Regex("""#EXT-X-MEDIA:TYPE=SUBTITLES.*?NAME="(.*?)".*?URI="(.*?)"""")
.findAll(masterPl)
.map {
Track(it.groupValues[2], it.groupValues[1])
- }.toList()
- Regex("""'token(\d+p?)': ?'([\w-]+)'""").findAll(script).forEach { match ->
- val quality = match.groupValues[1]
+ }.toList()*/
- val videoUrl =
- buildString {
- append(playlistUrl)
- append("?type=video&rendition=")
- append(quality)
- append("&token=")
- append(match.groupValues[2])
- append("&expires=$expires")
- append("&n=1")
- }
- videoList.add(Video(videoUrl, quality, videoUrl, subtitleTracks = subList))
+ Regex("""https?://vixcloud\.co/playlist/(.+)\?.*type=video&.*rendition=(\d+p?).*""").findAll(masterPl).forEach { match ->
+ var videoUrl = match.groupValues[0]
+ val filename = match.groupValues[1]
+ if (!filename.endsWith(".m3u8")) {
+ videoUrl = videoUrl.replace(filename, "$filename.m3u8")
+ }
+ val quality = match.groupValues[2]
+ videoList.add(Video(videoUrl, quality, videoUrl))
}
require(videoList.isNotEmpty()) { "Failed to fetch videos" }
diff --git a/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnityFilters.kt b/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnityFilters.kt
index c38f0e8b..0843915c 100644
--- a/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnityFilters.kt
+++ b/src/it/animeunity/src/eu/kanade/tachiyomi/animeextension/it/animeunity/AnimeUnityFilters.kt
@@ -197,7 +197,7 @@ object AnimeUnityFilters {
Pair("Sì", "true"),
)
- val YEAR = arrayOf(ANY) + (1969..2024).map {
+ val YEAR = arrayOf(ANY) + (1969..2025).map {
Pair(it.toString(), it.toString())
}.reversed().toTypedArray()
}