update code with new language and api features

Author: 13xforever

Clients/CirrusCiClient/CirrusCi.cs

@@ -23,8 +23,7 @@ public static class CirrusCi
     static CirrusCi()
     {
         var collection = new ServiceCollection();
-        collection.AddClient(ExecutionStrategy.CacheAndNetwork)
-            .ConfigureHttpClient(c => c.BaseAddress = new("https://api.cirrus-ci.com/graphql"));
+        collection.AddClient(ExecutionStrategy.CacheAndNetwork).ConfigureHttpClient(c => c.BaseAddress = new("https://api.cirrus-ci.com/graphql"));
         ServiceProvider = collection.BuildServiceProvider();
     }
 

Clients/CompatApiClient/ApiConfig.cs

@@ -90,8 +90,8 @@ static ApiConfig()
         catch (Exception e)
         {
             Log.Fatal(e);
-            ReverseDirections = new Dictionary<string, char>();
-            ReverseReleaseTypes = new Dictionary<string, char>();
+            ReverseDirections = new();
+            ReverseReleaseTypes = new();
         }
     }
 }

Clients/CompatApiClient/Compression/CompressionMessageHandler.cs

@@ -31,8 +31,7 @@ public CompressionMessageHandler(bool isServer = false)
     protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
     {
         if (isServer
-            && request.Content?.Headers.ContentEncoding != null
-            && request.Content.Headers.ContentEncoding.FirstOrDefault() is string serverEncoding
+            && request.Content?.Headers.ContentEncoding.FirstOrDefault() is string serverEncoding
             && Compressors.FirstOrDefault(c => c.EncodingType.Equals(serverEncoding, StringComparison.OrdinalIgnoreCase)) is ICompressor serverDecompressor)
         {
             request.Content = new DecompressedContent(request.Content, serverDecompressor);

Clients/CompatApiClient/Formatters/CompatApiCommitHashConverter.cs

@@ -8,16 +8,11 @@ public sealed class CompatApiCommitHashConverter : JsonConverter<string>
 {
     public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        if (reader.TokenType == JsonTokenType.Number
-            && !reader.HasValueSequence
-            && reader.ValueSpan.Length == 1
-            && reader.ValueSpan[0] == (byte)'0')
-        {
-            _ = reader.GetInt32();
-            return null;
-        }
-
-        return reader.GetString();
+        if (reader is not { TokenType: JsonTokenType.Number, HasValueSequence: false, ValueSpan: [(byte)'0'] })
+            return reader.GetString();
+        
+        _ = reader.GetInt32();
+        return null;
     }
 
     public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)

Clients/CompatApiClient/Formatters/NamingStyles.cs

@@ -18,15 +18,8 @@ public static string CamelCase(string value)
         return value;
     }
 
