tedkulp/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-25 22:46:31 -04:00
Code Issues Projects Releases Wiki Activity

New: Async HttpClient

Browse Source
This commit is contained in:
Bogdan
2023-07-16 21:07:31 +03:00
committed by Mark McDowall
parent 78593f428a
commit 0feee19146
61 changed files with 806 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Download/TorrentClientBase.cs
+7 -6
View File
@@ -1,5 +1,6 @@
using System;
using System.Net;
using System.Threading.Tasks;
using MonoTorrent;
using NLog;
using NzbDrone.Common.Disk;
@@ -41,7 +42,7 @@ namespace NzbDrone.Core.Download
protected abstract string AddFromMagnetLink(RemoteEpisode remoteEpisode, string hash, string magnetLink);
protected abstract string AddFromTorrentFile(RemoteEpisode remoteEpisode, string hash, string filename, byte[] fileContent);
public override string Download(RemoteEpisode remoteEpisode, IIndexer indexer)
public override async Task<string> Download(RemoteEpisode remoteEpisode, IIndexer indexer)
{
var torrentInfo = remoteEpisode.Release as TorrentInfo;
@@ -68,7 +69,7 @@ namespace NzbDrone.Core.Download
{
try
{
return DownloadFromWebUrl(remoteEpisode, indexer, torrentUrl);
return await DownloadFromWebUrl(remoteEpisode, indexer, torrentUrl);
}
catch (Exception ex)
{
@@ -114,14 +115,14 @@ namespace NzbDrone.Core.Download
if (torrentUrl.IsNotNullOrWhiteSpace())
{
return DownloadFromWebUrl(remoteEpisode, indexer, torrentUrl);
return await DownloadFromWebUrl(remoteEpisode, indexer, torrentUrl);
}
}
return null;
}
private string DownloadFromWebUrl(RemoteEpisode remoteEpisode, IIndexer indexer, string torrentUrl)
private async Task<string> DownloadFromWebUrl(RemoteEpisode remoteEpisode, IIndexer indexer, string torrentUrl)
{
byte[] torrentFile = null;
@@ -132,7 +133,7 @@ namespace NzbDrone.Core.Download
request.Headers.Accept = "application/x-bittorrent";
request.AllowAutoRedirect = false;
var response = _httpClient.Get(request);
var response = await _httpClient.GetAsync(request);
if (response.StatusCode == HttpStatusCode.MovedPermanently ||
response.StatusCode == HttpStatusCode.Found ||
@@ -151,7 +152,7 @@ namespace NzbDrone.Core.Download
request.Url += new HttpUri(locationHeader);
return DownloadFromWebUrl(remoteEpisode, indexer, request.Url.ToString());
return await DownloadFromWebUrl(remoteEpisode, indexer, request.Url.ToString());
}
throw new WebException("Remote website tried to redirect without providing a location.");