Add write async completion block

justeat · Jan 30, 2019 · 3173eda · 3173eda
1 parent 6f5dd5c
commit 3173eda
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/JustPersist/Classes/Core/Implementations/ChildCoreDataStore.swift b/JustPersist/Classes/Core/Implementations/ChildCoreDataStore.swift
@@ -99,13 +99,17 @@ extension ChildCoreDataStore: ChildDataStore {
     }
 
     func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void) {
-
+        writeAsync(writeBlock, completion: nil)
+    }
+
+    func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void, completion: (() -> Void)?) {
         precondition(isSetup, "You must setup the data store before trying to write to it")
 
         let accessor = readWriteAccessor()
         accessor.context.perform {
             writeBlock(accessor)
             accessor.save()
+            completion?()
         }
     }
 

diff --git a/JustPersist/Classes/Core/Interface/DataStore.swift b/JustPersist/Classes/Core/Interface/DataStore.swift
@@ -49,7 +49,15 @@ public protocol DataStore: class {
      - parameter writeBlock: Block that contains the work that will be done. The block will be passed a ```DataStoreReadWriteAccessor``` which can be used to access information in the data store that can then be modified. Once this block has finished running, the accessor will ensure that any changes that took place within the block will be persisted. It is **not** safe to perform UI work within this block.
      */
     func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void)
-
+
+    /**
+     Write to the data store asyncronously
+
+     - parameter writeBlock: Block that contains the work that will be done. The block will be passed a ```DataStoreReadWriteAccessor``` which can be used to access information in the data store that can then be modified. Once this block has finished running, the accessor will ensure that any changes that took place within the block will be persisted. It is **not** safe to perform UI work within this block.
+     - parameter completion: Block that is executed when the changes are saved.
+     */
+    func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void, completion: (() -> Void)?)
+
     // MARK: Child Data Store
 
     /**

diff --git a/JustPersist/Classes/Wrappers/MagicalRecord/MagicalRecordDataStore.swift b/JustPersist/Classes/Wrappers/MagicalRecord/MagicalRecordDataStore.swift
@@ -141,7 +141,10 @@ extension MagicalRecordDataStore: DataStore {
     }
 
     public func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void) {
-
+        writeAsync(writeBlock, completion: nil)
+    }
+
+    public func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void, completion: (() -> Void)?) {
         precondition(isSetup, "You must setup the data store before trying to write to it")
 
         let accessor = readWriteAccessor
@@ -150,7 +153,8 @@ extension MagicalRecordDataStore: DataStore {
             accessor.context.mr_saveToPersistentStoreAndWait() // Saves context and parent contexts all the way up to the persistent store.
         }
     }
-
+
+
     public func makeChildDataStore() -> ChildDataStore {
         return ChildCoreDataStore(parentDataStore: self, parentContext: readAccessor.context, errorHandler: errorHandler)
     }

diff --git a/JustPersist/Classes/Wrappers/Skopelos/SkopelosDataStore.swift b/JustPersist/Classes/Wrappers/Skopelos/SkopelosDataStore.swift
@@ -115,8 +115,7 @@ extension SkopelosDataStore: DataStore {
         }
     }
 
-    public func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void) {
-
+    public func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void, completion: (() -> Void)?) {
         precondition(isSetup, "You must setup the data store before trying to write to it")
 
         skopelos.writeAsync { context in
@@ -131,8 +130,13 @@ extension SkopelosDataStore: DataStore {
                 }
             }
             writeBlock(writeAccessor)
+            completion?()
         }
     }
+
+    public func writeAsync(_ writeBlock: @escaping (DataStoreReadWriteAccessor) -> Void) {
+        writeAsync(writeBlock, completion: nil)
+    }
 
     public func makeChildDataStore() -> ChildDataStore {
         var mainContext: NSManagedObjectContext! = nil