improve Download logic

Corona-Studio · Feb 23, 2025 · ff430e2 · ff430e2
1 parent 658cc57
commit ff430e2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/Download/DownloadHelper.Multipart.cs b/ProjBobcat/ProjBobcat/Class/Helper/Download/DownloadHelper.Multipart.cs
@@ -18,7 +18,7 @@ namespace ProjBobcat.Class.Helper.Download;
 
 public static partial class DownloadHelper
 {
-    private const int DefaultPartialDownloadTimeoutMs = 500;
+    private const int DefaultPartialDownloadTimeoutMs = 3000;
     private const int MinimumChunkSize = 8192;
 
     private static HttpClient Head => HttpClientHelper.HeadClient;

diff --git a/ProjBobcat/ProjBobcat/Class/Helper/Download/DownloadHelper.Normal.cs b/ProjBobcat/ProjBobcat/Class/Helper/Download/DownloadHelper.Normal.cs
@@ -60,7 +60,7 @@ public static async Task DownloadData(AbstractDownloadBase downloadFile, Downloa
 
                 var averageSpeed = 0d;
                 var outputStream = File.Create(filePath);
-                var cryptoStream = new CryptoStream(outputStream, hashProvider, CryptoStreamMode.Write, true);
+                var cryptoStream = new CryptoStream(outputStream, hashProvider, CryptoStreamMode.Write);
 
                 await using (var stream = await res.Content.ReadAsStreamAsync(cts.Token))
                 await using (Stream destStream = hashCheckFile ? cryptoStream : outputStream)

diff --git a/ProjBobcat/ProjBobcat/Class/Model/Downloading/DownloadSettings.cs b/ProjBobcat/ProjBobcat/Class/Model/Downloading/DownloadSettings.cs
@@ -24,7 +24,7 @@ public class DownloadSettings
         DownloadParts = 16
     };
 
-    public int MaxSubChunkSplitCount { get; init; } = 5;
+    public int MaxSubChunkSplitCount { get; init; } = 3;
     public int RetryCount { get; init; }
     public bool CheckFile { get; init; }
     public TimeSpan Timeout { get; init; } = TimeSpan.FromSeconds(30);

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/CrashCauses.cs b/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/CrashCauses.cs
@@ -74,5 +74,7 @@ public enum CrashCauses
     EntityCausedGameCrash,
     LogFileNotFound,
 
+    FileIsInUse,
+
     Other
 }
diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/DefaultLogAnalyzer.cs b/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/DefaultLogAnalyzer.cs
@@ -91,7 +91,7 @@ static LogFileType GetLogFileType(FileSystemInfo fi)
         return LogFileType.Unknown;
     }
 
-    static bool IsValidLogFile(FileInfo fi, double minutesAgo = 3)
+    static bool IsValidLogFile(FileInfo fi, double minutesAgo = 5)
     {
         if (!fi.Exists) return false;
         if (fi.Length == 0) return false;
@@ -281,6 +281,10 @@ static IEnumerable<IAnalysisReport> AnalysisLogs2(IReadOnlyDictionary<LogFileTyp
         {
             "java.lang.NoSuchMethodError: 'void net.minecraft.server.level.DistanceManager.addRegionTicket(net.minecraft.server.level.TicketType, net.minecraft.world.level.ChunkPos, int, java.lang.Object, boolean)'",
             CrashCauses.IncompatibleForgeAndOptifine
+        },
+        {
+            "java.nio.file.FileSystemException",
+            CrashCauses.FileIsInUse
         }
     };