Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed TorrentBlackhole failing fatally on magnet link instead of falling back to torrent url.

This commit is contained in:
Taloth Saldono 2015-03-15 01:49:11 +01:00
parent 36ac4f0a8d
commit a3873634b0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Common/Http/HttpClient.cs
View File

@ -115,7 +115,7 @@ namespace NzbDrone.Common.Http
response.StatusCode == HttpStatusCode.MovedPermanently || response.StatusCode == HttpStatusCode.MovedPermanently ||
response.StatusCode == HttpStatusCode.Found)) response.StatusCode == HttpStatusCode.Found))
{ {
throw new Exception("Server requested a redirect to [" + response.Headers["Location"] + "]. Update the request URL to avoid this redirect."); _logger.Error("Server requested a redirect to [" + response.Headers["Location"] + "]. Update the request URL to avoid this redirect.");
} }
if (!request.SuppressHttpError && response.HasHttpError) if (!request.SuppressHttpError && response.HasHttpError)

7
src/NzbDrone.Core/Download/TorrentClientBase.cs
View File

@ -69,9 +69,16 @@ namespace NzbDrone.Core.Download
String hash = null; String hash = null;
if (magnetUrl.IsNotNullOrWhiteSpace()) if (magnetUrl.IsNotNullOrWhiteSpace())
{
try
{ {
hash = DownloadFromMagnetUrl(remoteEpisode, magnetUrl); hash = DownloadFromMagnetUrl(remoteEpisode, magnetUrl);
} }
catch (NotSupportedException ex)
{
_logger.Debug("Magnet not supported by download client, trying torrent. ({0})", ex.Message);
}
}
if (hash == null && !torrentUrl.IsNullOrWhiteSpace()) if (hash == null && !torrentUrl.IsNullOrWhiteSpace())
{ {