pull/1131/head
deniscerri 4 months ago
parent a486733d78
commit df7fe579aa
No known key found for this signature in database
GPG Key ID: 95C43D517D830350

@ -461,7 +461,7 @@ class ResultRepository(private val resultDao: ResultDao, private val commandTemp
val info = getResultsFromSource(downloadItem.url, resetResults = false, addToResults = false, singleItem = true).first()
if (downloadItem.title.isEmpty()) downloadItem.title = info.title
if (downloadItem.author.isEmpty()) downloadItem.author = info.author
if (downloadItem.playlistTitle.isNotBlank() && downloadItem.playlistTitle != YTDLNIS_SEARCH) downloadItem.playlistTitle = info.playlistTitle
if (downloadItem.playlistTitle.isEmpty() || (downloadItem.playlistTitle.isNotBlank() && downloadItem.playlistTitle != YTDLNIS_SEARCH) ) downloadItem.playlistTitle = info.playlistTitle
downloadItem.duration = info.duration
downloadItem.website = info.website
if (downloadItem.thumb.isEmpty()) downloadItem.thumb = info.thumb

@ -123,11 +123,11 @@ class FormatUtil(private var context: Context) {
} else 0
}
"language" -> {
val defaults = listOf("original", "default")
if (audioLanguagePreference.isBlank()) {
(b.format_note.contains("default", true)).compareTo(
a.format_note.contains(
"default", true
)
(defaults.any { b.format_note.contains(it, true) }).compareTo(
defaults.any { a.format_note.contains(it, true) }
)
} else {
val res = (b.lang?.contains(audioLanguagePreference) == true).compareTo(
@ -136,10 +136,8 @@ class FormatUtil(private var context: Context) {
) == true
)
if(res == 0) {
(b.format_note.contains("default", true)).compareTo(
a.format_note.contains(
"default", true
)
(defaults.any { b.format_note.contains(it, true) }).compareTo(
defaults.any { a.format_note.contains(it, true) }
)
}else {
res

@ -281,6 +281,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
playlistTitle = title
}
title = ""
author = ""
}

Loading…
Cancel
Save