shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 63 Pull Requests Releases Wiki Activity

Remove incorrect workaround for crash when LazilyDecoding used on nil MO

This commit is contained in:
Shadowfacts 2023-12-04 16:20:22 -05:00
parent be1ca70ebf
commit 108a02826f
1 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Tusker/LazilyDecoding.swift
View File

@ -33,41 +33,37 @@ public struct LazilyDecoding<Enclosing: NSManagedObject, Value: Codable> {
public static subscript(_enclosingInstance instance: Enclosing, wrapped wrappedKeyPath: ReferenceWritableKeyPath<Enclosing, Value>, storage storageKeyPath: ReferenceWritableKeyPath<Enclosing, Self>) -> Value { public static subscript(_enclosingInstance instance: Enclosing, wrapped wrappedKeyPath: ReferenceWritableKeyPath<Enclosing, Value>, storage storageKeyPath: ReferenceWritableKeyPath<Enclosing, Self>) -> Value {
get { get {
instance.performOnContext { var wrapper = instance[keyPath: storageKeyPath]
var wrapper = instance[keyPath: storageKeyPath] if let value = wrapper.value {
if let value = wrapper.value { return value
return value } else {
} else { guard let data = instance[keyPath: wrapper.keyPath] else { return wrapper.fallback }
guard let data = instance[keyPath: wrapper.keyPath] else { return wrapper.fallback } do {
do { let value = try decoder.decode(Box.self, from: data)
let value = try decoder.decode(Box.self, from: data) wrapper.value = value.value
wrapper.value = value.value wrapper.observation = instance.observe(wrapper.keyPath, changeHandler: { instance, _ in
wrapper.observation = instance.observe(wrapper.keyPath, changeHandler: { instance, _ in var wrapper = instance[keyPath: storageKeyPath]
var wrapper = instance[keyPath: storageKeyPath] if wrapper.skipClearingOnNextUpdate {
if wrapper.skipClearingOnNextUpdate { wrapper.skipClearingOnNextUpdate = false
wrapper.skipClearingOnNextUpdate = false } else {
} else { wrapper.removeCachedValue()
wrapper.removeCachedValue() }
}
instance[keyPath: storageKeyPath] = wrapper
})
instance[keyPath: storageKeyPath] = wrapper instance[keyPath: storageKeyPath] = wrapper
return value.value })
} catch { instance[keyPath: storageKeyPath] = wrapper
return wrapper.fallback return value.value
} } catch {
return wrapper.fallback
} }
} }
} }
set { set {
instance.performOnContext { var wrapper = instance[keyPath: storageKeyPath]
var wrapper = instance[keyPath: storageKeyPath] wrapper.value = newValue
wrapper.value = newValue wrapper.skipClearingOnNextUpdate = true
wrapper.skipClearingOnNextUpdate = true instance[keyPath: storageKeyPath] = wrapper
instance[keyPath: storageKeyPath] = wrapper let newData = try! encoder.encode(Box(value: newValue))
let newData = try! encoder.encode(Box(value: newValue)) instance[keyPath: wrapper.keyPath] = newData
instance[keyPath: wrapper.keyPath] = newData
}
} }
} }
@ -78,16 +74,6 @@ public struct LazilyDecoding<Enclosing: NSManagedObject, Value: Codable> {
} }
extension NSManagedObject {
fileprivate func performOnContext<V>(_ f: () -> V) -> V {
if let managedObjectContext {
managedObjectContext.performAndWait(f)
} else {
f()
}
}
}
extension LazilyDecoding { extension LazilyDecoding {
init<T>(arrayFrom keyPath: ReferenceWritableKeyPath<Enclosing, Data?>) where Value == [T] { init<T>(arrayFrom keyPath: ReferenceWritableKeyPath<Enclosing, Data?>) where Value == [T] {
self.init(from: keyPath, fallback: []) self.init(from: keyPath, fallback: [])