test

README.md

@@ -214,18 +214,15 @@ services:
       # OR
       # - DOWNLOAD_CLIENT=qBittorrent
       # - QBITTORRENT__URL=http://localhost:8080
-      # - QBITTORRENT__URL_BASE=myCustomPath
       # - QBITTORRENT__USERNAME=user
       # - QBITTORRENT__PASSWORD=pass
       # OR
       # - DOWNLOAD_CLIENT=deluge
-      # - DELUGE__URL_BASE=myCustomPath
       # - DELUGE__URL=http://localhost:8112
       # - DELUGE__PASSWORD=testing
       # OR
       # - DOWNLOAD_CLIENT=transmission
       # - TRANSMISSION__URL=http://localhost:9091
-      # - TRANSMISSION__URL_BASE=myCustomPath
       # - TRANSMISSION__USERNAME=test
       # - TRANSMISSION__PASSWORD=testing
 

code/Common/Configuration/DownloadClient/DelugeConfig.cs

@@ -1,5 +1,4 @@
-using Common.Exceptions;
-using Microsoft.Extensions.Configuration;
+using Common.Exceptions;
 
 namespace Common.Configuration.DownloadClient;
 
@@ -9,9 +8,6 @@ public sealed record DelugeConfig : IConfig
     
     public Uri? Url { get; init; }
     
-    [ConfigurationKeyName("URL_BASE")]
-    public string UrlBase { get; init; } = string.Empty;
-    
     public string? Password { get; init; }
     
     public void Validate()

code/Common/Configuration/DownloadClient/QBitConfig.cs

@@ -1,5 +1,4 @@
-using Common.Exceptions;
-using Microsoft.Extensions.Configuration;
+using Common.Exceptions;
 
 namespace Common.Configuration.DownloadClient;
 
@@ -9,9 +8,6 @@ public sealed class QBitConfig : IConfig
     
     public Uri? Url { get; init; }
     
-    [ConfigurationKeyName("URL_BASE")]
-    public string UrlBase { get; init; } = string.Empty;
-    
     public string? Username { get; init; }
     
     public string? Password { get; init; }

code/Common/Configuration/DownloadClient/TransmissionConfig.cs

@@ -1,5 +1,4 @@
-using Common.Exceptions;
-using Microsoft.Extensions.Configuration;
+using Common.Exceptions;
 
 namespace Common.Configuration.DownloadClient;
 
@@ -9,9 +8,6 @@ public record TransmissionConfig : IConfig
     
     public Uri? Url { get; init; }
     
-    [ConfigurationKeyName("URL_BASE")]
-    public string UrlBase { get; init; } = "transmission";
-    
     public string? Username { get; init; }
     
     public string? Password { get; init; }

code/Executable/Program.cs

@@ -9,4 +9,7 @@ builder.Logging.AddLogging(builder.Configuration);
 var host = builder.Build();
 host.Init();
 
-host.Run();
+host.Run();
+
+
+

code/Executable/appsettings.Development.json

@@ -52,18 +52,15 @@
   "DOWNLOAD_CLIENT": "qbittorrent",
   "qBittorrent": {
     "Url": "http://localhost:8080",
-    "URL_BASE": "",
     "Username": "test",
     "Password": "testing"
   },
   "Deluge": {
     "Url": "http://localhost:8112",
-    "URL_BASE": "",
     "Password": "testing"
   },
   "Transmission": {
     "Url": "http://localhost:9091",
-    "URL_BASE": "transmission",
     "Username": "test",
     "Password": "testing"
   },

code/Executable/appsettings.json

@@ -42,18 +42,15 @@
   "DOWNLOAD_CLIENT": "none",
   "qBittorrent": {
     "Url": "http://localhost:8080",
-    "URL_BASE": "",
     "Username": "",
     "Password": ""
   },
   "Deluge": {
     "Url": "http://localhost:8112",
-    "URL_BASE": "",
     "Password": "testing"
   },
   "Transmission": {
     "Url": "http://localhost:9091",
-    "URL_BASE": "transmission",
     "Username": "test",
     "Password": "testing"
   },

code/Infrastructure/Verticals/Arr/ArrClient.cs

