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

fix(lib/sendvid-extractor): Don't try parsing a .mp4 as a .m3u8 file (#2803)

Browse Source
This commit is contained in:
Claudemirovsky 2024-01-21 12:41:50 -03:00 committed by GitHub
parent 55828e41b8
commit 8f70751e12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,4 +14,5 @@ android {
dependencies {
compileOnly(libs.bundles.common)
implementation(project(":lib-playlist-utils"))
}

44
lib/sendvid-extractor/src/main/java/eu/kanade/tachiyomi/lib/sendvidextractor/SendvidExtractor.kt
View File

@ -1,6 +1,7 @@
package eu.kanade.tachiyomi.lib.sendvidextractor
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
@ -8,38 +9,21 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
class SendvidExtractor(private val client: OkHttpClient, private val headers: Headers) {
private val playlistUtils by lazy { PlaylistUtils(client, headers) }
fun videosFromUrl(url: String, prefix: String = ""): List<Video> {
val videoList = mutableListOf<Video>()
val document = client.newCall(GET(url)).execute().asJsoup()
val document = client.newCall(GET(url, headers)).execute().use { it.asJsoup() }
val masterUrl = document.selectFirst("source#video_source")?.attr("src") ?: return emptyList()
val masterHeaders = headers.newBuilder()
.add("Accept", "*/*")
.add("Host", masterUrl.toHttpUrl().host)
.add("Origin", "https://${url.toHttpUrl().host}")
.add("Referer", "https://${url.toHttpUrl().host}/")
.build()
val masterPlaylist = client.newCall(
GET(masterUrl, headers = masterHeaders),
).execute().body.string()
val masterBase = "https://${masterUrl.toHttpUrl().host}${masterUrl.toHttpUrl().encodedPath}"
.substringBeforeLast("/") + "/"
masterPlaylist.substringAfter("#EXT-X-STREAM-INF:").split("#EXT-X-STREAM-INF:")
.forEach {
val quality = "Sendvid:" + it.substringAfter("RESOLUTION=").substringAfter("x").substringBefore(",") + "p "
val videoUrl = masterBase + it.substringAfter("\n").substringBefore("\n")
val videoHeaders = headers.newBuilder()
.add("Accept", "*/*")
.add("Host", videoUrl.toHttpUrl().host)
.add("Origin", "https://${url.toHttpUrl().host}")
.add("Referer", "https://${url.toHttpUrl().host}/")
.build()
videoList.add(Video(videoUrl, prefix + quality, videoUrl, headers = videoHeaders))
}
return videoList
return if (masterUrl.contains(".m3u8")) {
playlistUtils.extractFromHls(masterUrl, url, videoNameGen = { prefix + "Sendvid:$it" })
} else {
val httpUrl = "https://${url.toHttpUrl()}"
val newHeaders = headers.newBuilder()
.set("Origin", httpUrl)
.set("Referer", "$httpUrl/")
.build()
listOf(Video(masterUrl, prefix + "Sendvid:default", masterUrl, newHeaders))
}
}
}