CoreDataIntormationのイニシャライザにデフォルトバリューをもたせた

diff --git a/KCD/BookmarkDataStore.swift b/KCD/BookmarkDataStore.swift
index d01204e..9e929bd 100644 (file)
--- a/KCD/BookmarkDataStore.swift
+++ b/KCD/BookmarkDataStore.swift
@@ -9,14 +9,7 @@
 import Cocoa
 
 extension CoreDataIntormation {
-    static let bookmark = CoreDataIntormation(
-        modelName: "Bookmark",
-        storeFileName: "Bookmark.storedata",
-        storeOptions: [NSMigratePersistentStoresAutomaticallyOption: true,
-                       NSInferMappingModelAutomaticallyOption: true],
-        storeType: NSSQLiteStoreType,
-        deleteAndRetry: false
-    )
+    static let bookmark = CoreDataIntormation("Bookmark")
 }
 extension CoreDataCore {
     static let bookmark = CoreDataCore(.bookmark)

diff --git a/KCD/CoreDataCore.swift b/KCD/CoreDataCore.swift
index db5b6cd..304e9b8 100644 (file)
--- a/KCD/CoreDataCore.swift
+++ b/KCD/CoreDataCore.swift
@@ -25,6 +25,23 @@ struct CoreDataIntormation {
     let storeOptions: Dictionary<AnyHashable, Any>
     let storeType: String
     let deleteAndRetry: Bool
+    
+    private static let defaultOptions: [AnyHashable: Any] = [
+        NSMigratePersistentStoresAutomaticallyOption: true,
+        NSInferMappingModelAutomaticallyOption: true
+    ]
+    
+    init(_ modelName: String,
+         storeFileName: String? = nil,
+         storeOptions: [AnyHashable: Any] = defaultOptions,
+         storeType: String = NSSQLiteStoreType,
+         deleteAndRetry: Bool = false) {
+        self.modelName = modelName
+        self.storeFileName = storeFileName ?? "\(modelName).storedata"
+        self.storeOptions = storeOptions
+        self.storeType = storeType
+        self.deleteAndRetry = deleteAndRetry
+    }
 }
 
 struct CoreDataCore {

diff --git a/KCD/LocalDataStore.swift b/KCD/LocalDataStore.swift
index 147da6a..8ebb439 100644 (file)
--- a/KCD/LocalDataStore.swift
+++ b/KCD/LocalDataStore.swift
@@ -9,14 +9,7 @@
 import Cocoa
 
 extension CoreDataIntormation {
-    static let local = CoreDataIntormation(
-        modelName: "LocalData",
-        storeFileName: "LocalData.storedata",
-        storeOptions: [NSMigratePersistentStoresAutomaticallyOption: true,
-                       NSInferMappingModelAutomaticallyOption: true],
-        storeType: NSSQLiteStoreType,
-        deleteAndRetry: false
-    )
+    static let local = CoreDataIntormation("LocalData")
 }
 extension CoreDataCore {
     static let local = CoreDataCore(.local)

diff --git a/KCD/ResourceHistoryDataStore.swift b/KCD/ResourceHistoryDataStore.swift
index 546c90b..746eb01 100644 (file)
--- a/KCD/ResourceHistoryDataStore.swift
+++ b/KCD/ResourceHistoryDataStore.swift
@@ -9,14 +9,7 @@
 import Cocoa
 
 extension CoreDataIntormation {
-    static let resourceHistory = CoreDataIntormation(
-        modelName: "ResourceHistory",
-        storeFileName: "ResourceHistory.storedata",
-        storeOptions: [NSMigratePersistentStoresAutomaticallyOption: true,
-                       NSInferMappingModelAutomaticallyOption: true],
-        storeType: NSSQLiteStoreType,
-        deleteAndRetry: false
-    )
+    static let resourceHistory = CoreDataIntormation("ResourceHistory")
 }
 extension CoreDataCore {
     static let resourceHistory = CoreDataCore(.resourceHistory)

diff --git a/KCD/ServerDataStore.swift b/KCD/ServerDataStore.swift
index 42efa5a..5714a74 100644 (file)
--- a/KCD/ServerDataStore.swift
+++ b/KCD/ServerDataStore.swift
@@ -1,6 +1,6 @@
 //
 //  ServerDataStore.swift
-//  D
+//  KCD
 //
 //  Created by Hori,Masaki on 2017/01/07.
 //  Copyright © 2017年 Hori,Masaki. All rights reserved.
@@ -9,14 +9,7 @@
 import Cocoa
 
 extension CoreDataIntormation {
-    static let kcd = CoreDataIntormation(
-        modelName: "KCD",
-        storeFileName: "KCD.storedata",
-        storeOptions: [NSMigratePersistentStoresAutomaticallyOption: true,
-                       NSInferMappingModelAutomaticallyOption: true],
-        storeType: NSSQLiteStoreType,
-        deleteAndRetry: true
-    )
+    static let kcd = CoreDataIntormation("KCD", deleteAndRetry: true)
 }
 extension CoreDataCore {
     static let kcd = CoreDataCore(.kcd)

diff --git a/KCD/TemporaryDataStore.swift b/KCD/TemporaryDataStore.swift
index ad1df7f..98856b3 100644 (file)
--- a/KCD/TemporaryDataStore.swift
+++ b/KCD/TemporaryDataStore.swift
@@ -1,6 +1,6 @@
 //
 //  TemporaryDataStore.swift
-//  D
+//  KCD
 //
 //  Created by Hori,Masaki on 2017/01/06.
 //  Copyright © 2017年 Hori,Masaki. All rights reserved.
@@ -9,12 +9,10 @@
 import Cocoa
 
 extension CoreDataIntormation {
-    static let temporary = CoreDataIntormation(
-        modelName: "Temporary",
-        storeFileName: ":memory:",
-        storeOptions: [:],
-        storeType: NSInMemoryStoreType,
-        deleteAndRetry: false
+    static let temporary = CoreDataIntormation("Temporary",
+                                               storeFileName: ":memory:",
+                                               storeOptions: [:],
+                                               storeType: NSInMemoryStoreType
     )
 }
 extension CoreDataCore {