Implement timeout handling for Slskd, fix blocklist population issues, and resolve Spotify URL encoding

- Added timeout handling for Slskd downloads to ensure proper failure marking when the timeout is exceeded.
- Fixed blocklist population issues to ensure blocked items are correctly identified and managed.
- Resolved Spotify URL encoding problems to prevent double-encoding

Author: Meyn

Tubifarry/Blocklisting/BaseBlocklist.cs

@@ -11,7 +11,7 @@ public abstract class BaseBlocklist<TProtocol> : IBlocklistForProtocol where TPr
 
         public BaseBlocklist(IBlocklistRepository blocklistRepository) => _blocklistRepository = blocklistRepository;
 
-        public string Protocol => nameof(TProtocol);
+        public string Protocol => typeof(TProtocol).Name;
 
         public bool IsBlocklisted(int artistId, ReleaseInfo release) => _blocklistRepository.BlocklistedByTorrentInfoHash(artistId, release.Guid).Any(b => BaseBlocklist<TProtocol>.SameRelease(b, release));
 

Tubifarry/Blocklisting/Blocklists.cs

@@ -5,6 +5,7 @@ namespace NzbDrone.Core.Blocklisting
     public class YoutubeBlocklist : BaseBlocklist<YoutubeDownloadProtocol>
     {
         public YoutubeBlocklist(IBlocklistRepository blocklistRepository) : base(blocklistRepository) { }
+
     }
 
     public class SoulseekBlocklist : BaseBlocklist<SoulseekDownloadProtocol>

Tubifarry/Download/Clients/Soulseek/SlskdClient.cs

