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

fix(lib/playlist-utils): Revert #3032 (#3039)

Browse Source
This commit is contained in:
Claudemirovsky 2024-03-10 16:02:24 -03:00 committed by GitHub
parent fba3cd4924
commit e924e0a1a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.animesource.model.Video
import eu.kanade.tachiyomi.network.GET import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import okhttp3.Headers import okhttp3.Headers
import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.internal.commonEmptyHeaders import okhttp3.internal.commonEmptyHeaders
@ -106,8 +105,9 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
val masterUrlBasePath = playlistHttpUrl.newBuilder().apply { val masterUrlBasePath = playlistHttpUrl.newBuilder().apply {
removePathSegment(playlistHttpUrl.pathSize - 1) removePathSegment(playlistHttpUrl.pathSize - 1)
addPathSegment("") addPathSegment("")
query(null)
fragment(null) fragment(null)
}.build() }.build().toString()
// Get subtitles // Get subtitles
val subtitleTracks = subtitleList + SUBTITLE_REGEX.findAll(masterPlaylist).mapNotNull { val subtitleTracks = subtitleList + SUBTITLE_REGEX.findAll(masterPlaylist).mapNotNull {
@ -146,14 +146,14 @@ class PlaylistUtils(private val client: OkHttpClient, private val headers: Heade
} }
} }
private fun getAbsoluteUrl(url: String, playlistUrl: String, masterBase: HttpUrl): String? { private fun getAbsoluteUrl(url: String, playlistUrl: String, masterBase: String): String? {
return when { return when {
url.isEmpty() -> null url.isEmpty() -> null
url.startsWith("http") -> url url.startsWith("http") -> url
url.startsWith("//") -> "https:$url" url.startsWith("//") -> "https:$url"
url.startsWith("/") -> playlistUrl.toHttpUrl().newBuilder().encodedPath("/").build().toString() url.startsWith("/") -> playlistUrl.toHttpUrl().newBuilder().encodedPath("/").build().toString()
.substringBeforeLast("/") + url .substringBeforeLast("/") + url
else -> masterBase.newBuilder().addEncodedPathSegments(url).build().toString() else -> masterBase + url
} }
} }