Merge pull request #120 from /issues/75-TotalDataDownloaded

tpill90 · May 7, 2024 · 8676cc9 · 8676cc9
2 parents a715d1c + aa3bbf2
commit 8676cc9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/BattleNetPrefill/TactProductHandler.cs b/BattleNetPrefill/TactProductHandler.cs
@@ -88,12 +88,16 @@ await Task.WhenAll(archiveIndexHandler.BuildArchiveIndexesAsync(cdnConfig, ctx),
             _ansiConsole.LogMarkupLine("Retrieved product metadata", metadataTimer);
 
             // Actually start the download of any deferred requests
-            var downloadSuccess = await cdnRequestManager.DownloadQueuedRequestsAsync();
-            if (downloadSuccess)
+            var downloadSuccessful = await cdnRequestManager.DownloadQueuedRequestsAsync(_prefillSummaryResult);
+            if (downloadSuccessful)
             {
                 MarkDownloadAsSuccessful(product, targetVersion.Value);
                 _prefillSummaryResult.Updated++;
             }
+            else
+            {
+                _prefillSummaryResult.FailedApps++;
+            }
 
             if (!AppConfig.CompareAgainstRealRequests)
             {

diff --git a/BattleNetPrefill/Web/CdnRequestManager.cs b/BattleNetPrefill/Web/CdnRequestManager.cs
@@ -100,7 +100,7 @@ public void QueueRequest(RootFolder rootPath, in MD5Hash hash, in long? startByt
         /// false will be returned
         /// </summary>
         /// <returns>True if all downloads succeeded.  False if downloads failed 3 times.</returns>
-        public async Task<bool> DownloadQueuedRequestsAsync()
+        public async Task<bool> DownloadQueuedRequestsAsync(PrefillSummaryResult prefillSummaryResult)
         {
             // Combining requests to improve download performance
             var coalescedRequests = RequestUtils.CoalesceRequests(_queuedRequests, true);
@@ -144,6 +144,8 @@ await _ansiConsole.CreateSpectreProgress(AppConfig.TransferSpeedUnit).StartAsync
             // Logging some metrics about the download
             _ansiConsole.LogMarkupLine($"Finished in {LightYellow(downloadTimer.FormatElapsedString())} - {Magenta(totalDownloadSize.CalculateBitrate(downloadTimer))}");
             _ansiConsole.WriteLine();
+            //TODO I don't like the fact that I'm passing this down into this method
+            prefillSummaryResult.TotalBytesTransferred += totalDownloadSize;
 
             return true;
         }