performance optimization

Corona-Studio · Nov 15, 2023 · 2ba95be · 2ba95be
1 parent 06f02f9
commit 2ba95be
Show file tree

Hide file tree

Showing 23 changed files with 86 additions and 231 deletions.
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/DownloadHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/DownloadHelper.cs
@@ -269,7 +269,7 @@ public static async Task MultiPartDownloadTaskAsync(
                 headRes.EnsureSuccessStatusCode();
 
                 var responseLength = headRes.Content.Headers.ContentLength ?? 0;
-                var hasAcceptRanges = headRes.Headers.AcceptRanges.Any();
+                var hasAcceptRanges = headRes.Headers.AcceptRanges.Count != 0;
 
                 using var rangeGetMessage = new HttpRequestMessage(HttpMethod.Get, downloadFile.DownloadUri);
                 rangeGetMessage.Headers.Range = new RangeHeaderValue(0, 0);
@@ -484,7 +484,7 @@ public static async Task MultiPartDownloadTaskAsync(
             }
         }
 
-        if (exceptions.Any())
+        if (exceptions.Count > 0)
         {
             downloadFile.OnCompleted(false, new AggregateException(exceptions), 0);
             return;

diff --git a/ProjBobcat/ProjBobcat/Class/Helper/GameResourcesResolveHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/GameResourcesResolveHelper.cs
@@ -96,7 +96,7 @@ public static async IAsyncEnumerable<GameModResolvedInfo> ResolveModListAsync(IE
                         break;
                 }
 
-                if (!(model?.Any() ?? false))
+                if (model == null || model.Count == 0)
                     return null;
 
                 var authors = new HashSet<string>();
@@ -134,7 +134,7 @@ async Task<GameModResolvedInfo> GetFabricModInfo(IArchiveEntry entry)
                     var tempModel = await JsonSerializer.DeserializeAsync(stream,
                         FabricModInfoModelContext.Default.FabricModInfoModel, ct);
 
-                    var author = tempModel?.Authors?.Any() ?? false
+                    var author = tempModel?.Authors is { Length: > 0 }
                         ? string.Join(',', tempModel.Authors)
                         : null;
                     var modList = tempModel?.Depends?.Select(d => d.Key)?.ToImmutableList();

diff --git a/ProjBobcat/ProjBobcat/Class/Helper/RandomHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/RandomHelper.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Cryptography;
 
 namespace ProjBobcat.Class.Helper;
 
@@ -17,13 +16,12 @@ public static class RandomHelper
     ///     <see cref="OutOfMemoryException" /> 。
     /// </summary>
     /// <typeparam name="T">数据的类型。</typeparam>
-    /// <param name="enumerable">一个有限的 <see cref="IEnumerable{T}" /> 。</param>
-    /// <returns> <paramref name="enumerable" /> 中的随机一项。</returns>
+    /// <param name="list">一个有限的 <see cref="IList{T}" /> 。</param>
+    /// <returns> <paramref name="list" /> 中的随机一项。</returns>
     /// <exception cref="ArgumentNullException"></exception>
-    public static T? RandomSample<T>(this IEnumerable<T> enumerable)
+    public static T? RandomSample<T>(this IList<T> list)
     {
-        var arr = enumerable.ToArray();
-        return arr.Length == 0 ? default : arr[RandomInteger(0, arr.Length - 1)];
+        return list.Count == 0 ? default : list[RandomInteger(0, list.Count - 1)];
     }
 
     /// <summary>
@@ -34,7 +32,11 @@ public static class RandomHelper
     /// <returns></returns>
     public static int RandomInteger(int min, int max)
     {
-        return RandomNumberGenerator.GetInt32(min, max + 1);
+#if NET8_0_OR_GREATER
+        return Random.Shared.Next(min, max + 1);
+#else
+        return System.Security.Cryptography.RandomNumberGenerator.GetInt32(min, max + 1);
+#endif
     }
 
     /// <summary>

diff --git a/ProjBobcat/ProjBobcat/Class/Helper/RandomStringHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/RandomStringHelper.cs
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/RulesHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/RulesHelper.cs
@@ -21,7 +21,7 @@ public static bool CheckAllow(this IEnumerable<JvmRules?>? rules)
 
         var jvmRules = rules.Where(r => r != null).Select(r => r!).ToList();
 
-        if (!jvmRules.Any()) return false;
+        if (jvmRules.Count == 0) return false;
 
         var ruleFlag = false;
         var orderedRules = new List<JvmRules>();

diff --git a/ProjBobcat/ProjBobcat/Class/Model/Mojang/UserProfile.cs b/ProjBobcat/ProjBobcat/Class/Model/Mojang/UserProfile.cs
@@ -15,7 +15,7 @@ public class UserProfile
 
     [JsonPropertyName("id")] public string Id { get; set; }
     [JsonPropertyName("name")] public string Name { get; set; }
-    [JsonPropertyName("properties")] public UserProfileProperty[] Properties { get; set; }
+    [JsonPropertyName("properties")] public UserProfileProperty[]? Properties { get; set; }
 }
 
 [JsonSerializable(typeof(UserProfile))]

