sarsoo/Spotify.NET
1
0
Fork 0
mirror of https://github.com/Sarsoo/Spotify.NET.git synced 2024-12-24 06:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Status Code to models

Browse Source
This commit is contained in:
Jonas Dellinger 2017-05-31 18:17:07 +02:00
parent 3184d5569b
commit 1c6f317dda
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SpotifyAPI/Web/Models/BasicModel.cs
View File

@ -9,14 +9,16 @@ namespace SpotifyAPI.Web.Models
[JsonProperty("error")] [JsonProperty("error")]
public Error Error { get; set; } public Error Error { get; set; }
private WebHeaderCollection _headers; private ResponseInfo _info;
public bool HasError() => Error != null; public bool HasError() => Error != null;
internal void AddResponseInfo(ResponseInfo info) => _headers = info.Headers; internal void AddResponseInfo(ResponseInfo info) => _info = info;
public string Header(string key) => _headers?.Get(key); public string Header(string key) => _info.Headers?.Get(key);
public WebHeaderCollection Headers() => _headers; public WebHeaderCollection Headers() => _info.Headers;
public HttpStatusCode StatusCode() => _info.StatusCode;
} }
} }

2
SpotifyAPI/Web/Models/ResponseInfo.cs
View File

@ -6,6 +6,8 @@ namespace SpotifyAPI.Web.Models
{ {
public WebHeaderCollection Headers { get; set; } public WebHeaderCollection Headers { get; set; }
public HttpStatusCode StatusCode { get; set; }
public static readonly ResponseInfo Empty = new ResponseInfo(); public static readonly ResponseInfo Empty = new ResponseInfo();
} }
} }

8
SpotifyAPI/Web/SpotifyWebClient.cs
View File

@ -43,8 +43,9 @@ namespace SpotifyAPI.Web
} }
using (HttpResponseMessage response = Task.Run(() => client.GetAsync(url)).Result) using (HttpResponseMessage response = Task.Run(() => client.GetAsync(url)).Result)
{ {
return new Tuple<ResponseInfo, byte[]>(new ResponseInfo() return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
{ {
StatusCode = response.StatusCode,
Headers = ConvertHeaders(response.Headers) Headers = ConvertHeaders(response.Headers)
}, Task.Run(() => response.Content.ReadAsByteArrayAsync()).Result); }, Task.Run(() => response.Content.ReadAsByteArrayAsync()).Result);
} }
@ -64,8 +65,9 @@ namespace SpotifyAPI.Web
} }
using (HttpResponseMessage response = await client.GetAsync(url).ConfigureAwait(false)) using (HttpResponseMessage response = await client.GetAsync(url).ConfigureAwait(false))
{ {
return new Tuple<ResponseInfo, byte[]>(new ResponseInfo() return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
{ {
StatusCode = response.StatusCode,
Headers = ConvertHeaders(response.Headers) Headers = ConvertHeaders(response.Headers)
}, await response.Content.ReadAsByteArrayAsync()); }, await response.Content.ReadAsByteArrayAsync());
} }
@ -116,6 +118,7 @@ namespace SpotifyAPI.Web
{ {
return new Tuple<ResponseInfo, byte[]>(new ResponseInfo return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
{ {
StatusCode = response.StatusCode,
Headers = ConvertHeaders(response.Headers) Headers = ConvertHeaders(response.Headers)
}, Task.Run(() => response.Content.ReadAsByteArrayAsync()).Result); }, Task.Run(() => response.Content.ReadAsByteArrayAsync()).Result);
} }
@ -142,6 +145,7 @@ namespace SpotifyAPI.Web
{ {
return new Tuple<ResponseInfo, byte[]>(new ResponseInfo return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
{ {
StatusCode = response.StatusCode,
Headers = ConvertHeaders(response.Headers) Headers = ConvertHeaders(response.Headers)
}, await response.Content.ReadAsByteArrayAsync()); }, await response.Content.ReadAsByteArrayAsync());
} }