Added Status Code to models

JohnnyCrazy · May 31, 2017 · 1c6f317 · 1c6f317
1 parent 3184d55
commit 1c6f317
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/SpotifyAPI/Web/Models/BasicModel.cs b/SpotifyAPI/Web/Models/BasicModel.cs
@@ -9,14 +9,16 @@ public abstract class BasicModel
         [JsonProperty("error")]
         public Error Error { get; set; }
 
-        private WebHeaderCollection _headers;
+        private ResponseInfo _info;
 
         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;
     }
 }
diff --git a/SpotifyAPI/Web/Models/ResponseInfo.cs b/SpotifyAPI/Web/Models/ResponseInfo.cs
@@ -6,6 +6,8 @@ public class ResponseInfo
     {
         public WebHeaderCollection Headers { get; set; }
 
+        public HttpStatusCode StatusCode { get; set; }
+
         public static readonly ResponseInfo Empty = new ResponseInfo();
     }
 }
diff --git a/SpotifyAPI/Web/SpotifyWebClient.cs b/SpotifyAPI/Web/SpotifyWebClient.cs
@@ -43,8 +43,9 @@ public Tuple<ResponseInfo, byte[]> DownloadRaw(string url, Dictionary<string, st
                 }
                 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)
                     }, Task.Run(() => response.Content.ReadAsByteArrayAsync()).Result);
                 }
@@ -64,8 +65,9 @@ public async Task<Tuple<ResponseInfo, byte[]>> DownloadRawAsync(string url, Dict
                 }
                 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)
                     }, await response.Content.ReadAsByteArrayAsync());
                 }
@@ -116,6 +118,7 @@ public Tuple<ResponseInfo, byte[]> UploadRaw(string url, string body, string met
                 {
                     return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
                     {
+                        StatusCode = response.StatusCode,
                         Headers = ConvertHeaders(response.Headers)
                     }, Task.Run(() => response.Content.ReadAsByteArrayAsync()).Result);
                 }
@@ -142,6 +145,7 @@ public async Task<Tuple<ResponseInfo, byte[]>> UploadRawAsync(string url, string
                 {
                     return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
                     {
+                        StatusCode = response.StatusCode,
                         Headers = ConvertHeaders(response.Headers)
                     }, await response.Content.ReadAsByteArrayAsync());
                 }