From d01cb718666fd80017c711e07b9fec42a8c743ad Mon Sep 17 00:00:00 2001 From: Roger Far Date: Fri, 5 Jan 2024 10:28:22 -0700 Subject: [PATCH] Add bulk change settings modal. --- .../torrent-table.component.html | 146 +++++++++++++++++- .../torrent-table/torrent-table.component.ts | 105 ++++++++++++- client/src/app/torrent/torrent.component.html | 23 +++ client/src/app/torrent/torrent.component.ts | 3 + server/RdtClient.Data/Data/TorrentData.cs | 1 + 5 files changed, 274 insertions(+), 4 deletions(-) diff --git a/client/src/app/torrent-table/torrent-table.component.html b/client/src/app/torrent-table/torrent-table.component.html index 3e04bad..b431d4b 100644 --- a/client/src/app/torrent-table/torrent-table.component.html +++ b/client/src/app/torrent-table/torrent-table.component.html @@ -74,6 +74,15 @@ > Retry Selected + + @@ -150,11 +159,144 @@ class="button is-success" (click)="retryOk()" [disabled]="retrying" - [ngClass]="{ 'is-loading': deleting }" + [ngClass]="{ 'is-loading': retrying }" > Retry selected - + + + + +
+
+
+
+

Change settings for selected torrents

+ +
+
+
+ +
+ +
+

+ Select which downloader is used to download this torrent from the debrid provider to your host. +

+
+
+ +
+ +
+

+ When a torrent is finished downloading on the provider, perform this action. Use this setting if you only want + to add files to Real-Debrid but not download them to the host. +

+
+
+ +
+ +
+

The category becomes a sub-folder in your main download path.

+
+
+ +
+ +
+

+ Set the priority for this torrent where 1 is the highest. When empty it will be assigned the lowest priority. +

+
+
+ +
+ +
+

When a single download fails it will retry it this many times before marking it as failed.

+
+
+ +
+ +
+

+ When a single download has failed multiple times (see setting above) or when the torrent itself received an + error it will retry the full torrent this many times before marking it failed. +

+
+
+ +
+ +
+

+ When a download has been in error for this many minutes, delete it from the provider and the client. 0 to + disable. +

+
+
+ +
+ +
+

+ The maximum lifetime of a torrent in minutes. When this time has passed, mark the torrent as error. If the + torrent is completed and has downloads, the lifetime setting will not apply. 0 to disable. +