diff --git a/ProjBobcat/ProjBobcat/Class/Model/ServerPing/PingPayload.cs b/ProjBobcat/ProjBobcat/Class/Model/ServerPing/PingPayload.cs
@@ -11,7 +11,7 @@ public class PingPayload
 
     [JsonPropertyName("description")] public JsonElement Description { get; set; }
 
-    [JsonPropertyName("modinfo")] public ServerPingModInfo ModInfo { get; set; }
+    [JsonPropertyName("modinfo")] public ServerPingModInfo? ModInfo { get; set; }
 
     [JsonPropertyName("favicon")] public string Icon { get; set; }
 }

diff --git a/ProjBobcat/ProjBobcat/Class/Model/ServerPing/PlayersPayload.cs b/ProjBobcat/ProjBobcat/Class/Model/ServerPing/PlayersPayload.cs
@@ -8,5 +8,5 @@ public class PlayersPayload
 
     [JsonPropertyName("online")] public int Online { get; set; }
 
-    [JsonPropertyName("sample")] public Player[] Sample { get; set; }
+    [JsonPropertyName("sample")] public Player[]? Sample { get; set; }
 }
diff --git a/ProjBobcat/ProjBobcat/Class/Model/Version/ComparableVersion.cs b/ProjBobcat/ProjBobcat/Class/Model/Version/ComparableVersion.cs
@@ -143,7 +143,7 @@ void ParseVersion(string version)
 
         if (version.Length > startIndex) list.Add(ParseItem(isDigit, version[startIndex..]));
 
