Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
061785d77b
|
|||
|
c4c4fed4bc
|
@@ -84,12 +84,11 @@ public struct TemperatureAndHumiditySensor: Identifiable, Sendable {
|
|||||||
/// Check whether any of the sensor values have changed and need processed.
|
/// Check whether any of the sensor values have changed and need processed.
|
||||||
///
|
///
|
||||||
/// - Note: Setting a value will set to both the temperature and humidity properties.
|
/// - Note: Setting a value will set to both the temperature and humidity properties.
|
||||||
public var needsProcessed: Bool {
|
public var needsProcessed: Bool { $temperature.needsProcessed || $humidity.needsProcessed }
|
||||||
get { $temperature.needsProcessed || $humidity.needsProcessed }
|
|
||||||
set {
|
public mutating func setHasProcessed() {
|
||||||
$temperature.needsProcessed = newValue
|
$temperature.setHasProcessed()
|
||||||
$humidity.needsProcessed = newValue
|
$humidity.setHasProcessed()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Represents the different locations of a temperature and humidity sensor, which can
|
/// Represents the different locations of a temperature and humidity sensor, which can
|
||||||
|
|||||||
@@ -5,24 +5,20 @@
|
|||||||
@propertyWrapper
|
@propertyWrapper
|
||||||
public struct TrackedChanges<Value: Sendable>: Sendable {
|
public struct TrackedChanges<Value: Sendable>: Sendable {
|
||||||
|
|
||||||
/// The current tracking state.
|
/// The current value wrapped in a tracking state.
|
||||||
private var tracking: TrackingState
|
private var value: TrackingState
|
||||||
|
|
||||||
/// The current wrapped value.
|
|
||||||
private var value: Value
|
|
||||||
|
|
||||||
/// Used to check if a new value is equal to an old value.
|
/// Used to check if a new value is equal to an old value.
|
||||||
private var isEqual: @Sendable (Value, Value) -> Bool
|
private var isEqual: @Sendable (Value, Value) -> Bool
|
||||||
|
|
||||||
/// Access to the underlying property that we are wrapping.
|
/// Access to the underlying property that we are wrapping.
|
||||||
public var wrappedValue: Value {
|
public var wrappedValue: Value {
|
||||||
get { value }
|
get { value.currentValue }
|
||||||
set {
|
set {
|
||||||
// Check if the new value is equal to the old value.
|
// Check if the new value is equal to the old value.
|
||||||
guard !isEqual(newValue, value) else { return }
|
guard !isEqual(newValue, value.currentValue) else { return }
|
||||||
// If it's not equal then set it, as well as set the tracking to `.needsProcessed`.
|
// If it's not equal then set it, as well as set the tracking to `.needsProcessed`.
|
||||||
value = newValue
|
value = .needsProcessed(newValue)
|
||||||
tracking = .needsProcessed
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,31 +33,42 @@ public struct TrackedChanges<Value: Sendable>: Sendable {
|
|||||||
needsProcessed: Bool = false,
|
needsProcessed: Bool = false,
|
||||||
isEqual: @escaping @Sendable (Value, Value) -> Bool
|
isEqual: @escaping @Sendable (Value, Value) -> Bool
|
||||||
) {
|
) {
|
||||||
self.value = wrappedValue
|
self.value = .init(wrappedValue, needsProcessed: needsProcessed)
|
||||||
self.tracking = needsProcessed ? .needsProcessed : .hasProcessed
|
|
||||||
self.isEqual = isEqual
|
self.isEqual = isEqual
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Represents whether a wrapped value has changed and needs processed or not.
|
fileprivate enum TrackingState {
|
||||||
enum TrackingState {
|
case hasProcessed(Value)
|
||||||
|
case needsProcessed(Value)
|
||||||
|
|
||||||
/// The state when nothing has changed and we've already processed the current value.
|
init(_ value: Value, needsProcessed: Bool) {
|
||||||
case hasProcessed
|
if needsProcessed {
|
||||||
|
self = .needsProcessed(value)
|
||||||
|
} else {
|
||||||
|
self = .hasProcessed(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// The state when the value has changed and has not been processed yet.
|
var currentValue: Value {
|
||||||
case needsProcessed
|
switch self {
|
||||||
|
case let .hasProcessed(value):
|
||||||
|
return value
|
||||||
|
case let .needsProcessed(value):
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var needsProcessed: Bool {
|
||||||
|
guard case .needsProcessed = self else { return false }
|
||||||
|
return true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Whether the value needs processed.
|
/// Whether the value needs processed.
|
||||||
public var needsProcessed: Bool {
|
var needsProcessed: Bool { value.needsProcessed }
|
||||||
get { tracking == .needsProcessed }
|
|
||||||
set {
|
mutating func setHasProcessed() {
|
||||||
if newValue {
|
value = .hasProcessed(value.currentValue)
|
||||||
tracking = .needsProcessed
|
|
||||||
} else {
|
|
||||||
tracking = .hasProcessed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public var projectedValue: Self {
|
public var projectedValue: Self {
|
||||||
@@ -95,6 +102,5 @@ extension TrackedChanges: Hashable where Value: Hashable {
|
|||||||
|
|
||||||
public func hash(into hasher: inout Hasher) {
|
public func hash(into hasher: inout Hasher) {
|
||||||
hasher.combine(wrappedValue)
|
hasher.combine(wrappedValue)
|
||||||
hasher.combine(needsProcessed)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ private extension Array where Element == TemperatureAndHumiditySensor {
|
|||||||
guard let index = firstIndex(where: { $0.id == sensor.id }) else {
|
guard let index = firstIndex(where: { $0.id == sensor.id }) else {
|
||||||
throw SensorNotFoundError()
|
throw SensorNotFoundError()
|
||||||
}
|
}
|
||||||
self[index].needsProcessed = false
|
self[index].setHasProcessed()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user