不要となっていたプロパティを削除

[kcd/KCD.git] / KCD / TemporaryDataStore.swift

diff --git a/KCD/TemporaryDataStore.swift b/KCD/TemporaryDataStore.swift
index c86fe5c..6a6220c 100644 (file)
--- a/KCD/TemporaryDataStore.swift
+++ b/KCD/TemporaryDataStore.swift
@@ -7,99 +7,26 @@
 //
 
 import Cocoa
+import Doutaku
 
-extension CoreDataIntormation {
-    static let temporary = CoreDataIntormation(
-        modelName: "Temporary",
-        storeFileName: ":memory:",
-        storeOptions:[:],
-        storeType: NSInMemoryStoreType,
-        deleteAndRetry: false
-    )
-}
-extension CoreDataCore {
-    static let temporary = CoreDataCore(.temporary)
-}
-
-
-class TemporaryDataStore: CoreDataAccessor, CoreDataManager {
-    static var `default` = TemporaryDataStore(type: .reader)
-    class func oneTimeEditor() -> TemporaryDataStore {
-        return TemporaryDataStore(type: .editor)
-    }
+final class TemporaryDataStore: CoreDataManager {
     
-    required init(type: CoreDataManagerType) {
-        managedObjectContext =
-            type == .reader ? core.parentManagedObjectContext
-            : core.editorManagedObjectContext()
-    }
-    deinit {
-        saveActionCore()
-    }
+    static let core = CoreDataCore(CoreDataConfiguration("Temporary",
+                                                         fileName: ":memory:",
+                                                         options: [:],
+                                                         type: NSInMemoryStoreType))
     
-    let core = CoreDataCore.temporary
-    var managedObjectContext: NSManagedObjectContext
-}
-
-extension KCBattle: EntityProvider {
-    override class var entityName: String { return "Battle" }
-}
-extension KCDamage: EntityProvider {
-    override class var entityName: String { return "Damage" }
-}
-extension KCGuardEscaped: EntityProvider {
-    override class var entityName: String { return "GuardEscaped" }
-}
-
-extension TemporaryDataStore {
-    func battle() -> KCBattle? {
-        return battles().first
-    }
-    func battles() -> [KCBattle] {
-        guard let battles = try? self.objects(with: KCBattle.entity)
-            else { return [] }
-        return battles
-    }
-    func resetBattle() {
-        battles().forEach { delete($0) }
-    }
-    func createBattle() -> KCBattle? {
-        return insertNewObject(for: KCBattle.entity)
-    }
+    static let `default` = TemporaryDataStore(type: .reader)
     
-    func sortedDamagesById() -> [KCDamage] {
-        let sortDescriptor = NSSortDescriptor(key: "id", ascending: true)
-        guard let damages = try? objects(with: KCDamage.entity, sortDescriptors: [sortDescriptor])
-            else { return [] }
-        return damages
-    }
-    func damages() -> [KCDamage] {
-        guard let damages = try? objects(with: KCDamage.entity)
-            else { return [] }
-        return damages
-    }
-    func createDamage() -> KCDamage? {
-        return insertNewObject(for: KCDamage.entity)
+    required init(type: CoreDataManagerType) {
+        
+        context = TemporaryDataStore.context(for: type)
     }
     
-    func guardEscaped() -> [KCGuardEscaped] {
-        guard let escapeds = try? objects(with: KCGuardEscaped.entity)
-            else { return [] }
-        return escapeds
-    }
-    func ensuredGuardEscaped(byShipId shipId: Int) -> KCGuardEscaped? {
-        let p = NSPredicate(format: "shipID = %ld AND ensured = TRUE", shipId)
-        guard let escapes = try? objects(with: KCGuardEscaped.entity, predicate: p)
-            else { return nil }
-        return escapes.first
-    }
-    func notEnsuredGuardEscaped() -> [KCGuardEscaped] {
-        let predicate = NSPredicate(format: "ensured = FALSE")
-        guard let escapeds = try? objects(with: KCGuardEscaped.entity, predicate: predicate)
-            else { return [] }
-        return escapeds
-    }
-    func createGuardEscaped() -> KCGuardEscaped? {
-        return insertNewObject(for: KCGuardEscaped.entity)
+    deinit {
+        
+        save(errorHandler: presentOnMainThread)
     }
+    
+    let context: NSManagedObjectContext
 }