-        while (stack.Any())
+        while (stack.Count > 0)
         {
             list = (ListItem)stack.Pop();
             list.Normalize();

diff --git a/ProjBobcat/ProjBobcat/Class/Model/VersionInfo.cs b/ProjBobcat/ProjBobcat/Class/Model/VersionInfo.cs
@@ -23,8 +23,8 @@ public class VersionInfo
     public string? MainClass { get; set; }
     public string Assets { get; set; }
     public Asset? AssetInfo { get; set; }
-    public List<FileInfo> Libraries { get; set; }
-    public List<NativeFileInfo> Natives { get; set; }
+    public List<FileInfo>? Libraries { get; set; }
+    public List<NativeFileInfo>? Natives { get; set; }
     public Logging Logging { get; set; }
     public IEnumerable<string> JvmArguments { get; set; }
     public IEnumerable<string> GameArguments { get; set; }

diff --git a/ProjBobcat/ProjBobcat/Class/Model/YggdrasilAuth/AuthResponseModel.cs b/ProjBobcat/ProjBobcat/Class/Model/YggdrasilAuth/AuthResponseModel.cs
@@ -9,7 +9,7 @@ public class AuthResponseModel
     [JsonPropertyName("clientToken")] public string ClientToken { get; set; }
 
     [JsonPropertyName("availableProfiles")]
-    public ProfileInfoModel[] AvailableProfiles { get; set; }
+    public ProfileInfoModel[]? AvailableProfiles { get; set; }
 
     [JsonPropertyName("selectedProfile")] public ProfileInfoModel? SelectedProfile { get; set; }
 

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/MicrosoftAuthenticator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/MicrosoftAuthenticator.cs
@@ -218,7 +218,7 @@ await SendRequest(MSAuthXBLUrl, AuthXBLRequestModel.Get(accessToken),
             await ownResRes.Content.ReadFromJsonAsync(MojangOwnershipResponseModelContext.Default
                 .MojangOwnershipResponseModel);
 
-        if (!(ownRes?.Items?.Any() ?? false))
+        if (ownRes?.Items == null || ownRes.Items.Length == 0)
             return new MicrosoftAuthResult
             {
                 AuthStatus = AuthStatus.Failed,

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/YggdrasilAuthenticator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Authenticator/YggdrasilAuthenticator.cs
@@ -132,7 +132,7 @@ public async Task<AuthResultBase> AuthTaskAsync(bool userField = false)
             };
         }
 
-        if (result.SelectedProfile == null && !(result.AvailableProfiles?.Any() ?? false))
+        if (result.SelectedProfile == null && (result.AvailableProfiles == null || result.AvailableProfiles.Length == 0))
             return new YggdrasilAuthResult
             {
                 AuthStatus = AuthStatus.Failed,

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/HighVersionForgeInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/HighVersionForgeInstaller.cs
@@ -356,8 +356,7 @@ string ResolveVariableRegex(string val)
 
         foreach (var proc in ipModel.Processors)
         {
-            if (proc.Sides != null &&
-                proc.Sides.Any() &&
+            if (proc.Sides is { Length: > 0 } &&
                 !proc.Sides.Any(s => s.Equals("client", StringComparison.OrdinalIgnoreCase))
                )
                 continue;

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/OptifineInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/OptifineInstaller.cs
@@ -180,7 +180,7 @@ void LogReceivedEvent(object sender, DataReceivedEventArgs args)
         await p.WaitForExitAsync();
         InvokeStatusChangedEvent("安装即将完成", 90);
 
-        if (errList.Any())
+        if (errList.Count > 0)
             throw new NullReferenceException(string.Join(Environment.NewLine, errList));
 
         InvokeStatusChangedEvent("Optifine 安装完成", 100);

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultLaunchArgumentParser.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultLaunchArgumentParser.cs
@@ -318,7 +318,7 @@ public IEnumerable<string> ParseGameLoggingArguments()
     /// <returns></returns>
     public IEnumerable<string> ParseAdditionalArguments()
     {
-        if (!VersionInfo.AvailableGameArguments.Any()) yield break;
+        if (VersionInfo.AvailableGameArguments.Count == 0) yield break;
         if (!VersionInfo.AvailableGameArguments.ContainsKey("has_custom_resolution")) yield break;
 
         if (!(LaunchSettings.GameArguments?.Resolution?.IsDefault() ?? true))

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs
@@ -82,7 +82,7 @@ public override IEnumerable<string> ParseJvmArguments(IEnumerable<JsonElement>?
                 case JsonValueKind.Array:
                     var values = value.Deserialize(StringContext.Default.StringArray);
 
-                    if (!(values?.Any() ?? false)) continue;
+                    if (values == null || values.Length == 0) continue;
 
                     foreach (var val in values)
                         yield return StringHelper.FixArgument(val);
@@ -139,12 +139,12 @@ private protected override (IEnumerable<string>, Dictionary<string, string>) Par
 
             var rulesArr = rules.Deserialize(GameRulesContext.Default.GameRulesArray);
 
-            if (!(rulesArr?.Any() ?? false)) continue;
+            if (rulesArr == null || rulesArr.Length == 0) continue;
 
             foreach (var rule in rulesArr)
             {
                 if (!rule.Action.Equals("allow", StringComparison.Ordinal)) continue;
-                if (!rule.Features.Any()) continue;
+                if (rule.Features.Count == 0) continue;
                 if (!rule.Features.First().Value) continue;
 
                 ruleKey = rule.Features.First().Key;
@@ -381,7 +381,7 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(IEnumerable<Li
 
         // 检查游戏是否存在继承关系。
         // Check if there is inheritance.
-        if (inherits?.Any() ?? false)
+        if (inherits is { Count: > 0 })
         {
             // 存在继承关系。
             // Inheritance exists.

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/AnalysisReport/AnalysisReport.cs b/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/AnalysisReport/AnalysisReport.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using ProjBobcat.Interface;
 
 namespace ProjBobcat.DefaultComponent.LogAnalysis.AnalysisReport;
@@ -8,5 +7,5 @@ public record AnalysisReport(CrashCauses Cause) : IAnalysisReport
 {
     public string? From { get; set; }
     public IReadOnlyCollection<string>? Details { get; set; }
-    public bool HasDetails => Details?.Any() ?? false;
+    public bool HasDetails => Details is { Count: > 0 };
 }