kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 06:10:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2875 from Bnyro/master

Browse Source 
Better download file naming scheme
This commit is contained in:
Bnyro 2023-01-26 19:25:52 +01:00 committed by GitHub
commit 378dc1326b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/libretube/extensions/QualityString.kt Normal file
View File

@ -0,0 +1,8 @@
package com.github.libretube.extensions
import com.github.libretube.api.obj.PipedStream
fun PipedStream?.qualityString(fileName: String): String {
this ?: return ""
return fileName + "_" + quality?.replace(" ", "_") + "_" + format + "." + mimeType?.split("/")?.last()
}

12
app/src/main/java/com/github/libretube/extensions/ToDownloadItems.kt
View File

@ -16,12 +16,12 @@ fun Streams.toDownloadItems(
val items = mutableListOf<DownloadItem>()
if (!videoQuality.isNullOrEmpty() && !videoFormat.isNullOrEmpty()) {
val stream = videoStreams?.find { it.quality == videoQuality && it.format == videoFormat }
val stream = videoStreams.find { it.quality == videoQuality && it.format == videoFormat }
items.add(
DownloadItem(
type = FileType.VIDEO,
videoId = videoId,
fileName = fileName + "." + stream?.mimeType?.split("/")?.last(),
fileName = stream.qualityString(fileName),
path = "",
url = stream?.url,
format = videoFormat,
@ -31,12 +31,12 @@ fun Streams.toDownloadItems(
}
if (!audioQuality.isNullOrEmpty() && !audioFormat.isNullOrEmpty()) {
val stream = audioStreams?.find { it.quality == audioQuality && it.format == audioFormat }
val stream = audioStreams.find { it.quality == audioQuality && it.format == audioFormat }
items.add(
DownloadItem(
type = FileType.AUDIO,
videoId = videoId,
fileName = fileName + "." + stream?.mimeType?.split("/")?.last(),
fileName = stream.qualityString(fileName),
path = "",
url = stream?.url,
format = audioFormat,
@ -50,9 +50,9 @@ fun Streams.toDownloadItems(
DownloadItem(
type = FileType.SUBTITLE,
videoId = videoId,
fileName = "$fileName.srt",
fileName = "${fileName}_$subtitleCode.srt",
path = "",
url = subtitles?.find { it.code == subtitleCode }?.url
url = subtitles.find { it.code == subtitleCode }?.url
)
)
}