@@ -43,11 +43,9 @@ public abstract class ArrClient : IArrClient
 
     public virtual async Task<QueueListResponse> GetQueueItemsAsync(ArrInstance arrInstance, int page)
     {
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/{GetQueueUrlPath().TrimStart('/')}";
-        uriBuilder.Query = GetQueueUrlQuery(page);
+        Uri uri = new(arrInstance.Url, GetQueueUrlPath(page));
 
-        using HttpRequestMessage request = new(HttpMethod.Get, uriBuilder.Uri);
+        using HttpRequestMessage request = new(HttpMethod.Get, uri);
         SetApiKey(request, arrInstance.ApiKey);
         
         using HttpResponseMessage response = await _httpClient.SendAsync(request);
@@ -58,7 +56,7 @@ public abstract class ArrClient : IArrClient
         }
         catch
         {
-            _logger.LogError("queue list failed | {uri}", uriBuilder.Uri);
+            _logger.LogError("queue list failed | {uri}", uri);
             throw;
         }
         
@@ -67,7 +65,7 @@ public abstract class ArrClient : IArrClient
 
         if (queueResponse is null)
         {
-            throw new Exception($"unrecognized queue list response | {uriBuilder.Uri} | {responseBody}");
+            throw new Exception($"unrecognized queue list response | {uri} | {responseBody}");
         }
 
         return queueResponse;
@@ -116,13 +114,11 @@ public abstract class ArrClient : IArrClient
     
     public virtual async Task DeleteQueueItemAsync(ArrInstance arrInstance, QueueRecord record, bool removeFromClient)
     {
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/{GetQueueDeleteUrlPath(record.Id).TrimStart('/')}";
-        uriBuilder.Query = GetQueueDeleteUrlQuery(removeFromClient);
+        Uri uri = new(arrInstance.Url, GetQueueDeleteUrlPath(record.Id, removeFromClient));
 
         try
         {
-            using HttpRequestMessage request = new(HttpMethod.Delete, uriBuilder.Uri);
+            using HttpRequestMessage request = new(HttpMethod.Delete, uri);
             SetApiKey(request, arrInstance.ApiKey);
 
             HttpResponseMessage? response = await _dryRunInterceptor.InterceptAsync<HttpResponseMessage>(SendRequestAsync, request);
@@ -138,7 +134,7 @@ public abstract class ArrClient : IArrClient
         }
         catch
         {
-            _logger.LogError("queue delete failed | {uri} | {title}", uriBuilder.Uri, record.Title);
+            _logger.LogError("queue delete failed | {uri} | {title}", uri, record.Title);
             throw;
         }
     }
@@ -156,13 +152,9 @@ public abstract class ArrClient : IArrClient
         return true;
     }
     
-    protected abstract string GetQueueUrlPath();
+    protected abstract string GetQueueUrlPath(int page);
 
