Commit: 2ce69aad339dfed0000450e43e6a9f5169b97ccc - KCDtest (git)

main code repository.

Commit MetaInfo

• Revision: 2ce69aad339dfed0000450e43e6a9f5169b97ccc (tree)
• Time: 2018-03-18 10:40:33
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

処理を簡素にした

Change Summary

• modified: KCD/CoreDataManager.swift

Incremental Difference

--- a/KCD/CoreDataManager.swift
+++ b/KCD/CoreDataManager.swift
@@ -83,61 +83,50 @@ extension CoreDataProvider {
     
     func save() throws {
         
-        var caughtError: Error?
-        context.performAndWait {
-            
-            guard context.commitEditing() else {
-                
-                caughtError = CoreDataError.couldNotSave("\(String(describing: type(of: self))) unable to commit editing before saveing")
-                return
-            }
+        // parentを辿ってsaveしていく
+        func propagateSaveAsync(_ context: NSManagedObjectContext) {
             
-            do {
+            guard let parent = context.parent else {
                 
-                try context.save()
-                
-            } catch let error as NSError {
-                
-                caughtError = CoreDataError.couldNotSave(error.localizedDescription)
                 return
             }
             
-            guard let reader = context.parent else { return }
-            
-            // save parent context
-            var catchedError: NSError? = nil
-            reader.performAndWait {
+            parent.perform {
                 
                 do {
                     
-                    try reader.save()
+                    try parent.save()
                     
-                    guard let writer = reader.parent else {
-                        
-                        throw CoreDataError.couldNotSave("Could not get writer context.")
-                    }
+                    propagateSaveAsync(parent)
                     
-                    writer.performAndWait {
-                        
-                        do {
-                            
-                            try writer.save()
-                            
-                        } catch let error as NSError {
-                            
-                            catchedError = error
-                        }
-                    }
+                } catch {
                     
-                } catch let error as NSError {
-                    
-                    catchedError = error
+                    Logger.shared.log("Could not save context as \(error)")
                 }
             }
+        }
+        
+        var caughtError: Error?
+        context.performAndWait {
             
-            if let error = catchedError {
+            guard context.commitEditing() else {
+                
+                caughtError = CoreDataError.couldNotSave("Unable to commit editing before saveing")
+                return
+            }
+            
+            do {
+                
+                try context.save()
+                
+                // save reader and writer context async.
+                // non throw exceptions.
+                propagateSaveAsync(context)
+                
+            } catch let error as NSError {
                 
                 caughtError = CoreDataError.couldNotSave(error.localizedDescription)
+                return
             }
         }