Upgrade to .NET 10 (#94)

* Upgrade projects to .NET 10

* Use extension members

* Various tweaks

* Various tweaks to Operations

* Library project tweaks

* Remove unneeded code

Author: codeconscious

README.md

@@ -8,7 +8,7 @@ Additionally, your original audio files will be modified during selected operati
 
 ## Requirements
 
-- [.NET 9 runtime](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
+- [.NET 10 runtime](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
 - `settings.json` (See below)
 
 ## Running
@@ -36,24 +36,24 @@ dotnet run -- -r ~/Downloads/Audio/
 
 ## Flags
 
-| Flags | Description
+| Flags | Description |
 |---|---|
-| -v, --view | View full tag data.
-| -vs, --view-summary | View a summary of tag data.
-| -u, --update | Update tag data using filename patterns from the settings.
-| -u1, --update-single | Update a single tag in multiple files to a single, manually-specified value.
-| -ug, --update-genres | Update the genres in all files automatically using the CSV specified in the settings.
-| -um, --update-multiple | Update a single tag in multiple files with multiple values.
-| -uy, --update-year | Update the year using media files' own dates of creation. (Must do before other updates, lest the creation date be modified by those updates.)
-| -urt, --reverse-track-numbers | Reverse the track numbers of the given files.
-| -uea, --extract-artwork | Extracts artwork from directory files if they have the same artist and album, then deletes the artwork from the files containing it.
-| -ura, --remove-artwork | Removes artwork from files. (File size is not reduced, as padding remains.)
-| -rt, --rewrite-tags | Rewrites file tags. (Can be helping in reducing padding, such as from removed artwork.)
-| -r, --rename | Rename and reorganize files into folders based on tag data.
-| -d, --duplicates | List tracks with identical artists and titles. No files are modified or deleted.
-| -s, --stats | Display file statistics based on tag data.
-| -g, --genres | Save the primary genre for each artist to a genre file.
-| -p, --parse | Get a single tag value by parsing the data of another (generally Comments).
+| -v, --view | View full tag data. |
+| -vs, --view-summary | View a summary of tag data. |
+| -u, --update | Update tag data using filename patterns from the settings. |
+| -u1, --update-single | Update a single tag in multiple files to a single, manually-specified value. |
+| -ug, --update-genres | Update the genres in all files automatically using the CSV specified in the settings. |
+| -um, --update-multiple | Update a single tag in multiple files with multiple values. |
+| -uy, --update-year | Update the year using media files' own dates of creation. (Must do before other updates, lest the creation date be modified by those updates.) |
+| -urt, --reverse-track-numbers | Reverse the track numbers of the given files. |
+| -uea, --extract-artwork | Extracts artwork from directory files if they have the same artist and album, then deletes the artwork from the files containing it. |
+| -ura, --remove-artwork | Removes artwork from files. (File size is not reduced, as padding remains.) |
+| -rt, --rewrite-tags | Rewrites file tags. (Can be helping in reducing padding, such as from removed artwork.) |
+| -r, --rename | Rename and reorganize files into folders based on tag data. |
+| -d, --duplicates | List tracks with identical artists and titles. No files are modified or deleted. |
+| -s, --stats | Display file statistics based on tag data. |
+| -g, --genres | Save the primary genre for each artist to a genre file. |
+| -p, --parse | Get a single tag value by parsing the data of another (generally Comments). |
 
 Passing no arguments will also display these instructions.
 
@@ -72,7 +72,7 @@ A sample settings file, which can you copy and paste if you wish, follows:
       "(?:(?<albumArtists>.+) ≡ )?(?<album>.+?)(?: ?\\[(?<year>\\d{4})\\])? = (?<trackNo>\\d+) [–-] (?<artists>.+?) [–-] (?<title>.+)(?=\\.(?:m4a|opus))",
       "(?:(?<albumArtists>.+) ≡ )?(?<album>.+?)(?: ?\\[(?<year>\\d{4})\\])? = (?<trackNo>\\d{1,3}) [–-] (?<title>.+)(?=\\.(?:m4a|opus))",
       "(?:(?<albumArtists>.+) ≡ )(?<album>.+?)(?: ?\\[(?<year>\\d{4})\\])? = (?<artists>.+?) [–-] (?<title>.+)(?=\\.(?:m4a|opus))",
-      "(?:(?<albumArtists>.+) ≡ )?(?<album>.+?)(?: ?\\[(?<year>\\d{4})\\])? = (?<title>.+)(?=\\.(?:m4a|opus))",    ]
+      "(?:(?<albumArtists>.+) ≡ )?(?<album>.+?)(?: ?\\[(?<year>\\d{4})\\])? = (?<title>.+)(?=\\.(?:m4a|opus))" ]
   },
   "renaming": {
     "useAlbumDirectories": true,
@@ -99,7 +99,7 @@ A sample settings file, which can you copy and paste if you wish, follows:
     "exclusions": [
       { "artist": "Artist Name" },
       { "title": "Track Title" },
-      { "artist": "Artist Name", "title": "Track Title" },
+      { "artist": "Artist Name", "title": "Track Title" }
     ],
     "artistReplacements": [
       " ",
@@ -131,7 +131,7 @@ A sample settings file, which can you copy and paste if you wish, follows:
       ":",
       "："
     ]
-  },
+  }
 }
 ```
 

src/AudioTagger.Console/AudioTagger.Console.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AssemblyName>Audiotagger.Console</AssemblyName>
@@ -30,4 +30,4 @@
   <ItemGroup>
     <ProjectReference Include="..\AudioTagger.Library\AudioTagger.Library.csproj"/>
   </ItemGroup>
-</Project>
+</Project>

src/AudioTagger.Console/Extensions.cs

@@ -2,27 +2,24 @@ namespace AudioTagger.Console;
 
 public static class Extensions
 {
-    /// <summary>
-    /// Determines whether a collection is empty.
-    /// </summary>
-    public static bool None<T>(this IEnumerable<T> collection) =>
-        !collection.Any();
+    extension<T>(IEnumerable<T> collection)
+    {
+        public bool None() =>
+            !collection.Any();
 
-    /// <summary>
-    /// Determines whether no elements of a sequence satisfy a given condition.
-    /// </summary>
-    public static bool None<T>(this IEnumerable<T> collection, Func<T, bool> predicate) =>
-        !collection.Any(predicate);
+        public bool None(Func<T, bool> predicate) =>
+            !collection.Any(predicate);
+    }
 
-    /// <summary>
-    /// Returns a bool indicating whether a string is not null and has text (true) or not.
-    /// </summary>
-    public static bool HasText(this string? str) => !string.IsNullOrWhiteSpace(str);
+    extension(string? str)
+    {
+        public bool HasText() => !string.IsNullOrWhiteSpace(str);
 
-    public static string? TextOrNull(this string? text) =>
-        text switch
-        {
-            null or { Length: 0 } => null,
-            _ => text
-        };
+        public string? TextOrNull() =>
+            str switch
+            {
+                null or { Length: 0 } => null,
+                _ => str
+            };
+    }
 }

src/AudioTagger.Console/GetUserInput.cs

@@ -26,9 +26,10 @@ public static class ResponseHandler
     /// <summary>
     /// Ask the user a question that they can answer with a single keystroke.
     /// </summary>
-    private static UserResponse AskUserQuestion(IReadOnlyList<LineSubString> question,
-                                               IReadOnlyList<KeyResponse> allowedResponses,
-                                               IPrinter printer)
+    private static UserResponse AskUserQuestion(
+        IReadOnlyList<LineSubString> question,
+        IReadOnlyList<KeyResponse> allowedResponses,
+        IPrinter printer)
     {
         if (question.None())
         {

src/AudioTagger.Console/MediaFilePathInfo.cs

@@ -1,7 +1,7 @@
 namespace AudioTagger.Console;
 
 /// <summary>
-/// Contains all of the path information for a specific MediaFile.
+/// Contains all the path information for a specific MediaFile.
 /// </summary>
 internal sealed class MediaFilePathInfo
 {

src/AudioTagger.Console/MediaFileViewer.cs

@@ -5,7 +5,7 @@ namespace AudioTagger.Console;
 
 public sealed class MediaFileViewer
 {
-    public void PrintFileDetails(MediaFile file)
+    public static void PrintFileDetails(MediaFile file)
     {
         // TODO: Handle colors more gracefully.
         string TagNameFormatter(string s) => "[grey]" + s + "[/]";
@@ -30,7 +30,7 @@ public void PrintFileDetails(MediaFile file)
             table.AddRow(TagNameFormatter("Year"), file.Year.ToString());
         table.AddRow(TagNameFormatter("Duration"), file.Duration.ToString("m\\:ss"));
 
-        int genreCount = file.Genres.Length;
+        var genreCount = file.Genres.Length;
         table.AddRow(TagNameFormatter("Genres"),
                      file.Genres.Join().EscapeMarkup() +
                         (genreCount > 1 ? $" ({genreCount})" : string.Empty));
@@ -82,7 +82,7 @@ public static TableRow PrintFileSummary(MediaFile file)
             file.ReplayGainTrack.ToString(CultureInfo.InvariantCulture)
         };
 
-        IEnumerable<Markup> markups = rows.Select(r => new Markup(r));
+        var markups = rows.Select(r => new Markup(r));
 
         return new TableRow(markups);
     }

src/AudioTagger.Console/Operations/MediaFileRenamer.cs

@@ -281,20 +281,15 @@ private static bool RenameSingleFile(
 
         return shouldCancel;
 
-        /// <summary>
-        /// Generates and returns a new filename by replacing placeholders within the rename
-        /// pattern (e.g., `%ALBUM%`) with actual tag data from the `MediaFile`.
-        /// </summary>
+        // Generates and returns a new filename by replacing placeholders within the rename
+        // pattern (e.g., `%ALBUM%`) with actual tag data from the `MediaFile`.
         static string GenerateFileName(
             MediaFile file,
             ICollection<string> fileTagNames,
             string renamePattern)
         {
             StringBuilder workingFileName =
-                fileTagNames.Aggregate(
-                    new StringBuilder(renamePattern),
-                    (workingName, tagName) => ReplacePlaceholders(workingName, tagName)
-                );
+                fileTagNames.Aggregate(new StringBuilder(renamePattern), ReplacePlaceholders);
 
             var ext = Path.GetExtension(file.FileNameOnly);
             var unsanitizedName = workingFileName + ext;
@@ -333,9 +328,7 @@ StringBuilder ReplacePlaceholders(StringBuilder workingName, string tagName)
             }
         }
 
-        /// <summary>
-        /// Generates and returns a directory name for a file given its tags. Never returns null.
-        /// </summary>
+        // Generates and returns a directory name for a file given its tags. Never returns null.
         static string GenerateSafeDirectoryName(MediaFile file)
         {
             if (MediaFile.HasAnyValues(file.AlbumArtists))

src/AudioTagger.Console/Operations/TagDuplicateFinder.cs

@@ -39,7 +39,7 @@ public void Start(
         string artistLabel = PluralizeTerm(artistReplacements.Count);
         printer.Print($"Found {artistReplacements.Count} artist replacement {artistLabel}.");
 
-        var titleReplacements = settings.Duplicates?.TitleReplacements ?? [];
+        var titleReplacements = settings.Duplicates.TitleReplacements ?? [];
         string titleLabel = PluralizeTerm(titleReplacements.Count);
         printer.Print($"Found {titleReplacements.Count} title replacement {titleLabel}.");
 
@@ -64,9 +64,9 @@ public void Start(
         printer.Print($"Found {groupCount} duplicate {groupLabel} in {watch.ElapsedFriendly}.");
         PrintResults(duplicateGroups, printer);
 
-        string? searchFor = settings.Duplicates?.PathSearchFor?.TextOrNull();
-        string? replaceWith = settings.Duplicates?.PathReplaceWith?.TextOrNull();
-        string? saveDir = settings?.Duplicates?.SavePlaylistDirectory;
+        string? searchFor = settings.Duplicates.PathSearchFor?.TextOrNull();
+        string? replaceWith = settings.Duplicates.PathReplaceWith?.TextOrNull();
+        string? saveDir = settings.Duplicates.SavePlaylistDirectory;
         CreatePlaylistFile(duplicateGroups, saveDir, (searchFor, replaceWith), printer);
     }
 

src/AudioTagger.Console/Operations/TagUpdater.cs

@@ -77,11 +77,11 @@ private static bool UpdateTags(
             return shouldCancel;
         }
 
-        IEnumerable<Group>? matchedTags = match.Groups
+        IEnumerable<Group> matchedTags = match.Groups
                                .OfType<Group>()
                                .Where(g => g.Success);
 
-        if (matchedTags.Any() != true)
+        if (!matchedTags.Any())
         {
             printer.Print($"Could not parse data for filename \"{mediaFile.FileNameOnly}.\"",
                             ResultType.Failure);

src/AudioTagger.Console/Operations/TagUpdaterMultiple.cs

@@ -175,7 +175,7 @@ private static void UpdateTags(MediaFile mediaFile,
                 string sanitizedTitle = tagValue.Trim().Normalize()
                                              .Replace("___", "　")
                                              .Replace("__", " ");
-                mediaFile.Title = GetUpdatedValue(mediaFile.Title,
+                mediaFile.Title = GetUpdatedTagValue(mediaFile.Title,
                                                   sanitizedTitle,
                                                   updateType,
                                                   false);
@@ -208,7 +208,7 @@ private static void UpdateTags(MediaFile mediaFile,
                 string sanitizedAlbum = tagValue.Trim().Normalize()
                                              .Replace("___", "　")
                                              .Replace("__", " ");
-                mediaFile.Album = GetUpdatedValue(mediaFile.Album,
+                mediaFile.Album = GetUpdatedTagValue(mediaFile.Album,
                                                   sanitizedAlbum,
                                                   updateType,
                                                   false);
@@ -231,23 +231,15 @@ private static void UpdateTags(MediaFile mediaFile,
                 mediaFile.TrackNo = ushort.Parse(tagValue);
                 break;
             case "comment":
-                mediaFile.Comments = GetUpdatedValue(mediaFile.Comments, tagValue, updateType, true);
+                mediaFile.Comments = GetUpdatedTagValue(mediaFile.Comments, tagValue, updateType, true);
                 break;
             default:
                 throw new InvalidOperationException($"Unsupported tag \"{tagName}\" could not be processed.");
         }
 
         mediaFile.SaveUpdates();
 
-        /// <summary>
-        /// Returns the new, updated value for a tag.
-        /// </summary>
-        /// <param name="currentValue">The original value to be modified.</param>
-        /// <param name="newValue">The text to be added.</param>
-        /// <param name="updateType"></param>
-        /// <param name="useNewLine">Whether or not to add line breaks between the new and old text.</param>
-        /// <returns></returns>
-        static string GetUpdatedValue(string currentValue, string newValue, TagUpdateType updateType, bool useNewLines)
+        static string GetUpdatedTagValue(string currentValue, string newValue, TagUpdateType updateType, bool useNewLines)
         {
             string divider = useNewLines ? Environment.NewLine + Environment.NewLine : string.Empty;
             return updateType switch