starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-20 16:44:08 +01:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'corestore2_develop' into corestore2_develop_objc

Browse Source 
# Conflicts:
#	Sources/Observing/ListMonitor.swift
This commit is contained in:
John Rommel Estropia
2016-03-30 21:41:44 +09:00
parent a4d3d0c0ed d23121d8ed
commit b529735269
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/Internal/CoreStoreFetchedResultsController.swift
View File

@@ -52,7 +52,7 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
if let from = from {
self.reapplyAffectedStores = {
self.reapplyAffectedStores = { fetchRequest, context in
return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
}
@@ -64,7 +64,7 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
fatalError("Attempted to create an \(typeName(NSFetchedResultsController)) without a From clause or an NSEntityDescription.")
}
self.reapplyAffectedStores = {
self.reapplyAffectedStores = { fetchRequest, context in
return from.applyAffectedStoresForFetchedRequest(fetchRequest, context: context)
}
@@ -80,7 +80,7 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
internal func performFetchFromSpecifiedStores() throws {
if !self.reapplyAffectedStores() {
if !self.reapplyAffectedStores(fetchRequest: self.fetchRequest, context: self.managedObjectContext) {
CoreStore.log(
.Warning,
@@ -90,8 +90,13 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
try self.performFetch()
}
deinit {
self.delegate = nil
}
// MARK: Private
private let reapplyAffectedStores: () -> Bool
private let reapplyAffectedStores: (fetchRequest: NSFetchRequest, context: NSManagedObjectContext) -> Bool
}

4
Sources/Internal/NSManagedObjectContext+Transaction.swift
View File

@@ -84,7 +84,7 @@ internal extension NSManagedObjectContext {
var result = SaveResult(hasChanges: false)
self.performBlockAndWait { [unowned self] () -> Void in
self.performBlockAndWait {
guard self.hasChanges else {
@@ -129,7 +129,7 @@ internal extension NSManagedObjectContext {
@nonobjc
internal func saveAsynchronouslyWithCompletion(completion: ((result: SaveResult) -> Void) = { _ in }) {
self.performBlock { () -> Void in
self.performBlock {
guard self.hasChanges else {