From 41d0be91fdad00b734c701778d21bef2eea95118 Mon Sep 17 00:00:00 2001 From: reven Date: Mon, 31 Jan 2022 21:00:15 +1300 Subject: [PATCH] fixing issue with album_artist override album title --- MusicNodes/MusicInfoHelper.cs | 11 +++++++---- VideoNodes/FFMpegEncoder.cs | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/MusicNodes/MusicInfoHelper.cs b/MusicNodes/MusicInfoHelper.cs index 7b3ec44e..df9f7214 100644 --- a/MusicNodes/MusicInfoHelper.cs +++ b/MusicNodes/MusicInfoHelper.cs @@ -83,15 +83,18 @@ namespace FileFlows.MusicNodes int colonIndex = line.IndexOf(":"); if(colonIndex < 1) continue; - if(line.Trim().ToLower().StartsWith("language")) + if (line.Trim().ToLower().StartsWith("language")) mi.Language = line.Substring(colonIndex + 1).Trim(); else if (line.Trim().ToLower().StartsWith("track")) { if (int.TryParse(line.Substring(colonIndex + 1).Trim(), out int value)) mi.Track = value; } - else if (line.Trim().ToLower().StartsWith("artist")) - mi.Artist = line.Substring(colonIndex + 1).Trim(); + else if (line.Trim().ToLower().StartsWith("artist") || line.Trim().ToLower().StartsWith("album_artist")) + { + if(string.IsNullOrWhiteSpace(mi.Artist)) + mi.Artist = line.Substring(colonIndex + 1).Trim(); + } else if (line.Trim().ToLower().StartsWith("title")) mi.Title = line.Substring(colonIndex + 1).Trim(); else if (line.Trim().ToLower().StartsWith("album")) @@ -123,7 +126,7 @@ namespace FileFlows.MusicNodes else if (line.Trim().ToLower().StartsWith("duration")) { string temp = line.Substring(colonIndex + 1).Trim(); - if(temp.IndexOf(",") > 0) + if (temp.IndexOf(",") > 0) { temp = temp.Substring(0, temp.IndexOf(",")); if (TimeSpan.TryParse(temp, out TimeSpan value)) diff --git a/VideoNodes/FFMpegEncoder.cs b/VideoNodes/FFMpegEncoder.cs index 65f8f013..035e89b2 100644 --- a/VideoNodes/FFMpegEncoder.cs +++ b/VideoNodes/FFMpegEncoder.cs @@ -193,6 +193,10 @@ namespace FileFlows.VideoNodes Logger.ELog(e.Data); errorBuilder.AppendLine(e.Data); } + else if (e.Data.Contains("Skipping NAL unit")) + { + return; // just slighlty ignore these + } else { if (rgxTime.IsMatch(e.Data))