shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Follow redirects when getting torrent from KAT

Browse Source
This commit is contained in:
Mark McDowall
2014-12-13 15:56:11 -08:00
parent a066dcbc07
commit ca9c6c651f
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ namespace NzbDrone.Core.Download
String hash = null;
if (!magnetUrl.IsNullOrWhiteSpace())
if (magnetUrl.IsNotNullOrWhiteSpace())
{
hash = DownloadFromMagnetUrl(remoteEpisode, magnetUrl);
}
@@ -100,19 +100,26 @@ namespace NzbDrone.Core.Download
var response = _httpClient.Get(request);
if (response.StatusCode == HttpStatusCode.SeeOther)
if (response.StatusCode == HttpStatusCode.SeeOther || response.StatusCode == HttpStatusCode.Found)
{
var locationHeader = (string)response.Headers.GetValueOrDefault("Location", null);
if (locationHeader != null && locationHeader.StartsWith("magnet:"))
if (locationHeader != null)
{
return DownloadFromMagnetUrl(remoteEpisode, locationHeader);
if (locationHeader.StartsWith("magnet:"))
{
return DownloadFromMagnetUrl(remoteEpisode, locationHeader);
}
return DownloadFromWebUrl(remoteEpisode, locationHeader);
}
throw new WebException("Remote website tried to redirect without providing a location.");
}
torrentFile = response.ResponseData;
}
catch (WebException ex)
{
_logger.ErrorException(String.Format("Downloading torrentfile for episode '{0}' failed ({1})",
@@ -121,11 +128,8 @@ namespace NzbDrone.Core.Download
throw new ReleaseDownloadException(remoteEpisode.Release, "Downloading torrent failed", ex);
}
var filename = String.Format("{0}.torrent", FileNameBuilder.CleanFileName(remoteEpisode.Release.Title));
var hash = _torrentFileInfoReader.GetHashFromTorrentFile(torrentFile);
var actualHash = AddFromTorrentFile(remoteEpisode, hash, filename, torrentFile);
if (hash != actualHash)