mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Download mediacover using configured proxy. 

closes #3283
This commit is contained in:
Taloth Saldono 2019-08-30 23:36:30 +02:00
parent e96d05149c
commit b0415299ca
4 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NzbDrone.Common.Test/Http/HttpClientFixture.cs
View File

@ -271,6 +271,18 @@ namespace NzbDrone.Common.Test.Http
response.Resource.Headers[header].ToString().Should().Be(value);
}
[Test]
public void should_download_file()
{
var file = GetTempFilePath();
var url = "https://sonarr.tv/img/slider/seriesdetails.png";
Subject.DownloadFile(url, file);
File.Exists(file).Should().BeTrue();
}
[Test]
public void should_not_download_file_with_error()
{

32
src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs
View File

@ -33,7 +33,7 @@ namespace NzbDrone.Common.Http.Dispatchers
{
var webRequest = (HttpWebRequest)WebRequest.Create((Uri)request.Url);
if (PlatformInfo.IsMono)
if (PlatformInfo.IsMono && request.ResponseStream == null)
{
// On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
webRequest.AutomaticDecompression = DecompressionMethods.None;
@ -121,19 +121,27 @@ namespace NzbDrone.Common.Http.Dispatchers
{
try
{
data = responseStream.ToBytes();
if (PlatformInfo.IsMono && httpWebResponse.ContentEncoding == "gzip")
if (request.ResponseStream != null)
{
using (var compressedStream = new MemoryStream(data))
using (var gzip = new GZipStream(compressedStream, CompressionMode.Decompress))
using (var decompressedStream = new MemoryStream())
{
gzip.CopyTo(decompressedStream);
data = decompressedStream.ToArray();
}
// A target ResponseStream was specified, write to that instead.
responseStream.CopyTo(request.ResponseStream);
}
else
{
data = responseStream.ToBytes();
httpWebResponse.Headers.Remove("Content-Encoding");
if (PlatformInfo.IsMono && httpWebResponse.ContentEncoding == "gzip")
{
using (var compressedStream = new MemoryStream(data))
using (var gzip = new GZipStream(compressedStream, CompressionMode.Decompress))
using (var decompressedStream = new MemoryStream())
{
gzip.CopyTo(decompressedStream);
data = decompressedStream.ToArray();
}
httpWebResponse.Headers.Remove("Content-Encoding");
}
}
}
catch (Exception ex)

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

@ -131,7 +131,7 @@ namespace NzbDrone.Common.Http
response = interceptor.PostResponse(response);
}
if (request.LogResponseContent)
if (request.LogResponseContent && response.ResponseData != null)
{
_logger.Trace("Response content ({0} bytes): {1}", response.ResponseData.Length, response.Content);
}
@ -240,9 +240,12 @@ namespace NzbDrone.Common.Http
_logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
var stopWatch = Stopwatch.StartNew();
var webClient = new GZipWebClient();
webClient.Headers.Add(HttpRequestHeader.UserAgent, _userAgentBuilder.GetUserAgent());
webClient.DownloadFile(url, fileName);
using (var fileStream = new FileStream(fileName, FileMode.Create, FileAccess.ReadWrite))
{
var request = new HttpRequest(url);
request.ResponseStream = fileStream;
var response = Get(request);
}
stopWatch.Stop();
_logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
}

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

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Extensions;
@ -43,6 +44,7 @@ namespace NzbDrone.Common.Http
public bool StoreResponseCookie { get; set; }
public TimeSpan RequestTimeout { get; set; }
public TimeSpan RateLimit { get; set; }
public Stream ResponseStream { get; set; }
public override string ToString()
{