-    protected abstract string GetQueueUrlQuery(int page);
-
-    protected abstract string GetQueueDeleteUrlPath(long recordId);
-    
-    protected abstract string GetQueueDeleteUrlQuery(bool removeFromClient);
+    protected abstract string GetQueueDeleteUrlPath(long recordId, bool removeFromClient);
     
     protected virtual void SetApiKey(HttpRequestMessage request, string apiKey)
     {

code/Infrastructure/Verticals/Arr/LidarrClient.cs

@@ -27,42 +27,29 @@ public class LidarrClient : ArrClient, ILidarrClient
     {
     }
 
-    protected override string GetQueueUrlPath()
+    protected override string GetQueueUrlPath(int page)
     {
-        return "/api/v1/queue";
+        return $"/api/v1/queue?page={page}&pageSize=200&includeUnknownArtistItems=true&includeArtist=true&includeAlbum=true";
     }
 
-    protected override string GetQueueUrlQuery(int page)
+    protected override string GetQueueDeleteUrlPath(long recordId, bool removeFromClient)
     {
-        return $"page={page}&pageSize=200&includeUnknownArtistItems=true&includeArtist=true&includeAlbum=true";
-    }
+        string path = $"/api/v1/queue/{recordId}?blocklist=true&skipRedownload=true&changeCategory=false";
 
-    protected override string GetQueueDeleteUrlPath(long recordId)
-    {
-        return $"/api/v1/queue/{recordId}";
-    }
+        path += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
 
-    protected override string GetQueueDeleteUrlQuery(bool removeFromClient)
-    {
-        string query = "blocklist=true&skipRedownload=true&changeCategory=false";
-        query += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
-
-        return query;
+        return path;
     }
 
     public override async Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items)
     {
-        if (items?.Count is null or 0)
-        {
-            return;
-        }
+        if (items?.Count is null or 0) return;
 
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v1/command";
+        Uri uri = new(arrInstance.Url, "/api/v1/command");
 
         foreach (var command in GetSearchCommands(items))
         {
-            using HttpRequestMessage request = new(HttpMethod.Post, uriBuilder.Uri);
+            using HttpRequestMessage request = new(HttpMethod.Post, uri);
             request.Content = new StringContent(
                 JsonConvert.SerializeObject(command, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
                 Encoding.UTF8,
@@ -145,11 +132,8 @@ public class LidarrClient : ArrClient, ILidarrClient
 
     private async Task<List<Album>?> GetAlbumsAsync(ArrInstance arrInstance, List<long> albumIds)
     {
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v1/album";
-        uriBuilder.Query = string.Join('&', albumIds.Select(x => $"albumIds={x}"));
-        
-        using HttpRequestMessage request = new(HttpMethod.Get, uriBuilder.Uri);
+        Uri uri = new(arrInstance.Url, $"api/v1/album?{string.Join('&', albumIds.Select(x => $"albumIds={x}"))}");
+        using HttpRequestMessage request = new(HttpMethod.Get, uri);
         SetApiKey(request, arrInstance.ApiKey);
 
         using var response = await _httpClient.SendAsync(request);

code/Infrastructure/Verticals/Arr/RadarrClient.cs

@@ -27,27 +27,18 @@ public class RadarrClient : ArrClient, IRadarrClient
     {
     }
 
-    protected override string GetQueueUrlPath()
+    protected override string GetQueueUrlPath(int page)
     {
-        return "/api/v3/queue";
+        return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownMovieItems=true&includeMovie=true";
     }
 
-    protected override string GetQueueUrlQuery(int page)
+    protected override string GetQueueDeleteUrlPath(long recordId, bool removeFromClient)
     {
-        return $"page={page}&pageSize=200&includeUnknownMovieItems=true&includeMovie=true";
-    }
+        string path = $"/api/v3/queue/{recordId}?blocklist=true&skipRedownload=true&changeCategory=false";
+        
+        path += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
 
-    protected override string GetQueueDeleteUrlPath(long recordId)
-    {
-        return $"/api/v3/queue/{recordId}";
-    }
-
-    protected override string GetQueueDeleteUrlQuery(bool removeFromClient)
-    {
-        string query = "blocklist=true&skipRedownload=true&changeCategory=false";
-        query += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
-
-        return query;
+        return path;
     }
 
     public override async Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items)
@@ -59,16 +50,14 @@ public class RadarrClient : ArrClient, IRadarrClient
 
         List<long> ids = items.Select(item => item.Id).ToList();
         
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v3/command";
-        
+        Uri uri = new(arrInstance.Url, "/api/v3/command");
         RadarrCommand command = new()
         {
             Name = "MoviesSearch",
             MovieIds = ids,
         };
         
-        using HttpRequestMessage request = new(HttpMethod.Post, uriBuilder.Uri);
+        using HttpRequestMessage request = new(HttpMethod.Post, uri);
         request.Content = new StringContent(
             JsonConvert.SerializeObject(command),
             Encoding.UTF8,
@@ -146,10 +135,8 @@ public class RadarrClient : ArrClient, IRadarrClient
 
     private async Task<Movie?> GetMovie(ArrInstance arrInstance, long movieId)
     {
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v3/movie/{movieId}";
-        
-        using HttpRequestMessage request = new(HttpMethod.Get, uriBuilder.Uri);
+        Uri uri = new(arrInstance.Url, $"api/v3/movie/{movieId}");
+        using HttpRequestMessage request = new(HttpMethod.Get, uri);
         SetApiKey(request, arrInstance.ApiKey);
 
         using HttpResponseMessage response = await _httpClient.SendAsync(request);

code/Infrastructure/Verticals/Arr/SonarrClient.cs

@@ -28,27 +28,18 @@ public class SonarrClient : ArrClient, ISonarrClient
     {
     }
     
-    protected override string GetQueueUrlPath()
+    protected override string GetQueueUrlPath(int page)
     {
-        return "/api/v3/queue";
+        return $"/api/v3/queue?page={page}&pageSize=200&includeUnknownSeriesItems=true&includeSeries=true&includeEpisode=true";
     }
-
-    protected override string GetQueueUrlQuery(int page)
+    
+    protected override string GetQueueDeleteUrlPath(long recordId, bool removeFromClient)
     {
-        return $"page={page}&pageSize=200&includeUnknownSeriesItems=true&includeSeries=true&includeEpisode=true";
-    }
+        string path = $"/api/v3/queue/{recordId}?blocklist=true&skipRedownload=true&changeCategory=false";
 
-    protected override string GetQueueDeleteUrlPath(long recordId)
-    {
-        return $"/api/v3/queue/{recordId}";
-    }
+        path += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
 
-    protected override string GetQueueDeleteUrlQuery(bool removeFromClient)
-    {
-        string query = "blocklist=true&skipRedownload=true&changeCategory=false";
-        query += removeFromClient ? "&removeFromClient=true" : "&removeFromClient=false";
-        
-        return query;
+        return path;
     }
 
     public override async Task RefreshItemsAsync(ArrInstance arrInstance, HashSet<SearchItem>? items)
@@ -58,12 +49,11 @@ public class SonarrClient : ArrClient, ISonarrClient
             return;
         }
 
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v3/command";
+        Uri uri = new(arrInstance.Url, "/api/v3/command");
         
         foreach (SonarrCommand command in GetSearchCommands(items.Cast<SonarrSearchItem>().ToHashSet()))
         {
-            using HttpRequestMessage request = new(HttpMethod.Post, uriBuilder.Uri);
+            using HttpRequestMessage request = new(HttpMethod.Post, uri);
             request.Content = new StringContent(
                 JsonConvert.SerializeObject(command, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore }),
                 Encoding.UTF8,
@@ -209,11 +199,8 @@ public class SonarrClient : ArrClient, ISonarrClient
 
     private async Task<List<Episode>?> GetEpisodesAsync(ArrInstance arrInstance, List<long> episodeIds)
     {
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v3/episode";
-        uriBuilder.Query = string.Join('&', episodeIds.Select(x => $"episodeIds={x}"));
-        
-        using HttpRequestMessage request = new(HttpMethod.Get, uriBuilder.Uri);
+        Uri uri = new(arrInstance.Url, $"api/v3/episode?{string.Join('&', episodeIds.Select(x => $"episodeIds={x}"))}");
+        using HttpRequestMessage request = new(HttpMethod.Get, uri);
         SetApiKey(request, arrInstance.ApiKey);
 
         using HttpResponseMessage response = await _httpClient.SendAsync(request);
@@ -225,10 +212,8 @@ public class SonarrClient : ArrClient, ISonarrClient
 
     private async Task<Series?> GetSeriesAsync(ArrInstance arrInstance, long seriesId)
     {
-        UriBuilder uriBuilder = new(arrInstance.Url);
-        uriBuilder.Path = $"{uriBuilder.Path.TrimEnd('/')}/api/v3/series/{seriesId}";
-        
-        using HttpRequestMessage request = new(HttpMethod.Get, uriBuilder.Uri);
+        Uri uri = new(arrInstance.Url, $"api/v3/series/{seriesId}");
+        using HttpRequestMessage request = new(HttpMethod.Get, uri);
         SetApiKey(request, arrInstance.ApiKey);
 
         using HttpResponseMessage response = await _httpClient.SendAsync(request);

code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeClient.cs

@@ -33,7 +33,6 @@ public sealed class DelugeClient
     public DelugeClient(IOptions<DelugeConfig> config, IHttpClientFactory httpClientFactory)
     {
         _config = config.Value;
-        _config.Validate();
         _httpClient = httpClientFactory.CreateClient(nameof(DelugeService));
     }
     
@@ -80,24 +79,11 @@ public sealed class DelugeClient
     
     public async Task<TorrentStatus?> GetTorrentStatus(string hash)
     {
-        try
-        {
-            return await SendRequest<TorrentStatus?>(
-                "web.get_torrent_status",
-                hash,
-                Fields
-            );
-        }
-        catch (DelugeClientException e)
-        {
-            // Deluge returns an error when the torrent is not found
-            if (e.Message == "AttributeError: 'NoneType' object has no attribute 'call'")
-            {
-                return null;
-            }
-
-            throw;
-        }
+        return await SendRequest<TorrentStatus?>(
+            "web.get_torrent_status",
+            hash,
+            Fields
+        );
     }
     
     public async Task<List<TorrentStatus>?> GetStatusForAllTorrents()
@@ -135,12 +121,8 @@ public sealed class DelugeClient
     {
         StringContent content = new StringContent(json);
         content.Headers.ContentType = new MediaTypeWithQualityHeaderValue("application/json");
-        
-        UriBuilder uriBuilder = new(_config.Url);
-        uriBuilder.Path = string.IsNullOrEmpty(_config.UrlBase)
-            ? $"{uriBuilder.Path.TrimEnd('/')}/json"
-            : $"{uriBuilder.Path.TrimEnd('/')}/{_config.UrlBase.TrimStart('/').TrimEnd('/')}/json";
-        var responseMessage = await _httpClient.PostAsync(uriBuilder.Uri, content);
+
+        var responseMessage = await _httpClient.PostAsync(new Uri(_config.Url, "/json"), content);
         responseMessage.EnsureSuccessStatusCode();
 
         var responseJson = await responseMessage.Content.ReadAsStringAsync();

code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs

@@ -45,11 +45,7 @@ public class QBitService : DownloadService, IQBitService
     {
         _config = config.Value;
         _config.Validate();
-        UriBuilder uriBuilder = new(_config.Url);
-        uriBuilder.Path = string.IsNullOrEmpty(_config.UrlBase)
-            ? uriBuilder.Path
-            : $"{uriBuilder.Path.TrimEnd('/')}/{_config.UrlBase.TrimStart('/')}";
-        _client = new(httpClientFactory.CreateClient(Constants.HttpClientWithRetryName), uriBuilder.Uri);
+        _client = new(httpClientFactory.CreateClient(Constants.HttpClientWithRetryName), _config.Url);
     }
 
     public override async Task LoginAsync()

code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs

@@ -64,13 +64,9 @@ public class TransmissionService : DownloadService, ITransmissionService
     {
         _config = config.Value;
         _config.Validate();
-        UriBuilder uriBuilder = new(_config.Url);
-        uriBuilder.Path = string.IsNullOrEmpty(_config.UrlBase)
-            ? $"{uriBuilder.Path.TrimEnd('/')}/rpc"
-            : $"{uriBuilder.Path.TrimEnd('/')}/{_config.UrlBase.TrimStart('/').TrimEnd('/')}/rpc";
         _client = new(
             httpClientFactory.CreateClient(Constants.HttpClientWithRetryName),
-            uriBuilder.Uri.ToString(),
+            new Uri(_config.Url, "/transmission/rpc").ToString(),
             login: _config.Username,
             password: _config.Password
         );

variables.md

@@ -378,12 +378,6 @@
 - Default: `http://localhost:8080`.
 - Required: No.
 
-#### **`QBITTORRENT__URL_BASE`**
-- Adds a prefix to the qBittorrent url, such as `[QBITTORRENT__URL]/[QBITTORRENT__URL_BASE]/api`.
-- Type: String.
-- Default: Empty.
-- Required: No.
-
 #### **`QBITTORRENT__USERNAME`**
 - Username for qBittorrent authentication.
 - Type: String.
@@ -402,12 +396,6 @@
 - Default: `http://localhost:8112`.
 - Required: No.
 
-#### **`DELUGE__URL_BASE`**
-- Adds a prefix to the deluge json url, such as `[DELUGE__URL]/[DELUGE__URL_BASE]/json`.
-- Type: String.
-- Default: Empty.
-- Required: No.
-
 #### **`DELUGE__PASSWORD`**
 - Password for Deluge authentication.
 - Type: String.
@@ -420,12 +408,6 @@
 - Default: `http://localhost:9091`.
 - Required: No.
 
-#### **`TRANSMISSION__URL_BASE`**
-- Adds a prefix to the Transmission rpc url, such as `[TRANSMISSION__URL]/[TRANSMISSION__URL_BASE]/rpc`.
-- Type: String.
-- Default: `transmission`.
-- Required: No.
-
 #### **`TRANSMISSION__USERNAME`**
 - Username for Transmission authentication.
 - Type: String.