Preserve live charge session buffer on checkpoints · 9096cf8

+1 -1

USB Meter/Model/ChargeInsightsStore.swift

@@ -17,7 +17,7 @@ final class ChargeInsightsStore {
     }
 
     private static let maximumChargeSessionDuration: TimeInterval = 12 * 60 * 60
-    private static let persistedSamplesPerHour = 360
+    private static let persistedSamplesPerHour = 300
     private static let aggregatedSampleBucketDuration = 3600.0 / Double(persistedSamplesPerHour)
 
     private let context: NSManagedObjectContext


+2 -5

USB Meter/Model/Meter.swift

View

@@ -75,7 +75,6 @@ class Meter : NSObject, ObservableObject, Identifiable {
         let sessionID: UUID
         let sampleCount: Int
         let lastSampleTimestamp: Date?
-        let checkpointCount: Int
     }
 
 
@@ -989,13 +988,11 @@ class Meter : NSObject, ObservableObject, Identifiable {
         let restoreSignature = ChargeRecordRestoreSignature(
             sessionID: activeSession.id,
             sampleCount: activeSession.aggregatedSamples.count,
-            lastSampleTimestamp: activeSession.aggregatedSamples.last?.timestamp,
-            checkpointCount: activeSession.checkpoints.count
+            lastSampleTimestamp: activeSession.aggregatedSamples.last?.timestamp
         )
 
         if restoreSignature != restoredChargeRecordSignature {
-            let shouldRefreshPersistedBuffer = replacingLiveBufferIfNeeded ||
-                restoreSignature.checkpointCount != restoredChargeRecordSignature?.checkpointCount
+            let shouldRefreshPersistedBuffer = replacingLiveBufferIfNeeded
             restoreTrace("meter=\(name) charge-record-restore-start session=\(activeSession.id.uuidString) status=\(activeSession.status.rawValue) samples=\(restoreSignature.sampleCount) lastTs=\(restoreSignature.lastSampleTimestamp?.description ?? "nil") replaceLive=\(shouldRefreshPersistedBuffer) state=\(chargeRecordState) existingPower=\(chargeRecordMeasurements.power.samplePoints.count)")
             let didRestorePersistedSamples = chargeRecordMeasurements.restorePersistedChargeSessionSamplesIfNeeded(
                 from: activeSession,


	@@ -17,7 +17,7 @@ final class ChargeInsightsStore {
17	17	}
18	18
19	19	private static let maximumChargeSessionDuration: TimeInterval = 12 * 60 * 60
20		- private static let persistedSamplesPerHour = 360
	20	+ private static let persistedSamplesPerHour = 300
21	21	private static let aggregatedSampleBucketDuration = 3600.0 / Double(persistedSamplesPerHour)
22	22
23	23	private let context: NSManagedObjectContext

	@@ -75,7 +75,6 @@ class Meter : NSObject, ObservableObject, Identifiable {
75	75	let sessionID: UUID
76	76	let sampleCount: Int
77	77	let lastSampleTimestamp: Date?
78		- let checkpointCount: Int
79	78	}
80	79
81	80
	@@ -989,13 +988,11 @@ class Meter : NSObject, ObservableObject, Identifiable {
989	988	let restoreSignature = ChargeRecordRestoreSignature(
990	989	sessionID: activeSession.id,
991	990	sampleCount: activeSession.aggregatedSamples.count,
992		- lastSampleTimestamp: activeSession.aggregatedSamples.last?.timestamp,
993		- checkpointCount: activeSession.checkpoints.count
	991	+ lastSampleTimestamp: activeSession.aggregatedSamples.last?.timestamp
994	992	)
995	993
996	994	if restoreSignature != restoredChargeRecordSignature {
997		- let shouldRefreshPersistedBuffer = replacingLiveBufferIfNeeded \|\|
998		- restoreSignature.checkpointCount != restoredChargeRecordSignature?.checkpointCount
	995	+ let shouldRefreshPersistedBuffer = replacingLiveBufferIfNeeded
999	996	restoreTrace("meter=\(name) charge-record-restore-start session=\(activeSession.id.uuidString) status=\(activeSession.status.rawValue) samples=\(restoreSignature.sampleCount) lastTs=\(restoreSignature.lastSampleTimestamp?.description ?? "nil") replaceLive=\(shouldRefreshPersistedBuffer) state=\(chargeRecordState) existingPower=\(chargeRecordMeasurements.power.samplePoints.count)")
1000	997	let didRestorePersistedSamples = chargeRecordMeasurements.restorePersistedChargeSessionSamplesIfNeeded(
1001	998	from: activeSession,