aggregate Progress across data sources

StanfordSpezi · Apr 10, 2024 · dd43234 · dd43234
1 parent 805f0ed
commit dd43234
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Sources/SpeziHealthKit/BulkUpload/BulkUploadSampleDataSource.swift b/Sources/SpeziHealthKit/BulkUpload/BulkUploadSampleDataSource.swift
@@ -39,7 +39,7 @@ final class BulkUploadSampleDataSource: HealthKitDataSource {
         }
     }
 
-    var progress: Progress {
+    public var progress: Progress {
         let progress = Progress(totalUnitCount: Int64(totalSamples))
         progress.completedUnitCount = Int64(processedSamples)
         return progress

diff --git a/Sources/SpeziHealthKit/HealthKit.swift b/Sources/SpeziHealthKit/HealthKit.swift
@@ -74,6 +74,21 @@ public final class HealthKit: Module, EnvironmentAccessible, DefaultInitializabl
     private var healthKitDataSourceDescriptions: [HealthKitDataSourceDescription] = []
     @ObservationIgnored private var healthKitComponents: [any HealthKitDataSource] = []
 
+    public var progress: Progress {
+        var totalUnitCount: Int64 = 0
+        var completedUnitCount: Int64 = 0
+        for dataSource in healthKitComponents {
+            if let bulkDataSource = dataSource as? BulkUploadSampleDataSource {
+                let individualProgress = bulkDataSource.progress
+                totalUnitCount += individualProgress.totalUnitCount
+                completedUnitCount += individualProgress.completedUnitCount
+            }
+        }
+        let macroProgress = Progress(totalUnitCount: totalUnitCount)
+        macroProgress.completedUnitCount = completedUnitCount
+        return macroProgress
+    }
+
 
     private var healthKitSampleTypes: Set<HKSampleType> {
         (initialHealthKitDataSourceDescriptions + healthKitDataSourceDescriptions).reduce(into: Set()) {