INSANEMODE/aniyomi-extensions-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lib/streamhidevid): Fix getting playlist url from the page if unpacking fails (#3080)

Browse Source
This commit is contained in:
hollow 2024-03-27 10:03:43 +00:00 committed by GitHub
parent 0b592288dd
commit 66a097714d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/streamhidevid-extractor/build.gradle.kts
View File

@ -3,6 +3,7 @@ plugins {
} }
dependencies { dependencies {
implementation(project(":lib:playlist-utils"))
implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") { implementation("dev.datlag.jsunpacker:jsunpacker:1.0.1") {
exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8") exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib-jdk8")
} }

29
lib/streamhidevid-extractor/src/main/java/eu/kanade/tachiyomi/lib/streamhidevidextractor/StreamHideVidExtractor.kt
View File

@ -1,36 +1,25 @@
package eu.kanade.tachiyomi.lib.streamhidevidextractor package eu.kanade.tachiyomi.lib.streamhidevidextractor
import dev.datlag.jsunpacker.JsUnpacker import dev.datlag.jsunpacker.JsUnpacker
import eu.kanade.tachiyomi.animesource.model.Track
import eu.kanade.tachiyomi.animesource.model.Video import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.lib.playlistutils.PlaylistUtils
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
class StreamHideVidExtractor(private val client: OkHttpClient) { class StreamHideVidExtractor(private val client: OkHttpClient) {
// from nineanime / ask4movie FilemoonExtractor
private val subtitleRegex = Regex("""#EXT-X-MEDIA:TYPE=SUBTITLES.*?NAME="(.*?)".*?URI="(.*?)"""") private val playlistUtils by lazy { PlaylistUtils(client) }
fun videosFromUrl(url: String, prefix: String = ""): List<Video> { fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
val page = client.newCall(GET(url)).execute().body.string() val page = client.newCall(GET(url)).execute().body.string()
val unpacked = JsUnpacker.unpackAndCombine(page) ?: return emptyList() val playlistUrl = (JsUnpacker.unpackAndCombine(page) ?: page)
val playlistUrl = unpacked.substringAfter("sources:") .substringAfter("sources:")
.substringAfter("file:\"") // StreamHide .substringAfter("file:\"") // StreamHide
.substringAfter("src:\"") // StreamVid .substringAfter("src:\"") // StreamVid
.substringBefore('"') .substringBefore('"')
if (!playlistUrl.startsWith("http")) return emptyList()
val playlistData = client.newCall(GET(playlistUrl)).execute().body.string() return playlistUtils.extractFromHls(playlistUrl,
videoNameGen = { "${prefix}StreamHideVid - $it" }
val subs = subtitleRegex.findAll(playlistData).map { )
val urlPart = it.groupValues[2]
val subUrl = when {
!urlPart.startsWith("https:") ->
playlistUrl.substringBeforeLast("/") + "/$urlPart"
else -> urlPart
}
Track(subUrl, it.groupValues[1])
}.toList()
// The playlist usually only have one video quality.
return listOf(Video(playlistUrl, "${prefix}StreamHideVid", playlistUrl, subtitleTracks = subs))
} }
} }