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

Update RD.NET to 2.0

Browse source
This commit is contained in:
Roger Far 2021-07-20 19:15:11 -06:00
parent 553d46c68d
commit 697cd58023
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RD.NET" Version="1.0.4" />
<PackageReference Include="RD.NET" Version="2.0.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
</ItemGroup>

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

@ -9,7 +9,7 @@
<PackageReference Include="Downloader" Version="2.2.8" />
<PackageReference Include="MonoTorrent" Version="2.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RD.NET" Version="1.0.4" />
<PackageReference Include="RD.NET" Version="2.0.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Exceptions" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

23
server/RdtClient.Service/Services/Torrents.cs
View file

@ -102,7 +102,7 @@ namespace RdtClient.Service.Services
throw new Exception($"{ex.Message}, trying to parse {magnetLink}");
}
var rdTorrent = await GetRdNetClient().AddTorrentMagnetAsync(magnetLink);
var rdTorrent = await GetRdNetClient().Torrents.AddMagnetAsync(magnetLink);
await Add(rdTorrent.Id, magnet.InfoHash.ToHex(), category, downloadAction, finishedAction, downloadMinSize, downloadManualFiles, magnetLink, false);
}
@ -127,14 +127,14 @@ namespace RdtClient.Service.Services
throw new Exception($"{ex.Message}, trying to parse {fileAsBase64}");
}
var rdTorrent = await GetRdNetClient().AddTorrentFileAsync(bytes);
var rdTorrent = await GetRdNetClient().Torrents.AddFileAsync(bytes);
await Add(rdTorrent.Id, torrent.InfoHash.ToHex(), category, downloadAction, finishedAction, downloadMinSize, downloadManualFiles, fileAsBase64, true);
}
public async Task<List<TorrentInstantAvailabilityFile>> GetAvailableFiles(String hash)
{
var result = await GetRdNetClient().GetAvailableFiles(hash);
var result = await GetRdNetClient().Torrents.GetAvailableFiles(hash);
var files = result.SelectMany(m => m.Value).SelectMany(m => m.Value).SelectMany(m => m.Values);
@ -147,14 +147,14 @@ namespace RdtClient.Service.Services
{
var torrent = await GetById(torrentId);
await GetRdNetClient().SelectTorrentFilesAsync(torrent.RdId, fileIds.ToArray());
await GetRdNetClient().Torrents.SelectFilesAsync(torrent.RdId, fileIds.ToArray());
}
public async Task CheckForLinks(Guid torrentId)
{
var torrent = await GetById(torrentId);
var rdTorrent = await GetRdNetClient().GetTorrentInfoAsync(torrent.RdId);
var rdTorrent = await GetRdNetClient().Torrents.GetInfoAsync(torrent.RdId);
// Sometimes RD will give you 1 rar with all files, sometimes it will give you 1 link per file.
if (torrent.Files.Count != rdTorrent.Links.Count && rdTorrent.Links.Count != 1)
@ -202,7 +202,7 @@ namespace RdtClient.Service.Services
if (deleteRdTorrent)
{
await GetRdNetClient().DeleteTorrentAsync(torrent.RdId);
await GetRdNetClient().Torrents.DeleteAsync(torrent.RdId);
}
if (deleteLocalFiles)
@ -284,7 +284,7 @@ namespace RdtClient.Service.Services
{
var download = await _downloads.GetById(downloadId);
var unrestrictedLink = await GetRdNetClient().UnrestrictLinkAsync(download.Path);
var unrestrictedLink = await GetRdNetClient().Unrestrict.LinkAsync(download.Path);
await _downloads.UpdateUnrestrictedLink(downloadId, unrestrictedLink.Download);
@ -318,7 +318,7 @@ namespace RdtClient.Service.Services
public async Task<Profile> GetProfile()
{
var user = await GetRdNetClient().GetUserAsync();
var user = await GetRdNetClient().User.GetAsync();
var profile = new Profile
{
@ -337,7 +337,7 @@ namespace RdtClient.Service.Services
try
{
var rdTorrents = await GetRdNetClient().GetTorrentsAsync(0, 100);
var rdTorrents = await GetRdNetClient().Torrents.GetAsync(0, 100);
foreach (var rdTorrent in rdTorrents)
{
@ -484,7 +484,8 @@ namespace RdtClient.Service.Services
throw new Exception("Real-Debrid API Key not set in the settings");
}
_rdtNetClient = new RdNetClient("X245A4XAIBGVM", null, null, null, apiKey);
_rdtNetClient = new RdNetClient();
_rdtNetClient.UseApiAuthentication(apiKey);
}
return _rdtNetClient;
@ -577,7 +578,7 @@ namespace RdtClient.Service.Services
ReferenceLoopHandling = ReferenceLoopHandling.Ignore
});
var rdTorrent = await GetRdNetClient().GetTorrentInfoAsync(torrent.RdId);
var rdTorrent = await GetRdNetClient().Torrents.GetInfoAsync(torrent.RdId);
if (!String.IsNullOrWhiteSpace(rdTorrent.Filename))
{