Commit: bffee1debad5eda2a130353ba091b22564716d54 - KCDtest (git)

main code repository.

Commit MetaInfo

• Revision: bffee1debad5eda2a130353ba091b22564716d54 (tree)
• Time: 2018-03-23 22:06:50
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

NSManagedObjectIDを明に使用しないように変更

Change Summary

• modified: KCD/BookmarkListViewController.swift
• modified: KCD/CoreDataManager.swift
• modified: KCD/HistoryTableViewController.swift
• modified: KCD/MasterShipMapper.swift
• modified: KCD/ShipMapper.swift
• modified: KCD/ShipMasterDetailWindowController.swift
• modified: KCD/SlotItemMapper.swift

Incremental Difference

--- a/KCD/BookmarkListViewController.swift
+++ b/KCD/BookmarkListViewController.swift
@@ -154,8 +154,7 @@ extension BookmarkListViewController: NSTableViewDelegate, NSTableViewDataSource
                 
                 guard let data = $0.element.data(forType: .bookmarkItem) else { return }
                 guard let uri = NSKeyedUnarchiver.unarchiveObject(with: data) as? URL else { return }
-                guard let oID = self.managedObjectContext.persistentStoreCoordinator?.managedObjectID(forURIRepresentation: uri) else { return }
-                guard let bookmark = store.object(of: Bookmark.entity, with: oID) else { return }
+                guard let bookmark = store.object(of: Bookmark.entity, forURIRepresentation: uri) else { return }
                 
                 bookmark.order = targetOrder + $0.offset + 1
             }

