mirror of
https://github.com/lidarr/lidarr.git
synced 2025-07-13 08:33:58 -07:00
Updated HttpResponse to support binary content.
This commit is contained in:
parent
56436fea69
commit
80ed203258
6 changed files with 68 additions and 26 deletions
|
@ -1,24 +1,51 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using NzbDrone.Common.Serializer;
|
||||
|
||||
namespace NzbDrone.Common.Http
|
||||
{
|
||||
public class HttpResponse
|
||||
{
|
||||
public HttpResponse(HttpRequest request, HttpHeader headers, string content, HttpStatusCode statusCode)
|
||||
public HttpResponse(HttpRequest request, HttpHeader headers, Byte[] binaryData, HttpStatusCode statusCode = HttpStatusCode.OK)
|
||||
{
|
||||
Request = request;
|
||||
Headers = headers;
|
||||
Content = content;
|
||||
ResponseData = binaryData;
|
||||
StatusCode = statusCode;
|
||||
}
|
||||
|
||||
public HttpResponse(HttpRequest request, HttpHeader headers, String content, HttpStatusCode statusCode = HttpStatusCode.OK)
|
||||
{
|
||||
Request = request;
|
||||
Headers = headers;
|
||||
ResponseData = Encoding.UTF8.GetBytes(content);
|
||||
_content = content;
|
||||
StatusCode = statusCode;
|
||||
}
|
||||
|
||||
public HttpRequest Request { get; private set; }
|
||||
public HttpHeader Headers { get; private set; }
|
||||
public HttpStatusCode StatusCode { get; private set; }
|
||||
public string Content { get; private set; }
|
||||
public Byte[] ResponseData { get; private set; }
|
||||
|
||||
private String _content;
|
||||
|
||||
public String Content
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_content == null)
|
||||
{
|
||||
_content = GetStringFromResponseData();
|
||||
}
|
||||
|
||||
return _content;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public bool HasHttpError
|
||||
{
|
||||
|
@ -40,14 +67,34 @@ namespace NzbDrone.Common.Http
|
|||
return result;
|
||||
}
|
||||
|
||||
public Stream GetStream()
|
||||
protected virtual String GetStringFromResponseData()
|
||||
{
|
||||
var stream = new MemoryStream();
|
||||
var writer = new StreamWriter(stream);
|
||||
writer.Write(Content);
|
||||
writer.Flush();
|
||||
stream.Position = 0;
|
||||
return stream;
|
||||
Encoding encoding = null;
|
||||
|
||||
if (Headers.ContentType.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
var charset = Headers.ContentType.ToLowerInvariant()
|
||||
.Split(';', '=', ' ')
|
||||
.SkipWhile(v => v != "charset")
|
||||
.Skip(1).FirstOrDefault();
|
||||
|
||||
if (charset.IsNotNullOrWhiteSpace())
|
||||
{
|
||||
encoding = Encoding.GetEncoding(charset);
|
||||
}
|
||||
}
|
||||
|
||||
if (encoding == null)
|
||||
{
|
||||
// TODO: Find encoding by Byte order mask.
|
||||
}
|
||||
|
||||
if (encoding == null)
|
||||
{
|
||||
encoding = Encoding.UTF8;
|
||||
}
|
||||
|
||||
return encoding.GetString(ResponseData);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -55,7 +102,7 @@ namespace NzbDrone.Common.Http
|
|||
public class HttpResponse<T> : HttpResponse where T : new()
|
||||
{
|
||||
public HttpResponse(HttpResponse response)
|
||||
: base(response.Request, response.Headers, response.Content, response.StatusCode)
|
||||
: base(response.Request, response.Headers, response.ResponseData, response.StatusCode)
|
||||
{
|
||||
Resource = Json.Deserialize<T>(response.Content);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue