tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-22 22:15:17 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Build download requests from indexer implementation"

Browse Source 
This reverts commit 84e0f5bfcf.
This commit is contained in:
Qstick
2023-04-30 22:50:56 -05:00
parent cc63c3f3cd
commit 8e1bf785c3
27 changed files with 95 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Download/TorrentClientBase.cs
+6 -8
View File
@@ -42,7 +42,7 @@ namespace NzbDrone.Core.Download
protected abstract string AddFromMagnetLink(RemoteMovie remoteMovie, string hash, string magnetLink);
protected abstract string AddFromTorrentFile(RemoteMovie remoteMovie, string hash, string filename, byte[] fileContent);
public override string Download(RemoteMovie remoteMovie, IIndexer indexer)
public override string Download(RemoteMovie remoteMovie)
{
var torrentInfo = remoteMovie.Release as TorrentInfo;
@@ -69,7 +69,7 @@ namespace NzbDrone.Core.Download
{
try
{
return DownloadFromWebUrl(remoteMovie, indexer, torrentUrl);
return DownloadFromWebUrl(remoteMovie, torrentUrl);
}
catch (Exception ex)
{
@@ -115,20 +115,20 @@ namespace NzbDrone.Core.Download
if (torrentUrl.IsNotNullOrWhiteSpace())
{
return DownloadFromWebUrl(remoteMovie, indexer, torrentUrl);
return DownloadFromWebUrl(remoteMovie, torrentUrl);
}
}
return null;
}
private string DownloadFromWebUrl(RemoteMovie remoteMovie, IIndexer indexer, string torrentUrl)
private string DownloadFromWebUrl(RemoteMovie remoteMovie, string torrentUrl)
{
byte[] torrentFile = null;
try
{
var request = indexer.GetDownloadRequest(torrentUrl);
var request = new HttpRequest(torrentUrl);
request.RateLimitKey = remoteMovie?.Release?.IndexerId.ToString();
request.Headers.Accept = "application/x-bittorrent";
request.AllowAutoRedirect = false;
@@ -150,9 +150,7 @@ namespace NzbDrone.Core.Download
return DownloadFromMagnetUrl(remoteMovie, locationHeader);
}
request.Url += new HttpUri(locationHeader);
return DownloadFromWebUrl(remoteMovie, indexer, request.Url.ToString());
return DownloadFromWebUrl(remoteMovie, locationHeader);
}
throw new WebException("Remote website tried to redirect without providing a location.");