Arkai/extensions-source
1
0
Fork 0
forked from AlmightyHak/extensions-source
Code Pull requests Activity

Fix playlist-utils (#980)

Browse source 
* dont standardize qualities for everything

* bump all ext depending directly or indirectly on playlist-utils
This commit is contained in:
V3u47ZoN 2025-05-03 13:55:17 +00:00 • committed by GitHub
parent dd28b05f01
commit a4d3a117cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
145 changed files with 154 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/playlist-utils/src/main/java/eu/kanade/tachiyomi/lib/playlistutils/PlaylistUtils.kt
View file

@ -10,7 +10,6 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient
import okhttp3.internal.commonEmptyHeaders
import java.io.File
import kotlin.math.abs
class PlaylistUtils(private val client: OkHttpClient, private val headers: Headers = commonEmptyHeaders) {
@ -138,7 +137,7 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
val resolution = it.substringAfter("RESOLUTION=")
.substringBefore("\n")
.substringAfter("x")
.substringBefore(",").let(::stnQuality)
.substringBefore(",")
val videoUrl = it.substringAfter("\n").substringBefore("\n").let { url ->
getAbsoluteUrl(url, playlistUrl, masterUrlBasePath)?.trimEnd()
@ -337,13 +336,6 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
// ============================= Utilities ==============================
private fun stnQuality(quality: String): String {
val intQuality = quality.trim().toInt()
val standardQualities = listOf(144, 240, 360, 480, 720, 1080)
val result = standardQualities.minByOrNull { abs(it - intQuality) } ?: quality
return "${result}p"
}
private fun cleanSubtitleData(matchResult: MatchResult): String {
val lineCount = matchResult.groupValues[1].count { it == '\n' }
return "\n" + " \n".repeat(lineCount - 1)

12
lib/universal-extractor/src/main/java/eu/kanade/tachiyomi/lib/universalextractor/UniversalExtractor.kt
View file

@ -18,6 +18,7 @@ import uy.kohesive.injekt.injectLazy
import java.util.Locale
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import kotlin.math.abs
class UniversalExtractor(private val client: OkHttpClient) {
private val context: Application by injectLazy()
@ -73,7 +74,7 @@ class UniversalExtractor(private val client: OkHttpClient) {
for (quality in qualities) {
val modifiedUrl = resultUrl.replace("M3U8_AUTO_360", "M3U8_AUTO_$quality")
val videos = playlistUtils.extractFromHls(modifiedUrl, origRequestUrl, videoNameGen = { "$prefix - $host: $it $quality" + "p" })
val videos = playlistUtils.extractFromHls(modifiedUrl, origRequestUrl, videoNameGen = { "$prefix - $host: ${stnQuality(it)} $quality" + "p" })
if (videos.isNotEmpty()) {
allVideos.addAll(videos)
@ -89,7 +90,7 @@ class UniversalExtractor(private val client: OkHttpClient) {
return when {
"m3u8" in resultUrl -> {
Log.d("UniversalExtractor", "m3u8 URL: $resultUrl")
playlistUtils.extractFromHls(resultUrl, origRequestUrl, videoNameGen = { "$prefix - $host: $it" })
playlistUtils.extractFromHls(resultUrl, origRequestUrl, videoNameGen = { "$prefix - $host: ${stnQuality(it)}" })
}
"mpd" in resultUrl -> {
Log.d("UniversalExtractor", "mpd URL: $resultUrl")
@ -103,6 +104,13 @@ class UniversalExtractor(private val client: OkHttpClient) {
}
}
private fun stnQuality(quality: String): String {
val intQuality = quality.trim().toInt()
val standardQualities = listOf(144, 240, 360, 480, 720, 1080)
val result = standardQualities.minByOrNull { abs(it - intQuality) } ?: quality
return "${result}p"
}
private fun String.proper(): String {
return this.replaceFirstChar { if (it.isLowerCase()) it.titlecase(
Locale.getDefault()) else it.toString() }