From 7319714140174019e951d5d32fcc2c96c03e05f6 Mon Sep 17 00:00:00 2001 From: mexanoz <96656876+mexanoz@users.noreply.github.com> Date: Sun, 4 Feb 2024 18:10:34 +0600 Subject: [PATCH] fix setting metadata for certain tracks (#1507) --- .../ru/vtosters/lite/music/converter/ts/FFMpeg.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java index 10cbcac2c..c2c58fbb8 100644 --- a/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java +++ b/app/src/main/java/ru/vtosters/lite/music/converter/ts/FFMpeg.java @@ -33,9 +33,14 @@ public class FFMpeg { } private static String setMetadata(MusicTrack track) { - return Preferences.getBoolValue("setMetaData", false) ? " -metadata title=\"" + IOUtils.getValidFileName(M3UDownloader.getTitle(track)) + '"' - + " -metadata artist=\"" + normalizeMetadata(track.L.stream().map(Artist::w1).collect(Collectors.joining(", "))) + '"' - + " -metadata album=\"" + normalizeMetadata(track.I.getTitle()) + '"' : ""; + if (!Preferences.getBoolValue("setMetaData", false)) { + return ""; + } + return " -metadata title=\"" + IOUtils.getValidFileName(M3UDownloader.getTitle(track)) + '"' + + (track.L == null || track.I == null + ? " -metadata artist=\"" + normalizeMetadata(track.C) + '"' + : " -metadata artist=\"" + normalizeMetadata(track.L.stream().map(Artist::w1).collect(Collectors.joining(", "))) + '"' + + " -metadata album=\"" + normalizeMetadata(track.I.getTitle()) + '"'); } private static String normalizeMetadata(String in) {