refactor: clean up whitespace and improve code readability in M3U import and related tests

Author: sphildreth

src/Melodee.Common/Jobs/PlaylistReconciliationJob.cs

@@ -1,5 +1,4 @@
 using Melodee.Common.Configuration;
-using Melodee.Common.Constants;
 using Melodee.Common.Data;
 using Melodee.Common.Enums;
 using Melodee.Common.Services;
@@ -30,7 +29,7 @@ public override async Task Execute(IJobExecutionContext context)
 
         // Find all missing playlist items that haven't been attempted recently
         var retryThreshold = SystemClock.Instance.GetCurrentInstant().Minus(Duration.FromHours(1));
-        
+
         var missingItems = await dbContext.PlaylistUploadedFileItems
             .Where(x => x.Status == PlaylistItemStatus.Missing)
             .Where(x => x.LastAttemptUtc == null || x.LastAttemptUtc < retryThreshold)
@@ -47,14 +46,14 @@ public override async Task Execute(IJobExecutionContext context)
             return;
         }
 
-        Logger.Information("[{JobName}] Attempting to reconcile {ItemCount} missing playlist items.", 
+        Logger.Information("[{JobName}] Attempting to reconcile {ItemCount} missing playlist items.",
             nameof(PlaylistReconciliationJob), missingItems.Count);
 
         // Get library path for matching
         var librariesResult = await libraryService.GetStorageLibrariesAsync(context.CancellationToken).ConfigureAwait(false);
         var libraryPath = librariesResult.Data?.FirstOrDefault()?.Path;
 
-        var songMatcher = new SongMatchingService(logger, cacheManager, contextFactory);
+        var songMatcher = new SongMatchingService(Logger, cacheManager, contextFactory);
 
         var resolvedCount = 0;
         var now = SystemClock.Instance.GetCurrentInstant();
@@ -90,7 +89,7 @@ public override async Task Execute(IJobExecutionContext context)
                     // Find the associated playlist and add the song
                     var playlist = await dbContext.Playlists
                         .Include(p => p.Songs)
-                        .FirstOrDefaultAsync(p => p.PlaylistUploadedFileId == item.PlaylistUploadedFileId, 
+                        .FirstOrDefaultAsync(p => p.PlaylistUploadedFileId == item.PlaylistUploadedFileId,
                             context.CancellationToken)
                         .ConfigureAwait(false);
 
@@ -104,7 +103,7 @@ public override async Task Execute(IJobExecutionContext context)
                         {
                             // Add song to playlist maintaining sort order
                             var maxOrder = playlist.Songs.Any() ? playlist.Songs.Max(ps => ps.PlaylistOrder) : -1;
-                            
+
                             var playlistSong = new Data.Models.PlaylistSong
                             {
                                 PlaylistId = playlist.Id,
@@ -115,7 +114,7 @@ public override async Task Execute(IJobExecutionContext context)
 
                             playlist.Songs.Add(playlistSong);
                             playlist.SongCount = (short)playlist.Songs.Count;
-                            
+
                             // Efficiently calculate duration by loading song from matchResult instead of querying
                             var currentDuration = playlist.Songs
                                 .Where(ps => ps.SongId != matchResult.Song.Id)
@@ -130,7 +129,7 @@ public override async Task Execute(IJobExecutionContext context)
             }
             catch (Exception ex)
             {
-                Logger.Warning(ex, "[{JobName}] Error reconciling item: {Reference}", 
+                Logger.Warning(ex, "[{JobName}] Error reconciling item: {Reference}",
                     nameof(PlaylistReconciliationJob), item.NormalizedReference);
                 item.LastAttemptUtc = now;
             }

src/Melodee.Common/Migrations/20260117043252_AddPlaylistImportModels.cs

@@ -1,4 +1,3 @@
-using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 using NodaTime;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

src/Melodee.Common/Services/Parsing/M3UParser.cs

@@ -23,19 +23,19 @@ public async Task<M3UParseResult> ParseAsync(Stream fileStream, string fileName,
     {
         var isM3U8 = fileName.EndsWith(".m3u8", StringComparison.OrdinalIgnoreCase);
         var encoding = isM3U8 ? Encoding.UTF8 : DetectEncoding(fileStream);
-        
+
         fileStream.Position = 0;
-        
+
         var entries = new List<M3UEntry>();
         var lineNumber = 0;
 
         using var reader = new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks: true, leaveOpen: true);
-        
+
         string? line;
         while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) != null && !cancellationToken.IsCancellationRequested)
         {
             lineNumber++;
-            
+
             if (string.IsNullOrWhiteSpace(line))
             {
                 continue;
@@ -166,7 +166,7 @@ private static (string? FileName, string? ArtistFolder, string? AlbumFolder) Ext
 
             // Split path into segments
             var segments = normalizedPath.Split('/', StringSplitOptions.RemoveEmptyEntries);
-            
+
             if (segments.Length == 0)
             {
                 return (normalizedPath, null, null);

src/Melodee.Common/Services/PlaylistService.cs

@@ -1312,7 +1312,7 @@ public async Task<OperationResult<PlaylistImportResult>> ImportPlaylistAsync(
             using var memoryStream = new MemoryStream();
             await fileStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
             var fileBytes = memoryStream.ToArray();
-            
+
             // Parse the M3U file
             memoryStream.Position = 0;
             var parser = new Parsing.M3UParser(Logger);
@@ -1341,8 +1341,8 @@ public async Task<OperationResult<PlaylistImportResult>> ImportPlaylistAsync(
             {
                 UserId = userId,
                 OriginalFileName = fileName,
-                ContentType = fileName.EndsWith(".m3u8", StringComparison.OrdinalIgnoreCase) 
-                    ? "audio/x-mpegurl; charset=utf-8" 
+                ContentType = fileName.EndsWith(".m3u8", StringComparison.OrdinalIgnoreCase)
+                    ? "audio/x-mpegurl; charset=utf-8"
                     : "audio/x-mpegurl",
                 Length = fileBytes.Length,
                 FileData = fileBytes,

src/Melodee.Common/Services/SongMatchingService.cs

@@ -113,9 +113,9 @@ public async Task<SongMatchResult> MatchEntryAsync(
                 .Select(candidatePath => context.Songs
                     .Include(s => s.Album)
                         .ThenInclude(a => a.Artist)
-                    .FirstOrDefaultAsync(s => 
-                        s.FileName.Replace('\\', '/').EndsWith("/" + candidatePath) || 
-                        s.FileName.Replace('\\', '/') == candidatePath, 
+                    .FirstOrDefaultAsync(s =>
+                        s.FileName.Replace('\\', '/').EndsWith("/" + candidatePath) ||
+                        s.FileName.Replace('\\', '/') == candidatePath,
                         cancellationToken))
                 .ToList();
 
@@ -214,7 +214,7 @@ public async Task<SongMatchResult> MatchEntryAsync(
             }
 
             var potentialTitle = Path.GetFileNameWithoutExtension(entry.FileName);
-            
+
             // Remove common track number prefixes (01 - Title, 01. Title, etc.)
             potentialTitle = System.Text.RegularExpressions.Regex.Replace(potentialTitle, @"^\d+[\s\.\-_]+", "");
 

tests/Melodee.Tests.Common/Services/Parsing/M3UParserTests.cs

@@ -1,6 +1,5 @@
 using System.Text;
 using Melodee.Common.Services.Parsing;
-using Serilog;
 using Serilog.Core;
 
 namespace Melodee.Tests.Common.Services.Parsing;
@@ -21,7 +20,7 @@ public async Task ParseAsync_WithSimpleM3U_ParsesEntries()
             Artist/Album/01 - Song One.flac
             Artist/Album/02 - Song Two.flac
             """;
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -42,7 +41,7 @@ public async Task ParseAsync_SkipsBlankLines_Successfully()
             
             Artist/Album/Song2.flac
             """;
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -60,7 +59,7 @@ public async Task ParseAsync_SkipsComments_Successfully()
             # This is a comment
             Artist/Album/Song2.flac
             """;
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -72,7 +71,7 @@ public async Task ParseAsync_NormalizesBackslashes_ToForwardSlashes()
     {
         var parser = CreateParser();
         var content = @"D:\Music\Artist\Album\Song.mp3";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -85,7 +84,7 @@ public async Task ParseAsync_DecodesUrlEncodedPaths_Successfully()
     {
         var parser = CreateParser();
         var content = "Artist/Album/Song%20With%20Spaces.flac";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -101,7 +100,7 @@ public async Task ParseAsync_RemovesQuotes_FromPaths()
             "Artist/Album/Song.flac"
             'Artist/Album/Song2.flac'
             """;
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -115,7 +114,7 @@ public async Task ParseAsync_ExtractsPathHints_Correctly()
     {
         var parser = CreateParser();
         var content = "Pink Floyd/The Wall/02 - Another Brick in the Wall.flac";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -131,7 +130,7 @@ public async Task ParseAsync_HandlesAbsolutePaths_WithMultipleSegments()
     {
         var parser = CreateParser();
         var content = "/mnt/music/Artist/Album/Song.flac";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -147,7 +146,7 @@ public async Task ParseAsync_HandlesSingleFileNameOnly_WithoutFolders()
     {
         var parser = CreateParser();
         var content = "song.flac";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -163,7 +162,7 @@ public async Task ParseAsync_HandlesM3U8_UsesUTF8Encoding()
     {
         var parser = CreateParser();
         var content = "Artist/Album/日本語のタイトル.flac";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u8");
 
@@ -182,7 +181,7 @@ public async Task ParseAsync_PreservesSortOrder_FromLineNumbers()
             Second.flac
             Third.flac
             """;
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -197,7 +196,7 @@ public async Task ParseAsync_HandlesUrlsAsEntries_WithoutCrashing()
     {
         var parser = CreateParser();
         var content = "http://example.com/stream.mp3";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");
 
@@ -212,7 +211,7 @@ public async Task ParseAsync_HandlesSpecialCharacters_InPaths()
     {
         var parser = CreateParser();
         var content = "Artist/Album [2024]/Song (Remastered).flac";
-        
+
         using var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
         var result = await parser.ParseAsync(stream, "test.m3u");