--- a/KCD/CoreDataManager.swift
+++ b/KCD/CoreDataManager.swift
@@ -41,10 +41,15 @@ protocol CoreDataAccessor: CoreDataProvider {
     
     func insertNewObject<T>(for entity: Entity<T>) -> T?
     func delete(_ object: NSManagedObject)
-    func object<T>(of entity: Entity<T>, with objectId: NSManagedObjectID) -> T?
     func objects<T>(of entity: Entity<T>, sortDescriptors: [NSSortDescriptor]?, predicate: NSPredicate?) throws -> [T]
     
-    func object(with objectId: NSManagedObjectID) -> NSManagedObject
+    func object<T>(of entity: Entity<T>, forURIRepresentation: URL) -> T?
+    
+    /// NSManagedObectを自身が管理するNSManagedObjectに変換する
+    ///
+    /// - Parameter object: 変換するNSManagedObject
+    /// - Returns: 自身が管理するNSManagedObject。自身の管理下に該当オブジェクトがなければnilを返す。
+    func exchange<T: NSManagedObject>(_ object: T) -> T?
 }
 
 protocol CoreDataManager: CoreDataAccessor {
@@ -161,11 +166,6 @@ extension CoreDataAccessor {
         context.delete(object)
     }
     
-    func object<T>(of entity: Entity<T>, with objectId: NSManagedObjectID) -> T? {
-        
-        return context.object(with: objectId) as? T
-    }
-    
     func objects<T>(of entity: Entity<T>, sortDescriptors: [NSSortDescriptor]? = nil, predicate: NSPredicate? = nil) throws -> [T] {
         
         let req = NSFetchRequest<T>(entityName: entity.name)
@@ -191,13 +191,24 @@ extension CoreDataAccessor {
         return result ?? []
     }
     
-    func object(with objectId: NSManagedObjectID) -> NSManagedObject {
+    func object<T>(of entity: Entity<T>, forURIRepresentation uri: URL) -> T? {
+        
+        guard let oID = context.persistentStoreCoordinator?.managedObjectID(forURIRepresentation: uri) else { return nil }
+        
+        var result: NSManagedObject?
+        sync {
+            result = self.context.object(with: oID)
+        }
+        return result as? T
+    }
+    
+    func exchange<T: NSManagedObject>(_ obj: T) -> T? {
         
         var result: NSManagedObject?
         sync {
-            result = self.context.object(with: objectId)
+            result = self.context.object(with: obj.objectID)
         }
-        return result!
+        return result as? T
     }
 }
 

--- a/KCD/HistoryTableViewController.swift
+++ b/KCD/HistoryTableViewController.swift
@@ -51,8 +51,7 @@ class HistoryTableViewController: NSViewController {
         let selectedIndex = controller.selectionIndex
         store.sync {
             selection
-                .map { $0.objectID }
-                .map(store.object(with:))
+                .flatMap(store.exchange)
                 .forEach(store.delete)
         }
         

--- a/KCD/MasterShipMapper.swift
+++ b/KCD/MasterShipMapper.swift
@@ -51,7 +51,8 @@ final class MasterShipMapper: JSONMapper {
             return Logger.shared.log("MasterShipMapper: Can not find MasterSType")
         }
         
-        guard let masterSType = configuration.editorStore.object(of: MasterSType.entity, with: stype.objectID) else {
+        // FUCK: 型推論がバカなのでダウンキャストしてるんだ！！！
+        guard let masterSType = configuration.editorStore.exchange(stype) as? MasterSType else {
             
             return Logger.shared.log("MasterShipMapper: Can not convert to current moc object masterSType")
         }

--- a/KCD/ShipMapper.swift
+++ b/KCD/ShipMapper.swift
@@ -169,7 +169,7 @@ final class ShipMapper: JSONMapper {
     private func setMaster(_ masterId: Int, to ship: Ship) {
         
         guard let mShip = masterShips.binarySearch(comparator: { $0.id ==? masterId }),
-            let masterShip = store?.object(of: MasterShip.entity, with: mShip.objectID) else {
+            let masterShip = store?.exchange(mShip) else {
                 
                 return Logger.shared.log("Can not convert to current moc object masterShip")
         }
@@ -188,7 +188,7 @@ final class ShipMapper: JSONMapper {
             .flatMap { item in
                 
                 guard let found = self.slotItems.binarySearch(comparator: { $0.id ==? item }),
-                    let slotItem = store.object(of: SlotItem.entity, with: found.objectID) else {
+                    let slotItem = store.exchange(found) else {
                         
                         let maxV = convertedSlotItems.last
                         if maxV != nil, maxV! < item {
@@ -213,7 +213,7 @@ final class ShipMapper: JSONMapper {
             return
         }
         guard let found = slotItems.binarySearch(comparator: { $0.id ==? exSlotItem }),
-            let ex = store?.object(of: SlotItem.entity, with: found.objectID) else {
+            let ex = store?.exchange(found) else {
                 
                 return Logger.shared.log("Can not convert to current moc object")
         }

--- a/KCD/ShipMasterDetailWindowController.swift
+++ b/KCD/ShipMasterDetailWindowController.swift
@@ -69,8 +69,8 @@ final class ShipMasterDetailWindowController: NSWindowController {
         
         let store = ServerDataStore.oneTimeEditor()
         store.sync {
-            guard let i = self.selectedShip?.objectID else { return }
-            guard let ship = store.object(of: Ship.entity, with: i) else { return }
+            guard let selectedShip = self.selectedShip else { return }
+            guard let ship = store.exchange(selectedShip) else { return }
             //
             //        ship.sally_area = sally.integerValue as NSNumber
             

--- a/KCD/SlotItemMapper.swift
+++ b/KCD/SlotItemMapper.swift
@@ -97,7 +97,8 @@ final class SlotItemMapper: JSONMapper {
             return Logger.shared.log("Can not find MasterSlotItem")
         }
         
-        guard let masterSlotItem = configuration.editorStore.object(of: MasterSlotItem.entity, with: mSlotItem.objectID) else {
+        // FUCK: 型推論がバカなのでダウンキャストしてるんだ！！！
+        guard let masterSlotItem = configuration.editorStore.exchange(mSlotItem) as? MasterSlotItem else {
                 
                 return Logger.shared.log("Can not convert to current moc object")
         }