clean up some diagnostics

Author: fiso64

Sockseek.Cli/Program.cs

@@ -155,7 +155,7 @@ internal static async Task<CliExitCode> MainCore(string[] args, CliOutputControl
 
         LogCliSessionStart(remoteSettings);
 
-        var cts = new CancellationTokenSource();
+        using var cts = new CancellationTokenSource();
 
         if (remoteSettings.IsEnabled)
         {
@@ -419,7 +419,7 @@ await backend.SubmitExtractJobAsync(
         {
             SockseekLog.Trace("Main: Entered finally block. Disposing clientManager...");
             engine.Cancel();
-            cts.Cancel();
+            await cts.CancelAsync();
             cliReporter?.Stop();
             clientManager.Dispose();
             Printing.SetBuffering(false);
@@ -673,7 +673,7 @@ private static async Task<CliExitCode> RunRemoteAsync(
         }
         finally
         {
-            cts.Cancel();
+            await cts.CancelAsync();
             cliReporter?.Stop();
         }
     }
@@ -1256,7 +1256,7 @@ internal static void EnsureDaemonEndpointAvailable(DaemonSettings daemonSettings
 
         try
         {
-            var listener = new System.Net.Sockets.TcpListener(ipAddress, daemonSettings.ListenPort);
+            using var listener = new System.Net.Sockets.TcpListener(ipAddress, daemonSettings.ListenPort);
             listener.Start();
             listener.Stop();
         }

Sockseek.Cli/Services/InteractiveCliCoordinator.cs

@@ -9,6 +9,9 @@
 
 namespace Sockseek.Cli;
 
+// TODO [LIFETIME]: Make the interactive coordinator disposable as part of CLI run-scope ownership.
+// It owns a promptSemaphore today, while callers also start background RunUntilCompleteAsync work.
+// Dispose should be coordinated with that background task and the tests that construct coordinators directly.
 internal sealed class InteractiveCliCoordinator
 {
     private readonly ICliBackend backend;

Sockseek.Core/DownloadEngine.cs

@@ -24,6 +24,11 @@ namespace Sockseek.Core;
 // 1. Break this class into isolated services (e.g., IJobPipeline, IQueueOrchestrator).
 // 2. Inject dependencies (ISearcher, IDownloader) via constructor injection.
 // This will drastically improve maintainability and make the orchestration logic actually unit-testable.
+//
+// TODO [ARCHITECTURE]: Define explicit engine/service lifetime ownership.
+// DownloadEngine currently owns app-wide cancellation, a Searcher with disposable throttling
+// semaphores, and background stale-download work. Refactor this into an async-disposable
+// run scope so completion, cancellation, and server-host shutdown all dispose the same graph.
 public class DownloadEngine
 {
     private Searcher? searcher = null;
@@ -607,7 +612,7 @@ public async Task RunAsync(CancellationToken ct)
             Events.RaiseEngineCompleted(Queue);
 
         SockseekLog.Jobs.Debug("Exiting RunAsync");
-        appCts.Cancel();
+        await appCts.CancelAsync();
     }
 
 
@@ -2680,7 +2685,7 @@ async Task<JobOutcome> SearchAndDownloadSong(SongJob song, Job job, DownloadSett
                     if (fastDownload?.Status == FileDownloadStatus.Completed && fastDownload.Result != null)
                     {
                         // Fast download won — cancel the search.
-                        searchCts.Cancel();
+                        await searchCts.CancelAsync();
                         try { await searchTask; } catch (OperationCanceledException) { }
 
                         var result = fastDownload.Result;
@@ -3442,7 +3447,7 @@ async Task<JobOutcome> DownloadEmbeddedSong(
             if (cancelGroupOnFail && ShouldCancelGroupOnEmbeddedOutcome(outcome))
             {
                 CommitOutcome(song, outcome);
-                groupCts.Cancel();
+                await groupCts.CancelAsync();
                 throw new OperationCanceledException();
             }
 
@@ -3457,7 +3462,7 @@ async Task<JobOutcome> DownloadEmbeddedSong(
 
             if (cancelGroupOnFail && ShouldCancelGroupOnEmbeddedOutcome(finalOutcome))
             {
-                groupCts.Cancel();
+                await groupCts.CancelAsync();
                 throw new OperationCanceledException();
             }
 
@@ -3472,7 +3477,7 @@ async Task<JobOutcome> DownloadEmbeddedSong(
         }
         catch (OperationCanceledException) when (!groupCts.IsCancellationRequested && cancelGroupOnFail)
         {
-            groupCts.Cancel();
+            await groupCts.CancelAsync();
             throw;
         }
         finally

Sockseek.Core/Extractors/Csv.cs

@@ -2,6 +2,7 @@
 using Sockseek.Core.Jobs;
 using System.Text.RegularExpressions;
 using Sockseek.Core.Settings;
+using System.Globalization;
 
 namespace Sockseek.Core.Extractors;
     public partial class CsvExtractor : IExtractor, IInputMatcher
@@ -248,10 +249,10 @@ static double ParseTrackLength(string duration, string format)
             {
                 switch (formatParts[i])
                 {
-                    case "h":  totalSeconds += double.Parse(durationParts[i]) * 3600; break;
-                    case "m":  totalSeconds += double.Parse(durationParts[i]) * 60;   break;
-                    case "s":  totalSeconds += double.Parse(durationParts[i]);         break;
-                    case "ms": totalSeconds += double.Parse(durationParts[i]) / Math.Pow(10, durationParts[i].Length); break;
+                    case "h":  totalSeconds += double.Parse(durationParts[i], CultureInfo.InvariantCulture) * 3600; break;
+                    case "m":  totalSeconds += double.Parse(durationParts[i], CultureInfo.InvariantCulture) * 60;   break;
+                    case "s":  totalSeconds += double.Parse(durationParts[i], CultureInfo.InvariantCulture);         break;
+                    case "ms": totalSeconds += double.Parse(durationParts[i], CultureInfo.InvariantCulture) / Math.Pow(10, durationParts[i].Length); break;
                 }
             }
             return totalSeconds;

Sockseek.Core/Extractors/List.cs

@@ -25,7 +25,7 @@ public static bool InputMatches(string input)
             return !input.IsInternetUrl();
         }
 
-        public Task<Job> GetTracks(string input, ExtractionSettings extraction, ExtractorContext? context = null)
+        public async Task<Job> GetTracks(string input, ExtractionSettings extraction, ExtractorContext? context = null)
         {
             var maxTracks = extraction.MaxTracks;
             var offset    = extraction.Offset;
@@ -36,7 +36,7 @@ public Task<Job> GetTracks(string input, ExtractionSettings extraction, Extracto
             if (!File.Exists(listFilePath))
                 throw new FileNotFoundException($"List file '{listFilePath}' not found");
 
-            var lines = File.ReadAllLines(listFilePath);
+            var lines = await File.ReadAllLinesAsync(listFilePath);
 
             var result = new JobList { ItemName = Path.GetFileNameWithoutExtension(listFilePath), EnablesIndexByDefault = true };
 
@@ -103,7 +103,7 @@ public Task<Job> GetTracks(string input, ExtractionSettings extraction, Extracto
                 added++;
             }
 
-            return Task.FromResult<Job>(result);
+            return result;
         }
 
         static List<string> ParseLine(string input)

Sockseek.Core/Extractors/MusicBrainz.cs

@@ -14,7 +14,8 @@ public partial class MusicBrainzExtractor : IExtractor, IInputMatcher
 
         public static bool InputMatches(string input)
         {
-            return input.IsInternetUrl() && input.ToLower().Contains("musicbrainz.org");
+            return input.IsInternetUrl()
+                && input.Contains("musicbrainz.org", StringComparison.OrdinalIgnoreCase);
         }
 
         public async Task<Job> GetTracks(string input, ExtractionSettings extraction, ExtractorContext? context = null)
@@ -24,7 +25,7 @@ public async Task<Job> GetTracks(string input, ExtractionSettings extraction, Ex
             var offset    = extraction.Offset;
             var reverse   = extraction.Reverse;
 
-            var musicBrainzClient = new MusicBrainzClient(context.Log);
+            using var musicBrainzClient = new MusicBrainzClient(context.Log);
 
             int max = reverse ? int.MaxValue : maxTracks;
             int off = reverse ? 0 : offset;
@@ -68,7 +69,7 @@ public async Task<Job> GetTracks(string input, ExtractionSettings extraction, Ex
         }
     }
 
-    public class MusicBrainzClient
+    public class MusicBrainzClient : IDisposable
     {
         private readonly HttpClient _httpClient;
         private readonly IJobLog _log;
@@ -205,4 +206,10 @@ public async Task<JobList> GetCollectionReleases(string mbid, int max, int offse
             _log.Info($"Found {queue.Jobs.Count} releases in collection '{collectionName}'");
             return queue;
         }
+
+        public void Dispose()
+        {
+            _httpClient.Dispose();
+            GC.SuppressFinalize(this);
+        }
     }

Sockseek.Core/Extractors/Spotify.cs

@@ -37,7 +37,8 @@ public async Task<Job> GetTracks(string input, ExtractionSettings extraction, Ex
             if (string.IsNullOrEmpty(_spotify.ClientId) || string.IsNullOrEmpty(_spotify.ClientSecret))
                 throw new Exception("Spotify client ID and secret are required. Create a Spotify developer app and pass --spotify-id and --spotify-secret.");
 
-            spotifyClient = new Spotify(_spotify.ClientId ?? "", _spotify.ClientSecret ?? "", _spotify.Token ?? "", _spotify.Refresh ?? "", context.Log);
+            using var spotifySession = new Spotify(_spotify.ClientId ?? "", _spotify.ClientSecret ?? "", _spotify.Token ?? "", _spotify.Refresh ?? "", context.Log);
+            spotifyClient = spotifySession;
             await spotifyClient.Authorize(needLogin, extraction.RemoveTracksFromSource);
 
             Job result;
@@ -185,7 +186,7 @@ private static string Describe(APIException exception)
     }
 
 
-    public class Spotify
+    public class Spotify : IDisposable
     {
         private EmbedIOAuthServer? _server;
         private readonly string _clientId;
@@ -528,7 +529,7 @@ public async Task RemoveTrackFromPlaylist(string playlistId, string trackUri)
             return (p.Name ?? "", p.Id ?? playlistId, songs);
         }
 
-        private string GetPlaylistIdFromUrl(string url)
+        private static string GetPlaylistIdFromUrl(string url)
         {
             var uri      = new Uri(url);
             var segments = uri.Segments;
@@ -566,10 +567,16 @@ public async Task<AlbumJob> GetAlbumJob(string url, ExtractionSettings extractio
             return albumJob;
         }
 
-        private string GetAlbumIdFromUrl(string url)
+        private static string GetAlbumIdFromUrl(string url)
         {
             var uri      = new Uri(url);
             var segments = uri.Segments;
             return segments[^1].TrimEnd('/');
         }
+
+        public void Dispose()
+        {
+            _server?.Dispose();
+            GC.SuppressFinalize(this);
+        }
     }

Sockseek.Core/Extractors/String.cs

@@ -1,6 +1,7 @@
 using Sockseek.Core.Models;
 using Sockseek.Core.Jobs;
 using Sockseek.Core.Settings;
+using System.Globalization;
 
 namespace Sockseek.Core.Extractors;
     public class StringExtractor : IExtractor, IInputMatcher
@@ -94,7 +95,7 @@ void setProperty(string key, string value)
                 {
                     case "title":   _title  = value; break;
                     case "artist":  _artist = value; break;
-                    case "length":  _length = int.Parse(value); break;
+                    case "length":  _length = int.Parse(value, CultureInfo.InvariantCulture); break;
                     case "album":   _album  = value; break;
                     case "artist-maybe-wrong":
                         if (value == "true") _artistMaybeWrong = true;
@@ -106,12 +107,12 @@ void setProperty(string key, string value)
                             _maxCount = -1;
                         }
                         else if (value.Last() == '-')
-                            _maxCount = int.Parse(value[..^1]);
+                            _maxCount = int.Parse(value[..^1], CultureInfo.InvariantCulture);
                         else if (value.Last() == '+')
-                            _minCount = int.Parse(value[..^1]);
+                            _minCount = int.Parse(value[..^1], CultureInfo.InvariantCulture);
                         else
                         {
-                            _minCount = int.Parse(value);
+                            _minCount = int.Parse(value, CultureInfo.InvariantCulture);
                             _maxCount = _minCount;
                         }
                         break;

Sockseek.Core/Extractors/YouTube.cs

@@ -43,7 +43,7 @@ public async Task<Job> GetTracks(string input, ExtractionSettings extraction, Ex
             if (_yt.GetDeleted)
             {
                 context.Log.Info("Getting deleted videos..");
-                var archive = new YouTube.YouTubeArchiveRetriever(context.Log);
+                using var archive = new YouTube.YouTubeArchiveRetriever(context.Log);
                 deleted = await archive.RetrieveDeleted(input, printFailed: _yt.DeletedOnly);
             }
             if (!_yt.DeletedOnly)
@@ -115,7 +115,7 @@ public static string ApiKey
 
             var playlistRequest = service.Playlists.List("snippet");
             playlistRequest.Id = playlistId;
-            var playlistResponse = playlistRequest.Execute();
+            var playlistResponse = await playlistRequest.ExecuteAsync();
             if (playlistResponse.Items.Count == 0)
                 throw new InvalidOperationException($"Could not retrieve YouTube playlist '{playlistId}'.");
 
@@ -131,7 +131,7 @@ public static string ApiKey
 
             while (playlistItemsRequest != null && count < max + offset)
             {
-                var playlistItemsResponse = playlistItemsRequest.Execute();
+                var playlistItemsResponse = await playlistItemsRequest.ExecuteAsync();
                 foreach (var playlistItem in playlistItemsResponse.Items)
                 {
                     if (count >= offset)
@@ -149,7 +149,7 @@ public static string ApiKey
 
                             var videoRequest = service.Videos.List("contentDetails,snippet");
                             videoRequest.Id = playlistItem.Snippet.ResourceId.VideoId;
-                            var videoResponse = videoRequest.Execute();
+                            var videoResponse = await videoRequest.ExecuteAsync();
 
                             title = playlistItem.Snippet.Title;
                             if (videoResponse.Items.Count == 0) continue;
@@ -295,7 +295,7 @@ public static async Task<SongJob> ParseTrackInfo(string title, string uploader,
                         var service = RequireService();
                         var videoRequest = service.Videos.List("contentDetails,snippet");
                         videoRequest.Id = id;
-                        var videoResponse = videoRequest.Execute();
+                        var videoResponse = await videoRequest.ExecuteAsync();
                         o.title = videoResponse.Items[0].Snippet.Title;
                         o.uploader = videoResponse.Items[0].Snippet.ChannelTitle;
                         o.length = (int)XmlConvert.ToTimeSpan(videoResponse.Items[0].ContentDetails.Duration).TotalSeconds;
@@ -333,7 +333,7 @@ public static void StopService()
         public static async Task<Dictionary<string, SongJob>> GetDictYtExplode(string url, int max = int.MaxValue, int offset = 0, IJobLog? log = null)
         {
             log ??= ExtractorContext.None.Log;
-            var youtube = new YoutubeClient();
+            using var youtube = new YoutubeClient();
             var playlist = await youtube.Playlists.GetAsync(url);
             var songs = new Dictionary<string, SongJob>();
             int count = 0;
@@ -360,15 +360,15 @@ public static async Task<Dictionary<string, SongJob>> GetDictYtExplode(string ur
 
         public static async Task<string> GetPlaylistTitle(string url)
         {
-            var youtube = new YoutubeClient();
+            using var youtube = new YoutubeClient();
             var playlist = await youtube.Playlists.GetAsync(url);
             return playlist.Title;
         }
 
         public static async Task<(string, List<SongJob>)> GetSongsYtExplode(string url, int max = int.MaxValue, int offset = 0, IJobLog? log = null)
         {
             log ??= ExtractorContext.None.Log;
-            var youtube = new YoutubeClient();
+            using var youtube = new YoutubeClient();
             var playlist = await youtube.Playlists.GetAsync(url);
             var playlistTitle = playlist.Title;
             var songs = new List<SongJob>();
@@ -410,7 +410,7 @@ public static async Task<string> UrlToId(string url)
         [GeneratedRegex(@"document\.title\s*=\s*""(.+?) - YouTube"";")]
         private static partial Regex DocumentTitleRegex();
 
-        public class YouTubeArchiveRetriever
+            public class YouTubeArchiveRetriever : IDisposable
         {
             private readonly HttpClient _client;
             private readonly IJobLog _log;
@@ -424,7 +424,7 @@ public YouTubeArchiveRetriever(IJobLog? log = null)
 
             public async Task<List<SongJob>> RetrieveDeleted(string url, bool printFailed = true)
             {
-                var deletedVideoUrls = new BlockingCollection<string>();
+                using var deletedVideoUrls = new BlockingCollection<string>();
 
                 int totalCount = 0;
                 int archivedCount = 0;
@@ -435,7 +435,7 @@ public async Task<List<SongJob>> RetrieveDeleted(string url, bool printFailed =
                 int workerCount = 4;
                 var workers = new List<Task>();
 
-                var process = new Process
+                using var process = new Process
                 {
                     StartInfo = new ProcessStartInfo
                     {
@@ -498,7 +498,7 @@ public async Task<List<SongJob>> RetrieveDeleted(string url, bool printFailed =
                 }
 
                 await Task.WhenAll(workers);
-                process.WaitForExit();
+                await process.WaitForExitAsync();
                 deletedVideoUrls.CompleteAdding();
                 _log.Info($"Deleted metadata total/archived/retrieved: {totalCount}/{archivedCount}/{songs.Count}");
 
@@ -521,6 +521,12 @@ public async Task<List<SongJob>> RetrieveDeleted(string url, bool printFailed =
                 return songs.ToList();
             }
 
+            public void Dispose()
+            {
+                _client.Dispose();
+                GC.SuppressFinalize(this);
+            }
+
             private async Task<List<string>?> GetOldestArchiveUrls(string url, int limit)
             {
                 var url2 = $"http://web.archive.org/cdx/search/cdx?url={url}&fl=timestamp,original&filter=statuscode:200&sort=timestamp:asc&limit={limit}";

Sockseek.Core/Jobs/SearchJob.cs

@@ -17,7 +17,6 @@ public sealed record AggregateAlbumProjection(AlbumQuery Query);
 public class SearchJob : Job
 {
     private readonly Lock _projectionCacheLock = new();
-    private readonly Dictionary<string, (int Revision, bool IsComplete, object Value)> _projectionCache = [];
     private readonly Dictionary<string, object> _incrementalProjectionStates = [];
 
     public string QueryText { get; }