no message

fix(sabnzbd): Fix delete implementation to respect finished action

.devcontainer/Dockerfile

@@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble
+
+ARG NODE_MAJOR=22
+ARG ANGULAR_CLI_VERSION=21
+
+RUN curl -fsSL "https://deb.nodesource.com/setup_${NODE_MAJOR}.x" | bash - \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends nodejs sqlite3 \
+    && npm install -g "@angular/cli@^${ANGULAR_CLI_VERSION}" \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /data/db /data/downloads \
+    && chown -R vscode:vscode /data

.devcontainer/devcontainer.json

@@ -0,0 +1,51 @@
+{
+  "name": "rdt-client",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      "NODE_MAJOR": "22"
+    }
+  },
+  "remoteUser": "vscode",
+  "runArgs": ["--init"],
+  "containerEnv": {
+    "ASPNETCORE_ENVIRONMENT": "Development",
+    "BASE_PATH": "",
+    "DOTNET_USE_POLLING_FILE_WATCHER": "1",
+    "CHOKIDAR_USEPOLLING": "true"
+  },
+  "forwardPorts": [4200, 6500],
+  "portsAttributes": {
+    "4200": {
+      "label": "Angular client",
+      "onAutoForward": "notify"
+    },
+    "6500": {
+      "label": "RdtClient backend",
+      "onAutoForward": "silent"
+    }
+  },
+  "mounts": [
+    "source=rdtclient-data-db,target=/data/db,type=volume",
+    "source=rdtclient-data-downloads,target=/data/downloads,type=volume",
+    "source=rdtclient-nuget,target=/home/vscode/.nuget,type=volume",
+    "source=rdtclient-npm-cache,target=/home/vscode/.npm,type=volume"
+  ],
+  "postCreateCommand": "/bin/bash .devcontainer/post-create.sh",
+  "postStartCommand": "/bin/bash .devcontainer/post-start.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-dotnettools.csharp",
+        "ms-dotnettools.csdevkit",
+        "Angular.ng-template",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
+      ],
+      "settings": {
+        "dotnet.defaultSolution": "server/RdtClient.sln",
+        "terminal.integrated.defaultProfile.linux": "zsh"
+      }
+    }
+  }
+}

.devcontainer/post-create.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sudo install -d -m 0775 -o vscode -g vscode \
+  /data/db \
+  /data/downloads \
+  /home/vscode/.nuget \
+  /home/vscode/.nuget/NuGet \
+  /home/vscode/.nuget/packages \
+  /home/vscode/.npm
+
+sudo chown -R vscode:vscode /data /home/vscode/.nuget /home/vscode/.npm
+
+dotnet restore server/RdtClient.sln
+npm install --prefix client

.devcontainer/post-start.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+sudo install -d -m 0775 -o vscode -g vscode \
+  /data/db \
+  /data/downloads \
+  /home/vscode/.nuget \
+  /home/vscode/.nuget/NuGet \
+  /home/vscode/.nuget/packages \
+  /home/vscode/.npm
+
+sudo chown -R vscode:vscode /data /home/vscode/.nuget /home/vscode/.npm

.gitignore

@@ -8,3 +8,4 @@ server/RdtClient.Web/appsettings.Development.json
 data
 Dockerfile.dev
 test.bat
+.DS_Store

CHANGELOG.md

@@ -6,6 +6,95 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased
 
+## [2.0.138] - 2026-06-05
+### Fixed
+- SABnzbd fixes.
+
+## [2.0.137] - 2026-06-05
+### Fixed
+- Fix torbox save path mapping for single file downloads.
+
+## [2.0.136] - 2026-05-30
+### Added
+- Added devcontainer development workflow.
+
+### Changed
+- Upgraded torbox.net dependency.
+
+## [2.0.135] - 2026-05-27
+### Changed
+- When adding a torrent through the qBittorrent endpoints, it will wait to see if the torrent gets added properly or errors out, resulting in a better experience for infringing files and Sonarr / Radarr.
+- Upgraded torbox.net dependency. 
+- Support SABnzbd API key auth, thanks to @ALenfant!
+
+## [2.0.134] - 2026-05-22
+### Changed
+- Upgraded torbox.net dependency. 
+
+## [2.0.133] - 2026-05-17
+### Added
+- Added NZB support for Premiumize, thanks to @ALenfant!
+
+## [2.0.132] - 2026-05-17
+### Changed
+- Fixed for Cleanuparr
+- Upgrade Torbox.NET dependency
+
+## [2.0.131] - 2026-05-14
+### Changed
+- Fixes to the rate limiting.
+
+## [2.0.130] - 2026-04-28
+### Changed
+- Fixes to unit tests
+- Upgraded .NET and Angular dependencies
+- Added better qBittorrent capabilities for Cleanuparr
+- Performance fixes
+
+## [2.0.129] - 2026-04-06
+### Added
+- Optimized mobile views, thanks to @sylvaindd!
+
+## [2.0.128] - 2026-04-06
+### Changed
+- Fixed some qBittorrent endpoints.
+
+## [2.0.127] - 2026-03-15
+### Added
+- Implement qBittorrent endpoint for counting torrents, thanks to @vinodmishra!
+
+## [2.0.126] - 2026-03-14
+### Added
+- qBittorrent hash filtering on the /torrrents/info endpoint, thanks to @jfrconley!
+- Category select as a dropdown when adding a new torrent, thanks to @sylvaindd!
+
+### Changed
+- Rate limiting fixes, thanks to @omgbeez!
+- AllDebrid Symlink fixes, thanks to @AlexandreVassard!
+
+## [2.0.125] - 2026-03-01
+### Added
+- Added extra qBittorrent endpoints for Cleanuparr compatibility.
+
+## [2.0.124] - 2026-02-23
+### Added
+- Added /version/api for qBittorrent to support clients that still want to talk to the old API.
+- Improved rate limiting handling.
+
+## [2.0.123] - 2026-02-21
+### Changed
+- Reverted SharpCompress to 0.42.1 due to file locking issues.
+
+## [2.0.122] - 2026-02-21
+### Added
+- Sort torrents by added date by default, remember sort order in the browser.
+
+### Changed
+- Fixed ETA calculations.
+- Fixed Torrentbox statuses.
+- Fixed download progress reports.
+- Fixed NZB delete actions.
+
 ## [2.0.121] - 2026-02-18
 ### Added
 - NZB/Usernet support thanks to @omgbeez!

README.md

@@ -1,15 +1,15 @@
 # Real-Debrid Torrent & Usenet Client
 
-This is a web interface to manage your torrents on Real-Debrid, AllDebrid, Premiumize TorBox or DebridLink. It supports the following features:
+This is a web interface to manage your torrents on Real-Debrid, AllDebrid, Premiumize, TorBox or DebridLink. It supports the following features:
 
 - Add new torrents through magnets or files
-- Add usenet downloads through NZB files (TorBox only)
+- Add usenet downloads through NZB files (TorBox and Premiumize only)
 - Download all files from Real-Debrid, AllDebrid, Premiumize or TorBox to your local machine automatically
 - Unpack all files when finished downloading
 - Implements a fake qBittorrent API so you can hook up other applications like Sonarr, Radarr or Couchpotato.
 - Built with Angular 21 and .NET 10
 
-**You will need a Premium service at Real-Debrid, AllDebrid, Premiumize or Torbox!**
+**You will need a Premium service at Real-Debrid, AllDebrid, Premiumize, Torbox or DebridLink!**
 
 [Click here to sign up for Real-Debrid.](https://real-debrid.com/?id=1348683)
 
@@ -166,7 +166,9 @@ It has the following options:
 
 ### Connecting Sonarr/Radarr
 
-RdtClient emulates the qBittorrent web protocol and allow applications to use those APIs. This way you can use Sonarr and Radarr to download directly from RealDebrid.
+RdtClient emulates the qBittorrent web protocol and allows applications to use those APIs. This way you can use Sonarr and Radarr to download directly from RealDebrid.
+
+#### Torrents
 
 1. Login to Sonarr or Radarr and click `Settings`.
 1. Go to the `Download Client` tab and click the plus to add.
@@ -183,6 +185,24 @@ When downloading files it will append the `category` setting in the Sonarr/Radar
 
 Notice: the progress and ETA reported in Sonarr's Activity tab will not be accurate, but it will report the torrent as completed so it can be processed after it is done downloading.
 
+#### Usenet/NZB
+
+RdtClient also emulates part of the SABnzbd API so Sonarr and Radarr can add NZB downloads. This requires a provider that supports Usenet/NZB downloads, currently TorBox or Premiumize.
+
+1. Login to Sonarr or Radarr and click `Settings`.
+1. Go to the `Download Client` tab and click the plus to add.
+1. Click `SABnzbd` in the list.
+1. Enter the IP or hostname of RdtClient in the `Host` field.
+1. Enter `6500` in the `Port` field.
+1. Enable `Use SSL` only if you access RdtClient through HTTPS.
+1. Leave `URL Base` empty unless RdtClient is configured with a `BasePath`, for example `/rdt`.
+1. If RdtClient authentication is enabled, leave `API Key` empty and enter your RdtClient username and password. If your client only supports an API key, enter `{username}:{password}` in `API Key`.
+1. If RdtClient authentication is disabled, enter any value in `API Key`, for example `rdtclient`, and leave username/password empty.
+1. Set the category to `sonarr` for Sonarr or `radarr` for Radarr.
+1. Hit `Test` and then `Save` if all is well.
+
+When importing completed NZB downloads, Sonarr/Radarr must be able to access the path reported by RdtClient. In Docker setups this may require a Remote Path Mapping from the RdtClient download path to the path mounted inside Sonarr/Radarr.
+
 ### Running within a folder
 
 By default the application runs in the root of your hosted address (i.e. https://rdt.myserver.com/), but if you want to run it as a relative folder (i.e. https://myserver.com/rdt) you will have to change the `BasePath` setting in the `appsettings.json` file. You can set the `BASE_PATH` environment variable for docker enviroments.
@@ -198,6 +218,17 @@ By default the application runs in the root of your hosted address (i.e. https:/
 - Visual Studio 2025
 - (optional) Resharper
 
+### Dev Container
+
+The repository includes a dev container under `.devcontainer/` for the split development workflow used by this project.
+
+It installs .NET 10 and Node 22, forwards ports `4200` and `6500`, and persists `/data/db` and `/data/downloads` in named volumes so the local SQLite database, logs, and downloads survive container rebuilds.
+
+1. Open the repository in the dev container.
+1. In one terminal run `dotnet watch run --project server/RdtClient.Web`.
+1. In another terminal run `cd client && npm start`.
+1. Open `http://localhost:4200`. The Angular dev server proxies `/Api` and `/hub` to the backend running on `6500`.
+
 1. Open the client folder project in VS Code and run `npm install`.
 1. To debug run `ng serve`, to build run `ng build -c production`.
 1. Open the Visual Studio 2025 project `RdtClient.sln` and `Publish` the `RdtClient.Web` to the given `PublishFolder` target.

client/.ncurc.js

@@ -1,14 +1,14 @@
-const minorOnly = ['eslint'];
+const minorOnly = ["eslint", "typescript"];
 const patchOnly = [];
 
 module.exports = {
   target: (name) => {
     if (minorOnly.indexOf(name) > -1) {
-      return 'minor';
+      return "minor";
     }
     if (patchOnly.indexOf(name) > -1) {
-      return 'patch';
+      return "patch";
     }
-    return 'latest';
-  }
+    return "latest";
+  },
 };

client/package.json

@@ -8,46 +8,47 @@
     "watch": "ng build --watch --configuration development",
     "update": "ng update --force --allow-dirty @angular/cli @angular/core @angular/cdk",
     "lint": "ng lint",
-    "prettier": "prettier --write \"./**/*.{ts,html,json}\""
+    "prettier": "prettier --write .",
+    "precommit": "npm run prettier && npm run lint"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^21.1.4",
-    "@angular/cdk": "^21.1.4",
-    "@angular/common": "^21.1.4",
-    "@angular/compiler": "^21.1.4",
-    "@angular/core": "^21.1.4",
-    "@angular/forms": "^21.1.4",
-    "@angular/platform-browser": "^21.1.4",
-    "@angular/platform-browser-dynamic": "^21.1.4",
-    "@angular/router": "^21.1.4",
+    "@angular/animations": "^21.2.10",
+    "@angular/cdk": "^21.2.8",
+    "@angular/common": "^21.2.10",
+    "@angular/compiler": "^21.2.10",
+    "@angular/core": "^21.2.10",
+    "@angular/forms": "^21.2.10",
+    "@angular/platform-browser": "^21.2.10",
+    "@angular/platform-browser-dynamic": "^21.2.10",
+    "@angular/router": "^21.2.10",
     "@fortawesome/fontawesome-free": "^7.2.0",
     "@microsoft/signalr": "^10.0.0",
     "bulma": "^1.0.4",
     "curray": "^1.0.12",
     "file-saver-es": "^2.0.5",
-    "filesize": "^11.0.13",
+    "filesize": "^11.0.17",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
-    "zone.js": "^0.16.0"
+    "zone.js": "^0.16.1"
   },
   "devDependencies": {
-    "@angular-eslint/builder": "21.2.0",
-    "@angular-eslint/eslint-plugin": "21.2.0",
-    "@angular-eslint/eslint-plugin-template": "21.2.0",
-    "@angular-eslint/schematics": "21.2.0",
-    "@angular-eslint/template-parser": "21.2.0",
-    "@angular/build": "^21.1.4",
-    "@angular/cli": "^21.1.4",
-    "@angular/compiler-cli": "^21.1.4",
-    "@angular/language-service": "^21.1.4",
+    "@angular-eslint/builder": "21.3.1",
+    "@angular-eslint/eslint-plugin": "21.3.1",
+    "@angular-eslint/eslint-plugin-template": "21.3.1",
+    "@angular-eslint/schematics": "21.3.1",
+    "@angular-eslint/template-parser": "21.3.1",
+    "@angular/build": "^21.2.8",
+    "@angular/cli": "^21.2.8",
+    "@angular/compiler-cli": "^21.2.10",
+    "@angular/language-service": "^21.2.10",
     "@types/file-saver": "^2.0.7",
     "@types/file-saver-es": "^2.0.3",
-    "@types/node": "^25.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.55.0",
-    "@typescript-eslint/parser": "^8.55.0",
-    "eslint": "^9.39.2",
-    "prettier": "^3.8.1",
+    "@types/node": "^25.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.59.1",
+    "@typescript-eslint/parser": "^8.59.1",
+    "eslint": "^9.39.4",
+    "prettier": "^3.8.3",
     "typescript": "5.9.3"
   }
 }

client/src/app/add-new-torrent/add-new-torrent.component.html

@@ -87,7 +87,7 @@
   <div class="field" style="margin-top: 10px">
     <div class="control">
       <button class="button is-success" [disabled]="saving" [ngClass]="{ 'is-loading': saving }" (click)="ok()">
-        @if (type === 'torrent') {
+        @if (type === "torrent") {
           <span>Add Torrent</span>
         } @else {
           <span>Add NZB</span>
@@ -109,9 +109,7 @@
           <option [ngValue]="3">Synology DownloadStation</option>
         </select>
       </div>
-      <p class="help">
-        Select which downloader is used to download this from the debrid provider to your host.
-      </p>
+      <p class="help">Select which downloader is used to download this from the debrid provider to your host.</p>
     </div>
 
     <div class="field">
@@ -123,8 +121,8 @@
         </select>
       </div>
       <p class="help">
-        When a download is finished on the provider, perform this action. Use this setting if you only want
-        to add files to your debrid provider but not download them to the host.
+        When a download is finished on the provider, perform this action. Use this setting if you only want to add files
+        to your debrid provider but not download them to the host.
       </p>
     </div>
 
@@ -213,15 +211,31 @@
         <input class="input" type="number" [(ngModel)]="finishedActionDelay" />
       </div>
       <p class="help">
-        When a download is finished on the provider, perform this action. Use this setting if you only want
-        to add files to your debrid provider but not download them to the host.
+        When a download is finished on the provider, perform this action. Use this setting if you only want to add files
+        to your debrid provider but not download them to the host.
       </p>
     </div>
 
     <div class="field">
       <label class="label">Category</label>
-      <div class="control">
-        <input class="input" type="text" [(ngModel)]="category" />
+      <div class="control category-combo">
+        <input
+          class="input"
+          type="text"
+          [(ngModel)]="category"
+          (focus)="categoryDropdownOpen = true"
+          (input)="categoryDropdownOpen = true"
+          (blur)="onCategoryBlur()"
+          placeholder="Type or select a category"
+          autocomplete="off"
+        />
+        @if (categoryDropdownOpen && filteredCategories.length > 0) {
+          <div class="category-dropdown">
+            @for (cat of filteredCategories; track $index) {
+              <a class="category-option" (mousedown)="selectCategory(cat)">{{ cat }}</a>
+            }
+          </div>
+        }
       </div>
       <p class="help">The category becomes a sub-folder in your main download path.</p>
     </div>
@@ -231,9 +245,7 @@
       <div class="control">
         <input class="input" type="number" step="1" [(ngModel)]="priority" />
       </div>
-      <p class="help">
-        Set the priority where 1 is the highest. When empty it will be assigned the lowest priority.
-      </p>
+      <p class="help">Set the priority where 1 is the highest. When empty it will be assigned the lowest priority.</p>
     </div>
   </div>
 </div>
@@ -273,8 +285,8 @@
         <input class="input" type="number" max="100000" min="0" step="1" [(ngModel)]="torrentLifetime" />
       </div>
       <p class="help">
-        The maximum lifetime of a download in minutes. When this time has passed, mark it as error. If the
-        download is completed, the lifetime setting will not apply. 0 to disable.
+        The maximum lifetime of a download in minutes. When this time has passed, mark it as error. If the download is
+        completed, the lifetime setting will not apply. 0 to disable.
       </p>
     </div>
   </div>
@@ -287,4 +299,3 @@
     }
   </div>
 </div>
-

client/src/app/add-new-torrent/add-new-torrent.component.scss

@@ -27,3 +27,29 @@
 .separator:not(:empty)::after {
   margin-left: 0.25em;
 }
+
+.category-combo {
+  position: relative;
+}
+
+.category-dropdown {
+  position: absolute;
+  z-index: 10;
+  width: 100%;
+  background: white;
+  border: 1px solid #dbdbdb;
+  border-top: none;
+  border-radius: 0 0 4px 4px;
+  max-height: 200px;
+  overflow-y: auto;
+}
+
+.category-option {
+  display: block;
+  padding: 0.375rem 0.75rem;
+  color: #363636;
+
+  &:hover {
+    background: #f5f5f5;
+  }
+}

client/src/app/add-new-torrent/add-new-torrent.component.ts

@@ -1,11 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, DestroyRef, OnInit, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Router } from '@angular/router';
-import { TorrentService } from 'src/app/torrent.service';
 import { DownloadType, Torrent, TorrentFileAvailability } from '../models/torrent.model';
 import { SettingsService } from '../settings.service';
 import { ActivatedRoute } from '@angular/router';
 import { FormsModule } from '@angular/forms';
 import { NgClass } from '@angular/common';
