Implement automatic ImportList for saved Spotify playlists

Meyn · Meyn · commit 026a837e7286 · 2025-01-06T22:19:52.000+01:00
Improved Logging
diff --git a/Tubifarry/Core/AudioMetadataHandler.cs b/Tubifarry/Core/AudioMetadataHandler.cs
@@ -1,4 +1,5 @@
 ﻿using NLog;
+using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Parser.Model;
 using Xabe.FFmpeg;
 using Xabe.FFmpeg.Downloader;
@@ -16,10 +17,10 @@ internal class AudioMetadataHandler
         public bool UseID3v2_3 { get; set; }
 
 
-        public AudioMetadataHandler(string originalPath, Logger? logger)
+        public AudioMetadataHandler(string originalPath)
         {
             TrackPath = originalPath;
-            _logger = logger;
+            _logger = NzbDroneLogger.GetLogger(this); ;
         }
 
 
diff --git a/Tubifarry/Core/FileCache.cs b/Tubifarry/Core/FileCache.cs
@@ -25,7 +25,6 @@ public FileCache(string cacheDirectory)
 
             if (cachedData == null || DateTime.UtcNow - cachedData.CreatedAt > cachedData.ExpirationDuration)
             {
-                // Cache is expired or invalid, delete the file
                 File.Delete(cacheFilePath);
                 return default;
             }
@@ -44,7 +43,9 @@ public async Task SetAsync<T>(string cacheKey, T data, TimeSpan expirationDurati
                 ExpirationDuration = expirationDuration
             };
 
-            string json = JsonSerializer.Serialize(cachedData);
+            JsonSerializerOptions options = new() { WriteIndented = true };
+
+            string json = JsonSerializer.Serialize(cachedData, options);
             await File.WriteAllTextAsync(cacheFilePath, json);
         }
 
diff --git a/Tubifarry/Core/ReleaseFormatter.cs b/Tubifarry/Core/ReleaseFormatter.cs
@@ -34,9 +34,8 @@ public string BuildAlbumFilename(string? pattern, Album album)
 
     public string BuildArtistFolderName(string? pattern)
     {
-        // Fall back to the ArtistFolderFormat if no pattern is provided
         pattern ??= _namingConfig?.ArtistFolderFormat ?? "{Artist Name}";
-        Dictionary<string, Func<string>> tokenHandlers = GetTokenHandlers(null, null); // No track or album tokens for artist folder names
+        Dictionary<string, Func<string>> tokenHandlers = GetTokenHandlers(null, null);
         string formattedString = ReplaceTokens(pattern, tokenHandlers);
         return CleanFileName(formattedString);
     }
@@ -72,8 +71,8 @@ private Dictionary<string, Func<string>> GetTokenHandlers(Track? track, Album? a
             { "{Track ArtistName}", () => _artist?.Name ?? string.Empty },
             { "{Track ArtistNameThe}", () => TitleThe(_artist?.Name) },
             { "{Track ArtistMbId}", () => _artist?.ForeignArtistId ?? string.Empty },
-            { "{track:0}", () => FormatTrackNumber(track?.TrackNumber, "0") }, // Zero-padded single digit
-            { "{track:00}", () => FormatTrackNumber(track?.TrackNumber, "00") }, // Zero-padded two digits
+            { "{track:0}", () => FormatTrackNumber(track?.TrackNumber, "0") },
+            { "{track:00}", () => FormatTrackNumber(track?.TrackNumber, "00") },
 
             // Medium Tokens (only added if track is provided)
             { "{Medium Name}", () => track?.AlbumRelease?.Value?.Media?.FirstOrDefault(m => m.Number == track.MediumNumber)?.Name ?? string.Empty },
@@ -91,7 +90,7 @@ private static string ReplaceTokens(string pattern, Dictionary<string, Func<stri
         if (tokenHandlers.TryGetValue($"{{{token}}}", out Func<string>? handler))
             return handler();
 
-        return string.Empty; // Remove unknown tokens
+        return string.Empty;
     });
 
     private string CleanFileName(string fileName)
