Merge pull request #38 from aspriddell/add-staus-code-to-exception

use system throw for success code check
dragonfruitnetwork · Nov 19, 2020 · e8c90b3 · e8c90b3
2 parents 2f18728 + 0de41e6
commit e8c90b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/DragonFruit.Common.Data.Tests/Files/Objects/FileDownloadRequest.cs b/DragonFruit.Common.Data.Tests/Files/Objects/FileDownloadRequest.cs
@@ -6,8 +6,16 @@ namespace DragonFruit.Common.Data.Tests.Files.Objects
     /// <summary>
     /// Simple file download request with a path and a destination
     /// </summary>
-    public class FileDownloadRequest : ApiFileRequest
+    internal sealed class FileDownloadRequest : ApiFileRequest
     {
+        public FileDownloadRequest()
+        {
+            if (System.IO.File.Exists(Destination))
+            {
+                System.IO.File.Delete(Destination);
+            }
+        }
+
         public override string Path => "https://github.com/ppy/osu/archive/2020.327.0.zip";
 
         public override string Destination => System.IO.Path.Combine(System.IO.Path.GetTempPath(), "file.zip");

diff --git a/DragonFruit.Common.Data/ApiClient.cs b/DragonFruit.Common.Data/ApiClient.cs
@@ -350,10 +350,7 @@ protected T InternalPerform<T>(HttpRequestMessage request, Func<HttpResponseMess
         /// </summary>
         protected virtual T ValidateAndProcess<T>(HttpResponseMessage response, HttpRequestMessage request) where T : class
         {
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new HttpRequestException($"Response was unsuccessful ({response.StatusCode})");
-            }
+            response.EnsureSuccessStatusCode();
 
             using var stream = response.Content.ReadAsStreamAsync().Result;
             return Serializer.Deserialize<T>(stream);