+
+ + + + +
+ Error changing settings: {{ changeSettingsError }} +
+
+
+ +
diff --git a/client/src/app/torrent-table/torrent-table.component.ts b/client/src/app/torrent-table/torrent-table.component.ts index 3ca6eba..8adaee7 100644 --- a/client/src/app/torrent-table/torrent-table.component.ts +++ b/client/src/app/torrent-table/torrent-table.component.ts @@ -25,7 +25,23 @@ export class TorrentTableComponent implements OnInit { public retryError: string; public retrying: boolean; - constructor(private router: Router, private torrentService: TorrentService) {} + public isChangeSettingsModalActive: boolean; + public changeSettingsError: string; + public changingSettings: boolean; + + public updateSettingsDownloadClient: number; + public updateSettingsHostDownloadAction: number; + public updateSettingsCategory: string; + public updateSettingsPriority: number; + public updateSettingsDownloadRetryAttempts: number; + public updateSettingsTorrentRetryAttempts: number; + public updateSettingsDeleteOnError: number; + public updateSettingsTorrentLifetime: number; + + constructor( + private router: Router, + private torrentService: TorrentService, + ) {} ngOnInit(): void { this.torrentService.getList().subscribe( @@ -38,7 +54,7 @@ export class TorrentTableComponent implements OnInit { }, (err) => { this.error = err.error; - } + }, ); } @@ -138,4 +154,89 @@ export class TorrentTableComponent implements OnInit { }, }); } + + public changeSettingsModal(): void { + this.changeSettingsError = null; + + const selectedTorrents = this.torrents.where((m) => this.selectedTorrents.indexOf(m.torrentId) > -1); + + this.updateSettingsDownloadClient = + selectedTorrents.distinctBy((m) => m.downloadClient).count() == 1 ? selectedTorrents[0].downloadClient : null; + this.updateSettingsHostDownloadAction = + selectedTorrents.distinctBy((m) => m.hostDownloadAction).count() == 1 + ? selectedTorrents[0].hostDownloadAction + : null; + this.updateSettingsCategory = + selectedTorrents.distinctBy((m) => m.category).count() == 1 ? selectedTorrents[0].category : null; + this.updateSettingsPriority = + selectedTorrents.distinctBy((m) => m.priority).count() == 1 ? selectedTorrents[0].priority : null; + this.updateSettingsDownloadRetryAttempts = + selectedTorrents.distinctBy((m) => m.downloadRetryAttempts).count() == 1 + ? selectedTorrents[0].downloadRetryAttempts + : null; + this.updateSettingsTorrentRetryAttempts = + selectedTorrents.distinctBy((m) => m.torrentRetryAttempts).count() == 1 + ? selectedTorrents[0].torrentRetryAttempts + : null; + this.updateSettingsDeleteOnError = + selectedTorrents.distinctBy((m) => m.deleteOnError).count() == 1 ? selectedTorrents[0].deleteOnError : null; + this.updateSettingsTorrentLifetime = + selectedTorrents.distinctBy((m) => m.lifetime).count() == 1 ? selectedTorrents[0].lifetime : null; + + this.isChangeSettingsModalActive = true; + } + + public changeSettingsCancel(): void { + this.isChangeSettingsModalActive = false; + } + + public changeSettingsOk(): void { + this.changingSettings = true; + + let calls: Observable[] = []; + + const selectedTorrents = this.torrents.where((m) => this.selectedTorrents.indexOf(m.torrentId) > -1); + + selectedTorrents.forEach((torrent) => { + if (this.updateSettingsDownloadClient != null) { + torrent.downloadClient = this.updateSettingsDownloadClient; + } + if (this.updateSettingsHostDownloadAction != null) { + torrent.hostDownloadAction = this.updateSettingsHostDownloadAction; + } + if (this.updateSettingsCategory != null) { + torrent.category = this.updateSettingsCategory; + } + if (this.updateSettingsPriority != null) { + torrent.priority = this.updateSettingsPriority; + } + if (this.updateSettingsDownloadRetryAttempts != null) { + torrent.retryCount = this.updateSettingsDownloadRetryAttempts; + } + if (this.updateSettingsTorrentRetryAttempts != null) { + torrent.torrentRetryAttempts = this.updateSettingsTorrentRetryAttempts; + } + if (this.updateSettingsDeleteOnError != null) { + torrent.deleteOnError = this.updateSettingsDeleteOnError; + } + if (this.updateSettingsTorrentLifetime != null) { + torrent.lifetime = this.updateSettingsTorrentLifetime; + } + + calls.push(this.torrentService.update(torrent)); + }); + + forkJoin(calls).subscribe({ + complete: () => { + this.isChangeSettingsModalActive = false; + this.changingSettings = false; + + this.selectedTorrents = []; + }, + error: (err) => { + this.changeSettingsError = err.error; + this.changingSettings = false; + }, + }); + } } diff --git a/client/src/app/torrent/torrent.component.html b/client/src/app/torrent/torrent.component.html index 2bef09a..bc80910 100644 --- a/client/src/app/torrent/torrent.component.html +++ b/client/src/app/torrent/torrent.component.html @@ -51,6 +51,14 @@ {{ torrent.category || "(no category set)" }}
+
+ + + Internal Downloader + Aria2c + Symlink Downloader + +
@@ -469,10 +477,25 @@
+

Settings that are blank do not have the same values for each torrent. Updating a setting with a blank value will not update it.

+
+ +
+ +
+

+ Select which downloader is used to download this torrent from the debrid provider to your host. +

+
diff --git a/client/src/app/torrent/torrent.component.ts b/client/src/app/torrent/torrent.component.ts index b3109d7..a75fdfb 100644 --- a/client/src/app/torrent/torrent.component.ts +++ b/client/src/app/torrent/torrent.component.ts @@ -36,6 +36,7 @@ export class TorrentComponent implements OnInit { public isUpdateSettingsModalActive: boolean; + public updateSettingsDownloadClient: number; public updateSettingsHostDownloadAction: number; public updateSettingsCategory: string; public updateSettingsPriority: number; @@ -177,6 +178,7 @@ export class TorrentComponent implements OnInit { } public showUpdateSettingsModal(): void { + this.updateSettingsDownloadClient = this.torrent.downloadClient; this.updateSettingsHostDownloadAction = this.torrent.hostDownloadAction; this.updateSettingsCategory = this.torrent.category; this.updateSettingsPriority = this.torrent.priority; @@ -195,6 +197,7 @@ export class TorrentComponent implements OnInit { public updateSettingsOk(): void { this.updating = true; + this.torrent.downloadClient = this.updateSettingsDownloadClient; this.torrent.hostDownloadAction = this.updateSettingsHostDownloadAction; this.torrent.category = this.updateSettingsCategory; this.torrent.priority = this.updateSettingsPriority; diff --git a/server/RdtClient.Data/Data/TorrentData.cs b/server/RdtClient.Data/Data/TorrentData.cs index 6948cc6..510825f 100644 --- a/server/RdtClient.Data/Data/TorrentData.cs +++ b/server/RdtClient.Data/Data/TorrentData.cs @@ -150,6 +150,7 @@ public class TorrentData return; } + dbTorrent.DownloadClient = torrent.DownloadClient; dbTorrent.HostDownloadAction = torrent.HostDownloadAction; dbTorrent.Category = torrent.Category; dbTorrent.Priority = torrent.Priority;