-    public static string Dashed(string value)
-    {
-        return Delimitied(value, '-');
-    }
-
-    public static string Underscore(string value)
-    {
-        return Delimitied(value, '_');
-    }
+    public static string Dashed(string value) => Delimitied(value, '-');
+    public static string Underscore(string value) => Delimitied(value, '_');
 
     private static string Delimitied(string value, char separator)
     {

Clients/CompatApiClient/Utils/Statistics.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Numerics;
 
 namespace CompatApiClient.Utils;
 
 public static class Statistics
 {
     public static long Mean(this IEnumerable<long> data)
     {
-        System.Numerics.BigInteger sum = 0;
+        BigInteger sum = 0;
         var itemCount = 0;
         foreach (var value in data)
         {
@@ -22,12 +23,12 @@ public static long Mean(this IEnumerable<long> data)
 
     public static double StdDev(this IEnumerable<long> data)
     {
-        System.Numerics.BigInteger σx = 0, σx2 = 0;
+        BigInteger σx = 0, σx2 = 0;
         var n = 0;
         foreach (var value in data)
         {
             σx += value;
-            σx2 += (System.Numerics.BigInteger)value * value;
+            σx2 += (BigInteger)value * value;
             n++;
         }
         if (n == 0)

Clients/CompatApiClient/Utils/UriExtensions.cs

@@ -14,21 +14,15 @@ public static class UriExtensions
     public static NameValueCollection ParseQueryString(Uri uri)
     {
         if (!uri.IsAbsoluteUri)
-            uri = new Uri(FakeHost, uri);
+            uri = new(FakeHost, uri);
         return uri.ParseQueryString();
     }
 
     public static string? GetQueryParameter(this Uri uri, string name)
-    {
-        var parameters = ParseQueryString(uri);
-        return parameters[name];
-    }
+        => ParseQueryString(uri)[name];
 
     public static Uri AddQueryParameter(this Uri uri, string name, string value)
-    {
-        var queryValue = WebUtility.UrlEncode(name) + "=" + WebUtility.UrlEncode(value);
-        return AddQueryValue(uri, queryValue);
-    }
+        => AddQueryValue(uri, WebUtility.UrlEncode(name) + "=" + WebUtility.UrlEncode(value));
 
     public static Uri AddQueryParameters(Uri uri, IEnumerable<KeyValuePair<string, string>> parameters)
     {
@@ -105,16 +99,16 @@ private static Uri SetQueryValue(Uri uri, string value)
         if (isAbsolute)
         {
             var builder = new UriBuilder(uri) { Query = value };
-            return new Uri(builder.ToString());
+            return new(builder.ToString());
         }
         else
         {
             var startWithSlash = uri.OriginalString.StartsWith("/");
-            uri = new Uri(FakeHost, uri);
+            uri = new(FakeHost, uri);
             var builder = new UriBuilder(uri) { Query = value };
             var additionalStrip = startWithSlash ? 0 : 1;
             var newUri = builder.ToString()[(FakeHost.OriginalString.Length + additionalStrip)..];
-            return new Uri(newUri, UriKind.Relative);
+            return new(newUri, UriKind.Relative);
         }
     }
 }

Clients/CompatApiClient/Utils/Utils.cs

@@ -50,13 +50,11 @@ public static string AsStorageUnit(this int bytes)
         => AsStorageUnit((long)bytes);
 
     public static string AsStorageUnit(this long bytes)
-    {
-        if (bytes < UnderKB)
-            return $"{bytes} byte{(bytes == 1 ? "" : "s")}";
-        if (bytes < UnderMB)
-            return $"{bytes / 1024.0:0.##} KB";
-        if (bytes < UnderGB)
-            return $"{bytes / 1024.0 / 1024:0.##} MB";
-        return $"{bytes / 1024.0 / 1024 / 1024:0.##} GB";
-    }
+        => bytes switch
+        {
+            < UnderKB => $"{bytes} byte{(bytes == 1 ? "" : "s")}",
+            < UnderMB => $"{bytes / 1024.0:0.##} KB",
+            < UnderGB => $"{bytes / (1024.0 * 1024):0.##} MB",
+            _ => $"{bytes / (1024.0 * 1024 * 1024):0.##} GB"
+        };
 }

Clients/GithubClient/Client.cs

@@ -4,12 +4,13 @@
 using System.Threading.Tasks;
 using CompatApiClient;
 using Microsoft.Extensions.Caching.Memory;
+using Octokit;
 
 namespace GithubClient;
 
 public class Client
 {
-    private readonly Octokit.GitHubClient client;
+    private readonly GitHubClient client;
 
     private static readonly TimeSpan PrStatusCacheTime = TimeSpan.FromMinutes(3);
     private static readonly TimeSpan IssueStatusCacheTime = TimeSpan.FromMinutes(30);
@@ -22,26 +23,22 @@ public class Client
 
     public Client(string? githubToken)
     {
-        client = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(ApiConfig.ProductName, ApiConfig.ProductVersion));
-        if (!string.IsNullOrEmpty(githubToken))
-        {
-            client.Credentials = new Octokit.Credentials(githubToken);
-        }
+        client = new(new ProductHeaderValue(ApiConfig.ProductName, ApiConfig.ProductVersion));
+        if (githubToken is {Length: >0})
+            client.Credentials = new(githubToken);
     }
 
-    public async Task<Octokit.PullRequest?> GetPrInfoAsync(int pr, CancellationToken cancellationToken)
+    public async Task<PullRequest?> GetPrInfoAsync(int pr, CancellationToken cancellationToken)
     {
-        if (StatusesCache.TryGetValue(pr, out Octokit.PullRequest? result))
+        if (StatusesCache.TryGetValue(pr, out PullRequest? result))
         {
-            ApiConfig.Log.Debug($"Returned {nameof(Octokit.PullRequest)} for {pr} from cache");
+            ApiConfig.Log.Debug($"Returned {nameof(PullRequest)} for {pr} from cache");
             return result;
         }
 
         try
         {
-            var request = client.PullRequest.Get("RPCS3", "rpcs3", pr);
-            request.Wait(cancellationToken);
-            result = (await request.ConfigureAwait(false));
+            result = await client.PullRequest.Get("RPCS3", "rpcs3", pr).WaitAsync(cancellationToken).ConfigureAwait(false);
             UpdateRateLimitStats();
         }
         catch (Exception e)
@@ -50,102 +47,84 @@ public Client(string? githubToken)
         }
         if (result == null)
         {
-            ApiConfig.Log.Debug($"Failed to get {nameof(Octokit.PullRequest)}, returning empty result");
+            ApiConfig.Log.Debug($"Failed to get {nameof(PullRequest)}, returning empty result");
             return new(pr);
         }
 
         StatusesCache.Set(pr, result, PrStatusCacheTime);
-        ApiConfig.Log.Debug($"Cached {nameof(Octokit.PullRequest)} for {pr} for {PrStatusCacheTime}");
+        ApiConfig.Log.Debug($"Cached {nameof(PullRequest)} for {pr} for {PrStatusCacheTime}");
         return result;
     }
 
-    public async Task<Octokit.Issue?> GetIssueInfoAsync(int issue, CancellationToken cancellationToken)
+    public async Task<Issue?> GetIssueInfoAsync(int issue, CancellationToken cancellationToken)
     {
-        if (IssuesCache.TryGetValue(issue, out Octokit.Issue? result))
+        if (IssuesCache.TryGetValue(issue, out Issue? result))
         {
-            ApiConfig.Log.Debug($"Returned {nameof(Octokit.Issue)} for {issue} from cache");
+            ApiConfig.Log.Debug($"Returned {nameof(Issue)} for {issue} from cache");
             return result;
         }
 
         try
         {
-            var request = client.Issue.Get("RPCS3", "rpcs3", issue);
-            request.Wait(cancellationToken);
-            result = (await request.ConfigureAwait(false));
+            result = await client.Issue.Get("RPCS3", "rpcs3", issue).WaitAsync(cancellationToken).ConfigureAwait(false);
             UpdateRateLimitStats();
+            IssuesCache.Set(issue, result, IssueStatusCacheTime);
+            ApiConfig.Log.Debug($"Cached {nameof(Issue)} for {issue} for {IssueStatusCacheTime}");
+            return result;
         }
         catch (Exception e)
         {
             ApiConfig.Log.Error(e);
         }
-        if (result == null)
-        {
-            ApiConfig.Log.Debug($"Failed to get {nameof(Octokit.Issue)}, returning empty result");
-            return new() { };
-        }
-
-        IssuesCache.Set(issue, result, IssueStatusCacheTime);
-        ApiConfig.Log.Debug($"Cached {nameof(Octokit.Issue)} for {issue} for {IssueStatusCacheTime}");
-        return result;
+        ApiConfig.Log.Debug($"Failed to get {nameof(Issue)}, returning empty result");
+        return new();
     }
 
-    public Task<IReadOnlyList<Octokit.PullRequest>?> GetOpenPrsAsync(CancellationToken cancellationToken) => GetPrsWithStatusAsync(new Octokit.PullRequestRequest
-    {
-        State = Octokit.ItemStateFilter.Open
-    }, cancellationToken);
+    public Task<IReadOnlyList<PullRequest>?> GetOpenPrsAsync(CancellationToken cancellationToken)
+        => GetPrsWithStatusAsync(new() { State = ItemStateFilter.Open }, cancellationToken);
 
-    public Task<IReadOnlyList<Octokit.PullRequest>?> GetClosedPrsAsync(CancellationToken cancellationToken) => GetPrsWithStatusAsync(new Octokit.PullRequestRequest
+    public Task<IReadOnlyList<PullRequest>?> GetClosedPrsAsync(CancellationToken cancellationToken) => GetPrsWithStatusAsync(new()
     {
-        State = Octokit.ItemStateFilter.Closed,
-        SortProperty = Octokit.PullRequestSort.Updated,
-        SortDirection = Octokit.SortDirection.Descending
+        State = ItemStateFilter.Closed,
+        SortProperty = PullRequestSort.Updated,
+        SortDirection = SortDirection.Descending
     }, cancellationToken);
 
-    private async Task<IReadOnlyList<Octokit.PullRequest>?> GetPrsWithStatusAsync(Octokit.PullRequestRequest filter, CancellationToken cancellationToken)
+    private async Task<IReadOnlyList<PullRequest>?> GetPrsWithStatusAsync(PullRequestRequest filter, CancellationToken cancellationToken)
     {
-        var statusURI = "https://api.github.com/repos/RPCS3/rpcs3/pulls?state=" + filter.ToString();
-        if (StatusesCache.TryGetValue(statusURI, out IReadOnlyList<Octokit.PullRequest>? result))
+        var statusUri = "https://api.github.com/repos/RPCS3/rpcs3/pulls?state=" + filter;
+        if (StatusesCache.TryGetValue(statusUri, out IReadOnlyList<PullRequest>? result))
         {
             ApiConfig.Log.Debug("Returned list of opened PRs from cache");
             return result;
         }
 
         try
         {
-            var request = client.PullRequest.GetAllForRepository("RPCS3", "rpcs3", filter);
-            request.Wait(cancellationToken);
-
-            result = (await request.ConfigureAwait(false));
+            result = await client.PullRequest.GetAllForRepository("RPCS3", "rpcs3", filter).WaitAsync(cancellationToken).ConfigureAwait(false);
             UpdateRateLimitStats();
+            StatusesCache.Set(statusUri, result, PrStatusCacheTime);
+            foreach (var prInfo in result)
+                StatusesCache.Set(prInfo.Number, prInfo, PrStatusCacheTime);
+            ApiConfig.Log.Debug($"Cached list of open PRs for {PrStatusCacheTime}");
         }
         catch (Exception e)
         {
             ApiConfig.Log.Error(e);
         }
-        if (result != null)
-        {
-            StatusesCache.Set(statusURI, result, PrStatusCacheTime);
-            foreach (var prInfo in result)
-                StatusesCache.Set(prInfo.Number, prInfo, PrStatusCacheTime);
-            ApiConfig.Log.Debug($"Cached list of open PRs for {PrStatusCacheTime}");
-        }
         return result;
     }
 
     private void UpdateRateLimitStats()
     {
         var apiInfo = client.GetLastApiInfo();
         if (apiInfo == null)
-        {
             return;
-        }
 
         RateLimit = apiInfo.RateLimit.Limit;
         RateLimitRemaining = apiInfo.RateLimit.Remaining;
         RateLimitResetTime = DateTimeOffset.FromUnixTimeSeconds(apiInfo.RateLimit.ResetAsUtcEpochSeconds).UtcDateTime;
-
         if (RateLimitRemaining < 10)
             ApiConfig.Log.Warn($"Github rate limit is low: {RateLimitRemaining} out of {RateLimit}, will be reset on {RateLimitResetTime:u}");
     }
-
 }

Clients/IrdLibraryClient/IrdClient.cs

@@ -29,7 +29,7 @@ public class IrdClient
     public IrdClient()
     {
         client = HttpClientFactory.Create(new CompressionMessageHandler());
-        jsonOptions = new JsonSerializerOptions
+        jsonOptions = new()
         {
             PropertyNamingPolicy = SpecialJsonNamingPolicy.SnakeCase,
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
@@ -209,9 +209,8 @@ public async Task<List<Ird>> DownloadAsync(string productCode, string localCache
 
         var idx = html.LastIndexOf("</span>", StringComparison.Ordinal);
         var result = html[(idx + 7)..].Trim();
-        if (string.IsNullOrEmpty(result))
-            return null;
-
-        return result;
+        if (result is {Length: >0})
+            return result;
+        return null;
     }
 }