From c308746132f3ab89458b446f659f3d4073758da6 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 16 Apr 2021 10:56:24 -0500
Subject: When extracting a container use the uncompressed file size for
 progress Remove the container's cache progress when reextracting Skip
 extracting payloads that are already cached

---
 src/engine/plan.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/engine/plan.cpp')

diff --git a/src/engine/plan.cpp b/src/engine/plan.cpp
index 55fe7ddf..8421d87b 100644
--- a/src/engine/plan.cpp
+++ b/src/engine/plan.cpp
@@ -431,6 +431,7 @@ extern "C" HRESULT PlanLayoutBundle(
     pCacheAction->bundleLayout.qwBundleSize = qwBundleSize;
     pCacheAction->bundleLayout.pPayloadGroup = pLayoutPayloads;
 
+    // Acquire + Verify
     pPlan->qwCacheSizeTotal += 2 * qwBundleSize;
 
     ++pPlan->cOverallProgressTicksTotal;
@@ -1005,6 +1006,7 @@ extern "C" HRESULT PlanLayoutContainer(
             pCacheAction->type = BURN_CACHE_ACTION_TYPE_CONTAINER;
             pCacheAction->container.pContainer = pContainer;
 
+            // Acquire + Verify
             pPlan->qwCacheSizeTotal += 2 * pContainer->qwFileSize;
         }
     }
@@ -1012,11 +1014,9 @@ extern "C" HRESULT PlanLayoutContainer(
     {
         if (!pContainer->fActuallyAttached)
         {
+            // Acquire
             pPlan->qwCacheSizeTotal += pContainer->qwFileSize;
         }
-
-        // TODO: This should be the sum of all uncompressed payloads in the container, ideally restricted to the payloads that were actually planned.
-        pPlan->qwCacheSizeTotal += pContainer->qwFileSize;
     }
 
     if (!pContainer->sczUnverifiedPath)
@@ -1829,6 +1829,8 @@ static void ResetPlannedContainerState(
     )
 {
     pContainer->fPlanned = FALSE;
+    pContainer->qwExtractSizeTotal = 0;
+    pContainer->qwCommittedCacheProgress = 0;
 }
 
 static void ResetPlannedPayloadsState(
@@ -2246,9 +2248,17 @@ static HRESULT ProcessPayloadGroup(
 
         if (!pPlan->sczLayoutDirectory || !pPayload->pContainer)
         {
+            // Acquire + Verify
             pPlan->qwCacheSizeTotal += 2 * pPayload->qwFileSize;
         }
 
+        if (!pPlan->sczLayoutDirectory && pPayload->pContainer && 1 == pPayload->cRemainingInstances)
+        {
+            // Extract
+            pPlan->qwCacheSizeTotal += pPayload->qwFileSize;
+            pPayload->pContainer->qwExtractSizeTotal += pPayload->qwFileSize;
+        }
+
         if (!pPayload->sczUnverifiedPath)
         {
             hr = CacheCalculatePayloadWorkingPath(pPlan->wzBundleId, pPayload, &pPayload->sczUnverifiedPath);
-- 
cgit v1.2.3-55-g6feb