refactor getUpdatedIntSummary method

Author: chloe-yeo

Sources/FoundationEssentials/ProgressManager/ProgressManager+Properties+Helpers.swift

@@ -21,46 +21,19 @@ extension ProgressManager {
 
     //MARK: Helper Methods for Updating Dirty Path
     internal func getUpdatedIntSummary(property: MetatypeWrapper<Int, Int>) -> Int {
+        // Collect information from state
+        let updateInfo = state.withLock { state in
+            state.getIntSummaryUpdateInfo(property: property)
+        }
+        
+        // Get updated summary for each dirty child
+        let updatedSummaries = updateInfo.dirtyChildren.map { (index, child) in
+            State.IntSummaryUpdate(index: index, updatedSummary: child.getUpdatedIntSummary(property: property))
+        }
+        
+        // Consolidate updated values
         return state.withLock { state in
-            
-            var value: Int = property.defaultSummary
-            property.reduce(&value, state.propertiesInt[property] ?? property.defaultValue)
-            
-            guard !state.children.isEmpty else {
-                return value
-            }
-             
-            for (idx, childState) in state.children.enumerated() {
-                if let childPropertyState = childState.childPropertiesInt[property] {
-                    if childPropertyState.isDirty {
-                        // Dirty, needs to fetch value
-                        if let child = childState.child {
-                            let updatedSummary = child.getUpdatedIntSummary(property: property)
-                            let newChildPropertyState = PropertyStateInt(value: updatedSummary, isDirty: false)
-                            state.children[idx].childPropertiesInt[property] = newChildPropertyState
-                            value = property.merge(value, updatedSummary)
-                        }
-                    } else {
-                        // Not dirty, use value directly
-                        if let _ = childState.child {
-                            value = property.merge(value, childPropertyState.value)
-                        } else {
-                            // TODO: What to do after terminate? Set to nil?
-                            value = property.finalSummary(value, childPropertyState.value)
-                        }
-                    }
-                } else {
-                    // Said property doesn't even get cached yet, but children might have been set
-                    if let child = childState.child {
-                        // If there is a child
-                        let childSummary = child.getUpdatedIntSummary(property: property)
-                        let newChildPropertyState = PropertyStateInt(value: childSummary, isDirty: false)
-                        state.children[idx].childPropertiesInt[property] = newChildPropertyState
-                        value = property.merge(value, childSummary)
-                    }
-                }
-            }
-            return value
+            state.updateIntSummary(updateInfo, updatedSummaries)
         }
     }
 

Sources/FoundationEssentials/ProgressManager/ProgressManager+State.swift

@@ -301,6 +301,18 @@ extension ProgressManager {
         }
 
         // MARK: Clean up dirty paths
+        internal struct IntSummaryUpdateInfo {
+            let currentSummary: Int
+            let dirtyChildren: [(index: Int, manager: ProgressManager)]
+            let nonDirtySummaries: [(index: Int, summary: Int, isAlive: Bool)]
+            let property: MetatypeWrapper<Int, Int>
+        }
+        
+        internal struct IntSummaryUpdate {
+            let index: Int
+            let updatedSummary: Int
+        }
+        
         internal struct FileCountUpdateInfo {
             let currentSummary: Int
             let dirtyChildren: [(index: Int, manager: ProgressManager)]
@@ -347,6 +359,69 @@ extension ProgressManager {
             let updatedSummary: Duration
         }
 
+        internal mutating func getIntSummaryUpdateInfo(property: MetatypeWrapper<Int, Int>) -> IntSummaryUpdateInfo {
+            var currentSummary: Int = property.defaultSummary
+            property.reduce(&currentSummary, propertiesInt[property] ?? property.defaultValue)
+            
+            guard !children.isEmpty else {
+                return IntSummaryUpdateInfo(
+                    currentSummary: currentSummary,
+                    dirtyChildren: [],
+                    nonDirtySummaries: [],
+                    property: property
+                )
+            }
+            
+            var dirtyChildren: [(index: Int, manager: ProgressManager)] = []
+            var nonDirtySummaries: [(index: Int, summary: Int, isAlive: Bool)] = []
+            
+            for (idx, childState) in children.enumerated() {
+                if let childPropertyState = childState.childPropertiesInt[property] {
+                    if childPropertyState.isDirty {
+                        if let child = childState.child {
+                            dirtyChildren.append((idx, child))
+                        }
+                    } else {
+                        let isAlive = childState.child != nil
+                        nonDirtySummaries.append((idx, childPropertyState.value, isAlive))
+                    }
+                } else {
+                    // Property doesn't exist yet in child - need to fetch it
+                    if let child = childState.child {
+                        dirtyChildren.append((idx, child))
+                    }
+                }
+            }
+            
+            return IntSummaryUpdateInfo(
+                currentSummary: currentSummary,
+                dirtyChildren: dirtyChildren,
+                nonDirtySummaries: nonDirtySummaries,
+                property: property
+            )
+        }
+        
+        internal mutating func updateIntSummary(_ updateInfo: IntSummaryUpdateInfo, _ childUpdates: [IntSummaryUpdate]) -> Int {
+            var value = updateInfo.currentSummary
+            
+            // Apply updates from children that were dirty
+            for update in childUpdates {
+                children[update.index].childPropertiesInt[updateInfo.property] = PropertyStateInt(value: update.updatedSummary, isDirty: false)
+                value = updateInfo.property.merge(value, update.updatedSummary)
+            }
+            
+            // Apply values from non-dirty children
+            for (_, childSummary, isAlive) in updateInfo.nonDirtySummaries {
+                if isAlive {
+                    value = updateInfo.property.merge(value, childSummary)
+                } else {
+                    value = updateInfo.property.finalSummary(value, childSummary)
+                }
+            }
+            
+            return value
+        }
+        
         internal mutating func getFileCountUpdateInfo(type: CountType) -> FileCountUpdateInfo {
             let currentSummary: Int
             var dirtyChildren: [(index: Int, manager: ProgressManager)] = []