Enforce IsUsePreallocatedDownloader on InstallManagerBase

CollapseLauncher · Aug 29, 2024 · 8e5e92d · 8e5e92d
1 parent 053e1ea
commit 8e5e92d
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
@@ -3507,9 +3507,6 @@ private async ValueTask InvokePackageDownloadRoutine(DownloadClient           do
             // Subscribe the download progress to the event adapter
             _httpClient.DownloadProgress += HttpClientDownloadProgressAdapter;
 
-            // Create a speed limiter instance for the new DownloadClient and register it
-            DownloadSpeedLimiter speedLimiter = DownloadSpeedLimiter.CreateInstance(LauncherConfig.DownloadSpeedLimitCached);
-            LauncherConfig.DownloadSpeedLimitChanged += speedLimiter.GetListener();
             try
             {
                 // Iterate the package list
@@ -3521,30 +3518,26 @@ private async ValueTask InvokePackageDownloadRoutine(DownloadClient           do
                         // Iterate the segment list
                         for (int i = 0; i < package.Segments.Count; i++)
                         {
-                            await RunPackageDownloadRoutine(_httpClient, downloadClient, speedLimiter, package.Segments[i], token, packageCount);
+                            await RunPackageDownloadRoutine(_httpClient, downloadClient, package.Segments[i], token, packageCount);
                         }
 
                         // Skip action below and continue to the next segment
                         continue;
                     }
 
                     // Else, run the routine as normal
-                    await RunPackageDownloadRoutine(_httpClient, downloadClient, speedLimiter, package, token, packageCount);
+                    await RunPackageDownloadRoutine(_httpClient, downloadClient, package, token, packageCount);
                 }
             }
             finally
             {
                 // Unsubscribe the download progress from the event adapter
                 _httpClient.DownloadProgress -= HttpClientDownloadProgressAdapter;
-
-                // Unregister the speed limiter
-                LauncherConfig.DownloadSpeedLimitChanged -= speedLimiter.GetListener();
             }
         }
 
         private async ValueTask RunPackageDownloadRoutine(Http                  httpClient,
                                                           DownloadClient        downloadClient,
-                                                          DownloadSpeedLimiter  downloadSpeedLimiter,
                                                           GameInstallPackage    package,
                                                           CancellationToken     token,
                                                           int                   packageCount)
@@ -3712,7 +3705,9 @@ private async ValueTask<long> GetExistingDownloadPackageSize(DownloadClient down
                                                                                   packageList[i].Segments[j].Size,
                                                                                   token
                                                                                   );
-                        bool isUseLegacySegmentedSize                       = segmentDownloaded > newSegmentedDownloaded || newSegmentedDownloaded > packageList[i].Segments[j].Size;
+                        bool isUseLegacySegmentedSize                       = !LauncherConfig.IsUsePreallocatedDownloader
+                            || segmentDownloaded > newSegmentedDownloaded
+                            || newSegmentedDownloaded > packageList[i].Segments[j].Size;
                         totalSize                                           += isUseLegacySegmentedSize ? segmentDownloaded : newSegmentedDownloaded;
                         totalSegmentDownloaded                              += isUseLegacySegmentedSize ? segmentDownloaded : newSegmentedDownloaded;
                         packageList[i].Segments[j].SizeDownloaded           =  isUseLegacySegmentedSize ? segmentDownloaded : newSegmentedDownloaded;
@@ -3732,7 +3727,9 @@ private async ValueTask<long> GetExistingDownloadPackageSize(DownloadClient down
                                                     packageList[i].Size,
                                                     token
                                                     );
-                bool isUseLegacySize                    =  legacyDownloadedSize > newDownloaderSize || newDownloaderSize > packageList[i].Size;
+                bool isUseLegacySize                    = !LauncherConfig.IsUsePreallocatedDownloader
+                    || legacyDownloadedSize > newDownloaderSize
+                    || newDownloaderSize > packageList[i].Size;
                 packageList[i].IsUseLegacyDownloader    =  isUseLegacySize;
                 packageList[i].SizeDownloaded           =  isUseLegacySize ? legacyDownloadedSize : newDownloaderSize;
                 totalSize                               += packageList[i].SizeDownloaded;