Adding settings for the new Hi3Helper.Http

CollapseLauncher · Aug 25, 2024 · 3b57b28 · 3b57b28
1 parent 29c1cc8
commit 3b57b28
Show file tree

Hide file tree

Showing 10 changed files with 590 additions and 43 deletions.
diff --git a/CollapseLauncher/Classes/Extension/NumberExtensions.cs b/CollapseLauncher/Classes/Extension/NumberExtensions.cs
@@ -0,0 +1,15 @@
+using Hi3Helper.Shared.Region;
+using System;
+using System.Runtime.CompilerServices;
+
+namespace CollapseLauncher.Extension
+{
+    internal static class NumberExtensions
+    {
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static double ClampLimitedSpeedNumber(this double speed)
+            => LauncherConfig.DownloadSpeedLimitCached > 0 ?
+            Math.Min(LauncherConfig.DownloadSpeedLimitCached, speed) :
+            speed;
+    }
+}
diff --git a/CollapseLauncher/Classes/Interfaces/Class/ProgressBase.cs b/CollapseLauncher/Classes/Interfaces/Class/ProgressBase.cs
@@ -84,7 +84,7 @@ protected virtual async void _httpClient_FetchAssetProgress(int size, DownloadPr
         {
             if (await CheckIfNeedRefreshStopwatch())
             {
-                double speed = downloadProgress.BytesDownloaded / _stopwatch.Elapsed.TotalSeconds;
+                double speed = (downloadProgress.BytesDownloaded / _stopwatch.Elapsed.TotalSeconds).ClampLimitedSpeedNumber();
                 TimeSpan timeLeftSpan = ((downloadProgress.BytesTotal - downloadProgress.BytesDownloaded) / speed).ToTimeSpanNormalized();
                 double percentage = ConverterTool.GetPercentageNumber(downloadProgress.BytesDownloaded, downloadProgress.BytesTotal, 2);
 
@@ -144,13 +144,13 @@ protected virtual async void _httpClient_RepairAssetProgress(int size, DownloadP
             Interlocked.Add(ref _progressAllSizeCurrent, size);
             if (await CheckIfNeedRefreshStopwatch())
             {
-                double speed = _progressAllSizeCurrent / _downloadSpeedRefreshStopwatch.Elapsed.TotalSeconds;
+                double speed = (_progressAllSizeCurrent / _stopwatch.Elapsed.TotalSeconds).ClampLimitedSpeedNumber();
                 TimeSpan timeLeftSpan = ((_progressAllSizeCurrent - _progressAllSizeTotal) / speed).ToTimeSpanNormalized();
-                double percentage = ConverterTool.GetPercentageNumber(_progressAllSizeCurrent, _progressAllSizeTotal, 2);
+                double percentagePerFile = ConverterTool.GetPercentageNumber(downloadProgress.BytesDownloaded, downloadProgress.BytesTotal, 2);
 
                 lock (_progress!)
                 {
-                    _progress.ProgressPerFilePercentage = percentage;
+                    _progress.ProgressPerFilePercentage = percentagePerFile;
                     _progress.ProgressPerFileSizeCurrent = downloadProgress.BytesDownloaded;
                     _progress.ProgressPerFileSizeTotal = downloadProgress.BytesTotal;
                     _progress.ProgressAllSizeCurrent = _progressAllSizeCurrent;
@@ -258,7 +258,7 @@ protected virtual async void _httpClient_UpdateAssetProgress(int size, DownloadP
             if (await CheckIfNeedRefreshStopwatch())
             {
                 double speed = _progressAllSizeCurrent / _stopwatch.Elapsed.TotalSeconds;
-                TimeSpan timeLeftSpan = ((_progressAllSizeTotal - _progressAllSizeCurrent) / speed).ToTimeSpanNormalized();
+                TimeSpan timeLeftSpan = ((_progressAllSizeTotal - _progressAllSizeCurrent) / speed.ClampLimitedSpeedNumber()).ToTimeSpanNormalized();
                 double percentage = ConverterTool.GetPercentageNumber(_progressAllSizeCurrent, _progressAllSizeTotal, 2);
 
                 // Update current progress percentages and speed
@@ -952,40 +952,25 @@ protected bool SummarizeStatusAndProgress(List<T1> assetIndex, string msgIfFound
         }
 
         protected virtual bool IsArrayMatch(ReadOnlySpan<byte> source, ReadOnlySpan<byte> target) => source.SequenceEqual(target);
-
+
+#nullable enable
         protected virtual async Task RunDownloadTask(long assetSize, string assetPath, string assetURL,
-            DownloadClient downloadClient, DownloadProgressDelegate downloadProgress, CancellationToken token, bool isOverwrite = true)
+            DownloadClient downloadClient, DownloadProgressDelegate downloadProgress, CancellationToken token, bool isOverwrite = true,
+            EventHandler<long>? downloadSpeedLimitChanged = null)
         {
             // Always do multi-session download with the new DownloadClient regardless of any sizes (if applicable)
-            if (assetSize < 10 << 10)
-            {
-                using FileStream fileStream = File.Open(
-                    EnsureCreationOfDirectory(assetPath),
-                    isOverwrite ?
-                        FileMode.Create :
-                        FileMode.OpenOrCreate,
-                    FileAccess.ReadWrite,
-                    FileShare.ReadWrite);
-
-                await downloadClient.DownloadAsync(
-                    assetURL,
-                    fileStream,
-                    !isOverwrite,
-                    progressDelegateAsync: downloadProgress,
-                    cancelToken: token
-                    );
-            }
-            else
-            {
-                await downloadClient.DownloadAsync(
-                    assetURL,
-                    EnsureCreationOfDirectory(assetPath),
-                    isOverwrite,
-                    progressDelegateAsync: downloadProgress,
-                    cancelToken: token
-                    );
-            }
+            await downloadClient.DownloadAsync(
+                assetURL,
+                EnsureCreationOfDirectory(assetPath),
+                isOverwrite,
+                sessionChunkSize: LauncherConfig.DownloadChunkSize,
+                progressDelegateAsync: downloadProgress,
+                cancelToken: token,
+                downloadSpeedLimitEvent: downloadSpeedLimitChanged,
+                initialDownloadSpeed: LauncherConfig.DownloadSpeedLimitCached
+                );
         }
+#nullable restore
 
         protected virtual async Task RunDownloadTask(long assetSize, string assetPath, string assetURL, Http _httpClient, CancellationToken token)
         {

diff --git a/CollapseLauncher/Classes/RegionManagement/FallbackCDNUtil.cs b/CollapseLauncher/Classes/RegionManagement/FallbackCDNUtil.cs
@@ -389,7 +389,7 @@ private static async ValueTask<bool> TryGetCDNContent(CDNURLProperty cdnProp, Do
                 if (!urlStatus.Item1) return false;
 
                 // Continue to get the content and return true if successful
-                await downloadClient.DownloadAsync(urlStatus.Item2, outputStream, false, HttpInstance_DownloadProgressAdapter, null, null, token);
+                await downloadClient.DownloadAsync(urlStatus.Item2, outputStream, false, HttpInstance_DownloadProgressAdapter, null, null, cancelToken:token);
                 return true;
             }
             // Handle the error and log it. If fails, then log it and return false
@@ -415,7 +415,7 @@ private static async ValueTask<bool> TryGetCDNContent(CDNURLProperty cdnProp, Do
                 {
                     // If the CDN marked to not supporting the partial download, then use single thread mode download.
                     using FileStream stream = File.Create(outputPath);
-                    await downloadClient.DownloadAsync(urlStatus.Item2, stream, false, HttpInstance_DownloadProgressAdapter, null, null, token);
+                    await downloadClient.DownloadAsync(urlStatus.Item2, stream, false, HttpInstance_DownloadProgressAdapter, null, null, cancelToken:token);
                     return true;
                 }
                 await downloadClient.DownloadAsync(urlStatus.Item2, outputPath, true, progressDelegateAsync: HttpInstance_DownloadProgressAdapter, maxConnectionSessions: parallelThread, cancelToken: token);