@@ -78,7 +78,7 @@ public override IEnumerable<DownloadClientItem> GetItems()
         {
             UpdateDownloadItemsAsync().Wait();
             DownloadClientItemClientInfo clientInfo = DownloadClientItemClientInfo.FromDownloadClient(this, false);
-            foreach (DownloadClientItem? clientItem in GetDownloadItems().Select(x => x.GetDownloadClientItem(Settings.DownloadPath)))
+            foreach (DownloadClientItem? clientItem in GetDownloadItems().Select(x => x.GetDownloadClientItem(Settings.DownloadPath, Settings.GetTimeout())))
             {
                 clientItem.DownloadClientInfo = clientInfo;
                 yield return clientItem;

Tubifarry/Download/Clients/Soulseek/SlskdModels.cs

@@ -1,4 +1,6 @@
-using NzbDrone.Common.Disk;
+using NLog;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Indexers.Soulseek;
 using NzbDrone.Core.Parser.Model;
 using System.Text.Json;
@@ -18,6 +20,8 @@ public class SlskdDownloadItem
 
         public event EventHandler<SlskdDownloadFile>? FileStateChanged;
 
+        private Logger _logger;
+
         private SlskdDownloadDirectory? _slskdDownloadDirectory;
         private Dictionary<string, string> _previousFileStates = new();
 
@@ -37,6 +41,7 @@ public SlskdDownloadDirectory? SlskdDownloadDirectory
 
         public SlskdDownloadItem(RemoteAlbum remoteAlbum)
         {
+            _logger = NzbDroneLogger.GetLogger(this);
             RemoteAlbum = remoteAlbum;
             FileData = JsonSerializer.Deserialize<List<SlskdFileData>>(RemoteAlbum.Release.Source) ?? new();
             _lastUpdateTime = DateTime.UtcNow;
@@ -65,7 +70,7 @@ private void CompareFileStates(SlskdDownloadDirectory? previousDirectory, SlskdD
             .Split('/')
             .LastOrDefault() ?? ""));
 
-        public DownloadClientItem GetDownloadClientItem(string downloadPath)
+        public DownloadClientItem GetDownloadClientItem(string downloadPath, TimeSpan? timeout)
         {
             _downloadClientItem.OutputPath = GetFullFolderPath(downloadPath);
             _downloadClientItem.Title = RemoteAlbum.Release.Title;
@@ -92,8 +97,11 @@ public DownloadClientItem GetDownloadClientItem(string downloadPath)
                 .Select(file => Path.GetFileName(file.Filename)).ToList();
 
             DownloadItemStatus status = DownloadItemStatus.Queued;
+            DateTime lastTime = SlskdDownloadDirectory.Files.Max(x => x.EnqueuedAt > x.StartedAt ? x.EnqueuedAt : x.StartedAt + x.ElapsedTime);
 
-            if ((double)failedFiles.Count / fileStatuses.Count * 100 > 10)
+            if (now - lastTime > timeout)
+                status = DownloadItemStatus.Failed;
+            else if ((double)failedFiles.Count / fileStatuses.Count * 100 > 10)
             {
                 status = DownloadItemStatus.Failed;
                 _downloadClientItem.Message = $"Downloading {failedFiles.Count} files failed: {string.Join(", ", failedFiles)}";
@@ -161,7 +169,8 @@ public record SlskdDownloadFile(
        long BytesRemaining,
        TimeSpan ElapsedTime,
        double PercentComplete,
-       TimeSpan RemainingTime
+       TimeSpan RemainingTime,
+       TimeSpan? EndedAt
    )
     {
         public DownloadItemStatus GetStatus() => State switch
@@ -195,13 +204,14 @@ public static IEnumerable<SlskdDownloadFile> GetFiles(JsonElement filesElement)
                     State: file.TryGetProperty("state", out JsonElement state) ? state.GetString() ?? string.Empty : string.Empty,
                     RequestedAt: file.TryGetProperty("requestedAt", out JsonElement requestedAt) && DateTime.TryParse(requestedAt.GetString(), out DateTime requestedAtParsed) ? requestedAtParsed : DateTime.MinValue,
                     EnqueuedAt: file.TryGetProperty("enqueuedAt", out JsonElement enqueuedAt) && DateTime.TryParse(enqueuedAt.GetString(), out DateTime enqueuedAtParsed) ? enqueuedAtParsed : DateTime.MinValue,
-                    StartedAt: file.TryGetProperty("startedAt", out JsonElement startedAt) && DateTime.TryParse(startedAt.GetString(), out DateTime startedAtParsed) ? startedAtParsed : DateTime.MinValue,
+                    StartedAt: file.TryGetProperty("startedAt", out JsonElement startedAt) && DateTime.TryParse(startedAt.GetString(), out DateTime startedAtParsed) ? startedAtParsed.ToUniversalTime() : DateTime.MinValue,
                     BytesTransferred: file.TryGetProperty("bytesTransferred", out JsonElement bytesTransferred) ? bytesTransferred.GetInt64() : 0L,
                     AverageSpeed: file.TryGetProperty("averageSpeed", out JsonElement averageSpeed) ? averageSpeed.GetDouble() : 0.0,
                     BytesRemaining: file.TryGetProperty("bytesRemaining", out JsonElement bytesRemaining) ? bytesRemaining.GetInt64() : 0L,
                     ElapsedTime: file.TryGetProperty("elapsedTime", out JsonElement elapsedTime) && TimeSpan.TryParse(elapsedTime.GetString(), out TimeSpan elapsedTimeParsed) ? elapsedTimeParsed : TimeSpan.Zero,
                     PercentComplete: file.TryGetProperty("percentComplete", out JsonElement percentComplete) ? percentComplete.GetDouble() : 0.0,
-                    RemainingTime: file.TryGetProperty("remainingTime", out JsonElement remainingTime) && TimeSpan.TryParse(remainingTime.GetString(), out TimeSpan remainingTimeParsed) ? remainingTimeParsed : TimeSpan.Zero
+                    RemainingTime: file.TryGetProperty("remainingTime", out JsonElement remainingTime) && TimeSpan.TryParse(remainingTime.GetString(), out TimeSpan remainingTimeParsed) ? remainingTimeParsed : TimeSpan.Zero,
+                    EndedAt: file.TryGetProperty("endedAt", out JsonElement endedAt) && TimeSpan.TryParse(endedAt.GetString(), out TimeSpan endedAtParsed) ? endedAtParsed : null
                 );
             }
         }

Tubifarry/Download/Clients/Soulseek/SlskdProviderSettings.cs

@@ -25,6 +25,17 @@ public SlskdProviderSettingsValidator()
                 .Must(path => string.IsNullOrEmpty(path) || Path.IsPathRooted(path))
                 .WithMessage("Download path must be a valid directory path.")
                 .When(x => !string.IsNullOrEmpty(x.DownloadPath));
+
+            // Validate LRCLIBInstance URL
+            RuleFor(x => x.LRCLIBInstance)
+                .IsValidUrl()
+                .WithMessage("LRCLIB instance URL must be a valid URL.");
+
+            // Timeout validation (only if it has a value)
+            RuleFor(c => c.Timeout)
+                .GreaterThanOrEqualTo(0.1)
+                .WithMessage("Timeout must be at least 0.1 hours.")
+                .When(c => c.Timeout.HasValue);
         }
     }
 
