Fix AddQuery

TheArcaneBrony · May 2, 2024 · e885d07 · e885d07
1 parent ca63a0d
commit e885d07
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/ArcaneLibs/Extensions/DictionaryExtensions.cs b/ArcaneLibs/Extensions/DictionaryExtensions.cs
@@ -54,6 +54,23 @@ public static TY GetOrCreate<TX, TY>(this IDictionary<TX, TY> dict, TX key, Func
         return value;
     }
 
+    public static TV? GetOrDefault<TK, TV>(this IDictionary<TK, TV> dict, TK key, TV? defaultValue = default) => dict.TryGetValue(key, out var value) ? value : defaultValue;
+
+    public static async Task<TV?> GetOrDefaultAsync<TK, TV>(this IDictionary<TK, TV> dict, TK key, Func<TK, Task<TV>> valueFactory, SemaphoreSlim? semaphore = null) {
+        if (semaphore is not null) await semaphore.WaitAsync();
+        if (dict.TryGetValue(key, out var value)) {
+            semaphore?.Release();
+            return value;
+        }
+
+        value = await valueFactory(key);
+        dict.TryAdd(key, value);
+        semaphore?.Release();
+        return value;
+    }
+
+    public static TV? GetOrNull<TK, TV>(this IDictionary<TK, TV> dict, TK key) => dict.TryGetValue(key, out var value) ? value : default;
+
     public static bool StartsWith<T>(this IEnumerable<T> list, IEnumerable<T> prefix) {
         var array = prefix as T[] ?? prefix.ToArray();
         var prefixLen = array.Length;

diff --git a/ArcaneLibs/Extensions/UriExtensions.cs b/ArcaneLibs/Extensions/UriExtensions.cs
@@ -4,10 +4,12 @@ namespace ArcaneLibs.Extensions;
 
 public static class UriExtensions {
     public static Uri AddQuery(this Uri uri, string name, string value) {
-        var ub = new UriBuilder(uri);
-        var qs = HttpUtility.ParseQueryString(uri.Query);
-        qs[name] = value;
-        ub.Query = qs.ToString();
-        return ub.Uri;
+        var location = uri.OriginalString.Split('?')[0];
+        var query = uri.OriginalString.Split('?').Skip(1).FirstOrDefault();
+        var newQuery = HttpUtility.ParseQueryString(query ?? "");
+        newQuery[name] = value;
+        // Console.WriteLine("OriginalString: " + uri.OriginalString);
+
+        return new Uri(location + "?" + newQuery, uri.IsAbsoluteUri ? UriKind.Absolute : UriKind.Relative);
     }
 }