From 7dc11c33db74ce0836e384c3a17b88bb3a9ba10d Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Sat, 10 Oct 2026 18:48:18 +0900 Subject: [PATCH 01/11] Reorder tag field names during updates --- .../Operations/TagUpdater.cs | 4 +- src/AudioTagger.Library/OutputLine.cs | 3 +- src/AudioTagger.Library/UpdatableFields.cs | 57 ++++++++++--------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/AudioTagger.Console/Operations/TagUpdater.cs b/src/AudioTagger.Console/Operations/TagUpdater.cs index 60affc9..9669df5 100644 --- a/src/AudioTagger.Console/Operations/TagUpdater.cs +++ b/src/AudioTagger.Console/Operations/TagUpdater.cs @@ -89,8 +89,8 @@ private static bool UpdateTags( } IEnumerable matchedTags = match.Groups - .OfType() - .Where(g => g.Success); + .OfType() + .Where(g => g.Success); if (!matchedTags.Any()) { diff --git a/src/AudioTagger.Library/OutputLine.cs b/src/AudioTagger.Library/OutputLine.cs index 48ac7c8..5acfba8 100644 --- a/src/AudioTagger.Library/OutputLine.cs +++ b/src/AudioTagger.Library/OutputLine.cs @@ -109,8 +109,9 @@ public static Dictionary GetTagKeyValuePairs( { var lines = new Dictionary { - { "Title", fileData.Title }, + { "Album Artist(s)", fileData.AlbumArtists.Join() }, { "Artist(s)", fileData.Artists.Join() }, + { "Title", fileData.Title }, { "Album", fileData.Album }, { "Year", fileData.Year.ToString() }, { "Duration", fileData.Duration.ToString("m\\:ss") } diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index 87df93d..b100ac7 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -28,35 +28,27 @@ public UpdatableFields( foreach (Group element in matchedGroups) { - if (element.Name == "title") - { - // TODO: Relocate the replacements. - Title = element.Value.Trim().Normalize() - .Replace("___", " ") - .Replace("__", " "); - Count++; - } - else if (element.Name == "albumArtists") + if (element.Name == "albumArtists") { AlbumArtists = element.Value - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) - .Select(a => a.Normalize()) - .ToArray(); + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], + StringSplitOptions.RemoveEmptyEntries | + StringSplitOptions.TrimEntries) + .Select(a => a.Normalize()) + .ToArray(); Count++; } else if (element.Name == "artists") { Artists = element.Value.Replace("___", " ") - .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) - .Select(a => a.Normalize()) - .ToArray(); + .Replace("__", " ") + .Split([";"], + StringSplitOptions.RemoveEmptyEntries | + StringSplitOptions.TrimEntries) + .Select(a => a.Normalize()) + .ToArray(); Count++; } else if (element.Name == "album") @@ -66,12 +58,21 @@ public UpdatableFields( .Replace("__", " "); Count++; } + else if (element.Name == "title") + { + // TODO: Relocate the replacements. + Title = element.Value.Trim().Normalize() + .Replace("___", " ") + .Replace("__", " "); + Count++; + } else if (element.Name == "genres") { Genres = element.Value.Replace("___", " ") .Replace("__", " ") .Split([";"], - StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + StringSplitOptions.RemoveEmptyEntries | + StringSplitOptions.TrimEntries) .Select(g => g.Normalize()) .ToArray(); Count++; @@ -130,11 +131,6 @@ public Dictionary GetUpdateKeyValuePairs(MediaFile fileData) { var updateOutput = new Dictionary(); - if (Title != null && Title != fileData.Title) - { - updateOutput.Add("Title", Title); - } - if (AlbumArtists?.All(a => fileData.AlbumArtists.Contains(a)) == false) { updateOutput.Add("Album Artists", string.Join("; ", AlbumArtists)); @@ -150,6 +146,11 @@ public Dictionary GetUpdateKeyValuePairs(MediaFile fileData) updateOutput.Add("Album", Album); } + if (Title != null && Title != fileData.Title) + { + updateOutput.Add("Title", Title); + } + if (Year != null && Year != fileData.Year) { updateOutput.Add("Year", Year.Value.ToString(CultureInfo.InvariantCulture)); From c2843e70b51cac8899b949a905be49c3226cea05 Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Sat, 10 Oct 2026 18:49:56 +0900 Subject: [PATCH 02/11] Move comparison type to variable --- src/AudioTagger.Library/UpdatableFields.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index b100ac7..0813577 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -107,19 +107,21 @@ public UpdatableFields(string tagField, dynamic newValue) ArgumentNullException.ThrowIfNull(tagField); ArgumentNullException.ThrowIfNull(newValue); - if (tagField.Equals("year", StringComparison.OrdinalIgnoreCase) && + var comparisonType = StringComparison.OrdinalIgnoreCase; + + if (tagField.Equals("year", comparisonType) && newValue is int newYear) { Year = (uint)newYear; Count++; } - else if (tagField.Equals("genre", StringComparison.OrdinalIgnoreCase) && + else if (tagField.Equals("genre", comparisonType) && newValue is string newGenre) { Genres = [newGenre]; Count++; } - else if (tagField.Equals("genre", StringComparison.OrdinalIgnoreCase) && + else if (tagField.Equals("genre", comparisonType) && newValue is string[] newGenres) { Genres = newGenres; From e01a009c52480984abe2fd4c692a16ded583182c Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Sat, 10 Oct 2026 18:53:12 +0900 Subject: [PATCH 03/11] Spacing tweak --- src/AudioTagger.Library/UpdatableFields.cs | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index 0813577..d286245 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -31,24 +31,25 @@ public UpdatableFields( if (element.Name == "albumArtists") { AlbumArtists = element.Value - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) - .Select(a => a.Normalize()) - .ToArray(); + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], + StringSplitOptions.RemoveEmptyEntries | + StringSplitOptions.TrimEntries) + .Select(a => a.Normalize()) + .ToArray(); Count++; } else if (element.Name == "artists") { - Artists = element.Value.Replace("___", " ") - .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) - .Select(a => a.Normalize()) - .ToArray(); + Artists = element.Value + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], + StringSplitOptions.RemoveEmptyEntries | + StringSplitOptions.TrimEntries) + .Select(a => a.Normalize()) + .ToArray(); Count++; } else if (element.Name == "album") From 7b35fea4c818583ad2fa9858eaeac90b88a58cb2 Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Sat, 10 Oct 2026 18:58:31 +0900 Subject: [PATCH 04/11] Move split string options to const --- src/AudioTagger.Library/UpdatableFields.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index d286245..efc9cf6 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -26,6 +26,9 @@ public UpdatableFields( { ArgumentNullException.ThrowIfNull(matchedGroups); + const StringSplitOptions splitStringOptions = StringSplitOptions.RemoveEmptyEntries | + StringSplitOptions.TrimEntries; + foreach (Group element in matchedGroups) { if (element.Name == "albumArtists") @@ -33,9 +36,7 @@ public UpdatableFields( AlbumArtists = element.Value .Replace("___", " ") .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) + .Split([";"], splitStringOptions) .Select(a => a.Normalize()) .ToArray(); Count++; @@ -45,9 +46,7 @@ public UpdatableFields( Artists = element.Value .Replace("___", " ") .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) + .Split([";"], splitStringOptions) .Select(a => a.Normalize()) .ToArray(); Count++; @@ -71,9 +70,7 @@ public UpdatableFields( { Genres = element.Value.Replace("___", " ") .Replace("__", " ") - .Split([";"], - StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries) + .Split([";"], splitStringOptions) .Select(g => g.Normalize()) .ToArray(); Count++; From edc8d06161e95090410d6470a16e271ba87b1eea Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Sat, 10 Oct 2026 18:59:18 +0900 Subject: [PATCH 05/11] Convert comparisonType from variable to const --- src/AudioTagger.Library/UpdatableFields.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index efc9cf6..aad2892 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -105,7 +105,7 @@ public UpdatableFields(string tagField, dynamic newValue) ArgumentNullException.ThrowIfNull(tagField); ArgumentNullException.ThrowIfNull(newValue); - var comparisonType = StringComparison.OrdinalIgnoreCase; + const StringComparison comparisonType = StringComparison.OrdinalIgnoreCase; if (tagField.Equals("year", comparisonType) && newValue is int newYear) From ee44de201b3f9c9a1b48decd853994193507487d Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:25:56 +0900 Subject: [PATCH 06/11] Rename StringSplitOptions variable, etc. --- src/AudioTagger.Library/UpdatableFields.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index aad2892..0d23e4e 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -1,5 +1,6 @@ using System.Text.RegularExpressions; using System.Globalization; +using static System.StringSplitOptions; using AudioTagger.Library.MediaFiles; namespace AudioTagger.Library; @@ -26,8 +27,7 @@ public UpdatableFields( { ArgumentNullException.ThrowIfNull(matchedGroups); - const StringSplitOptions splitStringOptions = StringSplitOptions.RemoveEmptyEntries | - StringSplitOptions.TrimEntries; + const StringSplitOptions splitOptions = RemoveEmptyEntries | TrimEntries; foreach (Group element in matchedGroups) { @@ -36,7 +36,7 @@ public UpdatableFields( AlbumArtists = element.Value .Replace("___", " ") .Replace("__", " ") - .Split([";"], splitStringOptions) + .Split([";"], splitOptions) .Select(a => a.Normalize()) .ToArray(); Count++; @@ -46,7 +46,7 @@ public UpdatableFields( Artists = element.Value .Replace("___", " ") .Replace("__", " ") - .Split([";"], splitStringOptions) + .Split([";"], splitOptions) .Select(a => a.Normalize()) .ToArray(); Count++; @@ -70,7 +70,7 @@ public UpdatableFields( { Genres = element.Value.Replace("___", " ") .Replace("__", " ") - .Split([";"], splitStringOptions) + .Split([";"], splitOptions) .Select(g => g.Normalize()) .ToArray(); Count++; From ad5855052bfa12c94105afa30608d0bc73accd5f Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Mon, 19 Oct 2026 10:37:13 +0900 Subject: [PATCH 07/11] Auto-convert 'if' to 'switch' --- src/AudioTagger.Library/UpdatableFields.cs | 104 ++++++++++----------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index 0d23e4e..2772a18 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -31,59 +31,59 @@ public UpdatableFields( foreach (Group element in matchedGroups) { - if (element.Name == "albumArtists") + switch (element.Name) { - AlbumArtists = element.Value - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(a => a.Normalize()) - .ToArray(); - Count++; - } - else if (element.Name == "artists") - { - Artists = element.Value - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(a => a.Normalize()) - .ToArray(); - Count++; - } - else if (element.Name == "album") - { - Album = element.Value.Trim().Normalize() - .Replace("___", " ") - .Replace("__", " "); - Count++; - } - else if (element.Name == "title") - { - // TODO: Relocate the replacements. - Title = element.Value.Trim().Normalize() - .Replace("___", " ") - .Replace("__", " "); - Count++; - } - else if (element.Name == "genres") - { - Genres = element.Value.Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(g => g.Normalize()) - .ToArray(); - Count++; - } - else if (element.Name == "year") - { - Year = uint.TryParse(element.Value, out var parsed) ? parsed : 0; - Count++; - } - else if (element.Name == "trackNo") - { - TrackNo = uint.TryParse(element.Value, out var parsed) ? parsed : null; - Count++; + case "albumArtists": + AlbumArtists = element.Value + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(a => a.Normalize()) + .ToArray(); + Count++; + break; + case "artists": + Artists = element.Value + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(a => a.Normalize()) + .ToArray(); + Count++; + break; + case "album": + Album = element.Value.Trim().Normalize() + .Replace("___", " ") + .Replace("__", " "); + Count++; + break; + case "title": + // TODO: Relocate the replacements. + Title = element.Value.Trim().Normalize() + .Replace("___", " ") + .Replace("__", " "); + Count++; + break; + case "genres": + Genres = element.Value.Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(g => g.Normalize()) + .ToArray(); + Count++; + break; + case "year": + { + Year = uint.TryParse(element.Value, out var parsed) ? parsed : 0; + Count++; + break; + } + case "trackNo": + { + TrackNo = uint.TryParse(element.Value, out var parsed) ? parsed : null; + Count++; + break; + } } } From 7994fcda45e07c9b229b8ec9a153681267d092ab Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Mon, 19 Oct 2026 11:24:53 +0900 Subject: [PATCH 08/11] Update packages (to resolve build warnings) --- src/AudioTagger.Console/AudioTagger.Console.csproj | 6 +++--- src/AudioTagger.Library/AudioTagger.Library.csproj | 6 +++--- src/AudioTagger.Tests/AudioTagger.Tests.csproj | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/AudioTagger.Console/AudioTagger.Console.csproj b/src/AudioTagger.Console/AudioTagger.Console.csproj index 591f40e..2ab19dc 100644 --- a/src/AudioTagger.Console/AudioTagger.Console.csproj +++ b/src/AudioTagger.Console/AudioTagger.Console.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/src/AudioTagger.Library/AudioTagger.Library.csproj b/src/AudioTagger.Library/AudioTagger.Library.csproj index a4d8478..0d09f34 100644 --- a/src/AudioTagger.Library/AudioTagger.Library.csproj +++ b/src/AudioTagger.Library/AudioTagger.Library.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/src/AudioTagger.Tests/AudioTagger.Tests.csproj b/src/AudioTagger.Tests/AudioTagger.Tests.csproj index 1c3a135..0885794 100644 --- a/src/AudioTagger.Tests/AudioTagger.Tests.csproj +++ b/src/AudioTagger.Tests/AudioTagger.Tests.csproj @@ -6,13 +6,13 @@ false - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 96d4a1efd5ce480a2f6120fb63dd3f1767b2a7da Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Mon, 19 Oct 2026 11:50:22 +0900 Subject: [PATCH 09/11] Also trim albumArtists, artists, and genres --- src/AudioTagger.Library/UpdatableFields.cs | 43 +++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index 2772a18..5a4acba 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -34,42 +34,43 @@ public UpdatableFields( switch (element.Name) { case "albumArtists": - AlbumArtists = element.Value - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(a => a.Normalize()) - .ToArray(); + AlbumArtists = element.Value.Trim().Normalize() + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(a => a.Normalize()) + .ToArray(); Count++; break; case "artists": - Artists = element.Value - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(a => a.Normalize()) - .ToArray(); + Artists = element.Value.Trim().Normalize() + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(a => a.Normalize()) + .ToArray(); Count++; break; case "album": Album = element.Value.Trim().Normalize() - .Replace("___", " ") - .Replace("__", " "); + .Replace("___", " ") + .Replace("__", " "); Count++; break; case "title": // TODO: Relocate the replacements. Title = element.Value.Trim().Normalize() - .Replace("___", " ") - .Replace("__", " "); + .Replace("___", " ") + .Replace("__", " "); Count++; break; case "genres": - Genres = element.Value.Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(g => g.Normalize()) - .ToArray(); + Genres = element.Value.Trim().Normalize() + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(g => g.Normalize()) + .ToArray(); Count++; break; case "year": From ead6f862756484cc1771e1480c8dfeb4ee96d984 Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Mon, 19 Oct 2026 12:24:02 +0900 Subject: [PATCH 10/11] Use 'is' and 'is not' --- src/AudioTagger.Library/UpdatableFields.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index 5a4acba..8865995 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -89,8 +89,8 @@ public UpdatableFields( } // If no genre was manually passed in, check the settings for a registered one. - if (Genres?.Any() != true && - Artists?.Any() == true && + if (Genres?.Any() is not true && + Artists?.Any() is true && artistsWithGenres.Any()) { if (artistsWithGenres.Any() && From c8f85969406e7c27d0b7e585d31adf13c928a540 Mon Sep 17 00:00:00 2001 From: CodeConscious <50596087+codeconscious@users.noreply.github.com> Date: Mon, 19 Oct 2026 12:38:49 +0900 Subject: [PATCH 11/11] Minor code layout tweak --- src/AudioTagger.Library/UpdatableFields.cs | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/AudioTagger.Library/UpdatableFields.cs b/src/AudioTagger.Library/UpdatableFields.cs index 8865995..addb073 100644 --- a/src/AudioTagger.Library/UpdatableFields.cs +++ b/src/AudioTagger.Library/UpdatableFields.cs @@ -34,7 +34,8 @@ public UpdatableFields( switch (element.Name) { case "albumArtists": - AlbumArtists = element.Value.Trim().Normalize() + AlbumArtists = element.Value + .Trim().Normalize() .Replace("___", " ") .Replace("__", " ") .Split([";"], splitOptions) @@ -43,7 +44,8 @@ public UpdatableFields( Count++; break; case "artists": - Artists = element.Value.Trim().Normalize() + Artists = element.Value + .Trim().Normalize() .Replace("___", " ") .Replace("__", " ") .Split([";"], splitOptions) @@ -52,25 +54,28 @@ public UpdatableFields( Count++; break; case "album": - Album = element.Value.Trim().Normalize() + Album = element.Value + .Trim().Normalize() .Replace("___", " ") .Replace("__", " "); Count++; break; case "title": // TODO: Relocate the replacements. - Title = element.Value.Trim().Normalize() + Title = element.Value + .Trim().Normalize() .Replace("___", " ") .Replace("__", " "); Count++; break; case "genres": - Genres = element.Value.Trim().Normalize() - .Replace("___", " ") - .Replace("__", " ") - .Split([";"], splitOptions) - .Select(g => g.Normalize()) - .ToArray(); + Genres = element.Value + .Trim().Normalize() + .Replace("___", " ") + .Replace("__", " ") + .Split([";"], splitOptions) + .Select(g => g.Normalize()) + .ToArray(); Count++; break; case "year":