From f58b7d3e7237fda939202929ef4f6a2cf1c5ea8f Mon Sep 17 00:00:00 2001 From: Roger Far Date: Wed, 12 Feb 2025 20:24:22 -0700 Subject: [PATCH] Refactored TorrentClientKind to Provider. Upgrade Downloader.NET --- server/RdtClient.Data/Models/Data/Torrent.cs | 10 +--------- server/RdtClient.Service/RdtClient.Service.csproj | 2 +- server/RdtClient.Service/Services/DownloadClient.cs | 5 +++-- .../Services/Downloaders/SymlinkDownloader.cs | 6 +++--- server/RdtClient.Service/Services/QBittorrent.cs | 2 +- .../Services/TorrentClients/AllDebridTorrentClient.cs | 2 +- .../Services/TorrentClients/PremiumizeTorrentClient.cs | 2 +- .../Services/TorrentClients/RealDebridTorrentClient.cs | 2 +- .../Services/TorrentClients/TorBoxTorrentClient.cs | 2 +- 9 files changed, 13 insertions(+), 20 deletions(-) diff --git a/server/RdtClient.Data/Models/Data/Torrent.cs b/server/RdtClient.Data/Models/Data/Torrent.cs index f928e3e..57efdbf 100644 --- a/server/RdtClient.Data/Models/Data/Torrent.cs +++ b/server/RdtClient.Data/Models/Data/Torrent.cs @@ -44,7 +44,7 @@ public class Torrent [InverseProperty("Torrent")] public IList Downloads { get; set; } = []; - public TorrentClientKind? ClientKind { get; set; } + public Provider? ClientKind { get; set; } public String? RdId { get; set; } public String? RdName { get; set; } public Int64? RdSize { get; set; } @@ -93,12 +93,4 @@ public class Torrent return DownloadManualFiles.Split(","); } } - - public enum TorrentClientKind - { - AllDebrid, - Premiumize, - RealDebrid, - TorBox - } } \ No newline at end of file diff --git a/server/RdtClient.Service/RdtClient.Service.csproj b/server/RdtClient.Service/RdtClient.Service.csproj index ac3645f..8f2c179 100644 --- a/server/RdtClient.Service/RdtClient.Service.csproj +++ b/server/RdtClient.Service/RdtClient.Service.csproj @@ -12,7 +12,7 @@ - + diff --git a/server/RdtClient.Service/Services/DownloadClient.cs b/server/RdtClient.Service/Services/DownloadClient.cs index 23d0f1e..07cdbec 100644 --- a/server/RdtClient.Service/Services/DownloadClient.cs +++ b/server/RdtClient.Service/Services/DownloadClient.cs @@ -1,4 +1,5 @@ -using RdtClient.Data.Models.Data; +using RdtClient.Data.Enums; +using RdtClient.Data.Models.Data; using RdtClient.Service.Helpers; using RdtClient.Service.Services.Downloaders; using RdtClient.Service.Services.TorrentClients; @@ -40,7 +41,7 @@ public class DownloadClient(Download download, Torrent torrent, String destinati var filePath = DownloadHelper.GetDownloadPath(destinationPath, torrent, download); var downloadPath = DownloadHelper.GetDownloadPath(torrent, download); - if (torrent.ClientKind == Torrent.TorrentClientKind.AllDebrid && Type == Data.Enums.DownloadClient.Symlink) + if (torrent.ClientKind == Provider.AllDebrid && Type == Data.Enums.DownloadClient.Symlink) { downloadPath = AllDebridTorrentClient.GetSymlinkPath(torrent, download); } diff --git a/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs b/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs index 74db7c0..4ea8f79 100644 --- a/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs +++ b/server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs @@ -1,10 +1,10 @@ -using RdtClient.Data.Models.Data; +using RdtClient.Data.Enums; using RdtClient.Service.Helpers; using Serilog; namespace RdtClient.Service.Services.Downloaders; -public class SymlinkDownloader(String uri, String destinationPath, String path, Torrent.TorrentClientKind? clientKind) : IDownloader +public class SymlinkDownloader(String uri, String destinationPath, String path, Provider? clientKind) : IDownloader { public event EventHandler? DownloadComplete; public event EventHandler? DownloadProgress; @@ -62,7 +62,7 @@ public class SymlinkDownloader(String uri, String destinationPath, String path, var shouldSearch = true; // When resolving symlinks for AllDebrid, we know the exact file path, so we can skip the search. - if (clientKind == Torrent.TorrentClientKind.AllDebrid) + if (clientKind == Provider.AllDebrid) { var potentialFilePath = Path.Combine(rcloneMountPath, path); diff --git a/server/RdtClient.Service/Services/QBittorrent.cs b/server/RdtClient.Service/Services/QBittorrent.cs index d066fab..3c12685 100644 --- a/server/RdtClient.Service/Services/QBittorrent.cs +++ b/server/RdtClient.Service/Services/QBittorrent.cs @@ -209,7 +209,7 @@ public class QBittorrent(ILogger logger, Settings settings, Authent if (!String.IsNullOrWhiteSpace(torrent.RdName)) { // Alldebrid stores single file torrents at the root folder. - if (torrent.ClientKind == Torrent.TorrentClientKind.AllDebrid && torrent.Files.Count == 1) + if (torrent.ClientKind == Provider.AllDebrid && torrent.Files.Count == 1) { torrentPath = Path.Combine(downloadPath, torrent.Files[0].Path); } else diff --git a/server/RdtClient.Service/Services/TorrentClients/AllDebridTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/AllDebridTorrentClient.cs index 306da68..ed8249a 100644 --- a/server/RdtClient.Service/Services/TorrentClients/AllDebridTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/AllDebridTorrentClient.cs @@ -196,7 +196,7 @@ public class AllDebridTorrentClient(ILogger logger, IHtt torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files); } - torrent.ClientKind = Torrent.TorrentClientKind.AllDebrid; + torrent.ClientKind = Provider.AllDebrid; torrent.RdHost = torrentClientTorrent.Host; torrent.RdSplit = torrentClientTorrent.Split; torrent.RdProgress = torrentClientTorrent.Progress; diff --git a/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs index 438fe29..59da932 100644 --- a/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs @@ -162,7 +162,7 @@ public class PremiumizeTorrentClient(ILogger logger, IH torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files); } - torrent.ClientKind = Torrent.TorrentClientKind.Premiumize; + torrent.ClientKind = Provider.Premiumize; torrent.RdHost = torrentClientTorrent.Host; torrent.RdSplit = torrentClientTorrent.Split; torrent.RdProgress = torrentClientTorrent.Progress; diff --git a/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs index 29493fd..368e733 100644 --- a/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs @@ -295,7 +295,7 @@ public class RealDebridTorrentClient(ILogger logger, IH torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files); } - torrent.ClientKind = Data.Models.Data.Torrent.TorrentClientKind.RealDebrid; + torrent.ClientKind = Provider.RealDebrid; torrent.RdHost = torrentClientTorrent.Host; torrent.RdSplit = torrentClientTorrent.Split; torrent.RdProgress = torrentClientTorrent.Progress; diff --git a/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs b/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs index 45f562b..1a542f4 100644 --- a/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs +++ b/server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs @@ -230,7 +230,7 @@ public class TorBoxTorrentClient(ILogger logger, IHttpClien torrent.RdFiles = JsonConvert.SerializeObject(rdTorrent.Files); } - torrent.ClientKind = Torrent.TorrentClientKind.TorBox; + torrent.ClientKind = Provider.TorBox; torrent.RdHost = rdTorrent.Host; torrent.RdSplit = rdTorrent.Split; torrent.RdProgress = rdTorrent.Progress;