kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-04-23 20:31:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for cancelling in progress indexing operations

Browse Source
This commit is contained in:
Blake Watters
2012-10-22 19:33:08 -04:00
parent dfc27be911
commit dccff97644
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Code/Search/RKSearchIndexer.m
View File

@@ -142,7 +142,7 @@ NSString * const RKSearchableAttributeNamesUserInfoKey = @"RestKitSearchableAttr
[[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:managedObjectContext];
}
- (NSUInteger)indexManagedObject:(NSManagedObject *)managedObject
- (NSUInteger)indexManagedObject:(NSManagedObject *)managedObject withProgressBlock:(void (^)(NSManagedObject *managedObject, RKSearchWord *searchWord, BOOL *stop))progressBlock;
{
@autoreleasepool {
@@ -161,7 +161,8 @@ NSString * const RKSearchableAttributeNamesUserInfoKey = @"RestKitSearchableAttr
fetchRequest.fetchLimit = 1;
NSPredicate *predicateTemplate = [NSPredicate predicateWithFormat:@"%K == $SEARCH_WORD", RKSearchWordAttributeName];
NSManagedObjectContext *managedObjectContext = managedObject.managedObjectContext;
__block BOOL stop = NO;
[managedObjectContext performBlockAndWait:^{
NSMutableSet *searchWords = [NSMutableSet set];
for (NSString *searchableAttribute in searchableAttributes) {
@@ -185,23 +186,36 @@ NSString * const RKSearchableAttributeNamesUserInfoKey = @"RestKitSearchableAttr
NSAssert([[searchWord managedObjectContext] isEqual:managedObjectContext], @"Serious Core Data error: Expected `NSManagedObject` for the 'RKSearchWord' entity in context %@, but got one in %@", managedObject, [searchWord managedObjectContext]);
[searchWords addObject:searchWord];
if (progressBlock) progressBlock(managedObject, searchWord, &stop);
} else {
RKLogError(@"Failed to retrieve search word: %@", error);
}
}
if (stop) break;
}
}
if (stop) break;
}
[managedObject setValue:searchWords forKey:RKSearchWordsRelationshipName];
RKLogTrace(@"Indexed search words: %@", [searchWords valueForKey:RKSearchWordAttributeName]);
searchWordCount = [searchWords count];
if (! stop) {
[managedObject setValue:searchWords forKey:RKSearchWordsRelationshipName];
RKLogTrace(@"Indexed search words: %@", [searchWords valueForKey:RKSearchWordAttributeName]);
searchWordCount = [searchWords count];
}
}];
return searchWordCount;
}
}
- (NSUInteger)indexManagedObject:(NSManagedObject *)managedObject
{
return [self indexManagedObject:managedObject withProgressBlock:nil];
}
/**
NOTE: Does **NOT** use the indexing context as unsaved objects would not be available for indexing in that context
*/
@@ -265,7 +279,10 @@ NSString * const RKSearchableAttributeNamesUserInfoKey = @"RestKitSearchableAttr
NSManagedObject *managedObject = [self.indexingContext existingObjectWithID:objectID error:&error];
NSAssert([[managedObject managedObjectContext] isEqual:self.indexingContext], @"Serious Core Data error: Asked for an `NSManagedObject` with ID in indexing context %@, but got one in %@", objectID, self.indexingContext, [managedObject managedObjectContext]);
if (managedObject && error == nil) {
[self indexManagedObject:managedObject];
[self indexManagedObject:managedObject withProgressBlock:^(NSManagedObject *managedObject, RKSearchWord *searchWord, BOOL *stop) {
// Stop the indexing process if we have been cancelled
if ([indexingOperation isCancelled]) *stop = YES;
}];
} else {
RKLogError(@"Failed indexing of object %@ with error: %@", managedObject, error);
}