danvics/rdt-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored TorrentClientKind to Provider. Upgrade Downloader.NET

Browse source
This commit is contained in:
Roger Far 2025-02-12 20:24:22 -07:00
parent 780d0e5118
commit f58b7d3e72
9 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/RdtClient.Data/Models/Data/Torrent.cs
View file

@ -44,7 +44,7 @@ public class Torrent
[InverseProperty("Torrent")] [InverseProperty("Torrent")]
public IList<Download> Downloads { get; set; } = []; public IList<Download> Downloads { get; set; } = [];
public TorrentClientKind? ClientKind { get; set; } public Provider? ClientKind { get; set; }
public String? RdId { get; set; } public String? RdId { get; set; }
public String? RdName { get; set; } public String? RdName { get; set; }
public Int64? RdSize { get; set; } public Int64? RdSize { get; set; }
@ -93,12 +93,4 @@ public class Torrent
return DownloadManualFiles.Split(","); return DownloadManualFiles.Split(",");
} }
} }
public enum TorrentClientKind
{
AllDebrid,
Premiumize,
RealDebrid,
TorBox
}
} }

2
server/RdtClient.Service/RdtClient.Service.csproj
View file

@ -12,7 +12,7 @@
<PackageReference Include="AllDebrid.NET" Version="1.0.16" /> <PackageReference Include="AllDebrid.NET" Version="1.0.16" />
<PackageReference Include="Aria2.NET" Version="1.0.5" /> <PackageReference Include="Aria2.NET" Version="1.0.5" />
<PackageReference Include="Downloader" Version="3.3.3" /> <PackageReference Include="Downloader" Version="3.3.3" />
<PackageReference Include="Downloader.NET" Version="1.0.12" /> <PackageReference Include="Downloader.NET" Version="1.0.13" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.2" /> <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" /> <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
<PackageReference Include="MonoTorrent" Version="3.0.2" /> <PackageReference Include="MonoTorrent" Version="3.0.2" />

5
server/RdtClient.Service/Services/DownloadClient.cs
View file

@ -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.Helpers;
using RdtClient.Service.Services.Downloaders; using RdtClient.Service.Services.Downloaders;
using RdtClient.Service.Services.TorrentClients; 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 filePath = DownloadHelper.GetDownloadPath(destinationPath, torrent, download);
var downloadPath = DownloadHelper.GetDownloadPath(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); downloadPath = AllDebridTorrentClient.GetSymlinkPath(torrent, download);
} }

6
server/RdtClient.Service/Services/Downloaders/SymlinkDownloader.cs
View file

@ -1,10 +1,10 @@
using RdtClient.Data.Models.Data; using RdtClient.Data.Enums;
using RdtClient.Service.Helpers; using RdtClient.Service.Helpers;
using Serilog; using Serilog;
namespace RdtClient.Service.Services.Downloaders; 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<DownloadCompleteEventArgs>? DownloadComplete; public event EventHandler<DownloadCompleteEventArgs>? DownloadComplete;
public event EventHandler<DownloadProgressEventArgs>? DownloadProgress; public event EventHandler<DownloadProgressEventArgs>? DownloadProgress;
@ -62,7 +62,7 @@ public class SymlinkDownloader(String uri, String destinationPath, String path,
var shouldSearch = true; var shouldSearch = true;
// When resolving symlinks for AllDebrid, we know the exact file path, so we can skip the search. // 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); var potentialFilePath = Path.Combine(rcloneMountPath, path);

2
server/RdtClient.Service/Services/QBittorrent.cs
View file

@ -209,7 +209,7 @@ public class QBittorrent(ILogger<QBittorrent> logger, Settings settings, Authent
if (!String.IsNullOrWhiteSpace(torrent.RdName)) if (!String.IsNullOrWhiteSpace(torrent.RdName))
{ {
// Alldebrid stores single file torrents at the root folder. // 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); torrentPath = Path.Combine(downloadPath, torrent.Files[0].Path);
} else } else

2
server/RdtClient.Service/Services/TorrentClients/AllDebridTorrentClient.cs
View file

@ -196,7 +196,7 @@ public class AllDebridTorrentClient(ILogger<AllDebridTorrentClient> logger, IHtt
torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files); torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files);
} }
torrent.ClientKind = Torrent.TorrentClientKind.AllDebrid; torrent.ClientKind = Provider.AllDebrid;
torrent.RdHost = torrentClientTorrent.Host; torrent.RdHost = torrentClientTorrent.Host;
torrent.RdSplit = torrentClientTorrent.Split; torrent.RdSplit = torrentClientTorrent.Split;
torrent.RdProgress = torrentClientTorrent.Progress; torrent.RdProgress = torrentClientTorrent.Progress;

2
server/RdtClient.Service/Services/TorrentClients/PremiumizeTorrentClient.cs
View file

@ -162,7 +162,7 @@ public class PremiumizeTorrentClient(ILogger<PremiumizeTorrentClient> logger, IH
torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files); torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files);
} }
torrent.ClientKind = Torrent.TorrentClientKind.Premiumize; torrent.ClientKind = Provider.Premiumize;
torrent.RdHost = torrentClientTorrent.Host; torrent.RdHost = torrentClientTorrent.Host;
torrent.RdSplit = torrentClientTorrent.Split; torrent.RdSplit = torrentClientTorrent.Split;
torrent.RdProgress = torrentClientTorrent.Progress; torrent.RdProgress = torrentClientTorrent.Progress;

2
server/RdtClient.Service/Services/TorrentClients/RealDebridTorrentClient.cs
View file

@ -295,7 +295,7 @@ public class RealDebridTorrentClient(ILogger<RealDebridTorrentClient> logger, IH
torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files); torrent.RdFiles = JsonConvert.SerializeObject(torrentClientTorrent.Files);
} }
torrent.ClientKind = Data.Models.Data.Torrent.TorrentClientKind.RealDebrid; torrent.ClientKind = Provider.RealDebrid;
torrent.RdHost = torrentClientTorrent.Host; torrent.RdHost = torrentClientTorrent.Host;
torrent.RdSplit = torrentClientTorrent.Split; torrent.RdSplit = torrentClientTorrent.Split;
torrent.RdProgress = torrentClientTorrent.Progress; torrent.RdProgress = torrentClientTorrent.Progress;

2
server/RdtClient.Service/Services/TorrentClients/TorBoxTorrentClient.cs
View file

@ -230,7 +230,7 @@ public class TorBoxTorrentClient(ILogger<TorBoxTorrentClient> logger, IHttpClien
torrent.RdFiles = JsonConvert.SerializeObject(rdTorrent.Files); torrent.RdFiles = JsonConvert.SerializeObject(rdTorrent.Files);
} }
torrent.ClientKind = Torrent.TorrentClientKind.TorBox; torrent.ClientKind = Provider.TorBox;
torrent.RdHost = rdTorrent.Host; torrent.RdHost = rdTorrent.Host;
torrent.RdSplit = rdTorrent.Split; torrent.RdSplit = rdTorrent.Split;
torrent.RdProgress = rdTorrent.Progress; torrent.RdProgress = rdTorrent.Progress;