From ba243d3e837a435c2e5151bcfe0a02dacc3d6c9b Mon Sep 17 00:00:00 2001
From: Roger Far <roger@versluis.ca>
Date: Fri, 5 Jan 2024 09:59:54 -0700
Subject: [PATCH] Set the general downloadclient when adding torrents through
 *rr, watchfolder.

---
 client/src/app/add-new-torrent/add-new-torrent.component.html | 2 +-
 client/src/app/add-new-torrent/add-new-torrent.component.ts   | 1 +
 client/src/app/models/torrent.model.ts                        | 1 +
 client/src/app/torrent-table/torrent-table.component.html     | 4 ++++
 .../BackgroundServices/WatchFolderChecker.cs                  | 1 +
 server/RdtClient.Service/Services/QBittorrent.cs              | 2 ++
 server/RdtClient.Service/Services/Torrents.cs                 | 1 +
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/src/app/add-new-torrent/add-new-torrent.component.html b/client/src/app/add-new-torrent/add-new-torrent.component.html
index 99bb7b4..42e16a4 100644
--- a/client/src/app/add-new-torrent/add-new-torrent.component.html
+++ b/client/src/app/add-new-torrent/add-new-torrent.component.html
@@ -45,7 +45,7 @@
     <div class="field">
       <label class="label">Downloader</label>
       <div class="control select is-fullwidth">
-        <select [(ngModel)]="downloadClient" (ngModelChange)="setFinishAction()">
+        <select [(ngModel)]="downloadClient" (ngModelChange)="setFinishAction() ">
           <option [ngValue]="0">Internal Downloader</option>
           <option [ngValue]="1">Aria2c</option>
           <option [ngValue]="2">Symlink Downloader</option>
diff --git a/client/src/app/add-new-torrent/add-new-torrent.component.ts b/client/src/app/add-new-torrent/add-new-torrent.component.ts
index 2087720..3aaad21 100644
--- a/client/src/app/add-new-torrent/add-new-torrent.component.ts
+++ b/client/src/app/add-new-torrent/add-new-torrent.component.ts
@@ -146,6 +146,7 @@ export class AddNewTorrentComponent implements OnInit {
     torrent.downloadRetryAttempts = this.downloadRetryAttempts;
     torrent.deleteOnError = this.torrentDeleteOnError;
     torrent.lifetime = this.torrentLifetime;
+    torrent.downloadClient = this.downloadClient;
 
     if (this.magnetLink) {
       this.torrentService.uploadMagnet(this.magnetLink, torrent).subscribe(
diff --git a/client/src/app/models/torrent.model.ts b/client/src/app/models/torrent.model.ts
index 4e1bd07..681343d 100644
--- a/client/src/app/models/torrent.model.ts
+++ b/client/src/app/models/torrent.model.ts
@@ -4,6 +4,7 @@ export class Torrent {
   public torrentId: string;
   public hash: string;
   public category: string;
+  public downloadClient: number;
   public hostDownloadAction: number;
   public downloadAction: number;
   public finishedAction: number;
diff --git a/client/src/app/torrent-table/torrent-table.component.html b/client/src/app/torrent-table/torrent-table.component.html
index 65459b9..3e04bad 100644
--- a/client/src/app/torrent-table/torrent-table.component.html
+++ b/client/src/app/torrent-table/torrent-table.component.html
@@ -137,6 +137,10 @@
     </header>
     <section class="modal-card-body">
       <p>Are you sure you want to retry these torrent?</p>
+      <p>
+        This action will delete all the torrent data + all local downloads. Then it will re-add the original magnet link
+        or torrent file to the debrid provider.
+      </p>
       <div class="notification is-danger is-light" *ngIf="retryError?.length > 0">
         Error retrying torrent: {{ retryError }}
       </div>
diff --git a/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs b/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs
index 1d0265d..2f29a3d 100644
--- a/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs
+++ b/server/RdtClient.Service/BackgroundServices/WatchFolderChecker.cs
@@ -88,6 +88,7 @@ public class WatchFolderChecker : BackgroundService
 
                         var torrent = new Torrent
                         {
+                            DownloadClient = Settings.Get.DownloadClient.Client,
                             Category = Settings.Get.Watch.Default.Category,
                             HostDownloadAction = Settings.Get.Watch.Default.HostDownloadAction,
                             DownloadAction = Settings.Get.Watch.Default.OnlyDownloadAvailableFiles
diff --git a/server/RdtClient.Service/Services/QBittorrent.cs b/server/RdtClient.Service/Services/QBittorrent.cs
index b28907c..a1ceb2e 100644
--- a/server/RdtClient.Service/Services/QBittorrent.cs
+++ b/server/RdtClient.Service/Services/QBittorrent.cs
@@ -456,6 +456,7 @@ public class QBittorrent
         var torrent = new Torrent
         {
             Category = category,
+            DownloadClient = Settings.Get.DownloadClient.Client,
             HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
             DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
             FinishedAction = TorrentFinishedAction.None,
@@ -477,6 +478,7 @@ public class QBittorrent
         var torrent = new Torrent
         {
             Category = category,
+            DownloadClient = Settings.Get.DownloadClient.Client,
             HostDownloadAction = Settings.Get.Integrations.Default.HostDownloadAction,
             DownloadAction = Settings.Get.Integrations.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
             FinishedAction = TorrentFinishedAction.None,
diff --git a/server/RdtClient.Service/Services/Torrents.cs b/server/RdtClient.Service/Services/Torrents.cs
index 87d485e..88193f6 100644
--- a/server/RdtClient.Service/Services/Torrents.cs
+++ b/server/RdtClient.Service/Services/Torrents.cs
@@ -405,6 +405,7 @@ public class Torrents
                     var newTorrent = new Torrent
                     {
                         Category = Settings.Get.Provider.Default.Category,
+                        DownloadClient = Settings.Get.DownloadClient.Client,
                         DownloadAction = Settings.Get.Provider.Default.OnlyDownloadAvailableFiles ? TorrentDownloadAction.DownloadAvailableFiles : TorrentDownloadAction.DownloadAll,
                         FinishedAction = Settings.Get.Provider.Default.FinishedAction,
                         DownloadMinSize = Settings.Get.Provider.Default.MinFileSize,