+import { TorrentService } from '../torrent.service';
 
 @Component({
   selector: 'app-add-new-torrent',
@@ -15,6 +16,12 @@ import { NgClass } from '@angular/common';
   standalone: true,
 })
 export class AddNewTorrentComponent implements OnInit {
+  private destroyRef = inject(DestroyRef);
+  private router = inject(Router);
+  private torrentService = inject(TorrentService);
+  private settingsService = inject(SettingsService);
+  private activatedRoute = inject(ActivatedRoute);
+
   public type: 'torrent' | 'nzb' = 'torrent';
   public fileName: string;
   public magnetLink: string;
@@ -24,7 +31,10 @@ export class AddNewTorrentComponent implements OnInit {
   public provider: string;
   public downloadClient: number;
 
-  public category: string;
+  private _category = '';
+  public categories: string[] = [];
+  public filteredCategories: string[] = [];
+  public categoryDropdownOpen = false;
   public hostDownloadAction: number = 0;
   public downloadAction: number = 0;
   public finishedAction: number = 0;
@@ -49,17 +59,19 @@ export class AddNewTorrentComponent implements OnInit {
   public excludeRegexError: string;
   public regexSelected: TorrentFileAvailability[];
 
-  private selectedFile: File;
+  private selectedFile: File | null = null;
 
-  constructor(
-    private router: Router,
-    private torrentService: TorrentService,
-    private settingsService: SettingsService,
-    private activatedRoute: ActivatedRoute,
-  ) {}
+  public get category(): string {
+    return this._category;
+  }
+
+  public set category(value: string) {
+    this._category = value;
+    this.updateFilteredCategories();
+  }
 
   ngOnInit(): void {
-    this.activatedRoute.queryParams.subscribe((params) => {
+    this.activatedRoute.queryParams.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((params) => {
       if (params['type'] === 'nzb') {
         this.type = 'nzb';
       } else if (params['type'] === 'torrent') {
@@ -75,29 +87,65 @@ export class AddNewTorrentComponent implements OnInit {
         this.type = 'nzb';
       }
     });
-    this.settingsService.get().subscribe((settings) => {
-      const providerSetting = settings.find((m) => m.key === 'Provider:Provider');
-      this.provider = providerSetting.enumValues[providerSetting.value as number];
-      this.downloadClient = settings.find((m) => m.key === 'DownloadClient:Client')?.value as number;
 
-      this.category = settings.find((m) => m.key === 'Gui:Default:Category')?.value as string;
-      this.hostDownloadAction = this.downloadAction = settings.find((m) => m.key === 'Gui:Default:HostDownloadAction')
-        ?.value as number;
-      this.downloadAction =
-        settings.find((m) => m.key === 'Gui:Default:OnlyDownloadAvailableFiles')?.value === true ? 1 : 0;
-      this.finishedAction = settings.find((m) => m.key === 'Gui:Default:FinishedAction')?.value as number;
-      this.finishedActionDelay = settings.find((m) => m.key == 'Gui:Default:FinishedActionDelay')?.value as number;
-      this.downloadMinSize = settings.find((m) => m.key === 'Gui:Default:MinFileSize')?.value as number;
-      this.includeRegex = settings.find((m) => m.key === 'Gui:Default:IncludeRegex')?.value as string;
-      this.excludeRegex = settings.find((m) => m.key === 'Gui:Default:ExcludeRegex')?.value as string;
-      this.torrentRetryAttempts = settings.find((m) => m.key === 'Gui:Default:TorrentRetryAttempts')?.value as number;
-      this.downloadRetryAttempts = settings.find((m) => m.key === 'Gui:Default:DownloadRetryAttempts')?.value as number;
-      this.torrentDeleteOnError = settings.find((m) => m.key === 'Gui:Default:DeleteOnError')?.value as number;
-      this.torrentLifetime = settings.find((m) => m.key === 'Gui:Default:TorrentLifetime')?.value as number;
-      this.priority = settings.find((m) => m.key === 'Gui:Default:Priority')?.value as number;
+    this.settingsService
+      .get()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((settings) => {
+        const providerSetting = settings.find((m) => m.key === 'Provider:Provider');
+        this.provider = providerSetting.enumValues[providerSetting.value as number];
+        this.downloadClient = settings.find((m) => m.key === 'DownloadClient:Client')?.value as number;
 
-      this.setFinishAction();
-    });
+        this.category = settings.find((m) => m.key === 'Gui:Default:Category')?.value as string;
+        const categoriesSetting = settings.find((m) => m.key === 'General:Categories')?.value as string;
+        this.categories = (categoriesSetting ?? '')
+          .split(',')
+          .map((c) => c.trim())
+          .filter((c) => c.length > 0)
+          .filter((c, i, arr) => arr.findIndex((a) => a.toLowerCase() === c.toLowerCase()) === i);
+        const matchedCategory = this.categories.find((c) => c.toLowerCase() === (this.category ?? '').toLowerCase());
+        if (matchedCategory) {
+          this.category = matchedCategory;
+        } else {
+          this.updateFilteredCategories();
+        }
+        this.hostDownloadAction = this.downloadAction = settings.find((m) => m.key === 'Gui:Default:HostDownloadAction')
+          ?.value as number;
+        this.downloadAction =
+          settings.find((m) => m.key === 'Gui:Default:OnlyDownloadAvailableFiles')?.value === true ? 1 : 0;
+        this.finishedAction = settings.find((m) => m.key === 'Gui:Default:FinishedAction')?.value as number;
+        this.finishedActionDelay = settings.find((m) => m.key == 'Gui:Default:FinishedActionDelay')?.value as number;
+        this.downloadMinSize = settings.find((m) => m.key === 'Gui:Default:MinFileSize')?.value as number;
+        this.includeRegex = settings.find((m) => m.key === 'Gui:Default:IncludeRegex')?.value as string;
+        this.excludeRegex = settings.find((m) => m.key === 'Gui:Default:ExcludeRegex')?.value as string;
+        this.torrentRetryAttempts = settings.find((m) => m.key === 'Gui:Default:TorrentRetryAttempts')?.value as number;
+        this.downloadRetryAttempts = settings.find((m) => m.key === 'Gui:Default:DownloadRetryAttempts')
+          ?.value as number;
+        this.torrentDeleteOnError = settings.find((m) => m.key === 'Gui:Default:DeleteOnError')?.value as number;
+        this.torrentLifetime = settings.find((m) => m.key === 'Gui:Default:TorrentLifetime')?.value as number;
+        this.priority = settings.find((m) => m.key === 'Gui:Default:Priority')?.value as number;
+
+        this.setFinishAction();
+      });
+  }
+
+  private updateFilteredCategories(): void {
+    if (!this.category) {
+      this.filteredCategories = this.categories;
+      return;
+    }
+
+    const search = this.category.toLowerCase();
+    this.filteredCategories = this.categories.filter((value) => value.toLowerCase().includes(search));
+  }
+
+  public selectCategory(cat: string): void {
+    this.category = cat;
+    this.categoryDropdownOpen = false;
+  }
+
+  public onCategoryBlur(): void {
+    setTimeout(() => (this.categoryDropdownOpen = false), 150);
   }
 
   public setFinishAction() {
@@ -119,7 +167,7 @@ export class AddNewTorrentComponent implements OnInit {
   public pickFile(evt: Event): void {
     const files = (evt.target as HTMLInputElement).files;
 
-    if (files.length === 0) {
+    if (files == null || files.length === 0) {
       return;
     }
 

client/src/app/app.component.ts

@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
 
 @Component({
-    selector: 'app-root',
-    template: '<router-outlet></router-outlet>',
-    styles: [],
-    imports: [RouterOutlet],
+  selector: 'app-root',
+  template: '<router-outlet></router-outlet>',
+  styles: [],
+  imports: [RouterOutlet],
 })
 export class AppComponent {}

client/src/app/auth.interceptor.ts

@@ -1,12 +1,12 @@
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
-  constructor(private router: Router) {}
+  private router = inject(Router);
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     return next.handle(req).pipe(

client/src/app/auth.service.ts

@@ -1,16 +1,14 @@
 import { APP_BASE_HREF } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AuthService {
-  constructor(
-    private http: HttpClient,
-    @Inject(APP_BASE_HREF) private baseHref: string,
-  ) {}
+  private http = inject(HttpClient);
+  private baseHref = inject(APP_BASE_HREF);
 
   public isLoggedIn(): Observable<boolean> {
     return this.http.get<boolean>(`${this.baseHref}Api/Authentication/IsLoggedIn`);

client/src/app/decode-uri.pipe.ts

@@ -1,6 +1,6 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-@Pipe({ name: 'decodeURI', })
+@Pipe({ name: 'decodeURI' })
 export class DecodeURIPipe implements PipeTransform {
   transform(input: any) {
     return decodeURI(input);

client/src/app/download-status.pipe.ts

@@ -1,10 +1,10 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import { Pipe, PipeTransform, inject } from '@angular/core';
 import { Download } from './models/download.model';
 import { FileSizePipe } from './filesize.pipe';
 
 @Pipe({ name: 'downloadStatus' })
 export class DownloadStatusPipe implements PipeTransform {
-  constructor(private pipe: FileSizePipe) {}
+  private pipe = inject(FileSizePipe);
 
   transform(value: Download): string {
     if (!value) {

client/src/app/filesize.pipe.ts

@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 import { filesize } from 'filesize';
 
-@Pipe({ name: 'filesize', })
+@Pipe({ name: 'filesize' })
 export class FileSizePipe implements PipeTransform {
   private static transformOne(value: number, options?: any): string {
     return filesize(value, options).toString();

client/src/app/login/login.component.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { AuthService } from '../auth.service';
 import { FormsModule } from '@angular/forms';
@@ -12,16 +12,14 @@ import { NgClass } from '@angular/common';
   standalone: true,
 })
 export class LoginComponent {
+  private authService = inject(AuthService);
+  private router = inject(Router);
+
   public userName: string;
   public password: string;
   public error: string;
   public loggingIn: boolean;
 
-  constructor(
-    private authService: AuthService,
-    private router: Router,
-  ) {}
-
   public setUserName(event: Event): void {
     this.userName = (event.target as any).value;
   }

client/src/app/models/rate-limit-status.model.ts

@@ -0,0 +1,4 @@
+export interface RateLimitStatus {
+  nextDequeueTime: Date | null;
+  secondsRemaining: number;
+}

client/src/app/models/torrent.model.ts

@@ -44,9 +44,12 @@ export class Torrent {
   public rdSpeed: number;
   public rdSeeders: number;
   public rdFiles: string;
+  public statusText?: string;
+  public filesCount?: number;
+  public downloadsCount?: number;
 
-  public files: TorrentFile[];
-  public downloads: Download[];
+  public files?: TorrentFile[];
+  public downloads?: Download[];
 }
 
 export class TorrentFile {

client/src/app/navbar/navbar.component.scss

@@ -4,4 +4,4 @@
 
 .notification {
   margin-top: 52px;
-}
+}

client/src/app/navbar/navbar.component.ts

@@ -1,9 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, DestroyRef, OnInit, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { NavigationEnd, Router, RouterLink } from '@angular/router';
 import { AuthService } from '../auth.service';
 import { Profile } from '../models/profile.model';
 import { SettingsService } from '../settings.service';
 import { NgClass, DatePipe } from '@angular/common';
+import { filter } from 'rxjs';
 
 @Component({
   selector: 'app-navbar',
@@ -13,50 +15,60 @@ import { NgClass, DatePipe } from '@angular/common';
   standalone: true,
 })
 export class NavbarComponent implements OnInit {
+  private destroyRef = inject(DestroyRef);
+  private settingsService = inject(SettingsService);
+  private authService = inject(AuthService);
+  private router = inject(Router);
+
   public showMobileMenu = false;
 
   public profile: Profile;
   public providerLink: string;
   public version: string;
 
-  constructor(
-    private settingsService: SettingsService,
-    private authService: AuthService,
-    private router: Router,
-  ) {
-    this.router.events.subscribe((event) => {
-      if (event instanceof NavigationEnd) {
+  constructor() {
+    this.router.events
+      .pipe(
+        filter((event): event is NavigationEnd => event instanceof NavigationEnd),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe(() => {
         this.showMobileMenu = false;
-      }
-    });
+      });
   }
 
   ngOnInit(): void {
-    this.settingsService.getProfile().subscribe((result) => {
-      this.profile = result;
+    this.settingsService
+      .getProfile()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((result) => {
+        this.profile = result;
 
-      switch (result.provider) {
-        case 'RealDebrid':
-          this.providerLink = 'https://real-debrid.com/?id=1348683';
-          break;
-        case 'AllDebrid':
-          this.providerLink = 'https://alldebrid.com/?uid=2v91l&lang=en';
-          break;
-        case 'Premiumize':
-          this.providerLink = 'https://www.premiumize.me/';
-          break;
-        case 'TorBox':
-          this.providerLink = 'https://torbox.app/';
-          break;
-        case 'DebridLink':
-          this.providerLink = 'https://debrid-link.com/';
-          break;
-      }
-    });
+        switch (result.provider) {
+          case 'RealDebrid':
+            this.providerLink = 'https://real-debrid.com/?id=1348683';
+            break;
+          case 'AllDebrid':
+            this.providerLink = 'https://alldebrid.com/?uid=2v91l&lang=en';
+            break;
+          case 'Premiumize':
+            this.providerLink = 'https://www.premiumize.me/';
+            break;
+          case 'TorBox':
+            this.providerLink = 'https://torbox.app/';
+            break;
+          case 'DebridLink':
+            this.providerLink = 'https://debrid-link.com/';
+            break;
+        }
+      });
 
-    this.settingsService.getVersion().subscribe((result) => {
-      this.version = result.version;
-    });
+    this.settingsService
+      .getVersion()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe((result) => {
+        this.version = result.version;
+      });
   }
 
   public logout(): void {

client/src/app/nl2br.pipe.ts

@@ -1,9 +1,9 @@
-import { Pipe, PipeTransform, SecurityContext, VERSION } from '@angular/core';
+import { Pipe, PipeTransform, SecurityContext, VERSION, inject } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 
-@Pipe({ name: 'nl2br', })
+@Pipe({ name: 'nl2br' })
 export class Nl2BrPipe implements PipeTransform {
-  constructor(private sanitizer: DomSanitizer) {}
+  private sanitizer = inject(DomSanitizer);
 
   transform(value: string, sanitizeBeforehand?: boolean): string {
     if (typeof value !== 'string') {

client/src/app/profile/profile.component.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { AuthService } from '../auth.service';
 import { FormsModule } from '@angular/forms';
 import { NgClass } from '@angular/common';
@@ -11,7 +11,7 @@ import { NgClass } from '@angular/common';
   standalone: true,
 })
 export class ProfileComponent {
-  constructor(private authService: AuthService) {}
+  private authService = inject(AuthService);
 
   public username: string;
   public password: string;

client/src/app/settings.service.ts

@@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Profile } from './models/profile.model';
 import { Setting } from './models/setting.model';
@@ -10,10 +10,8 @@ import { Version } from './models/version.model';
   providedIn: 'root',
 })
 export class SettingsService {
-  constructor(
-    private http: HttpClient,
-    @Inject(APP_BASE_HREF) private baseHref: string,
-  ) {}
+  private http = inject(HttpClient);
+  private baseHref = inject(APP_BASE_HREF);
 
   public get(): Observable<Setting[]> {
     return this.http.get<Setting[]>(`${this.baseHref}Api/Settings`);

client/src/app/settings/settings.component.ts

@@ -1,10 +1,10 @@
-import { Component, OnInit } from '@angular/core';
-import { SettingsService } from 'src/app/settings.service';
+import { Component, OnInit, inject } from '@angular/core';
 import { Setting } from '../models/setting.model';
 import { NgClass, KeyValuePipe } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Nl2BrPipe } from '../nl2br.pipe';
 import { FileSizePipe } from '../filesize.pipe';
+import { SettingsService } from '../settings.service';
 
 @Component({
   selector: 'app-settings',
@@ -14,6 +14,8 @@ import { FileSizePipe } from '../filesize.pipe';
   standalone: true,
 })
 export class SettingsComponent implements OnInit {
+  private settingsService = inject(SettingsService);
+
   public activeTab = 0;
 
   public tabs: Setting[] = [];
@@ -35,8 +37,6 @@ export class SettingsComponent implements OnInit {
 
   public canRegisterMagnetHandler = false;
 
-  constructor(private settingsService: SettingsService) {}
-
   ngOnInit(): void {
     this.reset();
     this.canRegisterMagnetHandler = !!(window.isSecureContext && 'registerProtocolHandler' in navigator);

client/src/app/setup/setup.component.ts

@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { AuthService } from '../auth.service';
 import { NgClass } from '@angular/common';
@@ -12,6 +12,9 @@ import { FormsModule } from '@angular/forms';
   standalone: true,
 })
 export class SetupComponent {
+  private authService = inject(AuthService);
+  private router = inject(Router);
+
   public userName: string;
   public password: string;
   public provider = 0;
@@ -22,11 +25,6 @@ export class SetupComponent {
 
   public step: number = 1;
 
-  constructor(
-    private authService: AuthService,
-    private router: Router,
-  ) {}
-
   public setup(): void {
     this.error = null;
     this.working = true;

client/src/app/sort.pipe.ts

@@ -1,20 +1,78 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-@Pipe({ name: 'sort', })
-export class SortPipe implements PipeTransform {
-  transform(array: any[], field: string, order: 'asc' | 'desc' = 'asc'): any[] {
-    if (!Array.isArray(array)) {
-      return [];
+export type SortDirection = 'asc' | 'desc';
+
+export function getSortFieldValue(item: unknown, field: string): unknown {
+  if (item == null || !field) {
+    return undefined;
+  }
+
+  return field.split('.').reduce<unknown>((value, key) => {
+    if (value == null || typeof value !== 'object') {
+      return undefined;
     }
-    const sortedArray = array.sort((a, b) => {
-      if (a[field] < b[field]) {
-        return -1;
-      } else if (a[field] > b[field]) {
-        return 1;
-      } else {
-        return 0;
-      }
-    });
-    return order === 'asc' ? sortedArray : sortedArray.reverse();
+
+    return (value as Record<string, unknown>)[key];
+  }, item);
+}
+
+function compareSortValues(left: unknown, right: unknown): number {
+  if (left === right) {
+    return 0;
+  }
+
+  if (left == null) {
+    return 1;
+  }
+
+  if (right == null) {
+    return -1;
+  }
+
+  if (typeof left === 'string' && typeof right === 'string') {
+    return left.localeCompare(right, undefined, { sensitivity: 'base' });
+  }
+
+  if (left instanceof Date && right instanceof Date) {
+    return left.getTime() - right.getTime();
+  }
+
+  if (typeof left === 'boolean' && typeof right === 'boolean') {
+    return Number(left) - Number(right);
+  }
+
+  const comparableLeft = left as string | number | bigint;
+  const comparableRight = right as string | number | bigint;
+
+  if (comparableLeft < comparableRight) {
+    return -1;
+  }
+
+  if (comparableLeft > comparableRight) {
+    return 1;
+  }
+
+  return 0;
+}
+
+export function sortItems<T>(
+  array: readonly T[],
+  field: string,
+  order: SortDirection = 'asc',
+  accessor: (item: T, field: string) => unknown = getSortFieldValue,
+): T[] {
+  if (!Array.isArray(array)) {
+    return [];
+  }
+
+  const direction = order === 'asc' ? 1 : -1;
+
+  return [...array].sort((left, right) => compareSortValues(accessor(left, field), accessor(right, field)) * direction);
+}
+
+@Pipe({ name: 'sort' })
+export class SortPipe implements PipeTransform {
+  transform(array: unknown[], field: string, order: SortDirection = 'asc'): unknown[] {
+    return sortItems(array, field, order);
   }
 }

client/src/app/torrent-status.pipe.ts

@@ -2,98 +2,131 @@ import { Pipe, PipeTransform } from '@angular/core';
 import { RealDebridStatus, Torrent } from './models/torrent.model';
 import { FileSizePipe } from './filesize.pipe';
 
-@Pipe({ name: 'status' })
-export class TorrentStatusPipe implements PipeTransform {
-  constructor(private pipe: FileSizePipe) {}
+const fileSizePipe = new FileSizePipe();
 
-  transform(torrent: Torrent): string {
-    if (torrent.error) {
-      return torrent.error;
-    }
+export function getTorrentStatus(torrent: Torrent): string {
+  if (torrent.error) {
+    return torrent.error;
+  }
 
-    if (torrent.downloads.length > 0) {
-      const allFinished = torrent.downloads.every((m) => m.completed != null);
+  const downloads = torrent.downloads ?? [];
 
-      if (allFinished) {
-        return 'Finished';
+  if (downloads.length > 0) {
+    let allFinished = true;
+    let downloadingCount = 0;
+    let downloadedCount = 0;
+    let downloadingBytesDone = 0;
+    let downloadingBytesTotal = 0;
+    let downloadingSpeed = 0;
+    let unpackingCount = 0;
+    let unpackedCount = 0;
+    let unpackingBytesDone = 0;
+    let unpackingBytesTotal = 0;
+    let queuedForUnpackingCount = 0;
+    let queuedForDownloadingCount = 0;
+
+    for (const download of downloads) {
+      if (download.completed == null) {
+        allFinished = false;
       }
 
-      const downloading = torrent.downloads.filter((m) => m.downloadStarted && !m.downloadFinished && m.bytesDone > 0);
-      const downloaded = torrent.downloads.filter((m) => m.downloadFinished != null);
-
-      if (downloading.length > 0) {
-        const bytesDone = downloading.reduce((sum, m) => sum + m.bytesDone, 0);
-        const bytesTotal = downloading.reduce((sum, m) => sum + m.bytesTotal, 0);
-        const progress = (bytesDone / bytesTotal || 0) * 100;
-
-        const allSpeeds = downloading.reduce((sum, m) => sum + m.speed, 0);
-
-        const speed: string | string[] = this.pipe.transform(allSpeeds, 'filesize');
-
-        return `Downloading file ${downloading.length + downloaded.length}/${
-          torrent.downloads.length
-        } (${progress.toFixed(2)}% - ${speed}/s)`;
+      if (download.downloadFinished != null) {
+        downloadedCount += 1;
       }
 
-      const unpacking = torrent.downloads.filter((m) => m.unpackingStarted && !m.unpackingFinished && m.bytesDone > 0);
-      const unpacked = torrent.downloads.filter((m) => m.unpackingFinished != null);
-
-      if (unpacking.length > 0) {
-        const bytesDone = unpacking.reduce((sum, m) => sum + m.bytesDone, 0);
-        const bytesTotal = unpacking.reduce((sum, m) => sum + m.bytesTotal, 0);
-        const progress = (bytesDone / bytesTotal || 0) * 100;
-
-        return `Extracting file ${unpacking.length + unpacked.length}/${torrent.downloads.length} (${progress.toFixed(
-          2,
-        )}%)`;
+      if (download.downloadStarted && !download.downloadFinished && download.bytesDone > 0) {
+        downloadingCount += 1;
+        downloadingBytesDone += download.bytesDone;
+        downloadingBytesTotal += download.bytesTotal;
+        downloadingSpeed += download.speed;
       }
 
-      const queuedForUnpacking = torrent.downloads.filter((m) => m.unpackingQueued && !m.unpackingStarted);
-
-      if (queuedForUnpacking.length > 0) {
-        return `Queued for unpacking`;
+      if (download.unpackingFinished != null) {
+        unpackedCount += 1;
       }
 
-      const queuedForDownload = torrent.downloads.filter((m) => !m.downloadStarted && !m.downloadFinished);
-
-      if (queuedForDownload.length > 0) {
-        return `Queued for downloading`;
+      if (download.unpackingStarted && !download.unpackingFinished && download.bytesDone > 0) {
+        unpackingCount += 1;
+        unpackingBytesDone += download.bytesDone;
+        unpackingBytesTotal += download.bytesTotal;
       }
 
-      if (unpacked.length > 0) {
-        return `Files unpacked`;
+      if (download.unpackingQueued && !download.unpackingStarted) {
+        queuedForUnpackingCount += 1;
       }
 
-      if (downloaded.length > 0) {
-        return `Files downloaded to host`;
+      if (!download.downloadStarted && !download.downloadFinished) {
+        queuedForDownloadingCount += 1;
       }
     }
 
-    if (torrent.completed) {
+    if (allFinished) {
       return 'Finished';
     }
 
-    switch (torrent.rdStatus) {
-      case RealDebridStatus.Queued:
-        return 'Not Yet Added to Provider';
-      case RealDebridStatus.Downloading:
-        if (torrent.rdSeeders < 1 && torrent.type !== 1) {
-          return `Torrent stalled`;
-        }
-        const speed = this.pipe.transform(torrent.rdSpeed, 'filesize');
-        return `Torrent downloading (${torrent.rdProgress}% - ${speed}/s)`;
-      case RealDebridStatus.Processing:
-        return `Torrent processing`;
-      case RealDebridStatus.WaitingForFileSelection:
-        return `Torrent waiting for file selection`;
-      case RealDebridStatus.Error:
-        return `Torrent error: ${torrent.rdStatusRaw}`;
-      case RealDebridStatus.Finished:
-        return `Torrent finished, waiting for download links`;
-      case RealDebridStatus.Uploading:
-        return `Torrent uploading`;
-      default:
-        return 'Unknown status';
+    if (downloadingCount > 0) {
+      const progress = ((downloadingBytesDone / downloadingBytesTotal) || 0) * 100;
+      const speed = fileSizePipe.transform(downloadingSpeed, 'filesize') as string;
+
+      return `Downloading file ${downloadingCount + downloadedCount}/${downloads.length} (${progress.toFixed(2)}% - ${speed}/s)`;
+    }
+
+    if (unpackingCount > 0) {
+      const progress = ((unpackingBytesDone / unpackingBytesTotal) || 0) * 100;
+
+      return `Extracting file ${unpackingCount + unpackedCount}/${downloads.length} (${progress.toFixed(2)}%)`;
+    }
+
+    if (queuedForUnpackingCount > 0) {
+      return 'Queued for unpacking';
+    }
+
+    if (queuedForDownloadingCount > 0) {
+      return 'Queued for downloading';
+    }
+
+    if (unpackedCount > 0) {
+      return 'Files unpacked';
+    }
+
+    if (downloadedCount > 0) {
+      return 'Files downloaded to host';
     }
   }
+
+  if (torrent.completed) {
+    return 'Finished';
+  }
+
+  const prefix = torrent.type === 1 ? 'NZB' : 'Torrent';
+
+  switch (torrent.rdStatus) {
+    case RealDebridStatus.Queued:
+      return 'Not Yet Added to Provider';
+    case RealDebridStatus.Downloading:
+      if (torrent.rdSeeders < 1 && torrent.type !== 1) {
+        return 'Torrent stalled';
+      }
+
+      return `${prefix} downloading (${torrent.rdProgress}% - ${fileSizePipe.transform(torrent.rdSpeed, 'filesize') as string}/s)`;
+    case RealDebridStatus.Processing:
+      return `${prefix} processing`;
+    case RealDebridStatus.WaitingForFileSelection:
+      return `${prefix} waiting for file selection`;
+    case RealDebridStatus.Error:
+      return `${prefix} error: ${torrent.rdStatusRaw}`;
+    case RealDebridStatus.Finished:
+      return `${prefix} finished, waiting for download links`;
+    case RealDebridStatus.Uploading:
+      return `${prefix} uploading`;
+    default:
+      return 'Unknown status';
+  }
+}
+
+@Pipe({ name: 'status' })
+export class TorrentStatusPipe implements PipeTransform {
+  transform(torrent: Torrent): string {
+    return getTorrentStatus(torrent);
+  }
 }

client/src/app/torrent-table/torrent-table.component.html

@@ -10,72 +10,115 @@
     <br />
     Available: {{ diskSpaceStatus.availableSpaceGB }} GB | Resume at: {{ diskSpaceStatus.thresholdGB * 2 }} GB
     <br />
-    <small>Last check: {{ diskSpaceStatus.lastCheckTime | date: 'short' }}</small>
+    <small>Last check: {{ diskSpaceStatus.lastCheckTime | date: "short" }}</small>
+  </div>
+}
+@if (rateLimitStatus?.nextDequeueTime) {
+  <div class="notification is-warning">
+    <strong>Debrid provider rate limit reached</strong>
+    <br />
+    Processing paused until {{ rateLimitStatus.nextDequeueTime | date: "medium" }}
+    @if (rateLimitStatus.secondsRemaining > 0) {
+      ({{ rateLimitStatus.secondsRemaining | number: "1.0-0" }} seconds remaining)
+    }
   </div>
 }
 <div class="table-container">
-  <table class="table is-fullwidth is-hoverable">
-    <thead>
-      <tr>
-        <th>
-          <input
-            type="checkbox"
-            (click)="toggleDeleteSelectAll($event)"
-            [checked]="selectedTorrents.length > 0 && selectedTorrents.length === torrents.length"
-          />
-        </th>
-        <th (click)="sort('rdName')">Name</th>
-        <th (click)="sort('category')">Category</th>
-        <th (click)="sort('priority')">Priority</th>
-        <th (click)="sort('rdSeeders')">Seeders</th>
-        <th (click)="sort('files.length')">Files</th>
-        <th (click)="sort('downloads.length')">Downloads</th>
-        <th (click)="sort('rdSize')">Size</th>
-        <th (click)="sort('added')">Requested</th>
-        <th (click)="sort('status')">Status</th>
-      </tr>
-    </thead>
-    <tbody>
-      @for (torrent of torrents | sort: sortProperty : sortDirection; track torrent.torrentId) {
+  @if (!isMobile) {
+    <table class="table is-fullwidth is-hoverable">
+      <thead>
         <tr>
-          <td>
+          <th>
+            <input
+              type="checkbox"
+              (click)="toggleDeleteSelectAll($event)"
+              [checked]="selectedTorrents.length > 0 && selectedTorrents.length === torrents.length"
+            />
+          </th>
+          <th (click)="sort('rdName')">Name</th>
+          <th (click)="sort('category')">Category</th>
+          <th (click)="sort('priority')">Priority</th>
+          <th (click)="sort('rdSeeders')">Seeders</th>
+          <th (click)="sort('files.length')">Files</th>
+          <th (click)="sort('downloads.length')">Downloads</th>
+          <th (click)="sort('rdSize')">Size</th>
+          <th (click)="sort('added')">Requested</th>
+          <th (click)="sort('status')">Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        @for (torrent of sortedTorrents; track torrent.torrentId) {
+          <tr>
+            <td>
+              <input type="checkbox" (click)="toggleSelect(torrent.torrentId)" [checked]="isSelected(torrent.torrentId)" />
+            </td>
+            <td (click)="openTorrent(torrent.torrentId)" class="break-all">
+              {{ torrent.rdName }}
+            </td>
+            <td>
+              {{ torrent.category }}
+            </td>
+            <td>
+              {{ torrent.priority }}
+            </td>
+            <td>
+              {{ torrent.rdSeeders }}
+            </td>
+            <td>
+              {{ (torrent.filesCount ?? torrent.files?.length ?? 0) | number }}
+            </td>
+            <td>
+              {{ (torrent.downloadsCount ?? torrent.downloads?.length ?? 0) | number }}
+            </td>
+            <td>
+              {{ torrent.rdSize | filesize }}
+            </td>
+            <td>
+              {{ torrent.added | date: "medium" }}
+            </td>
+            <td>
+              {{ torrent.statusText ?? (torrent | status) }}
+            </td>
+          </tr>
+        }
+      </tbody>
+    </table>
+  } @else {
+    <div class="mobile-cards">
+      @for (torrent of sortedTorrents; track torrent.torrentId) {
+        <div class="box mobile-card" [class.is-selected]="isSelected(torrent.torrentId)">
+          <div class="mobile-card-checkbox">
             <input
               type="checkbox"
               (click)="toggleSelect(torrent.torrentId)"
-              [checked]="selectedTorrents.includes(torrent.torrentId)"
+              [checked]="isSelected(torrent.torrentId)"
             />
-          </td>
-          <td (click)="openTorrent(torrent.torrentId)" class="break-all">
-            {{ torrent.rdName }}
-          </td>
-          <td>
-            {{ torrent.category }}
-          </td>
-          <td>
-            {{ torrent.priority }}
-          </td>
-          <td>
-            {{ torrent.rdSeeders }}
-          </td>
-          <td>
-            {{ torrent.files.length | number }}
-          </td>
-          <td>
-            {{ torrent.downloads.length | number }}
-          </td>
-          <td>
-            {{ torrent.rdSize | filesize }}
-          </td>
-          <td>
-            {{ torrent.added | date: "medium" }}
-          </td>
-          <td>
-            {{ torrent | status }}
-          </td>
-        </tr>
+          </div>
+          <div class="mobile-card-body" (click)="openTorrent(torrent.torrentId)">
+            <p class="mobile-card-name">{{ torrent.rdName }}</p>
+            <div class="tags mb-2">
+              <span class="tag is-info is-light">{{ torrent.statusText ?? (torrent | status) }}</span>
+              @if (torrent.category) {
+                <span class="tag is-light">{{ torrent.category }}</span>
+              }
+            </div>
+            <div class="mobile-card-details">
+              <span class="mobile-card-detail"
+                ><span class="detail-label">Size</span> {{ torrent.rdSize | filesize }}</span
+              >
+              <span class="mobile-card-detail"><span class="detail-label">Seeders</span> {{ torrent.rdSeeders }}</span>
+              <span class="mobile-card-detail"
+                ><span class="detail-label">Files</span> {{ (torrent.filesCount ?? torrent.files?.length ?? 0) | number }}</span
+              >
+              <span class="mobile-card-detail"
+                ><span class="detail-label">Downloads</span> {{ (torrent.downloadsCount ?? torrent.downloads?.length ?? 0) | number }}</span
+              >
+            </div>
+          </div>
+        </div>
       }
-    </tbody>
-  </table>
+    </div>
+  }
 
   <div class="flex-container">
     @if (torrents.length > 0) {

client/src/app/torrent-table/torrent-table.component.scss

@@ -5,12 +5,74 @@ table {
       word-break: break-all;
     }
   }
-    // Make table horizontally scrollable on small screens
-    @media screen and (max-width: 768px) {
-      display: block;
-      overflow-x: auto;
-      white-space: nowrap;
-    }
+}
+
+.mobile-cards {
+  display: block;
+}
+
+.mobile-card {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.75rem;
+  padding: 0.875rem 0.75rem !important;
+  margin-bottom: 0.5rem !important;
+  cursor: pointer;
+
+  &.is-selected {
+    border-left: 3px solid hsl(217, 71%, 53%);
+  }
+
+  &:active {
+    background-color: hsl(0, 0%, 96%);
+  }
+}
+
+.mobile-card-checkbox {
+  flex-shrink: 0;
+  padding-top: 0.125rem;
+
+  input[type="checkbox"] {
+    width: 1.1rem;
+    height: 1.1rem;
+    cursor: pointer;
+  }
+}
+
+.mobile-card-body {
+  flex: 1;
+  min-width: 0;
+}
+
+.mobile-card-name {
+  font-weight: 600;
+  font-size: 0.9rem;
+  line-height: 1.3;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  margin-bottom: 0.375rem;
+  color: hsl(0, 0%, 21%);
+}
+
+.mobile-card-details {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.25rem 1rem;
+}
+
+.mobile-card-detail {
+  font-size: 0.8rem;
+  color: hsl(0, 0%, 29%);
+  white-space: nowrap;
+
+  .detail-label {
+    color: hsl(0, 0%, 48%);
+    font-size: 0.72rem;
+    text-transform: uppercase;
+    letter-spacing: 0.03em;
+    margin-right: 0.2em;
+  }
 }
 
 .flex-container {
@@ -18,8 +80,17 @@ table {
   flex: 1 1 0;
   gap: 20px;
   flex-direction: row;
+  margin-top: 1rem;
 
   @media screen and (max-width: 1279px) {
     flex-direction: column;
   }
+
+  @media screen and (max-width: 768px) {
+    gap: 0.5rem;
+
+    .button {
+      width: 100%;
+    }
+  }
 }

client/src/app/torrent-table/torrent-table.component.ts

@@ -1,28 +1,36 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, DestroyRef, OnDestroy, OnInit, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Router } from '@angular/router';
 import { Torrent } from '../models/torrent.model';
 import { DiskSpaceStatus } from '../models/disk-space-status.model';
+import { RateLimitStatus } from '../models/rate-limit-status.model';
 import { TorrentService } from '../torrent.service';
 import { forkJoin, Observable } from 'rxjs';
 import { FormsModule } from '@angular/forms';
 import { NgClass, DecimalPipe, DatePipe } from '@angular/common';
-import { TorrentStatusPipe } from '../torrent-status.pipe';
-import { SortPipe } from '../sort.pipe';
+import { getTorrentStatus, TorrentStatusPipe } from '../torrent-status.pipe';
+import { SortDirection, getSortFieldValue, sortItems } from '../sort.pipe';
 import { FileSizePipe } from '../filesize.pipe';
 
 @Component({
   selector: 'app-torrent-table',
   templateUrl: './torrent-table.component.html',
   styleUrls: ['./torrent-table.component.scss'],
-  imports: [FormsModule, NgClass, DecimalPipe, DatePipe, TorrentStatusPipe, SortPipe, FileSizePipe],
+  imports: [FormsModule, NgClass, DecimalPipe, DatePipe, TorrentStatusPipe, FileSizePipe],
   standalone: true,
 })
-export class TorrentTableComponent implements OnInit {
+export class TorrentTableComponent implements OnInit, OnDestroy {
+  private destroyRef = inject(DestroyRef);
+  private router = inject(Router);
+  private torrentService = inject(TorrentService);
+  private selectedTorrentIds = new Set<string>();
+
   public torrents: Torrent[] = [];
+  public sortedTorrents: Torrent[] = [];
   public selectedTorrents: string[] = [];
   public error: string;
-  public sortProperty = 'rdName';
-  public sortDirection: 'asc' | 'desc' = 'asc';
+  public sortProperty = 'added';
+  public sortDirection: SortDirection = 'desc';
 
   public isDeleteModalActive: boolean;
   public deleteError: string;
@@ -50,64 +58,119 @@ export class TorrentTableComponent implements OnInit {
   public updateSettingsTorrentLifetime: number;
 
   public diskSpaceStatus: DiskSpaceStatus | null = null;
+  public rateLimitStatus: RateLimitStatus | null = null;
 
-  constructor(
-    private router: Router,
-    private torrentService: TorrentService,
-  ) {}
+  public isMobile = false;
+  private mobileQuery: MediaQueryList;
+  private mobileQueryListener: (e: MediaQueryListEvent) => void;
 
   ngOnInit(): void {
-    this.torrentService.getDiskSpaceStatus().subscribe({
-      next: (status) => {
-        this.diskSpaceStatus = status;
-      },
-    });
+    this.mobileQuery = window.matchMedia('(max-width: 768px)');
+    this.isMobile = this.mobileQuery.matches;
+    this.mobileQueryListener = (e: MediaQueryListEvent) => {
+      this.isMobile = e.matches;
+    };
+    this.mobileQuery.addEventListener('change', this.mobileQueryListener);
 
-    this.torrentService.diskSpaceStatus$.subscribe((status) => {
+    // Load persisted sort settings (if any)
+    try {
+      const sp = localStorage.getItem('torrentTable.sortProperty');
+      const sd = localStorage.getItem('torrentTable.sortDirection');
+      if (sp) {
+        this.sortProperty = sp;
+      }
+      if (sd === 'asc' || sd === 'desc') {
+        this.sortDirection = sd as 'asc' | 'desc';
+      }
+    } catch (_) {
+      // Ignore storage errors (e.g., disabled storage)
+    }
+
+    this.torrentService
+      .getDiskSpaceStatus()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: (status) => {
+          this.diskSpaceStatus = status;
+        },
+      });
+
+    this.torrentService.diskSpaceStatus$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((status) => {
       this.diskSpaceStatus = status;
     });
 
-    this.torrentService.update$.subscribe((result) => {
-      this.torrents = result;
+    this.torrentService
+      .getRateLimitStatus()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: (status) => {
+          this.rateLimitStatus = status;
+        },
+      });
+
+    this.torrentService.rateLimitStatus$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((status) => {
+      this.rateLimitStatus = status;
     });
 
-    this.torrentService.getList().subscribe({
-      next: (result) => {
-        this.torrents = result;
-      },
-      error: (err) => {
-        this.error = err.error;
-      },
+    this.torrentService.update$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((result) => {
+      this.setTorrents(result);
     });
+
+    this.torrentService
+      .getList()
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe({
+        next: (result) => {
+          this.setTorrents(result);
+        },
+        error: (err) => {
+          this.error = err.error;
+        },
+      });
   }
 
   public sort(property: string): void {
-    this.sortProperty = property;
-    this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';
+    if (this.sortProperty === property) {
+      this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc';
+    } else {
+      this.sortProperty = property;
+      this.sortDirection = 'desc';
+    }
+
+    // Persist sort settings
+    try {
+      localStorage.setItem('torrentTable.sortProperty', this.sortProperty);
+      localStorage.setItem('torrentTable.sortDirection', this.sortDirection);
+    } catch (_) {
+      // Ignore storage errors
+    }
+
+    this.applySorting();
   }
 
   public openTorrent(torrentId: string): void {
     this.router.navigate([`/torrent/${torrentId}`]);
   }
 
-  public toggleDeleteSelectAll(event: any) {
-    this.selectedTorrents = [];
+  public toggleDeleteSelectAll(event: Event) {
+    const checked = (event.target as HTMLInputElement).checked;
 
-    if (event.target.checked) {
-      this.torrents.map((torrent) => {
-        this.selectedTorrents.push(torrent.torrentId);
-      });
-    }
+    this.selectedTorrentIds = checked ? new Set(this.torrents.map((torrent) => torrent.torrentId)) : new Set<string>();
+    this.syncSelectedTorrents();
   }
 
   public toggleSelect(torrentId: string) {
-    const index = this.selectedTorrents.indexOf(torrentId);
-
-    if (index > -1) {
-      this.selectedTorrents.splice(index, 1);
+    if (this.selectedTorrentIds.has(torrentId)) {
+      this.selectedTorrentIds.delete(torrentId);
     } else {
-      this.selectedTorrents.push(torrentId);
+      this.selectedTorrentIds.add(torrentId);
     }
+
+    this.syncSelectedTorrents();
+  }
+
+  public isSelected(torrentId: string): boolean {
+    return this.selectedTorrentIds.has(torrentId);
   }
 
   public showDeleteModal(): void {
@@ -137,7 +200,7 @@ export class TorrentTableComponent implements OnInit {
         this.isDeleteModalActive = false;
         this.deleting = false;
 
-        this.selectedTorrents = [];
+        this.clearSelectedTorrents();
       },
       error: (err) => {
         this.deleteError = err.error;
@@ -170,7 +233,7 @@ export class TorrentTableComponent implements OnInit {
         this.isRetryModalActive = false;
         this.retrying = false;
 
-        this.selectedTorrents = [];
+        this.clearSelectedTorrents();
       },
       error: (err) => {
         this.retryError = err.error;
@@ -182,7 +245,7 @@ export class TorrentTableComponent implements OnInit {
   public changeSettingsModal(): void {
     this.changeSettingsError = null;
 
-    const selectedTorrents = this.torrents.filter((m) => this.selectedTorrents.indexOf(m.torrentId) > -1);
+    const selectedTorrents = this.getSelectedTorrentModels();
 
     this.updateSettingsDownloadClient = selectedTorrents.every(
       (m, _, arr) => m.downloadClient === arr[0].downloadClient,
@@ -229,7 +292,7 @@ export class TorrentTableComponent implements OnInit {
 
     const calls: Observable<void>[] = [];
 
-    const selectedTorrents = this.torrents.filter((m) => this.selectedTorrents.indexOf(m.torrentId) > -1);
+    const selectedTorrents = this.getSelectedTorrentModels();
 
     selectedTorrents.forEach((torrent) => {
       if (this.updateSettingsDownloadClient != null) {
@@ -245,7 +308,7 @@ export class TorrentTableComponent implements OnInit {
         torrent.priority = this.updateSettingsPriority;
       }
       if (this.updateSettingsDownloadRetryAttempts != null) {
-        torrent.retryCount = this.updateSettingsDownloadRetryAttempts;
+        torrent.downloadRetryAttempts = this.updateSettingsDownloadRetryAttempts;
       }
       if (this.updateSettingsTorrentRetryAttempts != null) {
         torrent.torrentRetryAttempts = this.updateSettingsTorrentRetryAttempts;
@@ -265,7 +328,7 @@ export class TorrentTableComponent implements OnInit {
         this.isChangeSettingsModalActive = false;
         this.changingSettings = false;
 
-        this.selectedTorrents = [];
+        this.clearSelectedTorrents();
       },
       error: (err) => {
         this.changeSettingsError = err.error;
@@ -282,4 +345,56 @@ export class TorrentTableComponent implements OnInit {
   updateDeleteSelectAll() {
     this.deleteSelectAll = this.deleteData && this.deleteRdTorrent && this.deleteLocalFiles;
   }
+
+  ngOnDestroy(): void {
+    this.mobileQuery?.removeEventListener('change', this.mobileQueryListener);
+  }
+
+  private setTorrents(torrents: Torrent[]): void {
+    this.torrents = torrents;
+    this.pruneSelectedTorrents();
+    this.applySorting();
+  }
+
+  private applySorting(): void {
+    this.sortedTorrents = sortItems(this.torrents, this.sortProperty, this.sortDirection, (torrent, field) => {
+      switch (field) {
+        case 'files.length':
+          return torrent.filesCount ?? torrent.files?.length ?? 0;
+        case 'downloads.length':
+          return torrent.downloadsCount ?? torrent.downloads?.length ?? 0;
+        case 'status':
+          return torrent.statusText ?? getTorrentStatus(torrent);
+        default:
+          return getSortFieldValue(torrent, field);
+      }
+    });
+  }
+
+  private getSelectedTorrentModels(): Torrent[] {
+    return this.torrents.filter((torrent) => this.selectedTorrentIds.has(torrent.torrentId));
+  }
+
+  private pruneSelectedTorrents(): void {
+    const torrentIds = new Set(this.torrents.map((torrent) => torrent.torrentId));
+
+    for (const torrentId of this.selectedTorrentIds) {
+      if (!torrentIds.has(torrentId)) {
+        this.selectedTorrentIds.delete(torrentId);
+      }
+    }
+
+    this.syncSelectedTorrents();
+  }
+
+  private clearSelectedTorrents(): void {
+    this.selectedTorrentIds.clear();
+    this.syncSelectedTorrents();
+  }
+
+  private syncSelectedTorrents(): void {
+    this.selectedTorrents = this.torrents
+      .filter((torrent) => this.selectedTorrentIds.has(torrent.torrentId))
+      .map((torrent) => torrent.torrentId);
+  }
 }

client/src/app/torrent.service.ts

@@ -1,24 +1,26 @@
 import { HttpClient } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import * as signalR from '@microsoft/signalr';
 import { Observable, Subject } from 'rxjs';
 import { Torrent, TorrentFileAvailability } from './models/torrent.model';
 import { DiskSpaceStatus } from './models/disk-space-status.model';
+import { RateLimitStatus } from './models/rate-limit-status.model';
 import { APP_BASE_HREF } from '@angular/common';
 
 @Injectable({
   providedIn: 'root',
 })
 export class TorrentService {
+  private http = inject(HttpClient);
+  private baseHref = inject(APP_BASE_HREF);
+
   public update$: Subject<Torrent[]> = new Subject();
   public diskSpaceStatus$: Subject<DiskSpaceStatus> = new Subject();
+  public rateLimitStatus$: Subject<RateLimitStatus> = new Subject();
 
   private connection: signalR.HubConnection;
 
-  constructor(
-    private http: HttpClient,
-    @Inject(APP_BASE_HREF) private baseHref: string,
-  ) {
+  constructor() {
     this.connect();
   }
 
@@ -40,6 +42,10 @@ export class TorrentService {
       this.diskSpaceStatus$.next(status);
     });
 
+    this.connection.on('rateLimitStatus', (status: any) => {
+      this.rateLimitStatus$.next(status);
+    });
+
     this.connection.onreconnected(() => {
       this.getDiskSpaceStatus().subscribe({
         next: (status) => {
@@ -65,6 +71,10 @@ export class TorrentService {
     return this.http.get<DiskSpaceStatus | null>(`${this.baseHref}Api/Torrents/DiskSpaceStatus`);
   }
 
+  public getRateLimitStatus(): Observable<RateLimitStatus | null> {
+    return this.http.get<RateLimitStatus | null>(`${this.baseHref}Api/Torrents/RateLimitStatus`);
+  }
+
   public uploadMagnet(magnetLink: string, torrent: Torrent): Observable<void> {
     return this.http.post<void>(`${this.baseHref}Api/Torrents/UploadMagnet`, {
       magnetLink,

client/src/app/torrent/torrent.component.html

@@ -23,7 +23,7 @@
     @if (activeTab === 0) {
       <div class="flex-container">
         <div style="flex: 1 1 0">
-          <div class="field is-grouped">
+          <div class="field is-grouped is-grouped-multiline action-buttons">
             <div class="control">
               <button class="button is-danger" (click)="showDeleteModal()">Delete Torrent</button>
             </div>
@@ -44,7 +44,7 @@
           </div>
           <div class="field">
             <label class="label">Hash</label>
-            {{ torrent.hash }}
+            <span class="break-all">{{ torrent.hash }}</span>
           </div>
           <div class="field">
             <label class="label">Priority</label>
@@ -240,72 +240,75 @@
     @if (activeTab === 1) {
       <div>
         <div class="field">
-          <table class="table is-fullwidth">
-            <thead>
-              <tr>
-                <th>ID</th>
-                <th>Path</th>
-                <th>Size</th>
-                <th>Selected</th>
-              </tr>
-            </thead>
-            <tbody>
-              @for (file of torrent.files; track file.id) {
+          <div class="table-container">
+            <table class="table is-fullwidth">
+              <thead>
                 <tr>
-                  <td>
-                    {{ file.id }}
-                  </td>
-                  <td>
-                    {{ file.path }}
-                  </td>
-                  <td>
-                    {{ file.bytes | filesize }}
-                  </td>
-                  <td>
-                    @if (file.selected) {
-                      <i class="fas fa-check" style="color: green"></i>
-                    } @else {
-                      <i class="fas fa-times" style="color: red"></i>
-                    }
-                  </td>
+                  <th>ID</th>
+                  <th>Path</th>
+                  <th>Size</th>
+                  <th>Selected</th>
                 </tr>
-              }
-            </tbody>
-          </table>
+              </thead>
+              <tbody>
+                @for (file of torrent.files; track file.id) {
+                  <tr>
+                    <td>
+                      {{ file.id }}
+                    </td>
+                    <td class="break-all">
+                      {{ file.path }}
+                    </td>
+                    <td>
+                      {{ file.bytes | filesize }}
+                    </td>
+                    <td>
+                      @if (file.selected) {
+                        <i class="fas fa-check" style="color: green"></i>
+                      } @else {
+                        <i class="fas fa-times" style="color: red"></i>
+                      }
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
         </div>
       </div>
     }
     @if (activeTab === 2) {
       <div>
         <div class="field">
-          <table class="table is-fullwidth is-hoverable">
-            <thead>
-              <tr>
-                <th style="width: 35px"></th>
-                <th>Link</th>
-                <th>Size</th>
-                <th>Status</th>
-              </tr>
-            </thead>
-            <tbody>
-              @for (download of torrent.downloads; track download.downloadId) {
-                @let expanded = downloadExpanded[download.downloadId];
-                <tr (click)="downloadExpanded[download.downloadId] = !expanded">
-                  <td style="width: 35px">
-                    @if (!expanded) {
-                      <i class="fas fa-caret-right"></i>
-                    } @else {
-                      <i class="fas fa-caret-down"></i>
-                    }
-                  </td>
-                  <td>
-                    @if (download.link) {
-                      {{ download.link | decodeURI }}
-                    }
-                    @if (!download.link) {
-                      {{ download.path }}
-                    }
-                  </td>
+          <div class="table-container">
+            <table class="table is-fullwidth is-hoverable">
+              <thead>
+                <tr>
+                  <th style="width: 35px"></th>
+                  <th>Link</th>
+                  <th>Size</th>
+                  <th>Status</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (download of torrent.downloads; track download.downloadId) {
+                  @let expanded = downloadExpanded[download.downloadId];
+                  <tr (click)="downloadExpanded[download.downloadId] = !expanded">
+                    <td style="width: 35px">
+                      @if (!expanded) {
+                        <i class="fas fa-caret-right"></i>
+                      } @else {
+                        <i class="fas fa-caret-down"></i>
+                      }
+                    </td>
+                    <td class="break-all">
+                      @if (download.link) {
+                        {{ download.link | decodeURI }}
+                      }
+                      @if (!download.link) {
+                        {{ download.path }}
+                      }
+                    </td>
                   <td>
                     {{ download.bytesTotal | filesize }}
                   </td>
@@ -335,10 +338,10 @@
                           <div class="field">
                             <label class="label">Real-Debrid Unrestricted Link</label>
                             @if (download.link) {
-                              <a href="{{ download.link }}" target="_blank"> {{ download.link | decodeURI }}</a>
+                              <a class="break-all" href="{{ download.link }}" target="_blank"> {{ download.link | decodeURI }}</a>
                             }
                           </div>
-                          <div class="field">
+                          <div class="field break-all">
                             <label class="label">Real-Debrid Link</label>
                             {{ download.path }}
                           </div>
@@ -431,8 +434,9 @@
                   </tr>
                 }
               }
-            </tbody>
-          </table>
+              </tbody>
+            </table>
+          </div>
         </div>
       </div>
     }

client/src/app/torrent/torrent.component.scss

@@ -8,6 +8,10 @@ table {
   }
 }
 
+.break-all {
+  word-break: break-all;
+}
+
 .flex-container {
   display: flex;
   flex: 1 1 0;
@@ -18,3 +22,24 @@ table {
     flex-direction: column;
   }
 }
+
+@media screen and (max-width: 768px) {
+  .action-buttons {
+    .control {
+      width: 100%;
+
+      .button {
+        width: 100%;
+      }
+    }
+  }
+
+  .tabs ul {
+    flex-wrap: wrap;
+
+    li {
+      flex-grow: 1;
+      text-align: center;
+    }
+  }
+}

client/src/app/torrent/torrent.component.ts

@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, DestroyRef, OnInit, inject } from '@angular/core';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 import { saveAs } from 'file-saver-es';
 import { Torrent } from '../models/torrent.model';
@@ -10,6 +11,7 @@ import { TorrentStatusPipe } from '../torrent-status.pipe';
 import { DownloadStatusPipe } from '../download-status.pipe';
 import { DecodeURIPipe } from '../decode-uri.pipe';
 import { FileSizePipe } from '../filesize.pipe';
+import { EMPTY, distinctUntilChanged, map, switchMap, tap, catchError } from 'rxjs';
 
 @Component({
   selector: 'app-torrent',
@@ -28,6 +30,12 @@ import { FileSizePipe } from '../filesize.pipe';
   standalone: true,
 })
 export class TorrentComponent implements OnInit {
+  private destroyRef = inject(DestroyRef);
+  private activatedRoute = inject(ActivatedRoute);
+  private router = inject(Router);
+  private torrentService = inject(TorrentService);
+  private currentTorrentId: string | null = null;
+
   public torrent: Torrent;
 
   public activeTab: number = 0;
@@ -66,48 +74,66 @@ export class TorrentComponent implements OnInit {
 
   public updating: boolean;
 
-  constructor(
-    private activatedRoute: ActivatedRoute,
-    private router: Router,
-    private torrentService: TorrentService,
-  ) {}
-
   ngOnInit(): void {
-    this.activatedRoute.params.subscribe((params) => {
-      const torrentId = params['id'];
-
-      this.torrentService.get(torrentId).subscribe({
-        next: (torrent) => {
-          this.torrent = torrent;
-
-          this.torrentService.update$.subscribe((result) => {
-            this.update(result);
-          });
-        },
-        error: () => this.router.navigate(['/']),
+    this.activatedRoute.params
+      .pipe(
+        map((params) => params['id'] as string),
+        distinctUntilChanged(),
+        tap((torrentId) => {
+          this.currentTorrentId = torrentId;
+        }),
+        switchMap((torrentId) =>
+          this.torrentService.get(torrentId).pipe(
+            catchError(() => {
+              this.router.navigate(['/']);
+              return EMPTY;
+            }),
+          ),
+        ),
+        takeUntilDestroyed(this.destroyRef),
+      )
+      .subscribe((torrent) => {
+        this.torrent = torrent;
+        this.currentTorrentId = torrent.torrentId;
       });
+
+    this.torrentService.update$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((result) => {
+      this.update(result);
     });
   }
 
   public update(torrents: Torrent[]): void {
-    const updatedTorrent = torrents.find((m) => m.torrentId === this.torrent.torrentId);
+    const torrentId = this.currentTorrentId ?? this.torrent?.torrentId;
+
+    if (!torrentId) {
+      return;
+    }
+
+    const updatedTorrent = torrents.find((m) => m.torrentId === torrentId);
 
     if (updatedTorrent == null) {
       return;
     }
 
-    this.torrent = updatedTorrent;
+    const currentTorrent = this.torrent;
+    const hasIncomingFiles = Array.isArray(updatedTorrent.files) && updatedTorrent.files.length > 0;
+
+    this.torrent = {
+      ...currentTorrent,
+      ...updatedTorrent,
+      fileOrMagnet: updatedTorrent.fileOrMagnet ?? currentTorrent?.fileOrMagnet,
+      files: hasIncomingFiles ? updatedTorrent.files : currentTorrent?.files ?? [],
+      downloads: updatedTorrent.downloads ?? currentTorrent?.downloads ?? [],
+    };
   }
 
   public download(): void {
-    const byteArray = new Uint8Array(
-      window
-        .atob(this.torrent.fileOrMagnet)
-        .split('')
-        .map(function (c) {
-          return c.charCodeAt(0);
-        }),
-    );
+    const binaryString = window.atob(this.torrent.fileOrMagnet);
+    const byteArray = new Uint8Array(binaryString.length);
+
+    for (let index = 0; index < binaryString.length; index += 1) {
+      byteArray[index] = binaryString.charCodeAt(index);
+    }
 
     const blob = new Blob([byteArray], { type: 'application/x-bittorrent' });
     saveAs(blob, `${this.torrent.rdName}.torrent`);

client/src/main.ts

@@ -1,7 +1,6 @@
 import { enableProdMode, importProvidersFrom, provideZoneChangeDetection } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-
 import { environment } from './environments/environment';
 import { FileSizePipe } from './app/filesize.pipe';
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
@@ -18,12 +17,12 @@ if (environment.production) {
 }
 
 bootstrapApplication(AppComponent, {
-    providers: [
-        provideZoneChangeDetection(),importProvidersFrom(BrowserModule, AppRoutingModule, FormsModule, ClipboardModule),
-        FileSizePipe,
-        { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
-        { provide: APP_BASE_HREF, useValue: (window as any)['_app_base'] || '/' },
-        provideHttpClient(withInterceptorsFromDi()),
-    ]
-})
-  .catch((err) => console.error(err));
+  providers: [
+    provideZoneChangeDetection(),
+    importProvidersFrom(BrowserModule, AppRoutingModule, FormsModule, ClipboardModule),
+    FileSizePipe,
+    { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
+    { provide: APP_BASE_HREF, useValue: (window as any)['_app_base'] || '/' },
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
+}).catch((err) => console.error(err));

server/RdtClient.Data/Data/DataContext.cs

@@ -16,6 +16,14 @@ public class DataContext(DbContextOptions options) : IdentityDbContext(options)
     {
         base.OnModelCreating(builder);
 
+        builder.Entity<Download>()
+               .HasIndex(m => new
+               {
+                   m.TorrentId,
+                   m.Path
+               })
+               .IsUnique();
+
         var cascadeFKs = builder.Model.GetEntityTypes()
                                 .SelectMany(t => t.GetForeignKeys())
                                 .Where(fk => !fk.IsOwnership && fk.DeleteBehavior == DeleteBehavior.Cascade);

server/RdtClient.Data/Data/DownloadAddResult.cs

@@ -0,0 +1,9 @@
+namespace RdtClient.Data.Data;
+
+public enum DownloadAddResult
+{
+    Added,
+    AlreadyExists,
+    TorrentMissing,
+    InvalidInput
+}

server/RdtClient.Data/Data/DownloadData.cs

@@ -1,10 +1,12 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using RdtClient.Data.Models.Data;
 using Download = RdtClient.Data.Models.Data.Download;
 
 namespace RdtClient.Data.Data;
 
-public class DownloadData(DataContext dataContext)
+public class DownloadData(DataContext dataContext, ILogger<DownloadData>? logger = null)
 {
     public async Task<List<Download>> GetForTorrent(Guid torrentId)
     {
@@ -30,8 +32,29 @@ public class DownloadData(DataContext dataContext)
                                 .FirstOrDefaultAsync(m => m.TorrentId == torrentId && m.Path == path);
     }
 
-    public async Task<Download> Add(Guid torrentId, DownloadInfo downloadInfo)
+    public async Task<DownloadAddResult> TryAddForTorrent(Guid torrentId, DownloadInfo downloadInfo)
     {
+        if (String.IsNullOrWhiteSpace(downloadInfo.RestrictedLink))
+        {
+            logger?.LogDebug("Skipped download creation because the restricted link was blank. TorrentId: {torrentId}", torrentId);
+
+            return DownloadAddResult.InvalidInput;
+        }
+
+        if (!await dataContext.Torrents.AsNoTracking().AnyAsync(m => m.TorrentId == torrentId))
+        {
+            logger?.LogDebug("Skipped download creation because the torrent no longer exists. TorrentId: {torrentId}, Path: {path}", torrentId, downloadInfo.RestrictedLink);
+
+            return DownloadAddResult.TorrentMissing;
+        }
+
+        if (await dataContext.Downloads.AsNoTracking().AnyAsync(m => m.TorrentId == torrentId && m.Path == downloadInfo.RestrictedLink))
+        {
+            logger?.LogDebug("Skipped download creation because it already exists. TorrentId: {torrentId}, Path: {path}", torrentId, downloadInfo.RestrictedLink);
+
+            return DownloadAddResult.AlreadyExists;
+        }
+
         var download = new Download
         {
             DownloadId = Guid.NewGuid(),
@@ -45,9 +68,36 @@ public class DownloadData(DataContext dataContext)
 
         await dataContext.Downloads.AddAsync(download);
 
-        await dataContext.SaveChangesAsync();
+        try
+        {
+            await dataContext.SaveChangesAsync();
 
-        return download;
+            return DownloadAddResult.Added;
+        }
+
+        // These shouldn't be possible any longer, but added for safety and until confirmed.
+        catch (DbUpdateException ex)
+        {
+            dataContext.Entry(download).State = EntityState.Detached;
+
+            if (IsDuplicateDownloadViolation(ex))
+            {
+                logger?.LogDebug("Skipped download creation after a concurrent duplicate insert. TorrentId: {torrentId}, Path: {path}", torrentId, downloadInfo.RestrictedLink);
+
+                return DownloadAddResult.AlreadyExists;
+            }
+
+            if (IsForeignKeyViolation(ex) && !await dataContext.Torrents.AsNoTracking().AnyAsync(m => m.TorrentId == torrentId))
+            {
+                logger?.LogDebug("Skipped download creation after the torrent was deleted concurrently. TorrentId: {torrentId}, Path: {path}",
+                                 torrentId,
+                                 downloadInfo.RestrictedLink);
+
+                return DownloadAddResult.TorrentMissing;
+            }
+
+            throw;
+        }
     }
 
     public async Task UpdateUnrestrictedLink(Guid downloadId, String unrestrictedLink)
@@ -226,7 +276,7 @@ public class DownloadData(DataContext dataContext)
         await dataContext.SaveChangesAsync();
     }
 
-    public async Task Reset(Guid downloadId)
+    public async Task Reset(Guid downloadId, DateTimeOffset? downloadQueued = null)
     {
         var dbDownload = await dataContext.Downloads
                                           .FirstOrDefaultAsync(m => m.DownloadId == downloadId)
@@ -235,7 +285,7 @@ public class DownloadData(DataContext dataContext)
         dbDownload.RetryCount = 0;
         dbDownload.Link = null;
         dbDownload.Added = DateTimeOffset.UtcNow;
-        dbDownload.DownloadQueued = DateTimeOffset.UtcNow;
+        dbDownload.DownloadQueued = downloadQueued ?? DateTimeOffset.UtcNow;
         dbDownload.DownloadStarted = null;
         dbDownload.DownloadFinished = null;
         dbDownload.UnpackingQueued = null;
@@ -246,4 +296,20 @@ public class DownloadData(DataContext dataContext)
 
         await dataContext.SaveChangesAsync();
     }
+
+    private static Boolean IsDuplicateDownloadViolation(DbUpdateException exception)
+    {
+        var sqliteException = exception.InnerException as SqliteException;
+
+        return sqliteException?.SqliteExtendedErrorCode == 2067
+               || sqliteException?.Message.Contains("UNIQUE constraint failed: Downloads.TorrentId, Downloads.Path", StringComparison.Ordinal) == true;
+    }
+
+    private static Boolean IsForeignKeyViolation(DbUpdateException exception)
+    {
+        var sqliteException = exception.InnerException as SqliteException;
+
+        return sqliteException?.SqliteExtendedErrorCode == 787
+               || sqliteException?.Message.Contains("FOREIGN KEY constraint failed", StringComparison.Ordinal) == true;
+    }
 }

server/RdtClient.Data/Data/ITorrentData.cs

@@ -19,6 +19,7 @@ public interface ITorrentData
 
     Task UpdateRdData(Torrent torrent);
     Task UpdateRdId(Torrent torrent, String rdId);
+    Task UpdateHash(Torrent torrent, String hash);
     Task Update(Torrent torrent);
     Task UpdateCategory(Guid torrentId, String? category);
     Task UpdateComplete(Guid torrentId, String? error, DateTimeOffset? datetime, Boolean retry);

server/RdtClient.Data/Data/SettingData.cs

@@ -9,6 +9,7 @@ namespace RdtClient.Data.Data;
 
 public class SettingData(DataContext dataContext, ILogger<SettingData> logger)
 {
+    // ReSharper disable once AutoPropertyCanBeMadeGetOnly.Local
     public static DbSettings Get { get; private set; } = new();
 
     public static IList<SettingProperty> GetAll()

server/RdtClient.Data/Data/TorrentData.cs

@@ -1,10 +1,11 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
 
 namespace RdtClient.Data.Data;
 
-public class TorrentData(DataContext dataContext) : ITorrentData
+public class TorrentData(DataContext dataContext, ILogger<TorrentData>? logger = null) : ITorrentData
 {
     public async Task<IList<Torrent>> Get()
     {
@@ -12,6 +13,7 @@ public class TorrentData(DataContext dataContext) : ITorrentData
                                         .AsNoTracking()
                                         .AsSplitQuery()
                                         .Include(m => m.Downloads)
+                                        .OrderBy(m => m.Priority ?? 9999)
                                         .ToListAsync();
 
         return torrents.OrderBy(m => m.Priority ?? 9999)
@@ -286,15 +288,23 @@ public class TorrentData(DataContext dataContext) : ITorrentData
 
     public async Task Delete(Guid torrentId)
     {
-        var dbTorrent = await dataContext.Torrents.FirstOrDefaultAsync(m => m.TorrentId == torrentId);
+        await using var transaction = await dataContext.Database.BeginTransactionAsync();
 
-        if (dbTorrent == null)
+        await dataContext.Downloads
+                         .Where(m => m.TorrentId == torrentId)
+                         .ExecuteDeleteAsync();
+
+        var deletedTorrents = await dataContext.Torrents
+                                               .Where(m => m.TorrentId == torrentId)
+                                               .ExecuteDeleteAsync();
+
+        await transaction.CommitAsync();
+
+        if (deletedTorrents == 0)
         {
+            logger?.LogDebug("Skipped torrent graph deletion because the torrent was not found. TorrentId: {torrentId}", torrentId);
+
             return;
         }
-
-        dataContext.Torrents.Remove(dbTorrent);
-
-        await dataContext.SaveChangesAsync();
     }
 }

server/RdtClient.Data/GlobalSuppressions.cs

@@ -5,4 +5,4 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage("Style", "IDE0305:Simplify collection initialization", Justification = "Code style", Scope = "NamespaceAndDescendants", Target = "N:RdtClient.Web")]
+[assembly: SuppressMessage("Style", "IDE0305:Simplify collection initialization", Justification = "Code style", Scope = "NamespaceAndDescendants", Target = "N:RdtClient.Data")]

server/RdtClient.Data/Migrations/20260423031719_Downloads_Add_TorrentIdPath_Unique.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using RdtClient.Data.Data;
+
+#nullable disable
+
+namespace RdtClient.Data.Migrations;
+
+[DbContext(typeof(DataContext))]
+[Migration("20260423031719_Downloads_Add_TorrentIdPath_Unique")]
+public partial class Downloads_Add_TorrentIdPath_Unique : Migration
+{
+    protected override void Up(MigrationBuilder migrationBuilder)
+    {
+        // Orphaned downloads from previous failures.
+        migrationBuilder.Sql("""
+                             DELETE FROM Downloads
+                             WHERE rowid NOT IN (
+                                 SELECT MIN(rowid)
+                                 FROM Downloads
+                                 GROUP BY TorrentId, Path
+                             );
+                             """);
+
+        migrationBuilder.DropIndex(
+            name: "IX_Downloads_TorrentId",
+            table: "Downloads");
+
+        // Prevent accidental duplicates, provides idempotency at the DB level for downloads
+        migrationBuilder.CreateIndex(
+            name: "IX_Downloads_TorrentId_Path",
+            table: "Downloads",
+            columns: ["TorrentId", "Path"],
+            unique: true);
+    }
+
+    protected override void Down(MigrationBuilder migrationBuilder)
+    {
+        migrationBuilder.DropIndex(
+            name: "IX_Downloads_TorrentId_Path",
+            table: "Downloads");
+
+        migrationBuilder.CreateIndex(
+            name: "IX_Downloads_TorrentId",
+            table: "Downloads",
+            column: "TorrentId");
+    }
+}

server/RdtClient.Data/Migrations/DataContextModelSnapshot.cs

@@ -15,7 +15,7 @@ namespace RdtClient.Data.Migrations
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
+            modelBuilder.HasAnnotation("ProductVersion", "10.0.5");
 
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
                 {
@@ -263,7 +263,8 @@ namespace RdtClient.Data.Migrations
 
                     b.HasKey("DownloadId");
 
-                    b.HasIndex("TorrentId");
+                    b.HasIndex("TorrentId", "Path")
+                        .IsUnique();
 
                     b.ToTable("Downloads");
                 });

server/RdtClient.Data/Models/Data/Torrent.cs

@@ -8,6 +8,10 @@ namespace RdtClient.Data.Models.Data;
 
 public class Torrent
 {
+    private String? _rdFiles;
+    private IList<DebridClientFile> _filesCache = [];
+    private Boolean _filesCacheInitialized;
+
     [Key]
     public Guid TorrentId { get; set; }
 
@@ -59,26 +63,52 @@ public class Torrent
     public DateTimeOffset? RdEnded { get; set; }
     public Int64? RdSpeed { get; set; }
     public Int64? RdSeeders { get; set; }
-    public String? RdFiles { get; set; }
+
+    public String? RdFiles
+    {
+        get => _rdFiles;
+        set
+        {
+            if (_rdFiles == value)
+            {
+                return;
+            }
+
+            _rdFiles = value;
+            _filesCache = [];
+            _filesCacheInitialized = false;
+        }
+    }
 
     [NotMapped]
     public IList<DebridClientFile> Files
     {
         get
         {
+            if (_filesCacheInitialized)
+            {
+                return _filesCache;
+            }
+
+            _filesCacheInitialized = true;
+
             if (String.IsNullOrWhiteSpace(RdFiles))
             {
-                return [];
+                _filesCache = [];
+
+                return _filesCache;
             }
 
             try
             {
-                return JsonSerializer.Deserialize<List<DebridClientFile>>(RdFiles) ?? [];
+                _filesCache = JsonSerializer.Deserialize<List<DebridClientFile>>(RdFiles) ?? [];
             }
             catch
             {
-                return [];
+                _filesCache = [];
             }
+
+            return _filesCache;
         }
     }
 

server/RdtClient.Data/Models/Internal/DbSettings.cs

@@ -1,6 +1,6 @@
-using RdtClient.Data.Enums;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using RdtClient.Data.Enums;
 
 // ReSharper disable AutoPropertyCanBeMadeGetOnly.Global
 

server/RdtClient.Data/Models/Internal/RateLimitException.cs

@@ -0,0 +1,6 @@
+namespace RdtClient.Data.Models.Internal;
+
+public class RateLimitException(String message, TimeSpan retryAfter) : Exception(message)
+{
+    public TimeSpan RetryAfter { get; } = retryAfter;
+}

server/RdtClient.Data/Models/Internal/RateLimitStatus.cs

@@ -0,0 +1,7 @@
+namespace RdtClient.Data.Models.Internal;
+
+public class RateLimitStatus
+{
+    public DateTimeOffset? NextDequeueTime { get; set; }
+    public Double SecondsRemaining { get; set; }
+}

server/RdtClient.Data/Models/Internal/TorrentDto.cs

@@ -21,6 +21,7 @@ public class TorrentDto
     public DateTimeOffset? FilesSelected { get; set; }
     public DateTimeOffset? Completed { get; set; }
     public DownloadType Type { get; set; }
+    public String? FileOrMagnet { get; set; }
     public Boolean IsFile { get; set; }
     public Int32? Priority { get; set; }
     public Int32 RetryCount { get; set; }
@@ -41,6 +42,9 @@ public class TorrentDto
     public DateTimeOffset? RdEnded { get; set; }
     public Int64? RdSpeed { get; set; }
     public Int64? RdSeeders { get; set; }
+    public String StatusText { get; set; } = null!;
+    public Int32 FilesCount { get; set; }
+    public Int32 DownloadsCount { get; set; }
     public IList<DebridClientFile> Files { get; set; } = [];
     public IList<DownloadDto> Downloads { get; set; } = [];
 }

server/RdtClient.Data/Models/QBittorrent/TorrentFileItem.cs

@@ -4,6 +4,21 @@ namespace RdtClient.Data.Models.QBittorrent;
 
 public class TorrentFileItem
 {
+    [JsonPropertyName("index")]
+    public Int32 Index { get; set; }
+
     [JsonPropertyName("name")]
     public String? Name { get; set; }
+
+    [JsonPropertyName("size")]
+    public Int64 Size { get; set; }
+
+    [JsonPropertyName("progress")]
+    public Single Progress { get; set; }
+
+    [JsonPropertyName("priority")]
+    public Int32 Priority { get; set; }
+
+    [JsonPropertyName("is_seed")]
+    public Boolean IsSeed { get; set; }
 }

server/RdtClient.Data/Models/QBittorrent/TorrentProperties.cs

@@ -13,6 +13,9 @@ public class TorrentProperties
     [JsonPropertyName("completion_date")]
     public Int64? CompletionDate { get; set; }
 
+    [JsonPropertyName("is_private")]
+    public Boolean IsPrivate { get; set; }
+
     [JsonPropertyName("created_by")]
     public String? CreatedBy { get; set; }
 

server/RdtClient.Data/Models/QBittorrent/Tracker.cs

@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace RdtClient.Data.Models.QBittorrent;
+
+public class Tracker
+{
+    [JsonPropertyName("url")]
+    public required String Url { get; set; }
+
+    [JsonPropertyName("status")]
+    public required String Status { get; set; }
+
+    [JsonPropertyName("num_peers")]
+    public required Int64 NumPeers { get; set; }
+
+    [JsonPropertyName("msg")]
+    public required String Msg { get; set; }
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdCategory.cs

@@ -21,4 +21,4 @@ public class SabnzbdCategory
 
     [JsonPropertyName("script")]
     public String Script { get; set; } = "None";
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdConfig.cs

@@ -12,4 +12,4 @@ public class SabnzbdConfig
 
     [JsonPropertyName("servers")]
     public List<Object> Servers { get; set; } = new();
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdHistory.cs

@@ -12,4 +12,4 @@ public class SabnzbdHistory
 
     [JsonPropertyName("slots")]
     public List<SabnzbdHistorySlot> Slots { get; set; } = new();
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdHistorySlot.cs

@@ -21,4 +21,4 @@ public class SabnzbdHistorySlot
 
     [JsonPropertyName("storage")]
     public String Path { get; set; } = "";
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdMisc.cs

@@ -15,4 +15,4 @@ public class SabnzbdMisc
 
     [JsonPropertyName("version")]
     public String Version { get; set; } = "4.4.0";
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdQueue.cs

@@ -24,4 +24,4 @@ public class SabnzbdQueue
 
     [JsonPropertyName("slots")]
     public List<SabnzbdQueueSlot> Slots { get; set; } = new();
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdQueueSlot.cs

@@ -33,4 +33,4 @@ public class SabnzbdQueueSlot
 
     [JsonPropertyName("priority")]
     public String Priority { get; set; } = "Normal";
-}
+}

server/RdtClient.Data/Models/Sabnzbd/SabnzbdResponse.cs

@@ -27,4 +27,4 @@ public class SabnzbdResponse
 
     [JsonPropertyName("categories")]
     public List<String>? Categories { get; set; }
-}
+}

server/RdtClient.Data/RdtClient.Data.csproj

@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs

@@ -1,22 +1,22 @@
+using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
-using RdtClient.Data.Data;
 using RdtClient.Data.Models.Data;
 using RdtClient.Service.BackgroundServices;
 using RdtClient.Service.Services;
-using System.Reflection;
 
 namespace RdtClient.Service.Test.BackgroundServices;
 
 public class WatchFolderCheckerTests : IDisposable
 {
     private readonly Mock<ILogger<WatchFolderChecker>> _loggerMock;
+    private readonly Mock<IServiceProvider> _scopeServiceProviderMock;
     private readonly Mock<IServiceProvider> _serviceProviderMock;
     private readonly Mock<IServiceScope> _serviceScopeMock;
-    private readonly Mock<IServiceProvider> _scopeServiceProviderMock;
-    private readonly Mock<Torrents> _torrentsServiceMock;
     private readonly String _testPath;
+    private readonly TestSettings _settings;
+    private readonly Mock<Torrents> _torrentsServiceMock;
 
     public WatchFolderCheckerTests()
     {
@@ -24,7 +24,18 @@ public class WatchFolderCheckerTests : IDisposable
         _serviceProviderMock = new();
         _serviceScopeMock = new();
         _scopeServiceProviderMock = new();
-        _torrentsServiceMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
+
+        _settings = new(new()
+        {
+            Watch = new()
+            {
+                Interval = 0,
+                Default = new()
+            },
+            DownloadClient = new()
+        });
+
+        _torrentsServiceMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
 
         _serviceProviderMock
             .Setup(x => x.GetService(typeof(IServiceScopeFactory)))
@@ -41,10 +52,8 @@ public class WatchFolderCheckerTests : IDisposable
         _testPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
         Directory.CreateDirectory(_testPath);
 
-        // Reset Settings and Startup
         SetStartupReady(true);
-        ResetSettings();
-        Settings.Get.Watch.Path = _testPath;
+        _settings.Current.Watch.Path = _testPath;
     }
 
     public void Dispose()
@@ -61,22 +70,6 @@ public class WatchFolderCheckerTests : IDisposable
         property?.SetValue(null, ready);
     }
 
-    private static void ResetSettings()
-    {
-        var settings = new Data.Models.Internal.DbSettings
-        {
-            Watch = new()
-            {
-                Interval = 0,
-                Default = new()
-            },
-            DownloadClient = new()
-        };
-
-        var property = typeof(SettingData).GetProperty("Get", BindingFlags.Public | BindingFlags.Static);
-        property?.SetValue(null, settings);
-    }
-
     private static void ResetPrevCheck(WatchFolderChecker checker)
     {
         var field = typeof(WatchFolderChecker).GetField("_prevCheck", BindingFlags.NonPublic | BindingFlags.Instance);
@@ -91,7 +84,7 @@ public class WatchFolderCheckerTests : IDisposable
         var content = "torrent content"u8.ToArray();
         await File.WriteAllBytesAsync(filePath, content);
 
-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
         ResetPrevCheck(checker);
 
         var cts = new CancellationTokenSource();
@@ -104,13 +97,20 @@ public class WatchFolderCheckerTests : IDisposable
         var task = checker.StartAsync(cts.Token);
         await Task.Delay(500); // Give it some time to process
         await cts.CancelAsync();
-        try { await task; } catch (OperationCanceledException) { }
+
+        try
+        {
+            await task;
+        }
+        catch (OperationCanceledException)
+        {
+        }
 
         // Assert
-        _torrentsServiceMock.Verify(x => x.AddFileToDebridQueue(
-            It.Is<Byte[]>(b => b.SequenceEqual(content)),
-            It.IsAny<Torrent>()), Times.AtLeastOnce);
-        
+        _torrentsServiceMock.Verify(x => x.AddFileToDebridQueue(It.Is<Byte[]>(b => b.AsEnumerable().SequenceEqual(content)),
+                                                                It.IsAny<Torrent>()),
+                                    Times.AtLeastOnce);
+
         Assert.False(File.Exists(filePath));
         Assert.True(File.Exists(Path.Combine(_testPath, "processed", "test.torrent")));
     }
@@ -123,7 +123,7 @@ public class WatchFolderCheckerTests : IDisposable
         var content = "magnet:?xt=urn:btih:123";
         await File.WriteAllTextAsync(filePath, content);
 
-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
         ResetPrevCheck(checker);
 
         var cts = new CancellationTokenSource();
@@ -136,13 +136,20 @@ public class WatchFolderCheckerTests : IDisposable
         var task = checker.StartAsync(cts.Token);
         await Task.Delay(500);
         await cts.CancelAsync();
-        try { await task; } catch (OperationCanceledException) { }
+
+        try
+        {
+            await task;
+        }
+        catch (OperationCanceledException)
+        {
+        }
 
         // Assert
-        _torrentsServiceMock.Verify(x => x.AddMagnetToDebridQueue(
-            content,
-            It.IsAny<Torrent>()), Times.AtLeastOnce);
-        
+        _torrentsServiceMock.Verify(x => x.AddMagnetToDebridQueue(content,
+                                                                  It.IsAny<Torrent>()),
+                                    Times.AtLeastOnce);
+
         Assert.False(File.Exists(filePath));
         Assert.True(File.Exists(Path.Combine(_testPath, "processed", "test.magnet")));
     }
@@ -155,7 +162,7 @@ public class WatchFolderCheckerTests : IDisposable
         var content = "nzb content"u8.ToArray();
         await File.WriteAllBytesAsync(filePath, content);
 
-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
         ResetPrevCheck(checker);
 
         var cts = new CancellationTokenSource();
@@ -168,14 +175,21 @@ public class WatchFolderCheckerTests : IDisposable
         var task = checker.StartAsync(cts.Token);
         await Task.Delay(500);
         await cts.CancelAsync();
-        try { await task; } catch (OperationCanceledException) { }
+
+        try
+        {
+            await task;
+        }
+        catch (OperationCanceledException)
+        {
+        }
 
         // Assert
-        _torrentsServiceMock.Verify(x => x.AddNzbFileToDebridQueue(
-            It.Is<Byte[]>(b => b.SequenceEqual(content)),
-            "test.nzb",
-            It.IsAny<Torrent>()), Times.AtLeastOnce);
-        
+        _torrentsServiceMock.Verify(x => x.AddNzbFileToDebridQueue(It.Is<Byte[]>(b => b.AsEnumerable().SequenceEqual(content)),
+                                                                   "test.nzb",
+                                                                   It.IsAny<Torrent>()),
+                                    Times.AtLeastOnce);
+
         Assert.False(File.Exists(filePath));
         Assert.True(File.Exists(Path.Combine(_testPath, "processed", "test.nzb")));
     }
@@ -187,7 +201,7 @@ public class WatchFolderCheckerTests : IDisposable
         var filePath = Path.Combine(_testPath, "test.txt");
         await File.WriteAllTextAsync(filePath, "ignore me");
 
-        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object);
+        var checker = new WatchFolderChecker(_loggerMock.Object, _serviceProviderMock.Object, _settings);
         ResetPrevCheck(checker);
 
         var cts = new CancellationTokenSource();
@@ -196,18 +210,28 @@ public class WatchFolderCheckerTests : IDisposable
         var task = checker.StartAsync(cts.Token);
         await Task.Delay(500);
         await cts.CancelAsync();
-        try { await task; } catch (OperationCanceledException) { }
+
+        try
+        {
+            await task;
+        }
+        catch (OperationCanceledException)
+        {
+        }
 
         // Assert
         _torrentsServiceMock.Verify(x => x.AddFileToDebridQueue(It.IsAny<Byte[]>(), It.IsAny<Torrent>()), Times.Never);
         _torrentsServiceMock.Verify(x => x.AddMagnetToDebridQueue(It.IsAny<String>(), It.IsAny<Torrent>()), Times.Never);
         _torrentsServiceMock.Verify(x => x.AddNzbFileToDebridQueue(It.IsAny<Byte[]>(), It.IsAny<String>(), It.IsAny<Torrent>()), Times.Never);
-        
+
         Assert.True(File.Exists(filePath));
     }
 
     private class MockScopeFactory(IServiceScope scope) : IServiceScopeFactory
     {
-        public IServiceScope CreateScope() => scope;
+        public IServiceScope CreateScope()
+        {
+            return scope;
+        }
     }
 }

server/RdtClient.Service.Test/GlobalTestConfig.cs

@@ -0,0 +1 @@
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

server/RdtClient.Service.Test/Helpers/DownloadHelperTest.cs

@@ -181,7 +181,7 @@ public class DownloadHelperTest
             FileName = "file.txt"
         };
 
-        var fileRelativePath = "inside/lots/of/subdirectories/file.txt";
+        var fileRelativePath = Path.Combine("inside", "lots", "of", "subdirectories", "file.txt");
 
         IList<DebridClientFile> files =
         [
@@ -203,7 +203,7 @@ public class DownloadHelperTest
         var path = DownloadHelper.GetDownloadPath("/data/downloads", torrent, download, fileSystem);
 
         // Assert
-        var expectedPath = Path.Combine("/data/downloads", torrent.RdName, fileRelativePath);
+        var expectedPath = Path.Combine("/data/downloads", torrent.RdName, "inside", "lots", "of", "subdirectories", "file.txt");
         Assert.Equal(expectedPath, path);
     }
 
@@ -217,7 +217,7 @@ public class DownloadHelperTest
             FileName = "file.txt"
         };
 
-        var fileRelativePath = "inside/lots/of/subdirectories/file.txt";
+        var fileRelativePath = Path.Combine("inside", "lots", "of", "subdirectories", "file.txt");
 
         IList<DebridClientFile> files =
         [
@@ -237,7 +237,78 @@ public class DownloadHelperTest
         var path = DownloadHelper.GetDownloadPath(torrent, download);
 
         // Assert
-        var expectedPath = Path.Combine(torrent.RdName, fileRelativePath);
+        var expectedPath = Path.Combine(torrent.RdName, "inside", "lots", "of", "subdirectories", "file.txt");
+        Assert.Equal(expectedPath, path);
+    }
+
+    [Fact]
+    public void GetDownloadPath_WithPath_WhenFilePathStartsWithTorrentName_StripsPrefix()
+    {
+        // Arrange
+        var download = new Download
+        {
+            Link = "https://fake.url/file.txt",
+            FileName = "file.txt"
+        };
+
+        var fileRelativePath = Path.Combine("Torrent Name", "Saison 1", "file.txt");
+
+        IList<DebridClientFile> files =
+        [
+            new()
+            {
+                Path = fileRelativePath
+            }
+        ];
+
+        var torrent = new Torrent
+        {
+            RdName = "Torrent Name",
+            RdFiles = JsonSerializer.Serialize(files)
+        };
+
+        var fileSystem = new MockFileSystem();
+
+        // Act
+        var path = DownloadHelper.GetDownloadPath("/data/downloads", torrent, download, fileSystem);
+
+        // Assert
+        // The torrent name prefix in the file path should not duplicate the torrent name in the base dir
+        var expectedPath = Path.Combine("/data/downloads", "Torrent Name", "Saison 1", "file.txt");
+        Assert.Equal(expectedPath, path);
+    }
+
+    [Fact]
+    public void GetDownloadPath_WithoutPath_WhenFilePathStartsWithTorrentName_StripsPrefix()
+    {
+        // Arrange
+        var download = new Download
+        {
+            Link = "https://fake.url/file.txt",
+            FileName = "file.txt"
+        };
+
+        var fileRelativePath = Path.Combine("Torrent Name", "Saison 1", "file.txt");
+
+        IList<DebridClientFile> files =
+        [
+            new()
+            {
+                Path = fileRelativePath
+            }
+        ];
+
+        var torrent = new Torrent
+        {
+            RdName = "Torrent Name",
+            RdFiles = JsonSerializer.Serialize(files)
+        };
+
+        // Act
+        var path = DownloadHelper.GetDownloadPath(torrent, download);
+
+        // Assert
+        var expectedPath = Path.Combine("Torrent Name", "Saison 1", "file.txt");
         Assert.Equal(expectedPath, path);
     }
 

server/RdtClient.Service.Test/Helpers/RateLimitCoordinatorTest.cs

@@ -0,0 +1,68 @@
+using RdtClient.Service.Helpers;
+
+namespace RdtClient.Service.Test.Helpers;
+
+public class RateLimitCoordinatorTest
+{
+    [Fact]
+    public void UpdateCooldown_SetsCooldown()
+    {
+        // Arrange
+        var coordinator = new RateLimitCoordinator();
+        var key = "test.host";
+        var delay = TimeSpan.FromMinutes(5);
+
+        // Act
+        coordinator.UpdateCooldown(key, delay);
+        var remaining = coordinator.GetRemainingCooldown(key);
+
+        // Assert
+        Assert.True(remaining > TimeSpan.FromMinutes(4) && remaining <= TimeSpan.FromMinutes(5));
+    }
+
+    [Fact]
+    public void GetRemainingCooldown_ReturnsZero_WhenNoCooldown()
+    {
+        // Arrange
+        var coordinator = new RateLimitCoordinator();
+        var key = "test.host";
+
+        // Act
+        var remaining = coordinator.GetRemainingCooldown(key);
+
+        // Assert
+        Assert.Equal(TimeSpan.Zero, remaining);
+    }
+
+    [Fact]
+    public void GetMaxNextAllowedAt_ReturnsMax()
+    {
+        // Arrange
+        var coordinator = new RateLimitCoordinator();
+        var now = DateTimeOffset.UtcNow;
+        coordinator.UpdateCooldown("host1", TimeSpan.FromMinutes(10));
+        coordinator.UpdateCooldown("host2", TimeSpan.FromMinutes(20));
+
+        // Act
+        var maxNext = coordinator.GetMaxNextAllowedAt();
+
+        // Assert
+        Assert.NotNull(maxNext);
+        Assert.True(maxNext > now.AddMinutes(19));
+        Assert.True(maxNext < now.AddMinutes(21));
+    }
+
+    [Fact]
+    public void GetMaxNextAllowedAt_ReturnsNull_WhenAllExpired()
+    {
+        // Arrange
+        var coordinator = new RateLimitCoordinator();
+        coordinator.UpdateCooldown("host1", TimeSpan.FromSeconds(-10));
+
+        // Act
+        var maxNext = coordinator.GetMaxNextAllowedAt();
+
+        // Assert
+        Assert.Null(maxNext);
+    }
+}

server/RdtClient.Service.Test/Helpers/RateLimitHandlerTest.cs

@@ -0,0 +1,103 @@
+using System.Net;
+using Moq;
+using RdtClient.Data.Models.Internal;
+using RdtClient.Service.Helpers;
+
+namespace RdtClient.Service.Test.Helpers;
+
+public class RateLimitHandlerTest
+{
+    private readonly Mock<IRateLimitCoordinator> _coordinatorMock = new();
+
+    [Fact]
+    public async Task SendAsync_ThrowsRateLimitException_On429WithRetryAfter()
+    {
+        // Arrange
+        var handler = new RateLimitHandler(_coordinatorMock.Object)
+        {
+            InnerHandler = new MockHttpMessageHandler(HttpStatusCode.TooManyRequests, 3600)
+        };
+
+        var client = new HttpClient(handler);
+
+        // Act & Assert
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.GetAsync("http://example.com"));
+        Assert.Equal(TimeSpan.FromSeconds(3600), ex.RetryAfter);
+        Assert.Contains("rate limit exceeded", ex.Message);
+
+        _coordinatorMock.Verify(m => m.UpdateCooldown("example.com", TimeSpan.FromSeconds(3600)), Times.Once);
+    }
+
+    [Fact]
+    public async Task SendAsync_ThrowsRateLimitException_On429WithoutRetryAfter()
+    {
+        // Arrange
+        var handler = new RateLimitHandler(_coordinatorMock.Object)
+        {
+            InnerHandler = new MockHttpMessageHandler(HttpStatusCode.TooManyRequests, null)
+        };
+
+        var client = new HttpClient(handler);
+
+        // Act & Assert
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.GetAsync("http://example.com"));
+        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
+    }
+
+    [Fact]
+    public async Task SendAsync_ThrowsRateLimitException_WhenCooldownActive()
+    {
+        // Arrange
+        _coordinatorMock.Setup(m => m.GetRemainingCooldown("example.com")).Returns(TimeSpan.FromMinutes(5));
+
+        var handler = new RateLimitHandler(_coordinatorMock.Object)
+        {
+            InnerHandler = new MockHttpMessageHandler(HttpStatusCode.OK, null)
+        };
+
+        var client = new HttpClient(handler);
+
+        // Act & Assert
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.GetAsync("http://example.com"));
+        Assert.Equal(TimeSpan.FromMinutes(5), ex.RetryAfter);
+        Assert.Contains("cooldown active", ex.Message);
+    }
+
+    [Fact]
+    public async Task SendAsync_DoesNotCatchTimeoutException()
+    {
+        // Arrange
+        var handler = new RateLimitHandler(_coordinatorMock.Object)
+        {
+            InnerHandler = new MockExceptionHandler(new TimeoutException())
+        };
+
+        var client = new HttpClient(handler);
+
+        // Act & Assert
+        await Assert.ThrowsAsync<TimeoutException>(() => client.GetAsync("http://example.com"));
+    }
+
+    private class MockHttpMessageHandler(HttpStatusCode statusCode, Int32? retryAfterSeconds) : HttpMessageHandler
+    {
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var response = new HttpResponseMessage(statusCode);
+
+            if (retryAfterSeconds.HasValue)
+            {
+                response.Headers.RetryAfter = new(TimeSpan.FromSeconds(retryAfterSeconds.Value));
+            }
+
+            return Task.FromResult(response);
+        }
+    }
+
+    private class MockExceptionHandler(Exception ex) : HttpMessageHandler
+    {
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            throw ex;
+        }
+    }
+}

server/RdtClient.Service.Test/RdtClient.Service.Test.csproj

@@ -5,22 +5,24 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
         <AssemblyName>RdtClient.Service.Test</AssemblyName>
         <RootNamespace>RdtClient.Service.Test</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="AllDebrid.NET" Version="1.0.18" />
-        <PackageReference Include="coverlet.collector" Version="8.0.0">
+        <PackageReference Include="coverlet.collector" Version="10.0.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.0" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.0" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.0" />
-        <PackageReference Include="TorBox.NET" Version="1.6.0" />
+        <PackageReference Include="SharpCompress" Version="[0.42.1]" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.1" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
+        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.1" />
+        <PackageReference Include="TorBox.NET" Version="2.1.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
           <PrivateAssets>all</PrivateAssets>
@@ -36,10 +38,4 @@
       <ProjectReference Include="..\RdtClient.Service\RdtClient.Service.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Reference Include="TorBoxNET">
-        <HintPath>..\..\..\torbox-net\TorBoxNET\bin\Release\netstandard2.0\TorBoxNET.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
 </Project>

server/RdtClient.Service.Test/Regression/TorrentDownloadRaceTests.cs

@@ -0,0 +1,186 @@
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using RdtClient.Data.Data;
+using RdtClient.Data.Models.Data;
+
+namespace RdtClient.Service.Test.Regression;
+
+public class TorrentDownloadRaceTests : IAsyncLifetime
+{
+    private readonly String _databasePath = Path.Combine(Path.GetTempPath(), $"rdt-client-race-{Guid.NewGuid():N}.sqlite");
+
+    [Fact]
+    public async Task Add_WhenTorrentIsDeletedAfterItWasRead_DoesNotThrowAndDoesNotInsertDownload()
+    {
+        var torrentId = await SeedTorrentAsync();
+
+        await using (var readerContext = CreateContext())
+        {
+            var torrentData = new TorrentData(readerContext);
+            var torrent = await torrentData.GetById(torrentId);
+
+            Assert.NotNull(torrent);
+        }
+
+        await using (var deleteContext = CreateContext())
+        {
+            var torrentData = new TorrentData(deleteContext);
+            await torrentData.Delete(torrentId);
+        }
+
+        DownloadAddResult result;
+
+        await using (var addContext = CreateContext())
+        {
+            var downloadData = new DownloadData(addContext);
+            result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-a"));
+        }
+
+        Assert.Equal(DownloadAddResult.TorrentMissing, result);
+
+        await using var verifyContext = CreateContext();
+        Assert.False(await verifyContext.Torrents.AnyAsync(m => m.TorrentId == torrentId));
+        Assert.False(await verifyContext.Downloads.AnyAsync());
+    }
+
+    [Fact]
+    public async Task Delete_WhenDownloadIsInsertedBetweenChildAndParentDelete_DoesNotThrowAndRemovesTorrentGraph()
+    {
+        var torrentId = await SeedTorrentAsync();
+
+        await using (var deleteChildrenContext = CreateContext())
+        {
+            var downloadData = new DownloadData(deleteChildrenContext);
+            await downloadData.DeleteForTorrent(torrentId);
+        }
+
+        await using (var addContext = CreateContext())
+        {
+            var downloadData = new DownloadData(addContext);
+            var result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-b"));
+            Assert.Equal(DownloadAddResult.Added, result);
+        }
+
+        Exception? exception;
+
+        await using (var deleteParentContext = CreateContext())
+        {
+            var torrentData = new TorrentData(deleteParentContext);
+            exception = await Record.ExceptionAsync(() => torrentData.Delete(torrentId));
+        }
+
+        Assert.Null(exception);
+
+        await using var verifyContext = CreateContext();
+        Assert.False(await verifyContext.Torrents.AnyAsync(m => m.TorrentId == torrentId));
+        Assert.False(await verifyContext.Downloads.AnyAsync(m => m.TorrentId == torrentId));
+    }
+
+    [Fact]
+    public async Task TryAddForTorrent_WhenDownloadAlreadyExists_DoesNotInsertDuplicate()
+    {
+        var torrentId = await SeedTorrentAsync();
+
+        await using (var firstContext = CreateContext())
+        {
+            var downloadData = new DownloadData(firstContext);
+            var result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-c"));
+
+            Assert.Equal(DownloadAddResult.Added, result);
+        }
+
+        await using (var secondContext = CreateContext())
+        {
+            var downloadData = new DownloadData(secondContext);
+            var result = await downloadData.TryAddForTorrent(torrentId, CreateDownloadInfo("race-c"));
+
+            Assert.Equal(DownloadAddResult.AlreadyExists, result);
+        }
+
+        await using var verifyContext = CreateContext();
+        Assert.Equal(1, await verifyContext.Downloads.CountAsync(m => m.TorrentId == torrentId));
+    }
+
+    [Fact]
+    public async Task Delete_WhenTorrentWasAlreadyDeleted_DoesNotThrow()
+    {
+        var torrentId = await SeedTorrentAsync();
+
+        await using (var firstDeleteContext = CreateContext())
+        {
+            var torrentData = new TorrentData(firstDeleteContext);
+            await torrentData.Delete(torrentId);
+        }
+
+        Exception? exception;
+
+        await using (var secondDeleteContext = CreateContext())
+        {
+            var torrentData = new TorrentData(secondDeleteContext);
+            exception = await Record.ExceptionAsync(() => torrentData.Delete(torrentId));
+        }
+
+        Assert.Null(exception);
+    }
+
+    public async Task InitializeAsync()
+    {
+        await using var context = CreateContext();
+        await context.Database.EnsureDeletedAsync();
+        await context.Database.EnsureCreatedAsync();
+    }
+
+    public Task DisposeAsync()
+    {
+        SqliteConnection.ClearAllPools();
+
+        if (File.Exists(_databasePath))
+        {
+            File.Delete(_databasePath);
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private DataContext CreateContext()
+    {
+        var connectionString = new SqliteConnectionStringBuilder
+        {
+            DataSource = _databasePath,
+            ForeignKeys = true
+        }.ToString();
+
+        var options = new DbContextOptionsBuilder<DataContext>()
+                      .UseSqlite(connectionString)
+                      .Options;
+
+        return new(options);
+    }
+
+    private async Task<Guid> SeedTorrentAsync()
+    {
+        var torrentId = Guid.NewGuid();
+
+        await using var context = CreateContext();
+
+        context.Torrents.Add(new()
+        {
+            TorrentId = torrentId,
+            Hash = Guid.NewGuid().ToString("N"),
+            Added = DateTimeOffset.UtcNow
+        });
+
+        await context.SaveChangesAsync();
+
+        return torrentId;
+    }
+
+    private static DownloadInfo CreateDownloadInfo(String suffix)
+    {
+        return new()
+        {
+            FileName = $"download-{suffix}.bin",
+            RestrictedLink = $"https://example.invalid/{suffix}"
+        };
+    }
+}

server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs

@@ -3,22 +3,23 @@ using System.Text;
 using Moq;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
+using TorrentRunnerState = RdtClient.Service.Services.TorrentRunnerState;
 using TorrentsService = RdtClient.Service.Services.Torrents;
 
 namespace RdtClient.Service.Test.Services;
 
 public class NzbTorrentsTest
 {
-    private readonly Mocks _mocks;
     private readonly MockFileSystem _fileSystem;
+    private readonly Mocks _mocks;
     private readonly TorrentsService _torrents;
 
     public NzbTorrentsTest()
     {
         _mocks = new();
         _fileSystem = new();
-        _torrents = new(
-                        _mocks.TorrentsLoggerMock.Object,
+
+        _torrents = new(_mocks.TorrentsLoggerMock.Object,
                         _mocks.TorrentDataMock.Object,
                         _mocks.DownloadsMock.Object,
                         _mocks.ProcessFactoryMock.Object,
@@ -28,8 +29,9 @@ public class NzbTorrentsTest
                         null!,
                         null!,
                         null!,
-                        null!
-                       );
+                        null!,
+                        new TestSettings(),
+                        new TorrentRunnerState());
     }
 
     [Fact]
@@ -37,21 +39,26 @@ public class NzbTorrentsTest
     {
         // Arrange
         var nzbLink = "http://example.com/test.nzb";
+
         var torrent = new Torrent
         {
             DownloadClient = DownloadClient.Bezzad
         };
 
         _mocks.TorrentDataMock.Setup(t => t.GetByHash(It.IsAny<String>())).ReturnsAsync((Torrent)null!);
-        _mocks.TorrentDataMock.Setup(t => t.Add(
-            null,
-            It.IsAny<String>(),
-            nzbLink,
-            false,
-            DownloadType.Nzb,
-            torrent.DownloadClient,
-            It.IsAny<Torrent>()
-        )).ReturnsAsync(new Torrent { Hash = "mockHash", RdName = "test.nzb" });
+
+        _mocks.TorrentDataMock.Setup(t => t.Add(null,
+                                                It.IsAny<String>(),
+                                                nzbLink,
+                                                false,
+                                                DownloadType.Nzb,
+                                                torrent.DownloadClient,
+                                                It.IsAny<Torrent>()))
+              .ReturnsAsync(new Torrent
+              {
+                  Hash = "mockHash",
+                  RdName = "test.nzb"
+              });
 
         // Act
         var result = await _torrents.AddNzbLinkToDebridQueue(nzbLink, torrent);
@@ -60,15 +67,15 @@ public class NzbTorrentsTest
         Assert.NotNull(result);
         Assert.Equal("test.nzb", torrent.RdName);
         Assert.Equal(TorrentStatus.Queued, torrent.RdStatus);
-        _mocks.TorrentDataMock.Verify(t => t.Add(
-            null,
-            It.IsAny<String>(),
-            nzbLink,
-            false,
-            DownloadType.Nzb,
-            torrent.DownloadClient,
-            torrent
-        ), Times.Once);
+
+        _mocks.TorrentDataMock.Verify(t => t.Add(null,
+                                                 It.IsAny<String>(),
+                                                 nzbLink,
+                                                 false,
+                                                 DownloadType.Nzb,
+                                                 torrent.DownloadClient,
+                                                 torrent),
+                                      Times.Once);
     }
 
     [Fact]
@@ -86,23 +93,30 @@ public class NzbTorrentsTest
     public async Task AddNzbFileToDebridQueue_ValidFile_AddsToQueue()
     {
         // Arrange
-        var nzbContent = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\r\n <head>\r\n  <meta type=\"title\">Test NZB Title</meta>\r\n </head>\r\n</nzb>";
+        var nzbContent =
+            "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\r\n <head>\r\n  <meta type=\"title\">Test NZB Title</meta>\r\n </head>\r\n</nzb>";
+
         var bytes = Encoding.UTF8.GetBytes(nzbContent);
+
         var torrent = new Torrent
         {
             DownloadClient = DownloadClient.Bezzad
         };
 
         _mocks.TorrentDataMock.Setup(t => t.GetByHash(It.IsAny<String>())).ReturnsAsync((Torrent)null!);
-        _mocks.TorrentDataMock.Setup(t => t.Add(
-            null,
-            It.IsAny<String>(),
-            It.IsAny<String>(),
-            true,
-            DownloadType.Nzb,
-            torrent.DownloadClient,
-            It.IsAny<Torrent>()
-        )).ReturnsAsync(new Torrent { Hash = "mockHash", RdName = "Test NZB Title" });
+
+        _mocks.TorrentDataMock.Setup(t => t.Add(null,
+                                                It.IsAny<String>(),
+                                                It.IsAny<String>(),
+                                                true,
+                                                DownloadType.Nzb,
+                                                torrent.DownloadClient,
+                                                It.IsAny<Torrent>()))
+              .ReturnsAsync(new Torrent
+              {
+                  Hash = "mockHash",
+                  RdName = "Test NZB Title"
+              });
 
         // Act
         var result = await _torrents.AddNzbFileToDebridQueue(bytes, "filename.nzb", torrent);
@@ -111,15 +125,15 @@ public class NzbTorrentsTest
         Assert.NotNull(result);
         Assert.Equal("Test NZB Title", torrent.RdName);
         Assert.Equal(TorrentStatus.Queued, torrent.RdStatus);
-        _mocks.TorrentDataMock.Verify(t => t.Add(
-            null,
-            It.IsAny<String>(),
-            Convert.ToBase64String(bytes),
-            true,
-            DownloadType.Nzb,
-            torrent.DownloadClient,
-            torrent
-        ), Times.Once);
+
+        _mocks.TorrentDataMock.Verify(t => t.Add(null,
+                                                 It.IsAny<String>(),
+                                                 Convert.ToBase64String(bytes),
+                                                 true,
+                                                 DownloadType.Nzb,
+                                                 torrent.DownloadClient,
+                                                 torrent),
+                                      Times.Once);
     }
 
     [Fact]

server/RdtClient.Service.Test/Services/QBittorrentTest.cs

@@ -1,25 +1,31 @@
 using Microsoft.Extensions.Logging;
 using Moq;
+using System.Text.Json;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
+using RdtClient.Data.Models.DebridClient;
 using RdtClient.Service.Services;
 
 namespace RdtClient.Service.Test.Services;
 
 public class QBittorrentTest
 {
-    private readonly Mock<ILogger<QBittorrent>> _loggerMock;
-    private readonly Mock<Torrents> _torrentsMock;
     private readonly Mock<Authentication> _authenticationMock;
+    private readonly Mock<ILogger<QBittorrent>> _loggerMock;
     private readonly QBittorrent _qBittorrent;
+    private readonly TestSettings _settings;
+    private readonly TorrentRunnerState _runnerState;
+    private readonly Mock<Torrents> _torrentsMock;
 
     public QBittorrentTest()
     {
         _loggerMock = new();
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
+        _settings = new();
+        _runnerState = new();
+        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, _runnerState);
         _authenticationMock = new(null!, null!, null!);
-        
-        _qBittorrent = new(_loggerMock.Object, null!, _authenticationMock.Object, _torrentsMock.Object, null!);
+
+        _qBittorrent = new(_loggerMock.Object, _settings, _authenticationMock.Object, _torrentsMock.Object, null!, _runnerState);
     }
 
     [Fact]
@@ -54,4 +60,350 @@ public class QBittorrentTest
         Assert.Equal("hash1", result[0].Hash);
         Assert.Equal("Torrent 1", result[0].Name);
     }
+
+    [Fact]
+    public async Task TorrentInfo_ShouldReport100Percent_WhenDownloadIsComplete()
+    {
+        // Arrange
+        var downloadId = Guid.NewGuid();
+        var torrentId = Guid.NewGuid();
+
+        var allTorrents = new List<Torrent>
+        {
+            new()
+            {
+                TorrentId = torrentId,
+                Hash = "hash1",
+                RdName = "Torrent 1",
+                RdProgress = 100, // Real-Debrid is 100%
+                Type = DownloadType.Torrent,
+                Downloads = new List<Download>
+                {
+                    new()
+                    {
+                        DownloadId = downloadId,
+                        TorrentId = torrentId
+                    }
+                }
+            }
+        };
+
+        _torrentsMock.Setup(m => m.Get()).ReturnsAsync(allTorrents);
+
+        // Local download is also 100%
+        _torrentsMock.Setup(m => m.GetDownloadStats(downloadId)).Returns((0, 1000, 1000));
+
+        // Act
+        var result = await _qBittorrent.TorrentInfo();
+
+        // Assert
+        Assert.Single(result);
+        Assert.Equal(1.0f, result[0].Progress);
+    }
+
+    [Fact]
+    public async Task TorrentInfo_ShouldReport90Percent_WhenRDIs100AndLocalIs80()
+    {
+        // Arrange
+        var downloadId = Guid.NewGuid();
+        var torrentId = Guid.NewGuid();
+
+        var allTorrents = new List<Torrent>
+        {
+            new()
+            {
+                TorrentId = torrentId,
+                Hash = "hash1",
+                RdName = "Torrent 1",
+                RdProgress = 100, // Real-Debrid is 100%
+                Type = DownloadType.Torrent,
+                Downloads = new List<Download>
+                {
+                    new()
+                    {
+                        DownloadId = downloadId,
+                        TorrentId = torrentId
+                    }
+                }
+            }
+        };
+
+        _torrentsMock.Setup(m => m.Get()).ReturnsAsync(allTorrents);
+
+        // Local download is 80%
+        _torrentsMock.Setup(m => m.GetDownloadStats(downloadId)).Returns((0, 1000, 800));
+
+        // Act
+        var result = await _qBittorrent.TorrentInfo();
+
+        // Assert
+        Assert.Single(result);
+
+        // Current behavior is (1.0 + 0.8) / 2 = 0.9
+        Assert.Equal(0.9f, result[0].Progress);
+    }
+
+    [Fact]
+    public async Task TorrentFileContents_ShouldReturnAllFiles_WithIndexesAndPriority()
+    {
+        // Arrange
+        var torrent = new Torrent
+        {
+            Hash = "hash1",
+            Type = DownloadType.Torrent,
+            RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
+            {
+                new()
+                {
+                    Id = 1,
+                    Path = "good.mkv",
+                    Bytes = 1000,
+                    Selected = true
+                },
+                new()
+                {
+                    Id = 2,
+                    Path = "dangerous.exe",
+                    Bytes = 10,
+                    Selected = false
+                }
+            })
+        };
+
+        _torrentsMock.Setup(m => m.GetByHash("hash1")).ReturnsAsync(torrent);
+
+        // Act
+        var result = await _qBittorrent.TorrentFileContents("hash1");
+
+        // Assert
+        Assert.NotNull(result);
+
+        Assert.Collection(result!,
+                          first =>
+                          {
+                              Assert.Equal(0, first.Index);
+                              Assert.Equal("good.mkv", first.Name);
+                              Assert.Equal(1, first.Priority);
+                          },
+                          second =>
+                          {
+                              Assert.Equal(1, second.Index);
+                              Assert.Equal("dangerous.exe", second.Name);
+                              Assert.Equal(0, second.Priority);
+                          });
+    }
+
+    [Fact]
+    public async Task TorrentProperties_ShouldExposePublicTorrentFlag()
+    {
+        // Arrange
+        var torrent = new Torrent
+        {
+            Hash = "hash1",
+            Type = DownloadType.Torrent,
+            Added = DateTimeOffset.UtcNow
+        };
+
+        _torrentsMock.Setup(m => m.GetByHash("hash1")).ReturnsAsync(torrent);
+
+        // Act
+        var result = await _qBittorrent.TorrentProperties("hash1");
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.False(result!.IsPrivate);
+    }
+
+    [Fact]
+    public async Task TorrentInfo_ShouldUseSelectedTopLevelFileName_WhenRootFileAddsOnlyTheExtension()
+    {
+        // Arrange
+        var previousMappedPath = _settings.Current.DownloadClient.MappedPath;
+        _settings.Current.DownloadClient.MappedPath = "/data/downloads";
+
+        try
+        {
+            var torrentRootName = "Sample.Show.S01E01.1080p.WEB-DL-GROUP";
+            var selectedFileName = $"{torrentRootName}.mkv";
+
+            var torrent = new Torrent
+            {
+                Hash = "hash1",
+                Category = "tv",
+                Completed = DateTimeOffset.UtcNow,
+                RdName = torrentRootName,
+                RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
+                {
+                    new()
+                    {
+                        Id = 1,
+                        Path = $"/{selectedFileName}",
+                        Bytes = 1000,
+                        Selected = true
+                    },
+                    new()
+                    {
+                        Id = 2,
+                        Path = $"/{torrentRootName}.nfo",
+                        Bytes = 10,
+                        Selected = false
+                    }
+                }),
+                Type = DownloadType.Torrent
+            };
+
+            _torrentsMock.Setup(m => m.Get())
+                         .ReturnsAsync(new List<Torrent>
+                         {
+                             torrent
+                         });
+
+            // Act
+            var result = await _qBittorrent.TorrentInfo();
+
+            // Assert
+            Assert.Single(result);
+            Assert.Equal(Path.Combine("/data/downloads", "tv", selectedFileName) + Path.DirectorySeparatorChar, result[0].ContentPath);
+            Assert.Equal(torrentRootName, result[0].Name);
+        }
+        finally
+        {
+            _settings.Current.DownloadClient.MappedPath = previousMappedPath;
+        }
+    }
+
+    [Fact]
+    public async Task TorrentInfo_ShouldUseExistingCompletedContentRoot_WhenSingleFileDirectoryDiffersFromRdName()
+    {
+        var previousMappedPath = _settings.Current.DownloadClient.MappedPath;
+        var mappedPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        _settings.Current.DownloadClient.MappedPath = mappedPath;
+
+        try
+        {
+            var category = "tv";
+            var selectedFileName = "Sample.Show.S01E02.1080p.WEB-DL-GROUP.mkv";
+            var contentRoot = Path.Combine(mappedPath, category, selectedFileName);
+            Directory.CreateDirectory(contentRoot);
+            await File.WriteAllTextAsync(Path.Combine(contentRoot, selectedFileName), "test");
+
+            var torrent = new Torrent
+            {
+                Hash = "hash1",
+                Category = category,
+                Completed = DateTimeOffset.UtcNow,
+                Downloads = new List<Download>
+                {
+                    new()
+                    {
+                        DownloadId = Guid.NewGuid(),
+                        FileName = selectedFileName,
+                        Link = "https://fake.url/Sample.Show.S01E02.1080p.WEB-DL-GROUP.mkv",
+                        Completed = DateTimeOffset.UtcNow
+                    }
+                },
+                RdName = "tracker.example    -    Sample.Show.S01E02.1080p.WEB-DL-GROUP",
+                RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
+                {
+                    new()
+                    {
+                        Id = 1,
+                        Path = $"/{selectedFileName}",
+                        Bytes = 1000,
+                        Selected = true
+                    }
+                }),
+                Type = DownloadType.Torrent
+            };
+
+            _torrentsMock.Setup(m => m.Get())
+                         .ReturnsAsync(new List<Torrent>
+                         {
+                             torrent
+                         });
+
+            var result = await _qBittorrent.TorrentInfo();
+
+            Assert.Single(result);
+            Assert.Equal(contentRoot + Path.DirectorySeparatorChar, result[0].ContentPath);
+        }
+        finally
+        {
+            _settings.Current.DownloadClient.MappedPath = previousMappedPath;
+
+            if (Directory.Exists(mappedPath))
+            {
+                Directory.Delete(mappedPath, true);
+            }
+        }
+    }
+
+    [Fact]
+    public async Task TorrentInfo_ShouldUseExistingCompletedContentRoot_WhenSelectedFileIsNestedUnderDifferentRoot()
+    {
+        var previousMappedPath = _settings.Current.DownloadClient.MappedPath;
+        var mappedPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
+        _settings.Current.DownloadClient.MappedPath = mappedPath;
+
+        try
+        {
+            var category = "tv";
+            var rootDirectoryName = "tracker.example - Sample.Show.S01E03.1080p.x265-GROUP.mkv";
+            var nestedDirectoryName = "Sample.Show.S01E03.1080p.x265-GROUP";
+            var fileName = "Sample.Show.S01E03.1080p.x265-GROUP.mkv";
+            var contentRoot = Path.Combine(mappedPath, category, rootDirectoryName);
+            var nestedDirectory = Path.Combine(contentRoot, nestedDirectoryName);
+            Directory.CreateDirectory(nestedDirectory);
+            await File.WriteAllTextAsync(Path.Combine(nestedDirectory, fileName), "test");
+
+            var torrent = new Torrent
+            {
+                Hash = "hash1",
+                Category = category,
+                Completed = DateTimeOffset.UtcNow,
+                Downloads = new List<Download>
+                {
+                    new()
+                    {
+                        DownloadId = Guid.NewGuid(),
+                        FileName = fileName,
+                        Link = "https://fake.url/Sample.Show.S01E03.1080p.x265-GROUP.mkv",
+                        Completed = DateTimeOffset.UtcNow
+                    }
+                },
+                RdName = "tracker.example    -    Sample.Show.S01E03.1080p.x265-GROUP",
+                RdFiles = JsonSerializer.Serialize(new List<DebridClientFile>
+                {
+                    new()
+                    {
+                        Id = 1,
+                        Path = $"/{nestedDirectoryName}/{fileName}",
+                        Bytes = 1000,
+                        Selected = true
+                    }
+                }),
+                Type = DownloadType.Torrent
+            };
+
+            _torrentsMock.Setup(m => m.Get())
+                         .ReturnsAsync(new List<Torrent>
+                         {
+                             torrent
+                         });
+
+            var result = await _qBittorrent.TorrentInfo();
+
+            Assert.Single(result);
+            Assert.Equal(contentRoot + Path.DirectorySeparatorChar, result[0].ContentPath);
+        }
+        finally
+        {
+            _settings.Current.DownloadClient.MappedPath = previousMappedPath;
+
+            if (Directory.Exists(mappedPath))
+            {
+                Directory.Delete(mappedPath, true);
+            }
+        }
+    }
 }

server/RdtClient.Service.Test/Services/SabnzbdTest.cs

@@ -9,13 +9,19 @@ namespace RdtClient.Service.Test.Services;
 
 public class SabnzbdTest
 {
+    private readonly AppSettings _appSettings = new()
+    {
+        Port = 6500
+    };
+
     private readonly Mock<ILogger<Sabnzbd>> _loggerMock = new();
+    private readonly TestSettings _settings;
     private readonly Mock<Torrents> _torrentsMock;
-    private readonly AppSettings _appSettings = new() { Port = 6500 };
 
     public SabnzbdTest()
     {
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
+        _settings = new();
+        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(new List<Torrent>());
     }
 
@@ -34,7 +40,10 @@ public class SabnzbdTest
                 Downloads = new List<Download>
                 {
                     new()
-                        { BytesTotal = 1000, BytesDone = 500 }
+                    {
+                        BytesTotal = 1000,
+                        BytesDone = 500
+                    }
                 }
             }
         };
@@ -42,7 +51,7 @@ public class SabnzbdTest
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
         _torrentsMock.Setup(t => t.GetDownloadStats(It.IsAny<Guid>())).Returns((0, 1000, 500));
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetQueue();
@@ -52,6 +61,7 @@ public class SabnzbdTest
         Assert.Single(result.Slots);
         Assert.Equal("hash1", result.Slots[0].NzoId);
         Assert.Equal("Name 1", result.Slots[0].Filename);
+
         // (50% debrid + 50% download) / 2 = 50%
         Assert.Equal("50", result.Slots[0].Percentage);
     }
@@ -71,14 +81,17 @@ public class SabnzbdTest
                 Downloads = new List<Download>
                 {
                     new()
-                        { BytesTotal = 1000, BytesDone = 0 }
+                    {
+                        BytesTotal = 1000,
+                        BytesDone = 0
+                    }
                 }
             }
         };
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetQueue();
@@ -94,6 +107,7 @@ public class SabnzbdTest
         // Arrange
         var now = DateTimeOffset.UtcNow;
         var added = now.AddMinutes(-10);
+
         var torrentList = new List<Torrent>
         {
             new()
@@ -113,6 +127,7 @@ public class SabnzbdTest
                 }
             }
         };
+
         // Overall progress = (1.0 + 0.0) / 2 = 0.5
         // Elapsed = 10 minutes
         // Total estimated = 10 / 0.5 = 20 minutes
@@ -120,7 +135,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetQueue();
@@ -130,7 +145,7 @@ public class SabnzbdTest
         var timeLeftParts = result.Slots[0].TimeLeft.Split(':');
         var hours = Int32.Parse(timeLeftParts[0]);
         var minutes = Int32.Parse(timeLeftParts[1]);
-        
+
         Assert.Equal(0, hours);
         Assert.InRange(minutes, 9, 11);
     }
@@ -142,6 +157,7 @@ public class SabnzbdTest
         var now = DateTimeOffset.UtcNow;
         var added = now.AddMinutes(-20);
         var retry = now.AddMinutes(-10);
+
         var torrentList = new List<Torrent>
         {
             new()
@@ -162,6 +178,7 @@ public class SabnzbdTest
                 }
             }
         };
+
         // Later of Added and Retry is Retry (-10 mins)
         // Overall progress = (1.0 + 0.0) / 2 = 0.5
         // Elapsed = 10 minutes
@@ -170,7 +187,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetQueue();
@@ -179,7 +196,7 @@ public class SabnzbdTest
         var timeLeftParts = result.Slots[0].TimeLeft.Split(':');
         var hours = Int32.Parse(timeLeftParts[0]);
         var minutes = Int32.Parse(timeLeftParts[1]);
-        
+
         Assert.Equal(0, hours);
         Assert.InRange(minutes, 9, 11);
     }
@@ -208,7 +225,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetQueue();
@@ -244,7 +261,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetHistory();
@@ -259,7 +276,7 @@ public class SabnzbdTest
     {
         // Arrange
         var savePath = @"C:\Downloads";
-        Data.Data.SettingData.Get.DownloadClient.MappedPath = savePath;
+        _settings.Current.DownloadClient.MappedPath = savePath;
 
         var torrentList = new List<Torrent>
         {
@@ -276,7 +293,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetHistory();
@@ -292,7 +309,7 @@ public class SabnzbdTest
     {
         // Arrange
         var savePath = @"C:\Downloads";
-        Data.Data.SettingData.Get.DownloadClient.MappedPath = savePath;
+        _settings.Current.DownloadClient.MappedPath = savePath;
 
         var torrentList = new List<Torrent>
         {
@@ -309,7 +326,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetHistory();
@@ -339,7 +356,7 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = await sabnzbd.GetHistory();
@@ -349,11 +366,69 @@ public class SabnzbdTest
         Assert.Equal("Failed", result.Slots[0].Status);
     }
 
+    [Theory]
+    [InlineData(TorrentFinishedAction.RemoveAllTorrents, true, true, true, true)]
+    [InlineData(TorrentFinishedAction.RemoveAllTorrents, false, true, true, false)]
+    [InlineData(TorrentFinishedAction.RemoveRealDebrid, true, false, true, true)]
+    [InlineData(TorrentFinishedAction.RemoveRealDebrid, false, false, true, false)]
+    [InlineData(TorrentFinishedAction.RemoveClient, true, true, false, true)]
+    [InlineData(TorrentFinishedAction.RemoveClient, false, true, false, false)]
+    public async Task Delete_ShouldRespectFinishedActionAndDeleteFiles(
+        TorrentFinishedAction finishedAction,
+        Boolean deleteFiles,
+        Boolean expectedDeleteData,
+        Boolean expectedDeleteRdTorrent,
+        Boolean expectedDeleteLocalFiles)
+    {
+        // Arrange
+        var torrentId = Guid.NewGuid();
+        _settings.Current.Integrations.Default.FinishedAction = finishedAction;
+
+        _torrentsMock.Setup(t => t.GetByHash("hash1"))
+                     .ReturnsAsync(new Torrent
+                     {
+                         TorrentId = torrentId,
+                         Hash = "hash1",
+                         Type = DownloadType.Nzb
+                     });
+
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+
+        // Act
+        await sabnzbd.Delete("hash1", deleteFiles);
+
+        // Assert
+        _torrentsMock.Verify(t => t.Delete(torrentId, expectedDeleteData, expectedDeleteRdTorrent, expectedDeleteLocalFiles), Times.Once);
+    }
+
+    [Fact]
+    public async Task Delete_ShouldNotDelete_WhenFinishedActionIsNone()
+    {
+        // Arrange
+        _settings.Current.Integrations.Default.FinishedAction = TorrentFinishedAction.None;
+
+        _torrentsMock.Setup(t => t.GetByHash("hash1"))
+                     .ReturnsAsync(new Torrent
+                     {
+                         TorrentId = Guid.NewGuid(),
+                         Hash = "hash1",
+                         Type = DownloadType.Nzb
+                     });
+
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
+
+        // Act
+        await sabnzbd.Delete("hash1", true);
+
+        // Assert
+        _torrentsMock.Verify(t => t.Delete(It.IsAny<Guid>(), It.IsAny<Boolean>(), It.IsAny<Boolean>(), It.IsAny<Boolean>()), Times.Never);
+    }
+
     [Fact]
     public void GetConfig_ShouldReturnCorrectConfig()
     {
         // Arrange
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = sabnzbd.GetConfig();
@@ -383,9 +458,9 @@ public class SabnzbdTest
 
         _torrentsMock.Setup(t => t.Get()).ReturnsAsync(torrentList);
 
-        Data.Data.SettingData.Get.General.Categories = "TV, Music, *";
+        _settings.Current.General.Categories = "TV, Music, *";
 
-        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings);
+        var sabnzbd = new Sabnzbd(_loggerMock.Object, _torrentsMock.Object, _appSettings, _settings);
 
         // Act
         var result = sabnzbd.GetCategories();

server/RdtClient.Service.Test/Services/TorrentClients/AllDebridDebridClientTest.cs

@@ -522,8 +522,8 @@ public class AllDebridDebridClientTest
     {
         public readonly Mock<IAllDebridNetClientFactory> AllDebridClientFactoryMock;
         public readonly Mock<IAllDebridNETClient> AllDebridClientMock;
-        public readonly Mock<ILogger<AllDebridDebridClient>> LoggerMock;
         public readonly Mock<IDownloadableFileFilter> FileFilterMock;
+        public readonly Mock<ILogger<AllDebridDebridClient>> LoggerMock;
 
         public Mocks()
         {

server/RdtClient.Service.Test/Services/TorrentClients/PremiumizeDebridClientTest.cs

@@ -0,0 +1,225 @@
+using System.Net;
+using System.Text;
+using Microsoft.Extensions.Logging;
+using Moq;
+using RdtClient.Data.Models.Internal;
+using RdtClient.Service.Services;
+using RdtClient.Service.Services.DebridClients;
+
+namespace RdtClient.Service.Test.Services.TorrentClients;
+
+public class PremiumizeDebridClientTest
+{
+    private readonly Mock<IDownloadableFileFilter> _fileFilterMock;
+    private readonly Mock<IHttpClientFactory> _httpClientFactoryMock;
+    private readonly Mock<ILogger<PremiumizeDebridClient>> _loggerMock;
+    private readonly TestSettings _settings;
+
+    public PremiumizeDebridClientTest()
+    {
+        _loggerMock = new();
+        _httpClientFactoryMock = new();
+        _fileFilterMock = new();
+        _settings = new();
+        _settings.Current.Provider.ApiKey = "test-api-key";
+    }
+
+    [Fact]
+    public async Task AddNzbLink_UsesPremiumizeNetTransferCreate_ReturnsTransferId()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"transfer-id","name":"test.nzb"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var result = await client.AddNzbLink("http://example.com/test.nzb");
+
+        // Assert
+        Assert.Equal("transfer-id", result);
+        Assert.Equal(HttpMethod.Post, handler.Request!.Method);
+        Assert.Equal("https://www.premiumize.me/api/transfer/create?apikey=test-api-key", handler.Request.RequestUri!.ToString());
+        Assert.Null(handler.Request.Headers.Authorization);
+        Assert.Equal("application/x-www-form-urlencoded", handler.Request.Content!.Headers.ContentType!.MediaType);
+        Assert.Equal("src=http%3A%2F%2Fexample.com%2Ftest.nzb&folder_id=", handler.RequestBody);
+    }
+
+    [Fact]
+    public async Task AddNzbFile_SubmitsMultipartTransferCreateRequest_ReturnsTransferId()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"file-transfer-id","name":"test.nzb"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var result = await client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), "test.nzb");
+
+        // Assert
+        Assert.Equal("file-transfer-id", result);
+        Assert.Equal(HttpMethod.Post, handler.Request!.Method);
+        Assert.Equal("https://www.premiumize.me/api/transfer/create", handler.Request.RequestUri!.ToString());
+        Assert.Equal("Bearer", handler.Request.Headers.Authorization!.Scheme);
+        Assert.Equal("test-api-key", handler.Request.Headers.Authorization.Parameter);
+        Assert.Equal("multipart/form-data", handler.Request.Content!.Headers.ContentType!.MediaType);
+        Assert.Contains("Content-Disposition: form-data", handler.RequestBody);
+        Assert.Contains("src", handler.RequestBody);
+        Assert.Contains("test.nzb", handler.RequestBody);
+        Assert.Contains("nzb body", handler.RequestBody);
+    }
+
+    [Fact]
+    public async Task AddNzbFile_WhenNameIsMissing_UsesDefaultFilename()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"file-transfer-id","name":"upload.nzb"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        await client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), null);
+
+        // Assert
+        Assert.Contains("upload.nzb", handler.RequestBody);
+    }
+
+    [Fact]
+    public async Task AddNzbFile_WhenNameHasNoNzbExtension_AppendsNzbExtension()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"file-transfer-id","name":"release-title.nzb"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        await client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), "release-title");
+
+        // Assert
+        Assert.Contains("release-title.nzb", handler.RequestBody);
+    }
+
+    [Fact]
+    public async Task AddNzbLink_WhenSuccessResponseHasNoId_Throws()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","name":"test.nzb"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var ex = await Assert.ThrowsAsync<Exception>(() => client.AddNzbLink("http://example.com/test.nzb"));
+
+        // Assert
+        Assert.Contains("Unable to add NZB link", ex.Message);
+    }
+
+    [Fact]
+    public async Task AddNzbLink_WhenPremiumizeReturnsRateLimitError_ThrowsRateLimitException()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"error","code":"slow_down","message":"rate limit exceeded"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.AddNzbLink("http://example.com/test.nzb"));
+
+        // Assert
+        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
+    }
+
+    [Theory]
+    [InlineData("You've made too many API requests too quickly.")]
+    [InlineData("Your fair-use points, booster points, or active-job count is exhausted.")]
+    [InlineData("This account's usage limit for this service has been reached.")]
+    [InlineData("The target service is unreachable right now. Retry after a delay.")]
+    public async Task AddNzbLink_WhenPremiumizeNetReturnsDocumentedRetryMessage_ThrowsRateLimitException(String message)
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse($$"""{"status":"error","message":"{{message}}","code":"rate_limit_reached"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.AddNzbLink("http://example.com/test.nzb"));
+
+        // Assert
+        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
+    }
+
+    [Theory]
+    [InlineData("rate_limit_reached")]
+    [InlineData("account_limit_reached")]
+    [InlineData("service_limit_reached")]
+    [InlineData("service_down")]
+    [InlineData("semi_permanent_error")]
+    public async Task AddNzbFile_WhenPremiumizeReturnsDocumentedRetryCode_ThrowsRateLimitException(String code)
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse($$"""{"status":"error","code":"{{code}}","message":"retry later"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => client.AddNzbFile(Encoding.UTF8.GetBytes("nzb body"), "test.nzb"));
+
+        // Assert
+        Assert.Equal(TimeSpan.FromMinutes(2), ex.RetryAfter);
+    }
+
+    [Fact]
+    public async Task AddTorrentMagnet_UsesPremiumizeNetTransferCreate_ReturnsTransferId()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"magnet-transfer-id","name":"test"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var result = await client.AddTorrentMagnet("magnet:?xt=urn:btih:test");
+
+        // Assert
+        Assert.Equal("magnet-transfer-id", result);
+        Assert.Equal("https://www.premiumize.me/api/transfer/create?apikey=test-api-key", handler.Request!.RequestUri!.ToString());
+        Assert.Equal("src=magnet%3A%3Fxt%3Durn%3Abtih%3Atest&folder_id=", handler.RequestBody);
+    }
+
+    [Fact]
+    public async Task AddTorrentFile_UsesPremiumizeNetFileUpload_ReturnsTransferId()
+    {
+        // Arrange
+        var handler = new RecordingHttpMessageHandler(_ => JsonResponse("""{"status":"success","id":"torrent-transfer-id","name":"test"}"""));
+        var client = CreateClient(handler);
+
+        // Act
+        var result = await client.AddTorrentFile(Encoding.UTF8.GetBytes("torrent body"));
+
+        // Assert
+        Assert.Equal("torrent-transfer-id", result);
+        Assert.Equal("https://www.premiumize.me/api/transfer/create?apikey=test-api-key", handler.Request!.RequestUri!.ToString());
+        Assert.Contains("name=file", handler.RequestBody);
+        Assert.Contains("filename=1.torrent", handler.RequestBody);
+        Assert.Contains("application/x-bittorrent", handler.RequestBody);
+        Assert.Contains("torrent body", handler.RequestBody);
+    }
+
+    private PremiumizeDebridClient CreateClient(RecordingHttpMessageHandler handler)
+    {
+        _httpClientFactoryMock.Setup(m => m.CreateClient(It.IsAny<String>())).Returns(new HttpClient(handler));
+
+        return new(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _settings);
+    }
+
+    private static HttpResponseMessage JsonResponse(String json, HttpStatusCode statusCode = HttpStatusCode.OK)
+    {
+        return new(statusCode)
+        {
+            Content = new StringContent(json, Encoding.UTF8, "application/json")
+        };
+    }
+
+    private class RecordingHttpMessageHandler(Func<HttpRequestMessage, HttpResponseMessage> handler) : HttpMessageHandler
+    {
+        public HttpRequestMessage? Request { get; private set; }
+        public String? RequestBody { get; private set; }
+
+        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            Request = request;
+            RequestBody = request.Content == null ? null : await request.Content.ReadAsStringAsync(cancellationToken);
+
+            return handler(request);
+        }
+    }
+}

server/RdtClient.Service.Test/Services/TorrentClients/TorBoxDebridClientTest.cs

@@ -5,29 +5,37 @@ using Newtonsoft.Json;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.DebridClient;
+using RdtClient.Data.Models.Internal;
+using RdtClient.Service.Helpers;
 using RdtClient.Service.Services;
 using RdtClient.Service.Services.DebridClients;
 using TorBoxNET;
+using DownloadClient = RdtClient.Data.Enums.DownloadClient;
+using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace RdtClient.Service.Test.Services.TorrentClients;
 
 public class TorBoxDebridClientTest
 {
-    private readonly Mock<ILogger<TorBoxDebridClient>> _loggerMock;
-    private readonly Mock<IHttpClientFactory> _httpClientFactoryMock;
+    private readonly Mock<IRateLimitCoordinator> _coordinatorMock;
     private readonly Mock<IDownloadableFileFilter> _fileFilterMock;
+    private readonly Mock<IHttpClientFactory> _httpClientFactoryMock;
+    private readonly Mock<ILogger<TorBoxDebridClient>> _loggerMock;
+    private readonly TestSettings _settings;
 
     public TorBoxDebridClientTest()
     {
         _loggerMock = new();
         _httpClientFactoryMock = new();
         _fileFilterMock = new();
-        
+        _coordinatorMock = new();
+        _settings = new();
+
         var httpClient = new HttpClient();
         _httpClientFactoryMock.Setup(m => m.CreateClient(It.IsAny<String>())).Returns(httpClient);
-        
-        Settings.Get.Provider.ApiKey = "test-api-key";
-        Settings.Get.Provider.Timeout = 100;
+
+        _settings.Current.Provider.ApiKey = "test-api-key";
+        _settings.Current.Provider.Timeout = 100;
     }
 
     [Fact]
@@ -36,14 +44,30 @@ public class TorBoxDebridClientTest
         // Arrange
         var torrents = new List<TorrentInfoResult>
         {
-            new() { Hash = "hash1", Name = "torrent1", Size = 1000, CreatedAt = DateTime.UtcNow, UpdatedAt = DateTime.UtcNow }
-        };
-        var nzbs = new List<UsenetInfoResult>
-        {
-            new() { Hash = "hash2", Name = "nzb1", Size = 2000, CreatedAt = DateTime.UtcNow, UpdatedAt = DateTime.UtcNow }
+            new()
+            {
+                Id = 12345,
+                Hash = "hash1",
+                Name = "torrent1",
+                Size = 1000,
+                CreatedAt = DateTime.UtcNow,
+                UpdatedAt = DateTime.UtcNow
+            }
         };
 
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var nzbs = new List<UsenetInfoResult>
+        {
+            new()
+            {
+                Hash = "hash2",
+                Name = "nzb1",
+                Size = 2000,
+                CreatedAt = DateTime.UtcNow,
+                UpdatedAt = DateTime.UtcNow
+            }
+        };
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         clientMock.Protected().Setup<Task<IEnumerable<TorrentInfoResult>?>>("GetCurrentTorrents").ReturnsAsync(torrents);
         clientMock.Protected().Setup<Task<IEnumerable<TorrentInfoResult>?>>("GetQueuedTorrents").ReturnsAsync(new List<TorrentInfoResult>());
         clientMock.Protected().Setup<Task<IEnumerable<UsenetInfoResult>?>>("GetCurrentUsenet").ReturnsAsync(nzbs);
@@ -54,11 +78,11 @@ public class TorBoxDebridClientTest
 
         // Assert
         Assert.Equal(2, result.Count);
-        
-        var torrentResult = result.FirstOrDefault(r => r.Id == "hash1");
+
+        var torrentResult = result.FirstOrDefault(r => r.Id == "12345");
         Assert.NotNull(torrentResult);
         Assert.Equal(DownloadType.Torrent, torrentResult.Type);
-        
+
         var nzbResult = result.FirstOrDefault(r => r.Id == "hash2");
         Assert.NotNull(nzbResult);
         Assert.Equal(DownloadType.Nzb, nzbResult.Type);
@@ -69,6 +93,7 @@ public class TorBoxDebridClientTest
     {
         // Arrange
         var hash = "test-hash";
+
         var availability = new Response<List<AvailableTorrent?>>
         {
             Data = new()
@@ -77,14 +102,22 @@ public class TorBoxDebridClientTest
                 {
                     Files = new()
                     {
-                        new() { Name = "file1.mkv", Size = 100 },
-                        new() { Name = "file2.txt", Size = 10 }
+                        new()
+                        {
+                            Name = "file1.mkv",
+                            Size = 100
+                        },
+                        new()
+                        {
+                            Name = "file2.txt",
+                            Size = 10
+                        }
                     }
                 }
             }
         };
 
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         clientMock.Protected().Setup<Task<Response<List<AvailableTorrent?>>>>("GetTorrentAvailability", hash).ReturnsAsync(availability);
 
         // Act
@@ -103,7 +136,12 @@ public class TorBoxDebridClientTest
     {
         // Arrange
         var hash = "test-hash";
-        var torrentAvailability = new Response<List<AvailableTorrent?>> { Data = new() };
+
+        var torrentAvailability = new Response<List<AvailableTorrent?>>
+        {
+            Data = new()
+        };
+
         var usenetAvailability = new Response<List<AvailableUsenet?>>
         {
             Data = new()
@@ -112,13 +150,17 @@ public class TorBoxDebridClientTest
                 {
                     Files = new()
                     {
-                        new() { Name = "file1.nzb", Size = 200 }
+                        new()
+                        {
+                            Name = "file1.nzb",
+                            Size = 200
+                        }
                     }
                 }
             }
         };
 
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         clientMock.Protected().Setup<Task<Response<List<AvailableTorrent?>>>>("GetTorrentAvailability", hash).ReturnsAsync(torrentAvailability);
         clientMock.Protected().Setup<Task<Response<List<AvailableUsenet?>>>>("GetUsenetAvailability", hash).ReturnsAsync(usenetAvailability);
 
@@ -136,10 +178,18 @@ public class TorBoxDebridClientTest
     {
         // Arrange
         var hash = "test-hash";
-        var torrentAvailability = new Response<List<AvailableTorrent?>> { Data = new() };
-        var usenetAvailability = new Response<List<AvailableUsenet?>> { Data = new() };
 
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var torrentAvailability = new Response<List<AvailableTorrent?>>
+        {
+            Data = new()
+        };
+
+        var usenetAvailability = new Response<List<AvailableUsenet?>>
+        {
+            Data = new()
+        };
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         clientMock.Protected().Setup<Task<Response<List<AvailableTorrent?>>>>("GetTorrentAvailability", hash).ReturnsAsync(torrentAvailability);
         clientMock.Protected().Setup<Task<Response<List<AvailableUsenet?>>>>("GetUsenetAvailability", hash).ReturnsAsync(usenetAvailability);
 
@@ -151,27 +201,27 @@ public class TorBoxDebridClientTest
     }
 
     [Fact]
-    public async Task Delete_CallsTorrentsControl_WhenTypeIsTorrent()
+    public async Task Delete_CallsTorrentsControlById_WhenTypeIsTorrent()
     {
         // Arrange
         var torrent = new Torrent
         {
-            RdId = "torrent-id",
+            RdId = "12345",
             Type = DownloadType.Torrent
         };
 
         var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
 
         // Act
         await clientMock.Object.Delete(torrent);
 
         // Assert
-        torrentsApiMock.Verify(m => m.ControlAsync("torrent-id", "delete", It.IsAny<CancellationToken>()), Times.Once);
+        torrentsApiMock.Verify(m => m.ControlByIdAsync(12345, "delete", It.IsAny<CancellationToken>()), Times.Once);
     }
 
     [Fact]
@@ -185,11 +235,11 @@ public class TorBoxDebridClientTest
         };
 
         var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
 
         // Act
         await clientMock.Object.Delete(torrent);
@@ -207,17 +257,21 @@ public class TorBoxDebridClientTest
             RdId = "torrent-id",
             Type = DownloadType.Torrent
         };
+
         var link = "https://torbox.app/d/123/456";
 
         var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
         torrentsApiMock.Setup(m => m.RequestDownloadAsync(123, 456, false, It.IsAny<CancellationToken>()))
-                       .ReturnsAsync(new Response<String> { Data = "https://unrestricted-link" });
+                       .ReturnsAsync(new Response<String>
+                       {
+                           Data = "https://unrestricted-link"
+                       });
 
         // Act
         var result = await clientMock.Object.Unrestrict(torrent, link);
@@ -236,17 +290,21 @@ public class TorBoxDebridClientTest
             RdId = "nzb-id",
             Type = DownloadType.Nzb
         };
+
         var link = "https://torbox.app/d/123/456";
 
         var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
         usenetApiMock.Setup(m => m.RequestDownloadAsync(123, 456, false, It.IsAny<CancellationToken>()))
-                     .ReturnsAsync(new Response<String> { Data = "https://unrestricted-link-nzb" });
+                     .ReturnsAsync(new Response<String>
+                     {
+                         Data = "https://unrestricted-link-nzb"
+                     });
 
         // Act
         var result = await clientMock.Object.Unrestrict(torrent, link);
@@ -260,54 +318,78 @@ public class TorBoxDebridClientTest
     public async Task AddNzbFile_CallsUsenetAddFileAsyncWithName()
     {
         // Arrange
-        var bytes = new Byte[] { 1, 2, 3 };
+        var bytes = new Byte[]
+        {
+            1, 2, 3
+        };
+
         var name = "test-nzb";
         var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object) { CallBase = true };
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
-        usenetApiMock.Setup(m => m.AddFileAsync(bytes, -1, name, null, It.IsAny<CancellationToken>()))
-                     .ReturnsAsync(new Response<UsenetAddResult> { Data = new()
-                                       { Hash = "new-hash" } });
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        usenetApiMock.Setup(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), It.IsAny<Boolean>(), It.IsAny<CancellationToken>()))
+                     .ReturnsAsync(new Response<UsenetAddResult>
+                     {
+                         Data = new()
+                         {
+                             Hash = "new-hash"
+                         }
+                     });
 
         // Act
         var result = await clientMock.Object.AddNzbFile(bytes, name);
 
         // Assert
         Assert.Equal("new-hash", result);
-        usenetApiMock.Verify(m => m.AddFileAsync(bytes, -1, name, null, It.IsAny<CancellationToken>()), Times.Once);
+        usenetApiMock.Verify(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), It.IsAny<Boolean>(), It.IsAny<CancellationToken>()), Times.Once);
     }
+
     [Fact]
     public async Task GetDownloadInfos_GeneratesCorrectFakedlLinks_ForIndividualFiles()
     {
         // Arrange
         var files = new List<DebridClientFile>
         {
-            new() { Id = 1, Path = "file1.mkv", Bytes = 1000 },
-            new() { Id = 2, Path = "file2.mkv", Bytes = 2000 }
+            new()
+            {
+                Id = 1,
+                Path = "file1.mkv",
+                Bytes = 1000
+            },
+            new()
+            {
+                Id = 2,
+                Path = "file2.mkv",
+                Bytes = 2000
+            }
         };
+
         var torrent = new Torrent
         {
             Hash = "test-hash",
+            RdId = "12345",
             RdFiles = JsonConvert.SerializeObject(files)
         };
 
         var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
-        torrentsApiMock.Setup(m => m.GetHashInfoAsync("test-hash", true, It.IsAny<CancellationToken>()))
-                       .ReturnsAsync(new TorrentInfoResult { Id = 12345 });
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
 
         _fileFilterMock.Setup(m => m.IsDownloadable(torrent, It.IsAny<String>(), It.IsAny<Int64>())).Returns(true);
 
-        Settings.Get.Provider.PreferZippedDownloads = false;
+        _settings.Current.Provider.PreferZippedDownloads = false;
 
         // Act
         var result = await clientMock.Object.GetDownloadInfos(torrent);
@@ -325,27 +407,31 @@ public class TorBoxDebridClientTest
         // Arrange
         var files = new List<DebridClientFile>
         {
-            new() { Id = 1, Path = "file1.mkv", Bytes = 1000 }
+            new()
+            {
+                Id = 1,
+                Path = "file1.mkv",
+                Bytes = 1000
+            }
         };
+
         var torrent = new Torrent
         {
             Hash = "test-hash",
+            RdId = "12345",
             RdName = "TestTorrent",
             RdFiles = JsonConvert.SerializeObject(files),
-            DownloadClient = Data.Enums.DownloadClient.Aria2c
+            DownloadClient = DownloadClient.Aria2c
         };
 
-        Settings.Get.Provider.PreferZippedDownloads = true;
+        _settings.Current.Provider.PreferZippedDownloads = true;
 
         var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
-        torrentsApiMock.Setup(m => m.GetHashInfoAsync("test-hash", true, It.IsAny<CancellationToken>()))
-                       .ReturnsAsync(new TorrentInfoResult { Id = 12345 });
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
 
         _fileFilterMock.Setup(m => m.IsDownloadable(torrent, It.IsAny<String>(), It.IsAny<Int64>())).Returns(true);
 
@@ -367,17 +453,21 @@ public class TorBoxDebridClientTest
         {
             Type = DownloadType.Torrent
         };
+
         var link = "https://torbox.app/fakedl/12345/6789";
 
         var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
         torrentsApiMock.Setup(m => m.RequestDownloadAsync(12345, 6789, false, It.IsAny<CancellationToken>()))
-                       .ReturnsAsync(new Response<String> { Data = "https://real-download-link" });
+                       .ReturnsAsync(new Response<String>
+                       {
+                           Data = "https://real-download-link"
+                       });
 
         // Act
         var result = await clientMock.Object.Unrestrict(torrent, link);
@@ -395,17 +485,21 @@ public class TorBoxDebridClientTest
         {
             Type = DownloadType.Torrent
         };
+
         var link = "https://torbox.app/fakedl/12345/zip";
 
         var torrentsApiMock = new Mock<ITorrentsApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
         torrentsApiMock.Setup(m => m.RequestDownloadAsync(12345, 0, true, It.IsAny<CancellationToken>()))
-                       .ReturnsAsync(new Response<String> { Data = "https://real-zip-download-link" });
+                       .ReturnsAsync(new Response<String>
+                       {
+                           Data = "https://real-zip-download-link"
+                       });
 
         // Act
         var result = await clientMock.Object.Unrestrict(torrent, link);
@@ -414,14 +508,21 @@ public class TorBoxDebridClientTest
         Assert.Equal("https://real-zip-download-link", result);
         torrentsApiMock.Verify(m => m.RequestDownloadAsync(12345, 0, true, It.IsAny<CancellationToken>()), Times.Once);
     }
+
     [Fact]
     public async Task GetDownloadInfos_GeneratesCorrectFakedlLinks_ForUsenet()
     {
         // Arrange
         var files = new List<DebridClientFile>
         {
-            new() { Id = 1, Path = "file1.nzb", Bytes = 1000 }
+            new()
+            {
+                Id = 1,
+                Path = "file1.nzb",
+                Bytes = 1000
+            }
         };
+
         var torrent = new Torrent
         {
             Type = DownloadType.Nzb,
@@ -430,18 +531,25 @@ public class TorBoxDebridClientTest
         };
 
         var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
-        usenetApiMock.Setup(m => m.GetCurrentAsync(true, It.IsAny<CancellationToken>()))
-                     .ReturnsAsync(new List<UsenetInfoResult> { new() { Hash = "nzb-hash", Id = 98765 } });
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        usenetApiMock.Setup(m => m.GetCurrentAsync(true, 1000, It.IsAny<CancellationToken>()))
+                     .ReturnsAsync(new List<UsenetInfoResult>
+                     {
+                         new()
+                         {
+                             Hash = "nzb-hash",
+                             Id = 98765
+                         }
+                     });
 
         _fileFilterMock.Setup(m => m.IsDownloadable(torrent, It.IsAny<String>(), It.IsAny<Int64>())).Returns(true);
 
-        Settings.Get.Provider.PreferZippedDownloads = false;
+        _settings.Current.Provider.PreferZippedDownloads = false;
 
         // Act
         var result = await clientMock.Object.GetDownloadInfos(torrent);
@@ -460,17 +568,21 @@ public class TorBoxDebridClientTest
         {
             Type = DownloadType.Nzb
         };
+
         var link = "https://torbox.app/fakedl/98765/4321";
 
         var usenetApiMock = new Mock<IUsenetApi>();
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
         var torBoxClientMock = new Mock<ITorBoxNetClient>();
-        
+
         torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
-        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient").Returns(torBoxClientMock.Object);
-        
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
         usenetApiMock.Setup(m => m.RequestDownloadAsync(98765, 4321, false, It.IsAny<CancellationToken>()))
-                     .ReturnsAsync(new Response<String> { Data = "https://real-usenet-link" });
+                     .ReturnsAsync(new Response<String>
+                     {
+                         Data = "https://real-usenet-link"
+                     });
 
         // Act
         var result = await clientMock.Object.Unrestrict(torrent, link);
@@ -480,6 +592,288 @@ public class TorBoxDebridClientTest
         usenetApiMock.Verify(m => m.RequestDownloadAsync(98765, 4321, false, It.IsAny<CancellationToken>()), Times.Once);
     }
 
+    [Fact]
+    public async Task AddTorrentMagnet_ThrowsRateLimitException_OnActiveLimit()
+    {
+        // Arrange
+        var magnetLink = "magnet:?xt=urn:btih:test";
+        var torrentsApiMock = new Mock<ITorrentsApi>();
+        var userApiMock = new Mock<IUserApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
+        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new Response<User>
+                   {
+                       Data = new()
+                       {
+                           Settings = new()
+                           {
+                               SeedTorrents = 5
+                           }
+                       }
+                   });
+
+        torrentsApiMock.Setup(m => m.AddMagnetAsync(magnetLink, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                       .ThrowsAsync(new TorBoxException("active_limit", "Active limit reached"));
+
+        // Act & Assert
+        await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddTorrentMagnet(magnetLink));
+        torrentsApiMock.Verify(m => m.AddMagnetAsync(magnetLink, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()), Times.Once);
+        torrentsApiMock.Verify(m => m.AddMagnetAsync(magnetLink, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), true, It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task AddTorrentMagnet_ThrowsRateLimitException_OnSlowDown()
+    {
+        // Arrange
+        var magnetLink = "magnet:?xt=urn:btih:test";
+        var torrentsApiMock = new Mock<ITorrentsApi>();
+        var userApiMock = new Mock<IUserApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
+        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new Response<User>
+                   {
+                       Data = new()
+                       {
+                           Settings = new()
+                           {
+                               SeedTorrents = 5
+                           }
+                       }
+                   });
+
+        torrentsApiMock.Setup(m => m.AddMagnetAsync(magnetLink, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                       .ThrowsAsync(new("slow_down"));
+
+        // Act & Assert
+        await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddTorrentMagnet(magnetLink));
+    }
+
+    [Fact]
+    public async Task AddTorrentMagnet_ThrowsRateLimitException_OnRateLimitException()
+    {
+        // Arrange
+        var magnetLink = "magnet:?xt=urn:btih:test";
+        var torrentsApiMock = new Mock<ITorrentsApi>();
+        var userApiMock = new Mock<IUserApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
+        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new Response<User>
+                   {
+                       Data = new()
+                       {
+                           Settings = new()
+                           {
+                               SeedTorrents = 5
+                           }
+                       }
+                   });
+
+        torrentsApiMock.Setup(m => m.AddMagnetAsync(magnetLink, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                       .ThrowsAsync(new RateLimitException("TorBox rate limit exceeded", TimeSpan.FromMinutes(60)));
+
+        // Act & Assert
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddTorrentMagnet(magnetLink));
+        Assert.Equal(TimeSpan.FromMinutes(60), ex.RetryAfter);
+    }
+
+    [Fact]
+    public async Task AddTorrentMagnet_ThrowsRateLimitException_OnWrappedRateLimitException()
+    {
+        // Arrange
+        var magnetLink = "magnet:?xt=urn:btih:test";
+        var torrentsApiMock = new Mock<ITorrentsApi>();
+        var userApiMock = new Mock<IUserApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
+        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new Response<User>
+                   {
+                       Data = new()
+                       {
+                           Settings = new()
+                           {
+                               SeedTorrents = 5
+                           }
+                       }
+                   });
+
+        torrentsApiMock.Setup(m => m.AddMagnetAsync(magnetLink, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                       .ThrowsAsync(new("Wrapped", new RateLimitException("TorBox rate limit exceeded", TimeSpan.FromMinutes(60))));
+
+        // Act & Assert
+        var ex = await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddTorrentMagnet(magnetLink));
+        Assert.Equal(TimeSpan.FromMinutes(60), ex.RetryAfter);
+    }
+
+    [Fact]
+    public async Task AddTorrentFile_ThrowsRateLimitException_OnActiveLimit()
+    {
+        // Arrange
+        var bytes = new Byte[]
+        {
+            1, 2, 3
+        };
+
+        var torrentsApiMock = new Mock<ITorrentsApi>();
+        var userApiMock = new Mock<IUserApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Torrents).Returns(torrentsApiMock.Object);
+        torBoxClientMock.Setup(m => m.User).Returns(userApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        userApiMock.Setup(m => m.GetAsync(true, It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new Response<User>
+                   {
+                       Data = new()
+                       {
+                           Settings = new()
+                           {
+                               SeedTorrents = 5
+                           }
+                       }
+                   });
+
+        torrentsApiMock.Setup(m => m.AddFileAsync(bytes, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                       .ThrowsAsync(new TorBoxException("active_limit", "Active limit reached"));
+
+        // Act & Assert
+        await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddTorrentFile(bytes));
+        torrentsApiMock.Verify(m => m.AddFileAsync(bytes, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()), Times.Once);
+        torrentsApiMock.Verify(m => m.AddFileAsync(bytes, 5, It.IsAny<Boolean>(), It.IsAny<String?>(), true, It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task AddNzbLink_ThrowsRateLimitException_OnActiveLimit()
+    {
+        // Arrange
+        var nzbLink = "https://example.com/test.nzb";
+        var usenetApiMock = new Mock<IUsenetApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        usenetApiMock.Setup(m => m.AddLinkAsync(nzbLink, It.IsAny<Int32>(), It.IsAny<String?>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                     .ThrowsAsync(new TorBoxException("active_limit", "Active limit reached"));
+
+        // Act & Assert
+        await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddNzbLink(nzbLink));
+        usenetApiMock.Verify(m => m.AddLinkAsync(nzbLink, It.IsAny<Int32>(), It.IsAny<String?>(), It.IsAny<String?>(), false, It.IsAny<CancellationToken>()), Times.Once);
+        usenetApiMock.Verify(m => m.AddLinkAsync(nzbLink, It.IsAny<Int32>(), It.IsAny<String?>(), It.IsAny<String?>(), true, It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task AddNzbFile_ThrowsRateLimitException_OnActiveLimit()
+    {
+        // Arrange
+        var bytes = new Byte[]
+        {
+            1, 2, 3
+        };
+
+        var name = "test.nzb";
+        var usenetApiMock = new Mock<IUsenetApi>();
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings)
+        {
+            CallBase = true
+        };
+
+        var torBoxClientMock = new Mock<ITorBoxNetClient>();
+
+        torBoxClientMock.Setup(m => m.Usenet).Returns(usenetApiMock.Object);
+        clientMock.Protected().Setup<ITorBoxNetClient>("GetClient", ItExpr.IsAny<String>()).Returns(torBoxClientMock.Object);
+
+        usenetApiMock.Setup(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), false, It.IsAny<CancellationToken>()))
+                     .ThrowsAsync(new TorBoxException("active_limit", "Active limit reached"));
+
+        // Act & Assert
+        await Assert.ThrowsAsync<RateLimitException>(() => clientMock.Object.AddNzbFile(bytes, name));
+        usenetApiMock.Verify(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), false, It.IsAny<CancellationToken>()), Times.Once);
+        usenetApiMock.Verify(m => m.AddFileAsync(bytes, It.IsAny<Int32>(), name, It.IsAny<String?>(), true, It.IsAny<CancellationToken>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task UpdateData_SetsErrorStatus_WhenTorBoxStatusStartsWithFailed()
+    {
+        // Arrange
+        var torrent = new Torrent
+        {
+            RdId = "test-rd-id",
+            RdStatus = TorrentStatus.Downloading
+        };
+
+        var torrentClientTorrent = new DebridClientTorrent
+        {
+            Status = "failed (Aborted, cannot be completed - https://sabnzbd.org/not-complete)",
+            Filename = "test-file"
+        };
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+
+        // Act
+        var result = await clientMock.Object.UpdateData(torrent, torrentClientTorrent);
+
+        // Assert
+        Assert.Equal(TorrentStatus.Error, result.RdStatus);
+    }
+
     [Fact]
     public async Task UpdateData_LogsWarning_WhenTorBoxStatusIsUnmapped()
     {
@@ -490,25 +884,50 @@ public class TorBoxDebridClientTest
             RdStatus = TorrentStatus.Downloading,
             RdName = "test-torrent"
         };
+
         var torrentClientTorrent = new DebridClientTorrent
         {
             Status = "some-unknown-status",
             Filename = "test-torrent"
         };
 
-        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object);
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
 
         // Act
         await clientMock.Object.UpdateData(torrent, torrentClientTorrent);
 
         // Assert
-        _loggerMock.Verify(
-            x => x.Log(
-                Microsoft.Extensions.Logging.LogLevel.Information,
-                It.IsAny<EventId>(),
-                It.Is<It.IsAnyType>((v, t) => v.ToString()!.Contains("unmapped status") && v.ToString()!.Contains("some-unknown-status")),
-                It.IsAny<Exception>(),
-                It.Is<Func<It.IsAnyType, Exception?, String>>((v, t) => true)),
-            Times.Once);
+        _loggerMock.Verify(x => x.Log(LogLevel.Information,
+                                      It.IsAny<EventId>(),
+                                      It.Is<It.IsAnyType>((v, t) => v.ToString()!.Contains("unmapped status") && v.ToString()!.Contains("some-unknown-status")),
+                                      It.IsAny<Exception>(),
+                                      It.Is<Func<It.IsAnyType, Exception?, String>>((v, t) => true)),
+                           Times.Once);
+    }
+
+    [Fact]
+    public async Task UpdateData_SetsProcessingStatus_WhenTorBoxStatusIsUnmappedAndTorrentWasQueued()
+    {
+        // Arrange
+        var torrent = new Torrent
+        {
+            RdId = "test-rd-id",
+            RdStatus = TorrentStatus.Queued,
+            RdName = "test-torrent"
+        };
+
+        var torrentClientTorrent = new DebridClientTorrent
+        {
+            Status = "some-unknown-status",
+            Filename = "test-torrent"
+        };
+
+        var clientMock = new Mock<TorBoxDebridClient>(_loggerMock.Object, _httpClientFactoryMock.Object, _fileFilterMock.Object, _coordinatorMock.Object, _settings);
+
+        // Act
+        var result = await clientMock.Object.UpdateData(torrent, torrentClientTorrent);
+
+        // Assert
+        Assert.Equal(TorrentStatus.Processing, result.RdStatus);
     }
 }

server/RdtClient.Service.Test/Services/TorrentRunnerTest.cs

@@ -0,0 +1,77 @@
+using Microsoft.Extensions.Logging;
+using Moq;
+using RdtClient.Data.Data;
+using RdtClient.Data.Enums;
+using RdtClient.Data.Models.Data;
+using RdtClient.Service.Helpers;
+using RdtClient.Service.Services;
+
+namespace RdtClient.Service.Test.Services;
+
+public class TorrentRunnerTest
+{
+    [Fact]
+    public async Task Tick_ShouldNotRequeueCompletedErrorTorrent()
+    {
+        var testSettings = new TestSettings();
+        var runnerState = new TorrentRunnerState();
+
+        testSettings.Current.Provider.ApiKey = "test-api-key";
+        testSettings.Current.Provider.Provider = Provider.RealDebrid;
+        testSettings.Current.Provider.MaxParallelDownloads = 1;
+        testSettings.Current.DownloadClient.DownloadPath = "/downloads";
+
+        var erroredTorrent = new Torrent
+        {
+            TorrentId = Guid.NewGuid(),
+            Hash = "hash-1",
+            RdName = "Torrent 1",
+            FileOrMagnet = "magnet:?xt=urn:btih:hash-1",
+            Type = DownloadType.Torrent,
+            RdStatus = TorrentStatus.Queued,
+            DeleteOnError = 10,
+            Error = "Could not add to provider: Infringing file",
+            Completed = DateTimeOffset.UtcNow.AddMinutes(-5),
+            Downloads = new List<Download>()
+        };
+
+        var torrentDataMock = new Mock<ITorrentData>(MockBehavior.Strict);
+
+        torrentDataMock.Setup(m => m.Get())
+                       .ReturnsAsync(new List<Torrent>
+                       {
+                           erroredTorrent
+                       });
+
+        var torrents = new Torrents(Mock.Of<ILogger<Torrents>>(),
+                                    torrentDataMock.Object,
+                                    Mock.Of<IDownloads>(),
+                                    null!,
+                                    null!,
+                                    null!,
+                                    null!,
+                                    null!,
+                                    null!,
+                                    null!,
+                                    null!,
+                                    testSettings,
+                                    runnerState);
+
+        var torrentRunner = new TorrentRunner(Mock.Of<ILogger<TorrentRunner>>(),
+                                              torrents,
+                                              new(null!),
+                                              new(null!, torrents),
+                                              Mock.Of<IHttpClientFactory>(),
+                                              new RateLimitCoordinator(),
+                                              testSettings,
+                                              runnerState);
+
+        await torrentRunner.Tick();
+
+        torrentDataMock.Verify(m => m.UpdateComplete(It.IsAny<Guid>(),
+                                                     It.IsAny<String?>(),
+                                                     It.IsAny<DateTimeOffset?>(),
+                                                     It.IsAny<Boolean>()),
+                               Times.Never);
+    }
+}

server/RdtClient.Service.Test/Services/TorrentsTest.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.IO.Abstractions.TestingHelpers;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.Extensions.Logging;
@@ -10,6 +11,7 @@ using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.Internal;
 using RdtClient.Service.Services;
 using RdtClient.Service.Wrappers;
+using DownloadClient = RdtClient.Data.Enums.DownloadClient;
 using TorrentsService = RdtClient.Service.Services.Torrents;
 
 namespace RdtClient.Service.Test.Services;
@@ -88,9 +90,18 @@ public class TorrentsTest
         mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
         mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);
 
-        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
-        var torrentPath = $"{downloadPath}/{torrent.RdName}";
-        var filePath = $"{torrentPath}/{downloads[0].FileName}";
+        var category = torrent.Category!;
+        var torrentName = torrent.RdName!;
+        var fileName = downloads[0].FileName!;
+
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            settings.DownloadClient.DownloadPath = @"C:\Downloads";
+        }
+
+        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, category);
+        var torrentPath = Path.Combine(downloadPath, torrentName);
+        var filePath = Path.Combine(torrentPath, fileName);
 
         var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
         {
@@ -109,7 +120,9 @@ public class TorrentsTest
                                            null!,
                                            null!,
                                            null!,
-                                           null!);
+                                           null!,
+                                           new TestSettings(),
+                                           new TorrentRunnerState());
 
         mocks.ProcessMock.Setup(p => p.WaitForExit(It.IsAny<Int32>())).Returns(true);
 
@@ -154,9 +167,9 @@ public class TorrentsTest
         mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
         mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);
 
-        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
-        var torrentPath = $"{downloadPath}/{torrent.RdName}";
-        var filePath = $"{torrentPath}/{downloads[0].FileName}";
+        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, torrent.Category ?? "");
+        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "");
+        var filePath = Path.Combine(torrentPath, downloads[0].FileName ?? "");
 
         var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
         {
@@ -175,7 +188,9 @@ public class TorrentsTest
                                            null!,
                                            null!,
                                            null!,
-                                           null!);
+                                           null!,
+                                           new TestSettings(),
+                                           new TorrentRunnerState());
 
         //Act
         await torrents.RunTorrentComplete(torrent.TorrentId, settings);
@@ -202,9 +217,9 @@ public class TorrentsTest
         mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
         mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);
 
-        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
-        var torrentPath = $"{downloadPath}/{torrent.RdName}";
-        var filePath = $"{torrentPath}/{downloads[0].FileName}";
+        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, torrent.Category ?? "");
+        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "");
+        var filePath = Path.Combine(torrentPath, downloads[0].FileName ?? "");
 
         var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
         {
@@ -223,7 +238,9 @@ public class TorrentsTest
                                            null!,
                                            null!,
                                            null!,
-                                           null!);
+                                           null!,
+                                           new TestSettings(),
+                                           new TorrentRunnerState());
 
         mocks.ProcessMock.Setup(p => p.WaitForExit(It.IsAny<Int32>()))
              .Callback(() =>
@@ -269,9 +286,9 @@ public class TorrentsTest
         mocks.TorrentDataMock.Setup(t => t.GetById(torrent.TorrentId)).Returns(Task.FromResult<Torrent?>(torrent));
         mocks.DownloadsMock.Setup(d => d.GetForTorrent(torrent.TorrentId)).ReturnsAsync(downloads);
 
-        var downloadPath = $"{settings.DownloadClient.DownloadPath}/{torrent.Category}";
-        var torrentPath = $"{downloadPath}/{torrent.RdName}";
-        var filePath = $"{torrentPath}/{downloads[0].FileName}";
+        var downloadPath = Path.Combine(settings.DownloadClient.DownloadPath, torrent.Category ?? "");
+        var torrentPath = Path.Combine(downloadPath, torrent.RdName ?? "");
+        var filePath = Path.Combine(torrentPath, downloads[0].FileName ?? "");
 
         var fileSystemMock = new MockFileSystem(new Dictionary<String, MockFileData>
         {
@@ -290,7 +307,9 @@ public class TorrentsTest
                                            null!,
                                            null!,
                                            null!,
-                                           null!);
+                                           null!,
+                                           new TestSettings(),
+                                           new TorrentRunnerState());
 
         mocks.ProcessMock.Setup(p => p.WaitForExit(It.IsAny<Int32>()))
              .Callback(() =>
@@ -323,19 +342,23 @@ public class TorrentsTest
     {
         // Arrange
         var mocks = new Mocks();
+
         var torrent = new Torrent
         {
             TorrentId = Guid.NewGuid()
         };
-        var nzbContent = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\r\n <head>\r\n  <meta type=\"title\">Test NZB Title</meta>\r\n </head>\r\n</nzb>";
+
+        var nzbContent =
+            "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<nzb xmlns=\"http://www.newzbin.com/DTD/2003/nzb\">\r\n <head>\r\n  <meta type=\"title\">Test NZB Title</meta>\r\n </head>\r\n</nzb>";
+
         var bytes = Encoding.UTF8.GetBytes(nzbContent);
-        
+
         mocks.TorrentDataMock.Setup(t => t.Add(It.IsAny<String>(),
                                                It.IsAny<String>(),
                                                It.IsAny<String>(),
                                                true,
                                                DownloadType.Nzb,
-                                               It.IsAny<Data.Enums.DownloadClient>(),
+                                               It.IsAny<DownloadClient>(),
                                                It.IsAny<Torrent>()))
              .ReturnsAsync(new Torrent());
 
@@ -349,7 +372,9 @@ public class TorrentsTest
                                            null!,
                                            null!,
                                            null!,
-                                           null!);
+                                           null!,
+                                           new TestSettings(),
+                                           new TorrentRunnerState());
 
         // Act
         await torrents.AddNzbFileToDebridQueue(bytes, "filename.nzb", torrent);
@@ -360,8 +385,9 @@ public class TorrentsTest
                                                 It.IsAny<String>(),
                                                 true,
                                                 DownloadType.Nzb,
-                                                It.IsAny<Data.Enums.DownloadClient>(),
-                                                It.IsAny<Torrent>()), Times.Once);
+                                                It.IsAny<DownloadClient>(),
+                                                It.IsAny<Torrent>()),
+                                     Times.Once);
     }
 
     [Fact]
@@ -369,10 +395,12 @@ public class TorrentsTest
     {
         // Arrange
         var mocks = new Mocks();
+
         var torrent = new Torrent
         {
             TorrentId = Guid.NewGuid()
         };
+
         var link = "http://example.com/test.nzb";
 
         mocks.TorrentDataMock.Setup(t => t.Add(It.IsAny<String>(),
@@ -380,7 +408,7 @@ public class TorrentsTest
                                                It.IsAny<String>(),
                                                false,
                                                DownloadType.Nzb,
-                                               It.IsAny<Data.Enums.DownloadClient>(),
+                                               It.IsAny<DownloadClient>(),
                                                It.IsAny<Torrent>()))
              .ReturnsAsync(new Torrent());
 
@@ -394,7 +422,9 @@ public class TorrentsTest
                                            null!,
                                            null!,
                                            null!,
-                                           null!);
+                                           null!,
+                                           new TestSettings(),
+                                           new TorrentRunnerState());
 
         // Act
         await torrents.AddNzbLinkToDebridQueue(link, torrent);
@@ -405,7 +435,8 @@ public class TorrentsTest
                                                 link,
                                                 false,
                                                 DownloadType.Nzb,
-                                                It.IsAny<Data.Enums.DownloadClient>(),
-                                                It.IsAny<Torrent>()), Times.Once);
+                                                It.IsAny<DownloadClient>(),
+                                                It.IsAny<Torrent>()),
+                                     Times.Once);
     }
 }

server/RdtClient.Service.Test/TestSettings.cs

@@ -0,0 +1,59 @@
+using RdtClient.Data.Models.Internal;
+using RdtClient.Service.Services;
+
+namespace RdtClient.Service.Test;
+
+internal sealed class TestSettings(DbSettings? settings = null) : ISettings
+{
+    public DbSettings Current { get; } = settings ?? new();
+
+    public String DefaultSavePath
+    {
+        get
+        {
+            var downloadPath = Current.DownloadClient.MappedPath.TrimEnd('\\').TrimEnd('/');
+
+            return downloadPath + Path.DirectorySeparatorChar;
+        }
+    }
+
+    public IList<SettingProperty> GetAll()
+    {
+        return [];
+    }
+
+    public Task Update(IList<SettingProperty> settings)
+    {
+        return Task.CompletedTask;
+    }
+
+    public Task Update(String settingId, Object? value)
+    {
+        SetValue(Current, settingId.Split(':'), 0, value);
+
+        return Task.CompletedTask;
+    }
+
+    private static void SetValue(Object target, IReadOnlyList<String> path, Int32 index, Object? value)
+    {
+        var property = target.GetType().GetProperty(path[index]) ?? throw new($"Unknown setting {String.Join(":", path)}");
+
+        if (index < path.Count - 1)
+        {
+            SetValue(property.GetValue(target)!, path, index + 1, value);
+
+            return;
+        }
+
+        if (value == null)
+        {
+            property.SetValue(target, null);
+
+            return;
+        }
+
+        var propertyType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
+        var convertedValue = propertyType.IsEnum ? Enum.Parse(propertyType, value.ToString()!) : Convert.ChangeType(value, propertyType);
+        property.SetValue(target, convertedValue);
+    }
+}

server/RdtClient.Service/BackgroundServices/DiskSpaceMonitor.cs

@@ -8,7 +8,7 @@ using DownloadClient = RdtClient.Data.Enums.DownloadClient;
 
 namespace RdtClient.Service.BackgroundServices;
 
-public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider serviceProvider) : BackgroundService
+public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider serviceProvider, ISettings settings, ITorrentRunnerState runnerState) : BackgroundService
 {
     private static DiskSpaceStatus? _lastStatus;
     private Boolean _isPausedForLowDiskSpace;
@@ -34,7 +34,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
         {
             try
             {
-                var minimumFreeSpaceGB = Settings.Get.DownloadClient.MinimumFreeSpaceGB;
+                var minimumFreeSpaceGB = settings.Current.DownloadClient.MinimumFreeSpaceGB;
 
                 if (minimumFreeSpaceGB <= 0)
                 {
@@ -43,14 +43,14 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
                     continue;
                 }
 
-                var intervalMinutes = Settings.Get.DownloadClient.DiskSpaceCheckIntervalMinutes;
+                var intervalMinutes = settings.Current.DownloadClient.DiskSpaceCheckIntervalMinutes;
 
                 if (intervalMinutes < 1)
                 {
                     intervalMinutes = 1;
                 }
 
-                var downloadPath = Settings.Get.DownloadClient.DownloadPath;
+                var downloadPath = settings.Current.DownloadClient.DownloadPath;
                 logger.LogDebug($"Checking disk space for path: {downloadPath}");
 
                 if (!Directory.Exists(downloadPath))
@@ -78,7 +78,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
 
                     var pausedCount = 0;
 
-                    foreach (var download in TorrentRunner.ActiveDownloadClients)
+                    foreach (var download in runnerState.ActiveDownloadClients)
                     {
                         if (download.Value.Type == DownloadClient.Bezzad)
                         {
@@ -90,7 +90,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
 
                     logger.LogInformation($"Paused {pausedCount} active Bezzad downloads");
 
-                    TorrentRunner.IsPausedForLowDiskSpace = true;
+                    runnerState.IsPausedForLowDiskSpace = true;
                     _isPausedForLowDiskSpace = true;
 
                     var status = new DiskSpaceStatus
@@ -125,7 +125,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
 
                     var resumedCount = 0;
 
-                    foreach (var download in TorrentRunner.ActiveDownloadClients)
+                    foreach (var download in runnerState.ActiveDownloadClients)
                     {
                         if (download.Value.Type == DownloadClient.Bezzad)
                         {
@@ -137,7 +137,7 @@ public class DiskSpaceMonitor(ILogger<DiskSpaceMonitor> logger, IServiceProvider
 
                     logger.LogInformation($"Resumed {resumedCount} Bezzad downloads");
 
-                    TorrentRunner.IsPausedForLowDiskSpace = false;
+                    runnerState.IsPausedForLowDiskSpace = false;
                     _isPausedForLowDiskSpace = false;
 
                     var status = new DiskSpaceStatus

server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs

@@ -2,11 +2,12 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using RdtClient.Data.Enums;
+using RdtClient.Data.Models.Internal;
 using RdtClient.Service.Services;
 
 namespace RdtClient.Service.BackgroundServices;
 
-public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider serviceProvider) : BackgroundService
+public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider serviceProvider, ISettings settings) : BackgroundService
 {
     private static DateTime _nextUpdate = DateTime.UtcNow;
 
@@ -17,22 +18,23 @@ public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider s
             await Task.Delay(1000, stoppingToken);
         }
 
-        using var scope = serviceProvider.CreateScope();
-        var torrentService = scope.ServiceProvider.GetRequiredService<Torrents>();
-
         logger.LogInformation("ProviderUpdater started.");
 
         while (!stoppingToken.IsCancellationRequested)
         {
+            using var scope = serviceProvider.CreateScope();
+            var torrentService = scope.ServiceProvider.GetRequiredService<Torrents>();
+            var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
+
             try
             {
                 var torrents = await torrentService.Get();
 
-                if (_nextUpdate < DateTime.UtcNow && (Settings.Get.Provider.AutoImport || torrents.Any(t => t.RdStatus != TorrentStatus.Finished)))
+                if (_nextUpdate < DateTime.UtcNow && (settings.Current.Provider.AutoImport || torrents.Any(t => t.RdStatus != TorrentStatus.Finished) || RdtHub.HasConnections))
                 {
                     logger.LogDebug($"Updating torrent info from debrid provider");
 
-                    var updateTime = Settings.Get.Provider.CheckInterval * 3;
+                    var updateTime = settings.Current.Provider.CheckInterval * 3;
 
                     if (updateTime < 30)
                     {
@@ -41,7 +43,7 @@ public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider s
 
                     if (RdtHub.HasConnections)
                     {
-                        updateTime = Settings.Get.Provider.CheckInterval;
+                        updateTime = settings.Current.Provider.CheckInterval;
 
                         if (updateTime < 5)
                         {
@@ -56,6 +58,11 @@ public class ProviderUpdater(ILogger<ProviderUpdater> logger, IServiceProvider s
                     logger.LogDebug("Finished updating torrent info from debrid provider, next update in {updateTime} seconds", updateTime);
                 }
             }
+            catch (RateLimitException ex)
+            {
+                await torrentRunner.SetRateLimit(ex.RetryAfter, ex.Message);
+                _nextUpdate = DateTime.UtcNow.Add(ex.RetryAfter);
+            }
             catch (Exception ex)
             {
                 logger.LogError(ex, "Unexpected error occurred in ProviderUpdater: {ex.Message}", ex.Message);

server/RdtClient.Service/BackgroundServices/Startup.cs

@@ -1,4 +1,5 @@
 using System.Reflection;
+using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -39,6 +40,9 @@ public class Startup(IServiceProvider serviceProvider) : IHostedService
 
     public Task StopAsync(CancellationToken cancellationToken)
     {
+        Ready = false;
+        SqliteConnection.ClearAllPools();
+
         return Task.CompletedTask;
     }
 }

server/RdtClient.Service/BackgroundServices/TaskRunner.cs

@@ -16,15 +16,19 @@ public class TaskRunner(ILogger<TaskRunner> logger, IServiceProvider serviceProv
             await Task.Delay(1000, stoppingToken);
         }
 
-        using var scope = serviceProvider.CreateScope();
-        var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
-
         logger.LogInformation("TaskRunner started.");
 
-        await torrentRunner.Initialize();
+        using (var startupScope = serviceProvider.CreateScope())
+        {
+            var startupRunner = startupScope.ServiceProvider.GetRequiredService<TorrentRunner>();
+            await startupRunner.Initialize();
+        }
 
         while (!stoppingToken.IsCancellationRequested)
         {
+            using var scope = serviceProvider.CreateScope();
+            var torrentRunner = scope.ServiceProvider.GetRequiredService<TorrentRunner>();
+
             try
             {
                 await torrentRunner.Tick();

server/RdtClient.Service/BackgroundServices/UpdateChecker.cs

@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 
 namespace RdtClient.Service.BackgroundServices;
 
-public class UpdateChecker(ILogger<UpdateChecker> logger) : BackgroundService
+public class UpdateChecker(ILogger<UpdateChecker> logger, IHttpClientFactory httpClientFactory) : BackgroundService
 {
     private static readonly List<String> KnownGhsaIds = [];
     public static String? CurrentVersion { get; private set; }
@@ -79,9 +79,9 @@ public class UpdateChecker(ILogger<UpdateChecker> logger) : BackgroundService
         logger.LogInformation("UpdateChecker stopped.");
     }
 
-    private static async Task<T?> GitHubRequest<T>(String endpoint, CancellationToken cancellationToken)
+    private async Task<T?> GitHubRequest<T>(String endpoint, CancellationToken cancellationToken)
     {
-        var httpClient = new HttpClient();
+        var httpClient = httpClientFactory.CreateClient();
         httpClient.DefaultRequestHeaders.UserAgent.Add(new("RdtClient", CurrentVersion));
         var response = await httpClient.GetStringAsync($"https://api.github.com{endpoint}", cancellationToken);
 

server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs

@@ -8,7 +8,7 @@ using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 
 namespace RdtClient.Service.BackgroundServices;
 
-public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProvider serviceProvider) : BackgroundService
+public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProvider serviceProvider, ISettings settings) : BackgroundService
 {
     private DateTime _prevCheck = DateTime.MinValue;
 
@@ -28,34 +28,35 @@ public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProv
         {
             try
             {
-                var nextCheck = _prevCheck.AddSeconds(Math.Max(Settings.Get.Watch.Interval, 10));
+                var nextCheck = _prevCheck.AddSeconds(Math.Max(settings.Current.Watch.Interval, 10));
+
                 if (DateTime.Now < nextCheck)
                 {
                     var delay = nextCheck - DateTime.Now;
                     await Task.Delay(delay, stoppingToken);
                 }
+
                 _prevCheck = DateTime.Now;
 
-                if (String.IsNullOrWhiteSpace(Settings.Get.Watch.Path))
+                if (String.IsNullOrWhiteSpace(settings.Current.Watch.Path))
                 {
                     continue;
                 }
 
-                var processedStorePath = Path.Combine(Settings.Get.Watch.Path, "processed");
-                var errorStorePath = Path.Combine(Settings.Get.Watch.Path, "error");
+                var processedStorePath = Path.Combine(settings.Current.Watch.Path, "processed");
+                var errorStorePath = Path.Combine(settings.Current.Watch.Path, "error");
 
-                if (!String.IsNullOrWhiteSpace(Settings.Get.Watch.ProcessedPath))
+                if (!String.IsNullOrWhiteSpace(settings.Current.Watch.ProcessedPath))
                 {
-                    processedStorePath = Settings.Get.Watch.ProcessedPath;
+                    processedStorePath = settings.Current.Watch.ProcessedPath;
                 }
 
-                if (!String.IsNullOrWhiteSpace(Settings.Get.Watch.ErrorPath))
+                if (!String.IsNullOrWhiteSpace(settings.Current.Watch.ErrorPath))
                 {
-                    errorStorePath = Settings.Get.Watch.ErrorPath;
+                    errorStorePath = settings.Current.Watch.ErrorPath;
                 }
 
-
-                var torrentFiles = Directory.GetFiles(Settings.Get.Watch.Path, "*.*", SearchOption.TopDirectoryOnly);
+                var torrentFiles = Directory.GetFiles(settings.Current.Watch.Path, "*.*", SearchOption.TopDirectoryOnly);
 
                 foreach (var torrentFile in torrentFiles)
                 {
@@ -77,22 +78,22 @@ public class WatchFolderChecker(ILogger<WatchFolderChecker> logger, IServiceProv
 
                         var torrent = new Torrent
                         {
-                            DownloadClient = Settings.Get.DownloadClient.Client,
-                            Category = Settings.Get.Watch.Default.Category,
-                            HostDownloadAction = Settings.Get.Watch.Default.HostDownloadAction,
-                            FinishedActionDelay = Settings.Get.Watch.Default.FinishedActionDelay,
-                            DownloadAction = Settings.Get.Watch.Default.OnlyDownloadAvailableFiles
+                            DownloadClient = settings.Current.DownloadClient.Client,
+                            Category = settings.Current.Watch.Default.Category,
+                            HostDownloadAction = settings.Current.Watch.Default.HostDownloadAction,
+                            FinishedActionDelay = settings.Current.Watch.Default.FinishedActionDelay,
+                            DownloadAction = settings.Current.Watch.Default.OnlyDownloadAvailableFiles
                                 ? TorrentDownloadAction.DownloadAvailableFiles
                                 : TorrentDownloadAction.DownloadAll,
-                            FinishedAction = Settings.Get.Watch.Default.FinishedAction,
-                            DownloadMinSize = Settings.Get.Watch.Default.MinFileSize,
-                            IncludeRegex = Settings.Get.Watch.Default.IncludeRegex,
-                            ExcludeRegex = Settings.Get.Watch.Default.ExcludeRegex,
-                            TorrentRetryAttempts = Settings.Get.Watch.Default.TorrentRetryAttempts,
-                            DownloadRetryAttempts = Settings.Get.Watch.Default.DownloadRetryAttempts,
-                            DeleteOnError = Settings.Get.Watch.Default.DeleteOnError,
-                            Lifetime = Settings.Get.Watch.Default.TorrentLifetime,
-                            Priority = Settings.Get.Watch.Default.Priority > 0 ? Settings.Get.Watch.Default.Priority : null
+                            FinishedAction = settings.Current.Watch.Default.FinishedAction,
+                            DownloadMinSize = settings.Current.Watch.Default.MinFileSize,
+                            IncludeRegex = settings.Current.Watch.Default.IncludeRegex,
+                            ExcludeRegex = settings.Current.Watch.Default.ExcludeRegex,
+                            TorrentRetryAttempts = settings.Current.Watch.Default.TorrentRetryAttempts,
+                            DownloadRetryAttempts = settings.Current.Watch.Default.DownloadRetryAttempts,
+                            DeleteOnError = settings.Current.Watch.Default.DeleteOnError,
+                            Lifetime = settings.Current.Watch.Default.TorrentLifetime,
+                            Priority = settings.Current.Watch.Default.Priority > 0 ? settings.Current.Watch.Default.Priority : null
                         };
 
                         if (fileInfo.Extension == ".torrent")

server/RdtClient.Service/DiConfig.cs

@@ -4,8 +4,10 @@ using System.Reflection;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Polly;
-using Polly.Extensions.Http;
+using Polly.Timeout;
+using RateLimitHeaders.Polly;
 using RdtClient.Service.BackgroundServices;
+using RdtClient.Service.Helpers;
 using RdtClient.Service.Middleware;
 using RdtClient.Service.Services;
 using RdtClient.Service.Services.DebridClients;
@@ -16,6 +18,8 @@ namespace RdtClient.Service;
 public static class DiConfig
 {
     public const String RD_CLIENT = "RdClient";
+    public const String TORBOX_CLIENT = "TorBoxClient";
+    public const String TORBOX_CLIENT_SLOW = "TorBoxClientSlow";
     public static readonly String UserAgent = $"rdt-client {Assembly.GetEntryAssembly()?.GetName().Version}";
 
     public static void RegisterRdtServices(this IServiceCollection services)
@@ -25,6 +29,8 @@ public static class DiConfig
         services.AddSingleton<IAllDebridNetClientFactory, AllDebridNetClientFactory>();
         services.AddScoped<AllDebridDebridClient>();
 
+        services.AddSingleton<IRateLimitCoordinator, RateLimitCoordinator>();
+        services.AddSingleton(TorrentRunner.SharedState);
         services.AddSingleton<IProcessFactory, ProcessFactory>();
         services.AddSingleton<IFileSystem, FileSystem>();
 
@@ -36,7 +42,8 @@ public static class DiConfig
         services.AddScoped<Sabnzbd>();
         services.AddScoped<RemoteService>();
         services.AddScoped<RealDebridDebridClient>();
-        services.AddScoped<Settings>();
+        services.AddSingleton<Settings>();
+        services.AddSingleton<ISettings>(serviceProvider => serviceProvider.GetRequiredService<Settings>());
         services.AddScoped<TorBoxDebridClient>();
         services.AddScoped<Torrents>();
         services.AddScoped<TorrentRunner>();
@@ -46,7 +53,7 @@ public static class DiConfig
         services.AddSingleton<ITrackerListGrabber, TrackerListGrabber>();
         services.AddSingleton<IEnricher, Enricher>();
 
-        services.AddSingleton<IAuthorizationHandler, AuthSettingHandler>();
+        services.AddScoped<IAuthorizationHandler, AuthSettingHandler>();
         services.AddScoped<IAuthorizationHandler, SabnzbdHandler>();
 
         services.AddHostedService<DiskSpaceMonitor>();
@@ -60,11 +67,6 @@ public static class DiConfig
 
     public static void RegisterHttpClients(this IServiceCollection services)
     {
-        var retryPolicy = HttpPolicyExtensions
-                          .HandleTransientHttpError()
-                          .OrResult(r => r.StatusCode == HttpStatusCode.TooManyRequests)
-                          .WaitAndRetryAsync(5, attempt => TimeSpan.FromSeconds(Math.Pow(2, attempt)));
-
         services.AddHttpClient();
 
         services.ConfigureHttpClientDefaults(builder =>
@@ -75,7 +77,64 @@ public static class DiConfig
             });
         });
 
+        services.AddTransient<RateLimitHandler>();
+
         services.AddHttpClient(RD_CLIENT)
-                .AddPolicyHandler(retryPolicy);
+                .AddHttpMessageHandler<RateLimitHandler>()
+                .AddResilienceHandler("rd_client_handler", ConfigureResiliencePipeline);
+
+        // This likely works for most providers, but should be verified and then the providers changed
+        // to this HTTP client for added resilience.
+        services.AddHttpClient(TORBOX_CLIENT)
+                .AddResilienceHandler("torbox_client_handler", ConfigureResiliencePipeline);
+
+        services.AddHttpClient(TORBOX_CLIENT_SLOW)
+                .AddHttpMessageHandler<RateLimitHandler>()
+                .AddResilienceHandler("torbox_client_handler_slow", ConfigureResiliencePipeline);
+    }
+
+    private static void ConfigureResiliencePipeline(ResiliencePipelineBuilder<HttpResponseMessage> builder)
+    {
+        builder.AddRateLimitHeaders(options =>
+        {
+            options.EnableProactiveThrottling = true;
+        });
+
+        builder.AddRetry(new()
+        {
+            ShouldHandle = args => args.Outcome switch
+            {
+                { Exception: HttpRequestException } => PredicateResult.True(),
+                { Result.StatusCode: HttpStatusCode.RequestTimeout } => PredicateResult.True(),
+                { Result.StatusCode: HttpStatusCode.TooManyRequests } => PredicateResult.True(),
+                _ => PredicateResult.False()
+            },
+            MaxRetryAttempts = 2,
+            BackoffType = DelayBackoffType.Exponential,
+            Delay = TimeSpan.FromSeconds(2),
+            UseJitter = true,
+            DelayGenerator = args =>
+            {
+                if (args.Outcome.Result is { StatusCode: HttpStatusCode.TooManyRequests } response)
+                {
+                    var delay = RateLimitHandler.GetRetryAfterDelay(response);
+                    var timeout = TimeSpan.FromSeconds(Settings.Get.Provider.Timeout);
+
+                    if (delay >= timeout)
+                    {
+                        return new((TimeSpan?)null);
+                    }
+
+                    return new(delay);
+                }
+
+                return new((TimeSpan?)null);
+            }
+        });
+
+        builder.AddTimeout(new TimeoutStrategyOptions
+        {
+            TimeoutGenerator = _ => new(TimeSpan.FromSeconds(Settings.Get.Provider.Timeout))
+        });
     }
 }

server/RdtClient.Service/Helpers/CredentialRedactorEnricher.cs

@@ -1,6 +1,7 @@
+using System.Reflection;
+using RdtClient.Service.Services;
 using Serilog.Core;
 using Serilog.Events;
-using RdtClient.Service.Services;
 
 namespace RdtClient.Service.Helpers;
 
@@ -11,18 +12,21 @@ public class CredentialRedactorEnricher : ILogEventEnricher
         var sensitiveValues = new List<String>();
 
         var apiKey = Settings.Get.Provider.ApiKey;
+
         if (!String.IsNullOrWhiteSpace(apiKey) && apiKey.Length > 5)
         {
             sensitiveValues.Add(apiKey);
         }
 
         var aria2Secret = Settings.Get.DownloadClient.Aria2cSecret;
+
         if (!String.IsNullOrWhiteSpace(aria2Secret) && aria2Secret.Length > 5)
         {
             sensitiveValues.Add(aria2Secret);
         }
 
         var dsPassword = Settings.Get.DownloadClient.DownloadStationPassword;
+
         if (!String.IsNullOrWhiteSpace(dsPassword) && dsPassword.Length > 5)
         {
             sensitiveValues.Add(dsPassword);
@@ -39,15 +43,16 @@ public class CredentialRedactorEnricher : ILogEventEnricher
             if (logEvent.MessageTemplate.Text.Contains(sensitiveValue))
             {
                 var newText = logEvent.MessageTemplate.Text.Replace(sensitiveValue, "*****");
-                
-                var field = typeof(MessageTemplate).GetFields(System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic)
+
+                var field = typeof(MessageTemplate).GetFields(BindingFlags.Instance | BindingFlags.NonPublic)
                                                    .FirstOrDefault(f => f.FieldType == typeof(String));
-                
+
                 field?.SetValue(logEvent.MessageTemplate, newText);
             }
 
             // Redact in properties
             var propertiesToUpdate = new List<LogEventProperty>();
+
             foreach (var property in logEvent.Properties)
             {
                 if (property.Value is ScalarValue scalarValue && scalarValue.Value is String stringValue && stringValue.Contains(sensitiveValue))

server/RdtClient.Service/Helpers/DownloadHelper.cs

@@ -38,7 +38,12 @@ public static class DownloadHelper
             {
                 subPath = subPath.Trim('/').Trim('\\');
 
-                torrentPath = Path.Combine(torrentPath, subPath);
+                subPath = StripTorrentNamePrefix(subPath, directory);
+
+                if (!String.IsNullOrWhiteSpace(subPath))
+                {
+                    torrentPath = Path.Combine(torrentPath, subPath);
+                }
             }
         }
 
@@ -87,7 +92,12 @@ public static class DownloadHelper
             {
                 subPath = subPath.Trim('/').Trim('\\');
 
-                torrentPath = Path.Combine(torrentPath, subPath);
+                subPath = StripTorrentNamePrefix(subPath, torrentPath);
+
+                if (!String.IsNullOrWhiteSpace(subPath))
+                {
+                    torrentPath = Path.Combine(torrentPath, subPath);
+                }
             }
         }
 
@@ -117,4 +127,32 @@ public static class DownloadHelper
     {
         return String.Concat(path.Split(Path.GetInvalidPathChars()));
     }
+
+    private static String StripTorrentNamePrefix(String subPath, String torrentName)
+    {
+        var separatorIndex = subPath.IndexOfAny(['/', '\\']);
+
+        String firstComponent;
+        String remainder;
+
+        if (separatorIndex < 0)
+        {
+            firstComponent = subPath;
+            remainder = String.Empty;
+        }
+        else
+        {
+            firstComponent = subPath[..separatorIndex];
+            remainder = subPath[(separatorIndex + 1)..];
+        }
+
+        var normalizedFirst = RemoveInvalidPathChars(firstComponent);
+
+        if (normalizedFirst.Equals(torrentName.TrimEnd('/', '\\'), StringComparison.OrdinalIgnoreCase))
+        {
+            return remainder;
+        }
+
+        return subPath;
+    }
 }

server/RdtClient.Service/Helpers/FileHelper.cs

@@ -79,13 +79,14 @@ public static class FileHelper
     public static String RemoveInvalidFileNameChars(String filename)
     {
         var invalidChars = Path.GetInvalidFileNameChars()
-            .Concat(['/', '\\'])
-            .Distinct()
-            .ToArray();
+                               .Concat(['/', '\\'])
+                               .Distinct()
+                               .ToArray();
 
         var cleaned = String.Concat(filename.Split(invalidChars));
         cleaned = cleaned.Replace("..", "");
         cleaned = cleaned.TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+
         return cleaned;
     }
 

server/RdtClient.Service/Helpers/FileSizeHelper.cs

@@ -9,7 +9,11 @@ public static class FileSizeHelper
             return "0 B";
         }
 
-        String[] units = { "B", "KB", "MB", "GB", "TB", "PB", "EB" };
+        String[] units =
+        {
+            "B", "KB", "MB", "GB", "TB", "PB", "EB"
+        };
+
         var unitIndex = 0;
         Double size = bytes.Value;
 

server/RdtClient.Service/Helpers/IRateLimitCoordinator.cs

@@ -0,0 +1,10 @@
+namespace RdtClient.Service.Helpers;
+
+public interface IRateLimitCoordinator
+{
+    TimeSpan GetRemainingCooldown(String key);
+    TimeSpan GetMaxRemainingCooldown();
+    DateTimeOffset? GetMaxNextAllowedAt();
+    void UpdateCooldown(String key, TimeSpan retryAfter);
+    DateTimeOffset? GetNextAllowedAt(String key);
+}

server/RdtClient.Service/Helpers/Logger.cs

@@ -1,5 +1,6 @@
 using System.Web;
 using RdtClient.Data.Models.Data;
+using RdtClient.Service.Services;
 
 namespace RdtClient.Service.Helpers;
 
@@ -16,14 +17,15 @@ public static class Logger
             fileName = HttpUtility.UrlDecode(fileName);
         }
 
-        var done = (Int32)(((Double)download.BytesDone / download.BytesTotal) * 100);
+        var stats = TorrentRunner.GetStats(download.DownloadId);
+        var done = (Int32)(((Double)stats.BytesDone / stats.BytesTotal) * 100);
 
-        if (done < 0)
+        if (done < 0 || Double.IsNaN(done) || Double.IsInfinity(done))
         {
             done = 0;
         }
 
-        return $"for download {fileName}. Completed: {done}%, avg speed: {download.Speed}bytes/s ({download.DownloadId}) remoteID: {download.RemoteId}";
+        return $"for download {fileName}. Completed: {done}%, avg speed: {stats.Speed}bytes/s ({download.DownloadId}) remoteID: {download.RemoteId}";
     }
 
     public static String ToLog(this Torrent torrent)

server/RdtClient.Service/Helpers/RateLimitCoordinator.cs

@@ -0,0 +1,94 @@
+using System.Collections.Concurrent;
+
+namespace RdtClient.Service.Helpers;
+
+public class RateLimitCoordinator : IRateLimitCoordinator
+{
+    private readonly ConcurrentDictionary<String, DateTimeOffset> _cooldowns = new();
+
+    public TimeSpan GetRemainingCooldown(String key)
+    {
+        if (_cooldowns.TryGetValue(key, out var nextAllowedAt))
+        {
+            var remaining = nextAllowedAt - DateTimeOffset.UtcNow;
+
+            if (remaining > TimeSpan.Zero)
+            {
+                return remaining;
+            }
+
+            _cooldowns.TryRemove(key, out _);
+        }
+
+        return TimeSpan.Zero;
+    }
+
+    public TimeSpan GetMaxRemainingCooldown()
+    {
+        var now = DateTimeOffset.UtcNow;
+        var max = TimeSpan.Zero;
+
+        foreach (var (key, nextAllowedAt) in _cooldowns)
+        {
+            var remaining = nextAllowedAt - now;
+
+            if (remaining > TimeSpan.Zero)
+            {
+                if (remaining > max)
+                {
+                    max = remaining;
+                }
+            }
+            else
+            {
+                _cooldowns.TryRemove(key, out _);
+            }
+        }
+
+        return max;
+    }
+
+    public DateTimeOffset? GetMaxNextAllowedAt()
+    {
+        var now = DateTimeOffset.UtcNow;
+        DateTimeOffset? max = null;
+
+        foreach (var (key, nextAllowedAt) in _cooldowns)
+        {
+            if (nextAllowedAt > now)
+            {
+                if (max == null || nextAllowedAt > max)
+                {
+                    max = nextAllowedAt;
+                }
+            }
+            else
+            {
+                _cooldowns.TryRemove(key, out _);
+            }
+        }
+
+        return max;
+    }
+
+    public void UpdateCooldown(String key, TimeSpan retryAfter)
+    {
+        var nextAllowedAt = DateTimeOffset.UtcNow.Add(retryAfter);
+        _cooldowns.AddOrUpdate(key, nextAllowedAt, (_, existing) => nextAllowedAt > existing ? nextAllowedAt : existing);
+    }
+
+    public DateTimeOffset? GetNextAllowedAt(String key)
+    {
+        if (_cooldowns.TryGetValue(key, out var nextAllowedAt))
+        {
+            if (nextAllowedAt > DateTimeOffset.UtcNow)
+            {
+                return nextAllowedAt;
+            }
+
+            _cooldowns.TryRemove(key, out _);
+        }
+
+        return null;
+    }
+}

server/RdtClient.Service/Helpers/RateLimitHandler.cs

@@ -0,0 +1,61 @@
+using System.Net;
+using Polly;
+using RdtClient.Data.Models.Internal;
+
+namespace RdtClient.Service.Helpers;
+
+public class RateLimitHandler(IRateLimitCoordinator coordinator) : DelegatingHandler
+{
+    public static readonly ResiliencePropertyKey<DateTimeOffset> StartTimeKey = new("StartTime");
+
+    public static TimeSpan GetRetryAfterDelay(HttpResponseMessage response)
+    {
+        var retryAfter = response.Headers.RetryAfter;
+        var delay = retryAfter?.Delta ?? (retryAfter?.Date.HasValue == true ? retryAfter.Date.Value - DateTimeOffset.UtcNow : TimeSpan.FromMinutes(2));
+
+        if (delay < TimeSpan.Zero)
+        {
+            delay = TimeSpan.FromMinutes(2);
+        }
+
+        return delay;
+    }
+
+    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var host = request.RequestUri?.Host ?? "unknown";
+
+        var cooldown = coordinator.GetRemainingCooldown(host);
+
+        if (cooldown > TimeSpan.Zero)
+        {
+            throw new RateLimitException($"Rate limit cooldown active for {host}", cooldown);
+        }
+
+        var context = request.GetResilienceContext();
+
+        if (context == null)
+        {
+            context = ResilienceContextPool.Shared.Get(cancellationToken);
+            request.SetResilienceContext(context);
+        }
+
+        if (!context.Properties.TryGetValue(StartTimeKey, out _))
+        {
+            context.Properties.Set(StartTimeKey, DateTimeOffset.UtcNow);
+        }
+
+        var response = await base.SendAsync(request, cancellationToken);
+
+        if (response.StatusCode == HttpStatusCode.TooManyRequests)
+        {
+            var delay = GetRetryAfterDelay(response);
+            coordinator.UpdateCooldown(host, delay);
+            response.Dispose();
+
+            throw new RateLimitException($"Provider {host} rate limit exceeded", delay);
+        }
+
+        return response;
+    }
+}

server/RdtClient.Service/Helpers/TorrentDtoMapper.cs

@@ -0,0 +1,232 @@
+using RdtClient.Data.Enums;
+using RdtClient.Data.Models.Data;
+using RdtClient.Data.Models.Internal;
+
+namespace RdtClient.Service.Helpers;
+
+public static class TorrentDtoMapper
+{
+    public static TorrentDto ToListDto(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
+    {
+        return ToDto(torrent, getDownloadStats, includeDownloads: false, includeFiles: false, includeFileOrMagnet: false);
+    }
+
+    public static TorrentDto ToUpdateDto(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
+    {
+        return ToDto(torrent, getDownloadStats, includeDownloads: true, includeFiles: false, includeFileOrMagnet: false);
+    }
+
+    public static TorrentDto ToDetailDto(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
+    {
+        return ToDto(torrent, getDownloadStats, includeDownloads: true, includeFiles: true, includeFileOrMagnet: true);
+    }
+
+    private static TorrentDto ToDto(Torrent torrent,
+                                    Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats,
+                                    Boolean includeDownloads,
+                                    Boolean includeFiles,
+                                    Boolean includeFileOrMagnet)
+    {
+        var downloads = includeDownloads ? torrent.Downloads.Select(download => ToDto(download, getDownloadStats)).ToList() : [];
+
+        return new()
+        {
+            TorrentId = torrent.TorrentId,
+            Hash = torrent.Hash,
+            Category = torrent.Category,
+            DownloadAction = torrent.DownloadAction,
+            FinishedAction = torrent.FinishedAction,
+            FinishedActionDelay = torrent.FinishedActionDelay,
+            HostDownloadAction = torrent.HostDownloadAction,
+            DownloadMinSize = torrent.DownloadMinSize,
+            IncludeRegex = torrent.IncludeRegex,
+            ExcludeRegex = torrent.ExcludeRegex,
+            DownloadManualFiles = torrent.DownloadManualFiles,
+            DownloadClient = torrent.DownloadClient,
+            Added = torrent.Added,
+            FilesSelected = torrent.FilesSelected,
+            Completed = torrent.Completed,
+            Type = torrent.Type,
+            FileOrMagnet = includeFileOrMagnet ? torrent.FileOrMagnet : null,
+            IsFile = torrent.IsFile,
+            Priority = torrent.Priority,
+            RetryCount = torrent.RetryCount,
+            DownloadRetryAttempts = torrent.DownloadRetryAttempts,
+            TorrentRetryAttempts = torrent.TorrentRetryAttempts,
+            DeleteOnError = torrent.DeleteOnError,
+            Lifetime = torrent.Lifetime,
+            Error = torrent.Error,
+            RdId = torrent.RdId,
+            RdName = torrent.RdName,
+            RdSize = torrent.RdSize,
+            RdHost = torrent.RdHost,
+            RdSplit = torrent.RdSplit,
+            RdProgress = torrent.RdProgress,
+            RdStatus = torrent.RdStatus,
+            RdStatusRaw = torrent.RdStatusRaw,
+            RdAdded = torrent.RdAdded,
+            RdEnded = torrent.RdEnded,
+            RdSpeed = torrent.RdSpeed,
+            RdSeeders = torrent.RdSeeders,
+            StatusText = GetStatusText(torrent, getDownloadStats),
+            FilesCount = torrent.Files.Count,
+            DownloadsCount = torrent.Downloads.Count,
+            Files = includeFiles ? torrent.Files : [],
+            Downloads = downloads
+        };
+    }
+
+    private static DownloadDto ToDto(Download download, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
+    {
+        var (speed, bytesTotal, bytesDone) = getDownloadStats(download.DownloadId);
+
+        return new()
+        {
+            DownloadId = download.DownloadId,
+            TorrentId = download.TorrentId,
+            Path = download.Path,
+            Link = download.Link,
+            Added = download.Added,
+            DownloadQueued = download.DownloadQueued,
+            DownloadStarted = download.DownloadStarted,
+            DownloadFinished = download.DownloadFinished,
+            UnpackingQueued = download.UnpackingQueued,
+            UnpackingStarted = download.UnpackingStarted,
+            UnpackingFinished = download.UnpackingFinished,
+            Completed = download.Completed,
+            RetryCount = download.RetryCount,
+            Error = download.Error,
+            BytesTotal = bytesTotal,
+            BytesDone = bytesDone,
+            Speed = speed
+        };
+    }
+
+    private static String GetStatusText(Torrent torrent, Func<Guid, (Int64 Speed, Int64 BytesTotal, Int64 BytesDone)> getDownloadStats)
+    {
+        if (!String.IsNullOrWhiteSpace(torrent.Error))
+        {
+            return torrent.Error;
+        }
+
+        if (torrent.Downloads.Count > 0)
+        {
+            var allFinished = true;
+            var downloadingCount = 0;
+            var downloadedCount = 0;
+            Int64 downloadingBytesDone = 0;
+            Int64 downloadingBytesTotal = 0;
+            Int64 downloadingSpeed = 0;
+            var unpackingCount = 0;
+            var unpackedCount = 0;
+            Int64 unpackingBytesDone = 0;
+            Int64 unpackingBytesTotal = 0;
+            var queuedForUnpackingCount = 0;
+            var queuedForDownloadingCount = 0;
+
+            foreach (var download in torrent.Downloads)
+            {
+                if (download.Completed == null)
+                {
+                    allFinished = false;
+                }
+
+                var (speed, bytesTotal, bytesDone) = getDownloadStats(download.DownloadId);
+
+                if (download.DownloadFinished != null)
+                {
+                    downloadedCount += 1;
+                }
+
+                if (download.DownloadStarted != null && download.DownloadFinished == null && bytesDone > 0)
+                {
+                    downloadingCount += 1;
+                    downloadingBytesDone += bytesDone;
+                    downloadingBytesTotal += bytesTotal;
+                    downloadingSpeed += speed;
+                }
+
+                if (download.UnpackingFinished != null)
+                {
+                    unpackedCount += 1;
+                }
+
+                if (download.UnpackingStarted != null && download.UnpackingFinished == null && bytesDone > 0)
+                {
+                    unpackingCount += 1;
+                    unpackingBytesDone += bytesDone;
+                    unpackingBytesTotal += bytesTotal;
+                }
+
+                if (download.UnpackingQueued != null && download.UnpackingStarted == null)
+                {
+                    queuedForUnpackingCount += 1;
+                }
+
+                if (download.DownloadStarted == null && download.DownloadFinished == null)
+                {
+                    queuedForDownloadingCount += 1;
+                }
+            }
+
+            if (allFinished)
+            {
+                return "Finished";
+            }
+
+            if (downloadingCount > 0)
+            {
+                var progress = downloadingBytesTotal == 0 ? 0 : (Double)downloadingBytesDone / downloadingBytesTotal * 100;
+
+                return $"Downloading file {downloadingCount + downloadedCount}/{torrent.Downloads.Count} ({progress:0.00}% - {FileSizeHelper.FormatSize(downloadingSpeed)}/s)";
+            }
+
+            if (unpackingCount > 0)
+            {
+                var progress = unpackingBytesTotal == 0 ? 0 : (Double)unpackingBytesDone / unpackingBytesTotal * 100;
+
+                return $"Extracting file {unpackingCount + unpackedCount}/{torrent.Downloads.Count} ({progress:0.00}%)";
+            }
+
+            if (queuedForUnpackingCount > 0)
+            {
+                return "Queued for unpacking";
+            }
+
+            if (queuedForDownloadingCount > 0)
+            {
+                return "Queued for downloading";
+            }
+
+            if (unpackedCount > 0)
+            {
+                return "Files unpacked";
+            }
+
+            if (downloadedCount > 0)
+            {
+                return "Files downloaded to host";
+            }
+        }
+
+        if (torrent.Completed != null)
+        {
+            return "Finished";
+        }
+
+        var prefix = torrent.Type == DownloadType.Nzb ? "NZB" : "Torrent";
+
+        return torrent.RdStatus switch
+        {
+            TorrentStatus.Queued => "Not Yet Added to Provider",
+            TorrentStatus.Downloading when torrent.RdSeeders < 1 && torrent.Type != DownloadType.Nzb => "Torrent stalled",
+            TorrentStatus.Downloading => $"{prefix} downloading ({torrent.RdProgress}% - {FileSizeHelper.FormatSize(torrent.RdSpeed)}/s)",
+            TorrentStatus.Processing => $"{prefix} processing",
+            TorrentStatus.WaitingForFileSelection => $"{prefix} waiting for file selection",
+            TorrentStatus.Error => $"{prefix} error: {torrent.RdStatusRaw}",
+            TorrentStatus.Finished => $"{prefix} finished, waiting for download links",
+            TorrentStatus.Uploading => $"{prefix} uploading",
+            _ => "Unknown status"
+        };
+    }
+}

server/RdtClient.Service/Middleware/AuthSettingHandler.cs

@@ -8,7 +8,7 @@ public class AuthSettingRequirement : IAuthorizationRequirement
 {
 }
 
-public class AuthSettingHandler : AuthorizationHandler<AuthSettingRequirement>
+public class AuthSettingHandler(ISettings settings) : AuthorizationHandler<AuthSettingRequirement>
 {
     protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, AuthSettingRequirement requirement)
     {
@@ -17,7 +17,7 @@ public class AuthSettingHandler : AuthorizationHandler<AuthSettingRequirement>
             context.Succeed(requirement);
         }
 
-        if (Settings.Get.General.AuthenticationType == AuthenticationType.None)
+        if (settings.Current.General.AuthenticationType == AuthenticationType.None)
         {
             context.Succeed(requirement);
         }

server/RdtClient.Service/Middleware/SabnzbdHandler.cs

@@ -9,7 +9,7 @@ public class SabnzbdRequirement : IAuthorizationRequirement
 {
 }
 
-public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor httpContextAccessor) : AuthorizationHandler<SabnzbdRequirement>
+public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor httpContextAccessor, ISettings settings) : AuthorizationHandler<SabnzbdRequirement>
 {
     protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context, SabnzbdRequirement requirement)
     {
@@ -18,12 +18,14 @@ public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor
         if (context.User.Identity?.IsAuthenticated == true)
         {
             context.Succeed(requirement);
+
             return;
         }
 
-        if (Settings.Get.General.AuthenticationType == AuthenticationType.None)
+        if (settings.Current.General.AuthenticationType == AuthenticationType.None)
         {
             context.Succeed(requirement);
+
             return;
         }
 
@@ -34,6 +36,7 @@ public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor
             String? GetParam(String name)
             {
                 var value = request.Query[name].ToString();
+
                 if (String.IsNullOrWhiteSpace(value) && request.HasFormContentType)
                 {
                     value = request.Form[name].ToString();
@@ -48,11 +51,52 @@ public class SabnzbdHandler(Authentication authentication, IHttpContextAccessor
             if (!String.IsNullOrWhiteSpace(maUsername) && !String.IsNullOrWhiteSpace(maPassword))
             {
                 var loginResult = await authentication.Login(maUsername, maPassword);
+
                 if (loginResult.Succeeded)
                 {
                     context.Succeed(requirement);
+
+                    return;
                 }
+
+                // Invalid credentials provided
+                context.Fail();
+
+                return;
             }
+
+            var apiKey = GetParam("apikey");
+
+            if (!String.IsNullOrWhiteSpace(apiKey))
+            {
+                var separatorIndex = apiKey.IndexOf(':');
+
+                if (separatorIndex <= 0 || separatorIndex == apiKey.Length - 1)
+                {
+                    context.Fail();
+
+                    return;
+                }
+
+                var username = apiKey[..separatorIndex];
+                var password = apiKey[(separatorIndex + 1)..];
+
+                var loginResult = await authentication.Login(username, password);
+
+                if (loginResult.Succeeded)
+                {
+                    context.Succeed(requirement);
+
+                    return;
+                }
+
+                context.Fail();
+
+                return;
+            }
+
+            // Authentication required but missing credentials
+            context.Fail();
         }
     }
 }

server/RdtClient.Service/RdtClient.Service.csproj

@@ -11,21 +11,22 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="AllDebrid.NET" Version="1.0.18" />
     <PackageReference Include="Aria2.NET" Version="1.0.6" />
-    <PackageReference Include="DebridLinkFr.NET" Version="1.0.4" />
-    <PackageReference Include="Downloader" Version="4.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
+    <PackageReference Include="DebridLinkFr.NET" Version="2.0.0" />
+    <PackageReference Include="Downloader" Version="5.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.6.0" />
     <PackageReference Include="MonoTorrent" Version="3.0.2" />
-    <PackageReference Include="Polly" Version="8.6.5" />
+    <PackageReference Include="Polly" Version="8.6.6" />
     <PackageReference Include="Premiumize.NET" Version="1.0.10" />
+    <PackageReference Include="RateLimitHeaders.Polly" Version="1.0.0" />
     <PackageReference Include="RD.NET" Version="2.1.11" />
     <PackageReference Include="Serilog" Version="4.3.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="SharpCompress" Version="0.46.2" />
-    <PackageReference Include="Synology.Api.Client" Version="0.3.93" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.0" />
-    <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.0" />
-    <PackageReference Include="TorBox.NET" Version="1.6.0" />
+    <PackageReference Include="SharpCompress" Version="[0.42.1]" />
+    <PackageReference Include="Synology.Api.Client" Version="[0.3.93]" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions" Version="22.1.1" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.1.1" />
+    <PackageReference Include="TorBox.NET" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>