@@ -101,7 +100,6 @@ private string CleanFileName(string fileName)
         char[] invalidChars = invalidFileNameChars.Union(invalidPathChars).ToArray();
         fileName = invalidChars.Aggregate(fileName, (current, invalidChar) => current.Replace(invalidChar.ToString(), string.Empty));
 
-        // Handle colon replacement based on the naming config
         switch (_namingConfig?.ColonReplacementFormat)
         {
             case ColonReplacementFormat.Delete:
diff --git a/Tubifarry/Download/Clients/YouTube/YoutubeDownloadManager.cs b/Tubifarry/Download/Clients/YouTube/YoutubeDownloadManager.cs
@@ -42,7 +42,7 @@ public YoutubeDownloadManager(Logger logger)
             _logger = logger;
             _queue = new();
             _ytClient = new YouTubeMusicClient();
-            _logger.Debug("Initialized");
+            _logger.Trace("Initialized");
         }
 
         public void SetCookies(string path)
@@ -71,11 +71,10 @@ public Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer, NamingCo
                 LRCLIBInstance = provider.Settings.LRCLIBInstance,
                 UseID3v2_3 = provider.Settings.UseID3v2_3,
                 ReEncodeOptions = (ReEncodeOptions)provider.Settings.ReEncode,
-                ClientInfo = DownloadClientItemClientInfo.FromDownloadClient(provider, false),
-                Logger = _logger,
+                ClientInfo = DownloadClientItemClientInfo.FromDownloadClient(provider, false)
             });
             _queue.Add(request);
-            _logger.Debug($"Download request added to queue. Request ID: {request.ID}");
+            _logger.Trace($"Download request added to queue. Request ID: {request.ID}");
             return Task.FromResult(request.ID);
         }
 
@@ -88,7 +87,7 @@ public void RemoveItem(DownloadClientItem item)
                 return;
             req.Dispose();
             _queue.Remove(req);
-            _logger.Debug($"Item removed from queue. Download ID: {item.DownloadId}");
+            _logger.Trace($"Item removed from queue. Download ID: {item.DownloadId}");
         }
     }
 }
diff --git a/Tubifarry/Download/Clients/YouTubeAlbumOptions.cs b/Tubifarry/Download/Clients/YouTubeAlbumOptions.cs
@@ -1,5 +1,4 @@
-﻿using NLog;
-using NzbDrone.Core.Download;
+﻿using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.YouTube;
 using NzbDrone.Core.Organizer;
 using Requests.Options;
