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 42e16a4..483537e 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 @@ -66,7 +66,7 @@

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. + to add files to your debrid provider but not download them to the host.

@@ -132,7 +132,7 @@
- +

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

@@ -188,7 +188,7 @@

- These files are available for immediate download from Real-Debrid.
+ These files are available for immediate download from your debrid provider.
It is possible that there are more files in the torrent, which are not shown here.

diff --git a/client/src/app/auth.service.ts b/client/src/app/auth.service.ts index 47e5b76..01f9046 100644 --- a/client/src/app/auth.service.ts +++ b/client/src/app/auth.service.ts @@ -20,7 +20,7 @@ export class AuthService { }); } - public setupProvider(provider: string, token: string): Observable { + public setupProvider(provider: number, token: string): Observable { return this.http.post(`${this.baseHref}Api/Authentication/SetupProvider`, { provider, token, diff --git a/client/src/app/profile/profile.component.html b/client/src/app/profile/profile.component.html index 3ac97f9..1464759 100644 --- a/client/src/app/profile/profile.component.html +++ b/client/src/app/profile/profile.component.html @@ -1,7 +1,7 @@
- +

This is the username you use to login Real-Debrid Client. Only change this if you want to change the username. @@ -10,7 +10,7 @@

- +

This is the password you use to login Real-Debrid Client. Only change this if you want to change the password. diff --git a/client/src/app/settings/settings.component.html b/client/src/app/settings/settings.component.html index 0128937..e10d21b 100644 --- a/client/src/app/settings/settings.component.html +++ b/client/src/app/settings/settings.component.html @@ -19,7 +19,7 @@ }}

- +
diff --git a/client/src/app/setup/setup.component.html b/client/src/app/setup/setup.component.html index 29ebff0..3de49e5 100644 --- a/client/src/app/setup/setup.component.html +++ b/client/src/app/setup/setup.component.html @@ -62,9 +62,9 @@
@@ -73,19 +73,19 @@
-

+

You can find your API key here: https://real-debrid.com/apitoken.

-

+

You can find your API key here: https://alldebrid.com/apikeys/.

-

+

You can find your API key here: https://www.premiumize.me/account

- +

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

diff --git a/client/src/app/torrent/torrent.component.html b/client/src/app/torrent/torrent.component.html index bc80910..83a51de 100644 --- a/client/src/app/torrent/torrent.component.html +++ b/client/src/app/torrent/torrent.component.html @@ -508,7 +508,7 @@
- +

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

diff --git a/server/RdtClient.Data/Data/TorrentData.cs b/server/RdtClient.Data/Data/TorrentData.cs index 510825f..6b325eb 100644 --- a/server/RdtClient.Data/Data/TorrentData.cs +++ b/server/RdtClient.Data/Data/TorrentData.cs @@ -76,7 +76,7 @@ public class TorrentData return dbTorrent; } - public async Task Add(String realDebridId, + public async Task Add(String rdId, String hash, String? fileOrMagnetContents, Boolean isFile, @@ -87,7 +87,7 @@ public class TorrentData { TorrentId = Guid.NewGuid(), Added = DateTimeOffset.UtcNow, - RdId = realDebridId, + RdId = rdId, Hash = hash.ToLower(), Category = torrent.Category, HostDownloadAction = torrent.HostDownloadAction, diff --git a/server/RdtClient.Data/Models/Internal/DbSettings.cs b/server/RdtClient.Data/Models/Internal/DbSettings.cs index 01bf906..f0bda9b 100644 --- a/server/RdtClient.Data/Models/Internal/DbSettings.cs +++ b/server/RdtClient.Data/Models/Internal/DbSettings.cs @@ -145,11 +145,11 @@ or public String ApiKey { get; set; } = ""; [DisplayName("Automatically import and process torrents added to provider")] - [Description("When selected, import downloads that are not added through RealDebridClient but have been directly added to Real-Debrid, AllDebrid or Premiumize.")] + [Description("When selected, import downloads that are not added through RealDebridClient but have been directly added to your debrid provider.")] public Boolean AutoImport { get; set; } = false; [DisplayName("Automatically delete downloads removed from provider")] - [Description("When selected, cancel and delete downloads that have been removed from Real-Debrid, AllDebrid or Premiumize.")] + [Description("When selected, cancel and delete downloads that have been removed from your debrid provider.")] public Boolean AutoDelete { get; set; } = false; [DisplayName("Connection Timeout")] @@ -199,7 +199,7 @@ public class DbSettingsWatch public class DbSettingsDefaultsWithDownload : DbSettingsDefaultsWithCategory { [DisplayName("Post Torrent Download Action")] - [Description("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.")] + [Description("When a torrent is finished downloading on your debrid 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.")] public TorrentHostDownloadAction HostDownloadAction { get; set; } } diff --git a/server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs b/server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs index f3517f1..773c27c 100644 --- a/server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs +++ b/server/RdtClient.Service/BackgroundServices/ProviderUpdater.cs @@ -38,7 +38,7 @@ public class ProviderUpdater : BackgroundService if (_nextUpdate < DateTime.UtcNow && ((torrents.Count > 0 && !Settings.Get.Provider.AutoImport) || Settings.Get.Provider.AutoImport)) { - _logger.LogDebug($"Updating torrent info from Real-Debrid"); + _logger.LogDebug($"Updating torrent info from debrid provider"); var updateTime = Settings.Get.Provider.CheckInterval * 3; @@ -61,7 +61,7 @@ public class ProviderUpdater : BackgroundService await torrentService.UpdateRdData(); - _logger.LogDebug($"Finished updating torrent info from Real-Debrid, next update in {updateTime} seconds"); + _logger.LogDebug($"Finished updating torrent info from debrid provider, next update in {updateTime} seconds"); } } catch (Exception ex) diff --git a/server/RdtClient.Service/Services/QBittorrent.cs b/server/RdtClient.Service/Services/QBittorrent.cs index a1ceb2e..5f48116 100644 --- a/server/RdtClient.Service/Services/QBittorrent.cs +++ b/server/RdtClient.Service/Services/QBittorrent.cs @@ -424,12 +424,12 @@ public class QBittorrent switch (Settings.Get.Integrations.Default.FinishedAction) { case TorrentFinishedAction.RemoveAllTorrents: - _logger.LogDebug("Removing torrents from Real-Debrid and Real-Debrid Client, no files"); + _logger.LogDebug("Removing torrents from debrid provider and RDT-Client, no files"); await _torrents.Delete(torrent.TorrentId, true, true, false); break; case TorrentFinishedAction.RemoveRealDebrid: - _logger.LogDebug("Removing torrents from Real-Debrid, no files"); + _logger.LogDebug("Removing torrents from debrid provider, no files"); await _torrents.Delete(torrent.TorrentId, false, true, false); break; diff --git a/server/RdtClient.Service/Services/TorrentRunner.cs b/server/RdtClient.Service/Services/TorrentRunner.cs index 5e09b11..edec4c5 100644 --- a/server/RdtClient.Service/Services/TorrentRunner.cs +++ b/server/RdtClient.Service/Services/TorrentRunner.cs @@ -468,7 +468,7 @@ public class TorrentRunner Log("Processing", torrent); - // If torrent is erroring out on the Real-Debrid side. + // If torrent is erroring out on the debrid side. if (torrent.RdStatus == TorrentStatus.Error) { Log($"Torrent reported an error: {torrent.RdStatusRaw}", torrent); @@ -481,7 +481,7 @@ public class TorrentRunner continue; } - // Real-Debrid is waiting for file selection, select which files to download. + // Debrid provider is waiting for file selection, select which files to download. if ((torrent.RdStatus == TorrentStatus.WaitingForFileSelection || torrent.RdStatus == TorrentStatus.Finished) && torrent.FilesSelected == null && torrent.Downloads.Count == 0) @@ -493,10 +493,10 @@ public class TorrentRunner await _torrents.UpdateFilesSelected(torrent.TorrentId, DateTime.UtcNow); } - // Real-Debrid finished downloading the torrent, process the file to host. + // Debrid provider finished downloading the torrent, process the file to host. if (torrent.RdStatus == TorrentStatus.Finished) { - // The files are selected but there are no downloads yet, check if Real-Debrid has generated links yet. + // The files are selected but there are no downloads yet, check if debrid provider has generated links yet. if (torrent.Downloads.Count == 0 && torrent.FilesSelected != null) { Log($"Creating downloads", torrent); @@ -543,12 +543,12 @@ public class TorrentRunner switch (torrent.FinishedAction) { case TorrentFinishedAction.RemoveAllTorrents: - Log($"Removing torrents from Real-Debrid and Real-Debrid Client, no files", torrent); + Log($"Removing torrents from debrid provider and RDT-Client, no files", torrent); await _torrents.Delete(torrent.TorrentId, true, true, false); break; case TorrentFinishedAction.RemoveRealDebrid: - Log($"Removing torrents from Real-Debrid, no files", torrent); + Log($"Removing torrents from debrid provider, no files", torrent); await _torrents.Delete(torrent.TorrentId, false, true, false); break; diff --git a/server/RdtClient.Web/RdtClient.Web.csproj b/server/RdtClient.Web/RdtClient.Web.csproj index 2a012d9..174340d 100644 --- a/server/RdtClient.Web/RdtClient.Web.csproj +++ b/server/RdtClient.Web/RdtClient.Web.csproj @@ -48,5 +48,9 @@ + + + +