mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 17:49:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix hls download headers and weird characters

Browse source
This commit is contained in:
jmir1 2022-04-01 19:49:44 +02:00
parent b53bc48e0c
commit 98b7e1dbeb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/data/download/AnimeDownloader.kt
View file

@ -485,10 +485,11 @@ class AnimeDownloader(
private fun hlsObservable(video: Video, source: AnimeHttpSource, tmpDir: UniFile, filename: String): Observable<UniFile> { private fun hlsObservable(video: Video, source: AnimeHttpSource, tmpDir: UniFile, filename: String): Observable<UniFile> {
isFFmpegRunning = true isFFmpegRunning = true
val escapedFilename = "${tmpDir.filePath}/$filename.mp4".replace("\"", "\\\"")
val headers = video.headers ?: source.headers val headers = video.headers ?: source.headers
val headerOptions = headers.joinToString("-headers ", "-headers ", " ") { "\"${it.first}: ${it.second}\"" } val headerOptions = headers.joinToString("", "-headers '", "'") { "${it.first}: ${it.second}\r\n" }
// TODO: Support other file formats here as well (ffprobe or something, idk) // TODO: Support other file formats here as well (ffprobe or something, idk)
val ffmpegOptions = FFmpegKitConfig.parseArguments(headerOptions + "-i \"${video.videoUrl}\" -c copy \"${tmpDir.filePath}/$filename.mp4\"") val ffmpegOptions = FFmpegKitConfig.parseArguments(headerOptions + " -i '${video.videoUrl}' -c copy \"$escapedFilename\"")
val executeCallback = ExecuteCallback { val executeCallback = ExecuteCallback {
if (it.state != SessionState.COMPLETED) tmpDir.findFile("$filename.mp4")?.delete() if (it.state != SessionState.COMPLETED) tmpDir.findFile("$filename.mp4")?.delete()
} }