kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-01-12 09:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging with origin/develop

Browse Source
This commit is contained in:
Saul Mora
2012-10-30 09:05:06 -07:00
parent 0fb7d36f4d f7c4350e9d
commit 0af0731093
4 changed files with 5 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.h
View File

@@ -11,7 +11,7 @@
@interface NSManagedObjectContext (MagicalSaves)
- (void) MR_save;
- (void) MR_saveErrorHandler:(void (^)(NSError *))errorCallback;
- (void) MR_saveWithErrorCallback:(void(^)(NSError *))errorCallback;
- (void) MR_saveInBackgroundCompletion:(void (^)(void))completion;
- (void) MR_saveInBackgroundErrorHandler:(void (^)(NSError *))errorCallback;

13
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
View File

@@ -88,18 +88,7 @@
- (void) MR_save;
{
[self MR_saveErrorHandler:nil];
}
- (void) MR_saveErrorHandler:(void (^)(NSError *))errorCallback;
{
[self performBlockAndWait:^{
[self MR_saveWithErrorCallback:errorCallback];
[[self parentContext] performBlockAndWait:^{
[[self parentContext] MR_saveErrorHandler:errorCallback];
}];
}];
[self MR_saveWithErrorCallback:nil];
}
- (void) MR_saveInBackgroundCompletion:(void (^)(void))completion;

29
MagicalRecord/Core/MagicalRecord+Actions.m
View File

@@ -8,38 +8,15 @@
#import "CoreData+MagicalRecord.h"
#import "NSManagedObjectContext+MagicalRecord.h"
static dispatch_queue_t background_action_queue;
dispatch_queue_t action_queue(void);
dispatch_queue_t action_queue(void)
{
if (background_action_queue == NULL)
{
background_action_queue = dispatch_queue_create("com.magicalpanda.magicalrecord.actionQueue", DISPATCH_QUEUE_SERIAL);
}
return background_action_queue;
}
void reset_action_queue(void);
void reset_action_queue(void)
{
if (background_action_queue != NULL)
{
MRDispatchQueueRelease(background_action_queue);
background_action_queue = NULL;
}
}
@implementation MagicalRecord (Actions)
+ (void) saveInBackgroundUsingContext:(NSManagedObjectContext *)localContext block:(void (^)(NSManagedObjectContext *))block completion:(void(^)(void))completion errorHandler:(void(^)(NSError *))errorHandler;
{
dispatch_async(action_queue(), ^{
[localContext performBlock: ^{
block(localContext);
[localContext MR_saveNestedContextsErrorHandler:errorHandler completion:completion];
});
}];
}
+ (void) saveInBackgroundWithBlock:(void (^)(NSManagedObjectContext *))block completion:(void (^)(void))completion errorHandler:(void (^)(NSError *))errorHandler;
@@ -66,7 +43,7 @@ void reset_action_queue(void)
if ([localContext hasChanges])
{
[localContext MR_saveErrorHandler:errorHandler];
[localContext MR_saveWithErrorCallback:errorHandler];
}
if (completion)

2
MagicalRecord/Core/MagicalRecord.m
View File

@@ -20,7 +20,6 @@
@end
void reset_action_queue(void);
@implementation MagicalRecord
@@ -28,7 +27,6 @@ void reset_action_queue(void);
{
[self cleanUpErrorHanding];
[self cleanUpStack];
reset_action_queue();
}
+ (void) cleanUpStack;