OSDN Git Service

CoreDataIntormationの名前をCoreDataConfigurationに変更
authormasakih <masakih@users.sourceforge.jp>
Tue, 21 Mar 2017 12:56:43 +0000 (21:56 +0900)
committermasakih <masakih@users.sourceforge.jp>
Tue, 21 Mar 2017 12:56:43 +0000 (21:56 +0900)
KCD/BookmarkDataStore.swift
KCD/CoreDataCore.swift
KCD/LocalDataStore.swift
KCD/ManagedObjectContextGenerator.swift
KCD/ResourceHistoryDataStore.swift
KCD/ServerDataStore.swift
KCD/TemporaryDataStore.swift

index 78e2465..4511824 100644 (file)
@@ -8,8 +8,8 @@
 
 import Cocoa
 
-extension CoreDataIntormation {
-    static let bookmark = CoreDataIntormation("Bookmark")
+extension CoreDataConfiguration {
+    static let bookmark = CoreDataConfiguration("Bookmark")
 }
 extension CoreDataCore {
     static let bookmark = CoreDataCore(.bookmark)
index 7204309..78ab313 100644 (file)
@@ -15,7 +15,7 @@ enum CoreDataManagerType {
 }
 
 // MARK: - struct
-struct CoreDataIntormation {
+struct CoreDataConfiguration {
     let modelName: String
     let fileName: String
     let options: [AnyHashable: Any]
@@ -41,15 +41,15 @@ struct CoreDataIntormation {
 }
 
 struct CoreDataCore {
-    let info: CoreDataIntormation
+    let config: CoreDataConfiguration
     let model: NSManagedObjectModel
     let coordinator: NSPersistentStoreCoordinator
     let parentContext: NSManagedObjectContext
     
-    init(_ info: CoreDataIntormation) {
-        self.info = info
+    init(_ config: CoreDataConfiguration) {
+        self.config = config
         do {
-            (model, coordinator, parentContext) = try genarate(info)
+            (model, coordinator, parentContext) = try genarate(config)
         } catch {
             NSApplication.shared().presentError(error)
             fatalError("CoreDataCore: can not initialize. \(error)")
@@ -141,6 +141,6 @@ extension CoreDataAccessor {
 
 extension CoreDataManager where Self: CoreDataProvider {
     func removeDataFile() {
-        remove(name: core.info.fileName)
+        remove(name: core.config.fileName)
     }
 }
index ecda507..c797fde 100644 (file)
@@ -8,8 +8,8 @@
 
 import Cocoa
 
-extension CoreDataIntormation {
-    static let local = CoreDataIntormation("LocalData")
+extension CoreDataConfiguration {
+    static let local = CoreDataConfiguration("LocalData")
 }
 extension CoreDataCore {
     static let local = CoreDataCore(.local)
index 4fb8548..e51d2f3 100644 (file)
@@ -21,11 +21,11 @@ func remove(name: String) {
         .forEach { removeDataFile(at: $0) }
 }
 
-func genarate(_ info: CoreDataIntormation) throws ->
+func genarate(_ config: CoreDataConfiguration) throws ->
     (model: NSManagedObjectModel, coordinator: NSPersistentStoreCoordinator, moc: NSManagedObjectContext) {
         do {
-            let model = try createModel(info)
-            let coordinator = try getCoordinator(info, model)
+            let model = try createModel(config)
+            let coordinator = try getCoordinator(config, model)
             let moc = createContext(coordinator)
             return (model: model, coordinator: coordinator, moc: moc)
         } catch {
@@ -42,27 +42,27 @@ private func removeDataFile(at url: URL) {
 }
 
 // MARK: - NSManagedObjectContext and ...
-private  func createModel(_ info: CoreDataIntormation) throws -> NSManagedObjectModel {
-    guard let modelURL = Bundle.main.url(forResource: info.modelName, withExtension: "momd"),
+private  func createModel(_ config: CoreDataConfiguration) throws -> NSManagedObjectModel {
+    guard let modelURL = Bundle.main.url(forResource: config.modelName, withExtension: "momd"),
         let model = NSManagedObjectModel(contentsOf: modelURL)
         else {
             throw CoreDataError.couldNotCreateModel
     }
     return model
 }
-private func getCoordinator(_ info: CoreDataIntormation,
+private func getCoordinator(_ config: CoreDataConfiguration,
                             _ model: NSManagedObjectModel) throws -> NSPersistentStoreCoordinator {
     do {
-        return try createCoordinator(info, model)
+        return try createCoordinator(config, model)
     } catch {
         let nserror = error as NSError
         // Data Modelが更新されていたらストアファイルを削除してもう一度
         if nserror.domain == NSCocoaErrorDomain,
             (nserror.code == 134130 || nserror.code == 134110),
-            info.tryRemake {
-            remove(name: info.fileName)
+            config.tryRemake {
+            remove(name: config.fileName)
             do {
-                return try createCoordinator(info, model)
+                return try createCoordinator(config, model)
             } catch {
                 print("Fail crrate NSPersistentStoreCoordinator twice.")
             }
@@ -70,7 +70,7 @@ private func getCoordinator(_ info: CoreDataIntormation,
         throw error
     }
 }
-private func createCoordinator(_ info: CoreDataIntormation,
+private func createCoordinator(_ config: CoreDataConfiguration,
                                _ model: NSManagedObjectModel) throws -> NSPersistentStoreCoordinator {
     if !checkDirectory(ApplicationDirecrories.support) {
         let failureReason = "Can not use directory \(ApplicationDirecrories.support.path)"
@@ -78,12 +78,12 @@ private func createCoordinator(_ info: CoreDataIntormation,
     }
     
     let coordinator: NSPersistentStoreCoordinator = NSPersistentStoreCoordinator(managedObjectModel: model)
-    let url = ApplicationDirecrories.support.appendingPathComponent(info.fileName)
+    let url = ApplicationDirecrories.support.appendingPathComponent(config.fileName)
     do {
-        try coordinator.addPersistentStore(ofType: info.type,
+        try coordinator.addPersistentStore(ofType: config.type,
                                            configurationName: nil,
                                            at: url,
-                                           options: info.options)
+                                           options: config.options)
     } catch {
         throw error
     }
index 5f8a28a..3e546b8 100644 (file)
@@ -8,8 +8,8 @@
 
 import Cocoa
 
-extension CoreDataIntormation {
-    static let resourceHistory = CoreDataIntormation("ResourceHistory")
+extension CoreDataConfiguration {
+    static let resourceHistory = CoreDataConfiguration("ResourceHistory")
 }
 extension CoreDataCore {
     static let resourceHistory = CoreDataCore(.resourceHistory)
index 661455b..cea2e4f 100644 (file)
@@ -8,8 +8,8 @@
 
 import Cocoa
 
-extension CoreDataIntormation {
-    static let kcd = CoreDataIntormation("KCD", tryRemake: true)
+extension CoreDataConfiguration {
+    static let kcd = CoreDataConfiguration("KCD", tryRemake: true)
 }
 extension CoreDataCore {
     static let kcd = CoreDataCore(.kcd)
index 7aded19..1d818d7 100644 (file)
@@ -8,11 +8,11 @@
 
 import Cocoa
 
-extension CoreDataIntormation {
-    static let temporary = CoreDataIntormation("Temporary",
-                                               fileName: ":memory:",
-                                               options: [:],
-                                               type: NSInMemoryStoreType
+extension CoreDataConfiguration {
+    static let temporary = CoreDataConfiguration("Temporary",
+                                                 fileName: ":memory:",
+                                                 options: [:],
+                                                 type: NSInMemoryStoreType
     )
 }
 extension CoreDataCore {