try

Author: Meyn

Tubifarry/Download/Clients/Soulseek/SlskdClient.cs

@@ -4,6 +4,7 @@
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.History;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.RemotePathMappings;
@@ -15,13 +16,15 @@ namespace NzbDrone.Core.Download.Clients.Soulseek
     public class SlskdClient : DownloadClientBase<SlskdProviderSettings>
     {
         private readonly IHttpClient _httpClient;
+        private readonly IHistoryService _historyService;
+
         private static readonly Dictionary<DownloadKey, SlskdDownloadItem> _downloadMappings = new();
 
         public override string Name => "Slskd";
         public override string Protocol => nameof(SoulseekDownloadProtocol);
 
-        public SlskdClient(IHttpClient httpClient, IConfigService configService, IDiskProvider diskProvider, IRemotePathMappingService remotePathMappingService, Logger logger)
-            : base(configService, diskProvider, remotePathMappingService, logger) => _httpClient = httpClient;
+        public SlskdClient(IHttpClient httpClient, IConfigService configService, IDiskProvider diskProvider,IHistoryService history, IRemotePathMappingService remotePathMappingService, Logger logger)
+            : base(configService, diskProvider, remotePathMappingService, logger) { _httpClient = httpClient; _historyService = history; }
 
 
         public override async Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer)

Tubifarry/Download/Clients/Soulseek/SlskdModels.cs

@@ -22,13 +22,13 @@ public SlskdDownloadItem(RemoteAlbum remoteAlbum)
         {
             RemoteAlbum = remoteAlbum;
             FileData = JsonSerializer.Deserialize<List<SlskdFileData>>(RemoteAlbum.Release.Source) ?? new();
-            _downloadClientItem = new() { DownloadId = ID.ToString(), CanBeRemoved = true, CanMoveFiles = true };
             _lastUpdateTime = DateTime.UtcNow;
             _lastDownloadedSize = 0;
             HashCode hash = new();
             foreach (SlskdFileData file in FileData)
                 hash.Add(file.Filename);
             ID = hash.ToHashCode();
+            _downloadClientItem = new() { DownloadId = ID.ToString(), CanBeRemoved = true, CanMoveFiles = true };
         }
 
         public DownloadClientItem GetDownloadClientItem(string downloadPath)
@@ -38,7 +38,6 @@ public DownloadClientItem GetDownloadClientItem(string downloadPath)
             .TrimEnd('/')
             .Split('/')
             .LastOrDefault() ?? ""));
-            NzbDroneLogger.GetLogger(true).Info(_downloadClientItem.OutputPath);
             _downloadClientItem.Title = RemoteAlbum.Release.Title;
 
             if (SlskdDownloadDirectory?.Files == null)

Tubifarry/Indexers/Soulseek/SlskdRequestGenerator.cs

@@ -4,6 +4,7 @@
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using System.Net;
+using System.Text;
 
 namespace NzbDrone.Core.Indexers.Soulseek
 {
@@ -69,7 +70,12 @@ private IEnumerable<IndexerRequest> GetRequests(string artist, string? album = n
             _logger.Trace($"Generated search initiation request: {searchRequest.Url}");
 
             HttpRequest request = new HttpRequestBuilder($"{Settings.BaseUrl}/api/v0/searches/{searchData.Id}")
-                .AddQueryParam("includeResponses", true).SetHeader("X-API-KEY", Settings.ApiKey).SetHeader("X-ALBUM", album).SetHeader("X-ARTIST", artist).SetHeader("X-INTERACTIVE", interactive.ToString()).Build();
+                .AddQueryParam("includeResponses", true)
+                .SetHeader("X-API-KEY", Settings.ApiKey)
+                .SetHeader("X-ALBUM", Convert.ToBase64String(Encoding.UTF8.GetBytes(album ?? "")))
+                .SetHeader("X-ARTIST", Convert.ToBase64String(Encoding.UTF8.GetBytes(artist)))
+                .SetHeader("X-INTERACTIVE", interactive.ToString())
+                .Build();
             yield return new IndexerRequest(request);
         }
 
@@ -88,7 +94,7 @@ private async Task WaitOnSearchCompletionAsync(string searchId, TimeSpan timeout
                 if (elapsed > timeout && !hasTimedOut)
                 {
                     hasTimedOut = true;
-                    timeoutEndTime = DateTime.UtcNow.AddSeconds(8);
+                    timeoutEndTime = DateTime.UtcNow.AddSeconds(20);
                 }
                 else if (hasTimedOut && timeoutEndTime < DateTime.UtcNow)
                     break;
@@ -104,10 +110,7 @@ private async Task WaitOnSearchCompletionAsync(string searchId, TimeSpan timeout
                 double delay;
 
                 if (hasTimedOut && DateTime.UtcNow < timeoutEndTime)
-                {
-                    await Task.Delay(1000);
-                    delay = 0.5;
-                }
+                    delay = 1;
                 else
                     delay = CalculateQuadraticDelay(progress);
 

Tubifarry/Indexers/Soulseek/SlskdSettings.cs

@@ -99,7 +99,7 @@ public class SlskdSettings : IIndexerSettings
         public int ResponseLimit { get; set; } = 100;
 
         [FieldDefinition(11, Type = FieldType.Number, Label = "Timeout", Unit = "seconds", HelpText = "Timeout for search requests in seconds.", Advanced = true)]
-        public double TimeoutInSeconds { get; set; } = 15;
+        public double TimeoutInSeconds { get; set; } = 5;
 
         public NzbDroneValidationResult Validate() => new(Validator.Validate(this));
     }

Tubifarry/Indexers/Soulseek/SoulseekModels.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+using System.Text;
+using System.Text.Json;
 using System.Text.RegularExpressions;
 using Tubifarry.Core;
 
@@ -110,8 +111,9 @@ public int CalculatePriority()
     public record SlskdSearchData(string? Artist, string? Album)
     {
         public static SlskdSearchData ParseSearchText(IndexerRequest request) => new(
-                Artist: request.HttpRequest.Headers.GetSingleValue("X-ARTIST"),
-                Album: request.HttpRequest.Headers.GetSingleValue("X-ALBUM"));
+            Artist: Encoding.UTF8.GetString(Convert.FromBase64String(request.HttpRequest.Headers["X-ARTIST"] ?? "")),
+            Album: Encoding.UTF8.GetString(Convert.FromBase64String(request.HttpRequest.Headers["X-ALBUM"] ?? ""))
+        );
     }
 }