Bug fix for the Unity Web Request HTTP Service

Auros · Sep 5, 2023 · 5e4268e · 5e4268e
1 parent 9e775ef
commit 5e4268e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/SiraUtil/Web/Implementations/UWRHttpService.cs b/SiraUtil/Web/Implementations/UWRHttpService.cs
@@ -24,34 +24,23 @@ public string? Token
                         Headers.Remove("Authorization");
 
                 if (value is not null)
-                    if (Headers.ContainsKey("Authorization"))
-                        Headers["Authorization"] = $"Bearer {value}";
-                    else
-                        Headers.Add("Authorization", $"Bearer {value}");
+                    Headers["Authorization"] = $"Bearer {value}";
             }
         }
 
         public string? BaseURL { get; set; }
 
         public string? UserAgent
         {
-            get
-            {
-                if (Headers.TryGetValue("User-Agent", out string value))
-                    return value;
-                else return null;
-            }
+            get => Headers.TryGetValue("User-Agent", out var value) ? value : null;
             set
             {
                 if (value is null)
                     if (Headers.ContainsKey("User-Agent"))
                         Headers.Remove("User-Agent");
 
                 if (value is not null)
-                    if (Headers.ContainsKey("User-Agent"))
-                        Headers["User-Agent"] = value;
-                    else
-                        Headers.Add("User-Agent", value);
+                    Headers["User-Agent"] = value;
             }
         }
 
@@ -82,26 +71,25 @@ public Task<IHttpResponse> DeleteAsync(string url, CancellationToken? cancellati
 
         public async Task<IHttpResponse> SendAsync(HTTPMethod method, string url, string? body = null, IDictionary<string, string>? withHeaders = null, IProgress<float>? downloadProgress = null, CancellationToken? cancellationToken = null)
         {
-            if (body != null)
+            if (body is not null)
             {
-                if (withHeaders == null)
-                    withHeaders = new Dictionary<string, string>();
+                withHeaders ??= new Dictionary<string, string>();
                 withHeaders.Add("Content-Type", "application/json");
             }
-            return await SendRawAsync(method, url, Encoding.UTF8.GetBytes(body), withHeaders, downloadProgress, cancellationToken);
+            return await SendRawAsync(method, url, body is not null ? Encoding.UTF8.GetBytes(body) : null, withHeaders, downloadProgress, cancellationToken);
         }
 
         public async Task<IHttpResponse> SendRawAsync(HTTPMethod method, string url, byte[]? body = null, IDictionary<string, string>? withHeaders = null, IProgress<float>? downloadProgress = null, CancellationToken? cancellationToken = null)
         {
             // I HATE UNITY I HATE UNITY I HATE UNITY
             var response = await await UnityMainThreadTaskScheduler.Factory.StartNew(async () =>
             {
-                string newURL = url;
+                var newURL = url;
                 if (BaseURL != null)
                     newURL = Path.Combine(BaseURL, url);
                 DownloadHandler? dHandler = new DownloadHandlerBuffer();
 
-                HTTPMethod originalMethod = method;
+                var originalMethod = method;
                 if (method == HTTPMethod.POST && body != null)
                     method = HTTPMethod.PUT;
 
@@ -119,28 +107,28 @@ public async Task<IHttpResponse> SendRawAsync(HTTPMethod method, string url, byt
                 if (body != null && originalMethod == HTTPMethod.POST && method == HTTPMethod.PUT)
                     request.method = originalMethod.ToString();
 
-                float _lastProgress = -1f;
+                var lastProgress = -1f;
                 AsyncOperation asyncOp = request.SendWebRequest();
                 while (!asyncOp.isDone)
                 {
-                    if (cancellationToken.HasValue && cancellationToken.Value.IsCancellationRequested)
+                    if (cancellationToken is { IsCancellationRequested: true })
                     {
                         request.Abort();
                         break;
                     }
                     if (downloadProgress is not null && dHandler is not null)
                     {
-                        float currentProgress = asyncOp.progress;
-                        if (_lastProgress != currentProgress)
+                        var currentProgress = asyncOp.progress;
+                        if (Math.Abs(lastProgress - currentProgress) > 0.001f)
                         {
                             downloadProgress.Report(currentProgress);
-                            _lastProgress = currentProgress;
+                            lastProgress = currentProgress;
                         }
                     }
                     await Task.Delay(10);
                 }
                 downloadProgress?.Report(1f);
-                bool successful = request.isDone && request.result == UnityWebRequest.Result.Success;
+                var successful = request is { isDone: true, result: UnityWebRequest.Result.Success };
                 return new UnityWebRequestHttpResponse(request, successful);
             });
             return response;

diff --git a/SiraUtil/manifest.json b/SiraUtil/manifest.json
@@ -3,7 +3,7 @@
   "id": "SiraUtil",
   "name": "SiraUtil",
   "author": "Auros",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "icon": "SiraUtil.Resources.logo.png",
   "description": "A powerful utility mod which provides more tools to Beat Saber modders.",
   "gameVersion": "1.31.1",