diff --git a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt index 8795f8b2..1db4e0d2 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt @@ -565,7 +565,7 @@ object UiUtil { bottomSheet.requestWindowFeature(Window.FEATURE_NO_TITLE) bottomSheet.setContentView(R.layout.history_item_details_bottom_sheet) bottomSheet.findViewById(R.id.bottom_sheet_title)?.apply { - text = item.title.ifEmpty { item.url.ifEmpty { item.playlistTitle.ifEmpty { "`${context.getString(R.string.defaultValue)}`" } } } + text = item.title.ifEmpty { item.playlistTitle.ifEmpty { item.url.ifEmpty { "`${context.getString(R.string.defaultValue)}`" } } } setOnLongClickListener { showFullTextDialog(context, text.toString(), context.getString(R.string.title)) true diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt index a1feca12..0b75b3c7 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt @@ -1076,13 +1076,13 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co val preferredAudioCodec = sharedPreferences.getString("audio_codec", "")!! val aCodecPrefIndex = context.getStringArray(R.array.audio_codec_values).indexOf(preferredAudioCodec) - var aCodecPref = runCatching { context.getStringArray(R.array.audio_codec_values_ytdlp)[aCodecPrefIndex] }.getOrElse { "" } + val aCodecPref = runCatching { context.getStringArray(R.array.audio_codec_values_ytdlp)[aCodecPrefIndex] }.getOrElse { "" } when(type){ DownloadType.audio -> { val supportedContainers = context.resources.getStringArray(R.array.audio_containers) val preferredLanguage = sharedPreferences.getString("audio_language","")!! - val formatImportance = formatUtil.getAudioFormatImportance() + val formatImportance = formatUtil.getAudioFormatImportance(false) var abrSort = "" diff --git a/app/src/main/java/com/deniscerri/ytdl/work/DownloadWorker.kt b/app/src/main/java/com/deniscerri/ytdl/work/DownloadWorker.kt index 630cece2..05bd3904 100644 --- a/app/src/main/java/com/deniscerri/ytdl/work/DownloadWorker.kt +++ b/app/src/main/java/com/deniscerri/ytdl/work/DownloadWorker.kt @@ -207,7 +207,7 @@ class DownloadWorker( val logString = StringBuilder(initialLogDetails) val logItem = LogItem( 0, - downloadItem.title.ifBlank { downloadItem.url }, + downloadItem.title.ifBlank { downloadItem.playlistTitle.ifEmpty { downloadItem.url } }, logString.toString(), downloadItem.format, downloadItem.type, @@ -330,7 +330,7 @@ class DownloadWorker( val historyItem = HistoryItem(0, downloadItem.url, - downloadItem.title, + downloadItem.title.ifEmpty { downloadItem.playlistTitle }, downloadItem.author, downloadItem.duration, downloadItem.thumb,