@@ -11,8 +10,6 @@ public record YouTubeAlbumOptions : RequestOptions<string, string>
     {
         public YouTubeMusicClient? YouTubeMusicClient { get; set; }
 
-        public Logger? Logger { get; set; }
-
         public DownloadClientItemClientInfo? ClientInfo { get; set; }
 
         public bool TryIncludeLrc { get; set; }
@@ -36,7 +33,6 @@ public YouTubeAlbumOptions() { }
         protected YouTubeAlbumOptions(YouTubeAlbumOptions options) : base(options)
         {
             YouTubeMusicClient = options.YouTubeMusicClient;
-            Logger = options.Logger;
             ClientInfo = options.ClientInfo;
             TryIncludeSycLrc = options.TryIncludeSycLrc;
             TryIncludeLrc = options.TryIncludeLrc;
diff --git a/Tubifarry/Download/Clients/YouTubeAlbumRequest.cs b/Tubifarry/Download/Clients/YouTubeAlbumRequest.cs
@@ -3,6 +3,7 @@
 using DownloadAssistant.Requests;
 using NLog;
 using NzbDrone.Common.Disk;
+using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.YouTube;
 using NzbDrone.Core.Music;
@@ -28,13 +29,13 @@ internal class YouTubeAlbumRequest : Request<YouTubeAlbumOptions, string, string
         private readonly Album _albumData;
         private readonly DownloadClientItem _clientItem;
         private readonly ReleaseFormatter _releaseFormatter;
+        private readonly Logger _logger;
 
         private DateTime _lastUpdateTime = DateTime.MinValue;
         private long _lastRemainingSize = 0;
         private byte[]? _albumCover;
 
         private ReleaseInfo ReleaseInfo => _remoteAlbum.Release;
-        private Logger? Logger => Options.Logger;
 
         public override Task Task => _requestContainer.Task;
         public override RequestState State => _requestContainer.State;
@@ -57,6 +58,7 @@ public DownloadClientItem ClientItem
         public YouTubeAlbumRequest(RemoteAlbum remoteAlbum, YouTubeAlbumOptions? options) : base(options)
         {
             Options.YouTubeMusicClient ??= new YouTubeMusicClient();
+            _logger = NzbDroneLogger.GetLogger(this);
             _remoteAlbum = remoteAlbum;
             _albumData = remoteAlbum.Albums.FirstOrDefault() ?? new();
             _releaseFormatter = new(ReleaseInfo, remoteAlbum.Artist, Options.NameingConfig);
@@ -86,7 +88,7 @@ private async Task ProcessAlbumAsync(CancellationToken token)
         {
             string albumBrowseID = await Options.YouTubeMusicClient!.GetAlbumBrowseIdAsync(ReleaseInfo.DownloadUrl, token).ConfigureAwait(false);
             AlbumInfo albumInfo = await Options.YouTubeMusicClient.GetAlbumInfoAsync(albumBrowseID, token).ConfigureAwait(false);
-            Logger.Info(Options.NameingConfig.StandardTrackFormat);
+            _logger.Info(Options.NameingConfig.StandardTrackFormat);
             if (albumInfo?.Songs == null || !albumInfo.Songs.Any())
             {
                 LogAndAppendMessage($"No tracks to download found in the album: {ReleaseInfo.Album}", LogLevel.Debug);
@@ -117,15 +119,15 @@ private async Task ProcessAlbumAsync(CancellationToken token)
                 catch (Exception ex)
                 {
                     LogAndAppendMessage($"Failed to process track '{trackInfo.Name}' in album '{ReleaseInfo.Album}'", LogLevel.Error);
-                    Logger?.Error(ex, $"Failed to process track '{trackInfo.Name}' in album '{ReleaseInfo.Album}'.");
+                    _logger?.Error(ex, $"Failed to process track '{trackInfo.Name}' in album '{ReleaseInfo.Album}'.");
                 }
             }
         }
 
         private void LogAndAppendMessage(string message, LogLevel logLevel)
         {
             _message.AppendLine(message);
-            Logger?.Log(logLevel, message);
+            _logger?.Log(logLevel, message);
         }
 
         public async Task<byte[]?> TryDownloadCoverAsync(AlbumInfo albumInfo, CancellationToken token)
@@ -201,7 +203,7 @@ private async Task<bool> SongDownloadCompletedAsync(AlbumInfo albumInfo, AlbumSo
             if (!File.Exists(trackPath))
                 return false;
 
-            AudioMetadataHandler audioData = new(trackPath, Options.Logger) { AlbumCover = _albumCover, UseID3v2_3 = Options.UseID3v2_3 };
+            AudioMetadataHandler audioData = new(trackPath) { AlbumCover = _albumCover, UseID3v2_3 = Options.UseID3v2_3 };
 
             if (Options.TryIncludeLrc)
                 audioData.Lyric = await Lyric.FetchLyricsFromLRCLIBAsync(Options.LRCLIBInstance, ReleaseInfo, trackInfo, token);
diff --git a/Tubifarry/ImportLists/ArrStack/ArrSoundtrackImport.cs b/Tubifarry/ImportLists/ArrStack/ArrSoundtrackImport.cs
@@ -30,9 +30,9 @@ public class ArrSoundtrackImport : HttpImportListBase<ArrSoundtrackImportSetting
 
         public ArrSoundtrackImport(IHttpClient httpClient, IImportListStatusService importListStatusService, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, importListStatusService, configService, parsingService, logger) { }
 
-        public override IImportListRequestGenerator GetRequestGenerator() => _generator ??= new ArrSoundtrackRequestGenerator(Settings, _logger);
+        public override IImportListRequestGenerator GetRequestGenerator() => _generator ??= new ArrSoundtrackRequestGenerator(Settings);
 
-        public override IParseImportListResponse GetParser() => _parser ??= new ArrSoundtrackImportParser(Settings, _logger, _httpClient);
+        public override IParseImportListResponse GetParser() => _parser ??= new ArrSoundtrackImportParser(Settings, _httpClient);
 
         protected override void Test(List<ValidationFailure> failures)
         {
diff --git a/Tubifarry/ImportLists/ArrStack/ArrSoundtrackImportParser.cs b/Tubifarry/ImportLists/ArrStack/ArrSoundtrackImportParser.cs
@@ -1,5 +1,6 @@
 ﻿using NLog;
 using NzbDrone.Common.Http;
+using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Parser.Model;
 using System.Security.Cryptography;
 using System.Text;
@@ -15,22 +16,23 @@ namespace NzbDrone.Core.ImportLists.ArrStack
     internal class ArrSoundtrackImportParser : IParseImportListResponse
     {
         private static readonly string[] SoundtrackTerms = { "soundtrack", "ost", "score", "original soundtrack", "film score" };
-
-        public ArrSoundtrackImportSettings Settings { get; set; }
-        public Logger Logger { get; set; }
+        public readonly Logger _logger;
         private readonly IHttpClient _httpClient;
         private readonly FileCache _fileCache;
 
+        public ArrSoundtrackImportSettings Settings { get; set; }
+
+
         private static readonly JsonSerializerOptions _jsonOptions = new()
         {
             PropertyNameCaseInsensitive = true,
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
         };
 
-        public ArrSoundtrackImportParser(ArrSoundtrackImportSettings settings, Logger logger, IHttpClient httpClient)
+        public ArrSoundtrackImportParser(ArrSoundtrackImportSettings settings, IHttpClient httpClient)
         {
             Settings = settings;
-            Logger = logger;
+            _logger = NzbDroneLogger.GetLogger(this);
             _httpClient = httpClient;
             _fileCache = new FileCache(Settings.CacheDirectory);
         }
@@ -91,7 +93,7 @@ public async Task<List<ImportListItemInfo>> ParseResponseAsync(ImportListRespons
                             itemInfos.Add(importItem);
                         }
                         else
-                            Logger.Debug($"Not similar enough: {albumDetails?.Title ?? "Empty"} | {media.Title}");
+                            _logger.Debug($"Not similar enough: {albumDetails?.Title ?? "Empty"} | {media.Title}");
                     }
 
                     CachedData cachedDataToSave = new()
@@ -111,10 +113,10 @@ public async Task<List<ImportListItemInfo>> ParseResponseAsync(ImportListRespons
                 {
                     if (ex.Message.Contains("503:ServiceUnavailable"))
                     {
-                        Logger.Warn("Rate limit exceeded. Stopping further processing.");
+                        _logger.Warn("Rate limit exceeded. Stopping further processing.");
                         break;
                     }
-                    Logger.Error(ex, "Failed fetching search");
+                    _logger.Error(ex, "Failed fetching search");
                 }
             }
             return itemInfos;
@@ -179,7 +181,7 @@ private static string EscapeLuceneQuery(string query)
 
             if (releaseGroup == null)
             {
-                Logger.Warn($"No release-group found for album ID: {albumId}");
+                _logger.Warn($"No release-group found for album ID: {albumId}");
                 return null;
             }
             return MusicBrainzAlbumItem.FromXml(releaseGroup, ns);
diff --git a/Tubifarry/ImportLists/ArrStack/ArrSoundtrackImportSettings.cs b/Tubifarry/ImportLists/ArrStack/ArrSoundtrackImportSettings.cs
@@ -66,7 +66,7 @@ public class ArrSoundtrackImportSettings : IImportListSettings
         [FieldDefinition(4, Label = "Use Strong Search", Type = FieldType.Checkbox, HelpText = "Enable to use a strong-typed search query on MusicBrainz. Disable to allow more lenient searches, which may include audio tracks from movies.", Advanced = true)]
         public bool UseStrongMusicBrainzSearch { get; set; } = true;
 
-        [FieldDefinition(5, Label = "Cache Directory", Type = FieldType.Path, HelpText = "The directory where cached data will be stored. If left empty, the default cache directory will be used.", Placeholder = "/config/soundtrack-cache")]
+        [FieldDefinition(5, Label = "Cache Directory", Type = FieldType.Path, HelpText = "The directory where cached data will be stored.", Placeholder = "/config/soundtrack-cache")]
         public string CacheDirectory { get; set; } = string.Empty;
 
         [FieldDefinition(6, Label = "Cache Retention Time", Type = FieldType.Number, HelpText = "The number of days to retain cached data.", Advanced = true, Placeholder = "7")]
diff --git a/Tubifarry/ImportLists/ArrStack/ArrSoundtrackRequestGenerator.cs b/Tubifarry/ImportLists/ArrStack/ArrSoundtrackRequestGenerator.cs
@@ -1,17 +1,14 @@
-﻿using NLog;
-using NzbDrone.Common.Http;
+﻿using NzbDrone.Common.Http;
 
 namespace NzbDrone.Core.ImportLists.ArrStack
 {
     internal class ArrSoundtrackRequestGenerator : IImportListRequestGenerator
     {
         public ArrSoundtrackImportSettings Settings { get; set; }
-        public Logger Logger { get; set; }
 
-        public ArrSoundtrackRequestGenerator(ArrSoundtrackImportSettings settings, Logger logger)
+        public ArrSoundtrackRequestGenerator(ArrSoundtrackImportSettings settings)
         {
             Settings = settings;
-            Logger = logger;
         }
 
         public ImportListPageableRequestChain GetListItems()
diff --git a/Tubifarry/ImportLists/Spotify/SpotifyUserPlaylistImport.cs b/Tubifarry/ImportLists/Spotify/SpotifyUserPlaylistImport.cs
diff --git a/Tubifarry/ImportLists/Spotify/SpotifyUserPlaylistImportSettings.cs b/Tubifarry/ImportLists/Spotify/SpotifyUserPlaylistImportSettings.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using NLog;`
	`2`	`+using NzbDrone.Common.Instrumentation;`
`2`	`3`	`using NzbDrone.Core.Parser.Model;`
`3`	`4`	`using Xabe.FFmpeg;`
`4`	`5`	`using Xabe.FFmpeg.Downloader;`
`@@ -16,10 +17,10 @@ internal class AudioMetadataHandler`
`16`	`17`	`public bool UseID3v2_3 { get; set; }`
`17`	`18`
`18`	`19`
`19`		`- public AudioMetadataHandler(string originalPath, Logger? logger)`
	`20`	`+ public AudioMetadataHandler(string originalPath)`
`20`	`21`	`{`
`21`	`22`	`TrackPath = originalPath;`
`22`		`- _logger = logger;`
	`23`	`+ _logger = NzbDroneLogger.GetLogger(this); ;`
`23`	`24`	`}`
`24`	`25`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ public FileCache(string cacheDirectory)`
`25`	`25`
`26`	`26`	`if (cachedData == null \|\| DateTime.UtcNow - cachedData.CreatedAt > cachedData.ExpirationDuration)`
`27`	`27`	`{`
`28`		`- // Cache is expired or invalid, delete the file`
`29`	`28`	`File.Delete(cacheFilePath);`
`30`	`29`	`return default;`
`31`	`30`	`}`
`@@ -44,7 +43,9 @@ public async Task SetAsync<T>(string cacheKey, T data, TimeSpan expirationDurati`
`44`	`43`	`ExpirationDuration = expirationDuration`
`45`	`44`	`};`
`46`	`45`
`47`		`- string json = JsonSerializer.Serialize(cachedData);`
	`46`	`+ JsonSerializerOptions options = new() { WriteIndented = true };`
	`47`	`+`
	`48`	`+ string json = JsonSerializer.Serialize(cachedData, options);`
`48`	`49`	`await File.WriteAllTextAsync(cacheFilePath, json);`
`49`	`50`	`}`
`50`	`51`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public YoutubeDownloadManager(Logger logger)`
`42`	`42`	`_logger = logger;`
`43`	`43`	`_queue = new();`
`44`	`44`	`_ytClient = new YouTubeMusicClient();`
`45`		`- _logger.Debug("Initialized");`
	`45`	`+ _logger.Trace("Initialized");`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public void SetCookies(string path)`
`@@ -71,11 +71,10 @@ public Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer, NamingCo`
`71`	`71`	`LRCLIBInstance = provider.Settings.LRCLIBInstance,`
`72`	`72`	`UseID3v2_3 = provider.Settings.UseID3v2_3,`
`73`	`73`	`ReEncodeOptions = (ReEncodeOptions)provider.Settings.ReEncode,`
`74`		`- ClientInfo = DownloadClientItemClientInfo.FromDownloadClient(provider, false),`
`75`		`- Logger = _logger,`
	`74`	`+ ClientInfo = DownloadClientItemClientInfo.FromDownloadClient(provider, false)`
`76`	`75`	`});`
`77`	`76`	`_queue.Add(request);`
`78`		`- _logger.Debug($"Download request added to queue. Request ID: {request.ID}");`
	`77`	`+ _logger.Trace($"Download request added to queue. Request ID: {request.ID}");`
`79`	`78`	`return Task.FromResult(request.ID);`
`80`	`79`	`}`
`81`	`80`
`@@ -88,7 +87,7 @@ public void RemoveItem(DownloadClientItem item)`
`88`	`87`	`return;`
`89`	`88`	`req.Dispose();`
`90`	`89`	`_queue.Remove(req);`
`91`		`- _logger.Debug($"Item removed from queue. Download ID: {item.DownloadId}");`
	`90`	`+ _logger.Trace($"Item removed from queue. Download ID: {item.DownloadId}");`
`92`	`91`	`}`
`93`	`92`	`}`
`94`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ public class ArrSoundtrackImport : HttpImportListBase<ArrSoundtrackImportSetting`
`30`	`30`
`31`	`31`	`public ArrSoundtrackImport(IHttpClient httpClient, IImportListStatusService importListStatusService, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, importListStatusService, configService, parsingService, logger) { }`
`32`	`32`
`33`		`- public override IImportListRequestGenerator GetRequestGenerator() => _generator ??= new ArrSoundtrackRequestGenerator(Settings, _logger);`
	`33`	`+ public override IImportListRequestGenerator GetRequestGenerator() => _generator ??= new ArrSoundtrackRequestGenerator(Settings);`
`34`	`34`
`35`		`- public override IParseImportListResponse GetParser() => _parser ??= new ArrSoundtrackImportParser(Settings, _logger, _httpClient);`
	`35`	`+ public override IParseImportListResponse GetParser() => _parser ??= new ArrSoundtrackImportParser(Settings, _httpClient);`
`36`	`36`
`37`	`37`	`protected override void Test(List<ValidationFailure> failures)`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using NLog;`
`2`	`2`	`using NzbDrone.Common.Http;`
	`3`	`+using NzbDrone.Common.Instrumentation;`
`3`	`4`	`using NzbDrone.Core.Parser.Model;`
`4`	`5`	`using System.Security.Cryptography;`
`5`	`6`	`using System.Text;`
`@@ -15,22 +16,23 @@ namespace NzbDrone.Core.ImportLists.ArrStack`
`15`	`16`	`internal class ArrSoundtrackImportParser : IParseImportListResponse`
`16`	`17`	`{`
`17`	`18`	`private static readonly string[] SoundtrackTerms = { "soundtrack", "ost", "score", "original soundtrack", "film score" };`
`18`		`-`
`19`		`- public ArrSoundtrackImportSettings Settings { get; set; }`
`20`		`- public Logger Logger { get; set; }`
	`19`	`+ public readonly Logger _logger;`
`21`	`20`	`private readonly IHttpClient _httpClient;`
`22`	`21`	`private readonly FileCache _fileCache;`
`23`	`22`
	`23`	`+ public ArrSoundtrackImportSettings Settings { get; set; }`
	`24`	`+`
	`25`	`+`
`24`	`26`	`private static readonly JsonSerializerOptions _jsonOptions = new()`
`25`	`27`	`{`
`26`	`28`	`PropertyNameCaseInsensitive = true,`
`27`	`29`	`DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull`
`28`	`30`	`};`
`29`	`31`
`30`		`- public ArrSoundtrackImportParser(ArrSoundtrackImportSettings settings, Logger logger, IHttpClient httpClient)`
	`32`	`+ public ArrSoundtrackImportParser(ArrSoundtrackImportSettings settings, IHttpClient httpClient)`
`31`	`33`	`{`
`32`	`34`	`Settings = settings;`
`33`		`- Logger = logger;`
	`35`	`+ _logger = NzbDroneLogger.GetLogger(this);`
`34`	`36`	`_httpClient = httpClient;`
`35`	`37`	`_fileCache = new FileCache(Settings.CacheDirectory);`
`36`	`38`	`}`
`@@ -91,7 +93,7 @@ public async Task<List<ImportListItemInfo>> ParseResponseAsync(ImportListRespons`
`91`	`93`	`itemInfos.Add(importItem);`
`92`	`94`	`}`
`93`	`95`	`else`
`94`		`- Logger.Debug($"Not similar enough: {albumDetails?.Title ?? "Empty"} \| {media.Title}");`
	`96`	`+ _logger.Debug($"Not similar enough: {albumDetails?.Title ?? "Empty"} \| {media.Title}");`
`95`	`97`	`}`
`96`	`98`
`97`	`99`	`CachedData cachedDataToSave = new()`
`@@ -111,10 +113,10 @@ public async Task<List<ImportListItemInfo>> ParseResponseAsync(ImportListRespons`
`111`	`113`	`{`
`112`	`114`	`if (ex.Message.Contains("503:ServiceUnavailable"))`
`113`	`115`	`{`
`114`		`- Logger.Warn("Rate limit exceeded. Stopping further processing.");`
	`116`	`+ _logger.Warn("Rate limit exceeded. Stopping further processing.");`
`115`	`117`	`break;`
`116`	`118`	`}`
`117`		`- Logger.Error(ex, "Failed fetching search");`
	`119`	`+ _logger.Error(ex, "Failed fetching search");`
`118`	`120`	`}`
`119`	`121`	`}`
`120`	`122`	`return itemInfos;`
`@@ -179,7 +181,7 @@ private static string EscapeLuceneQuery(string query)`
`179`	`181`
`180`	`182`	`if (releaseGroup == null)`
`181`	`183`	`{`
`182`		`- Logger.Warn($"No release-group found for album ID: {albumId}");`
	`184`	`+ _logger.Warn($"No release-group found for album ID: {albumId}");`
`183`	`185`	`return null;`
`184`	`186`	`}`
`185`	`187`	`return MusicBrainzAlbumItem.FromXml(releaseGroup, ns);`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,14 @@`
`1`		`-using NLog;`
`2`		`-using NzbDrone.Common.Http;`
	`1`	`+using NzbDrone.Common.Http;`
`3`	`2`
`4`	`3`	`namespace NzbDrone.Core.ImportLists.ArrStack`
`5`	`4`	`{`
`6`	`5`	`internal class ArrSoundtrackRequestGenerator : IImportListRequestGenerator`
`7`	`6`	`{`
`8`	`7`	`public ArrSoundtrackImportSettings Settings { get; set; }`
`9`		`- public Logger Logger { get; set; }`
`10`	`8`
`11`		`- public ArrSoundtrackRequestGenerator(ArrSoundtrackImportSettings settings, Logger logger)`
	`9`	`+ public ArrSoundtrackRequestGenerator(ArrSoundtrackImportSettings settings)`
`12`	`10`	`{`
`13`	`11`	`Settings = settings;`
`14`		`- Logger = logger;`
`15`	`12`	`}`
`16`	`13`
`17`	`14`	`public ImportListPageableRequestChain GetListItems()`