Doutaku を 1.0 にアップデート

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

diff --git a/KCD/TemporaryDataStoreAccessor.swift b/KCD/TemporaryDataStoreAccessor.swift
index 57a6257..703f869 100644 (file)
--- a/KCD/TemporaryDataStoreAccessor.swift
+++ b/KCD/TemporaryDataStoreAccessor.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2017年 Hori,Masaki. All rights reserved.
 //
 
+import Doutaku
+
 extension TemporaryDataStore {
     
     func battle() -> Battle? {
@@ -15,7 +17,10 @@ extension TemporaryDataStore {
     
     func battles() -> [Battle] {
         
-        guard let battles = try? self.objects(of: Battle.entity) else { return [] }
+        guard let battles = try? self.objects(of: Battle.self) else {
+            
+            return []
+        }
         
         return battles
     }
@@ -27,59 +32,73 @@ extension TemporaryDataStore {
     
     func createBattle() -> Battle? {
         
-        return insertNewObject(for: Battle.entity)
+        return insertNewObject(for: Battle.self)
     }
     
     func sortedDamagesById() -> [Damage] {
         
-        let sortDescriptor = NSSortDescriptor(key: #keyPath(Damage.id), ascending: true)
+        let sortDescriptors = SortDescriptors(keyPath: \Damage.id, ascending: true)
         
-        guard let damages = try? objects(of: Damage.entity, sortDescriptors: [sortDescriptor]) else { return [] }
+        guard let damages = try? objects(of: Damage.self, sortDescriptors: sortDescriptors) else {
+            
+            return []
+        }
         
         return damages
     }
     
     func damages() -> [Damage] {
         
-        guard let damages = try? objects(of: Damage.entity) else { return [] }
+        guard let damages = try? objects(of: Damage.self) else {
+            
+            return []
+        }
         
         return damages
     }
     
     func createDamage() -> Damage? {
         
-        return insertNewObject(for: Damage.entity)
+        return insertNewObject(for: Damage.self)
     }
     
     func guardEscaped() -> [GuardEscaped] {
         
-        guard let escapeds = try? objects(of: GuardEscaped.entity) else { return [] }
+        guard let escapeds = try? objects(of: GuardEscaped.self) else {
+            
+            return []
+        }
         
         return escapeds
     }
     
     func ensuredGuardEscaped(byShipId shipId: Int) -> GuardEscaped? {
         
-        let p = NSPredicate.empty
-            .and(NSPredicate(#keyPath(GuardEscaped.shipID), equal: shipId))
-            .and(.true(#keyPath(GuardEscaped.ensured)))
+        let predicate = Predicate(\GuardEscaped.shipID, equalTo: shipId)
+            .and(Predicate(true: \GuardEscaped.ensured))
         
-        guard let escapes = try? objects(of: GuardEscaped.entity, predicate: p) else { return nil }
+        guard let escapes = try? objects(of: GuardEscaped.self, predicate: predicate) else {
+            
+            return nil
+        }
         
         return escapes.first
     }
     
     func notEnsuredGuardEscaped() -> [GuardEscaped] {
         
-        let predicate = NSPredicate.false(#keyPath(GuardEscaped.ensured))
+        let predicate = Predicate(false: \GuardEscaped.ensured)
         
-        guard let escapeds = try? objects(of: GuardEscaped.entity, predicate: predicate) else { return [] }
+        guard let escapeds = try? objects(of: GuardEscaped.self, predicate: predicate) else {
+            
+            return []
+        }
         
         return escapeds
     }
     
     func createGuardEscaped() -> GuardEscaped? {
         
-        return insertNewObject(for: GuardEscaped.entity)
+        return insertNewObject(for: GuardEscaped.self)
     }
 }