@@ -47,12 +58,20 @@ public class SlskdProviderSettings : IProviderConfig
         [FieldDefinition(6, Label = "LRC Lib Instance", Type = FieldType.Url, HelpText = "The URL of a LRC Lib instance to connect to. Default is 'https://lrclib.net'.", Advanced = true)]
         public string LRCLIBInstance { get; set; } = "https://lrclib.net";
 
+        [FieldDefinition(7, Label = "Timeout", Type = FieldType.Textbox, HelpText = "Specify the maximum time to wait for a response from the Slskd instance before timing out. Fractional values are allowed (e.g., 1.5 for 1 hour and 30 minutes). Set leave blank for no timeout.", Unit = "hours", Advanced = true, Placeholder = "Enter timeout in hours")]
+        public double? Timeout { get; set; }
+
         [FieldDefinition(98, Label = "Is Fetched remote", Type = FieldType.Checkbox, Hidden = HiddenType.Hidden)]
         public bool IsRemotePath { get; set; }
 
         [FieldDefinition(99, Label = "Is Localhost", Type = FieldType.Checkbox, Hidden = HiddenType.Hidden)]
         public bool IsLocalhost { get; set; }
 
+
+        public TimeSpan? GetTimeout() => Timeout == null ? null : TimeSpan.FromHours(Timeout.Value);
+
+
+
         public NzbDroneValidationResult Validate() => new(Validator.Validate(this));
     }
 }

Tubifarry/ImportLists/ArrStack/ArrSoundtrackImportSettings.cs

@@ -72,7 +72,7 @@ public class ArrSoundtrackImportSettings : IImportListSettings
         [FieldDefinition(6, Label = "Cache Retention Time", Type = FieldType.Number, HelpText = "The number of days to retain cached data.", Advanced = true, Placeholder = "7")]
         public int CacheRetentionDays { get; set; } = 7;
 
-        [FieldDefinition(7, Label = "Refresh Interval", Type = FieldType.Textbox, HelpText = "The interval in hours to refresh the import list. Fractional values are allowed (e.g., 1.5 for 1 hour and 30 minutes).", Advanced = true, Placeholder = "12")]
+        [FieldDefinition(7, Label = "Refresh Interval", Type = FieldType.Textbox, HelpText = "The interval to refresh the import list. Fractional values are allowed (e.g., 1.5 for 1 hour and 30 minutes).", Unit = "hours", Advanced = true, Placeholder = "12")]
         public double RefreshInterval { get; set; } = 12.0;
 
         public NzbDroneValidationResult Validate() => new(Validator.Validate(this));

Tubifarry/ImportLists/Spotify/SpotifyUserPlaylistImportSettings.cs

@@ -27,7 +27,7 @@ public class SpotifyUserPlaylistImportSettings : SpotifySettingsBase<SpotifyUser
 
         public override string Scope => "playlist-read-private";
 
-        [FieldDefinition(1, Label = "Refresh Interval", Type = FieldType.Textbox, HelpText = "The interval in hours to refresh the import list. Fractional values are allowed (e.g., 1.5 for 1 hour and 30 minutes).", Advanced = true, Placeholder = "12")]
+        [FieldDefinition(1, Label = "Refresh Interval", Type = FieldType.Textbox, HelpText = "The interval to refresh the import list. Fractional values are allowed (e.g., 1.5 for 1 hour and 30 minutes).", Unit = "hours", Advanced = true, Placeholder = "12")]
         public double RefreshInterval { get; set; } = 12.0;
 
         [FieldDefinition(2, Label = "Cache Directory", Type = FieldType.Path, HelpText = "The directory where cached data will be stored. If left empty, no cache will be used.", Placeholder = "/config/spotify-cache")]

Tubifarry/Indexers/Spotify/SpotifyRequestGenerator.cs

@@ -75,7 +75,6 @@ private IEnumerable<IndexerRequest> GetRequests(string searchQuery, string searc
             HandleToken();
 
             string formattedQuery = Uri.EscapeDataString(searchQuery)
-                .Replace("%20", "%2520") // Encode spaces as %2520 for better compatibility
                 .Replace(":", "%3A");    // Encode colons as %3A for filters
 
             for (int page = 0; page < MaxPages; page++)

Tubifarry/Indexers/Spotify/SpotifyToYoutubeParser.cs

@@ -66,7 +66,6 @@ public IList<ReleaseInfo> ParseResponse(IndexerResponse indexerResponse)
                     _logger.Error("Spotify response does not contain 'items' property under 'albums'.");
                     return releases;
                 }
-
                 ProcessAlbums(items, releases);
                 return releases.OrderByDescending(o => o.PublishDate).ToArray();
             }