XMPPCoreDataStorage APIs

addWillSaveManagedObjectContextBlock:
addDidSaveManagedObjectContextBlock:

Author: ObjColumnist

Extensions/CoreDataStorage/XMPPCoreDataStorage.h

@@ -48,6 +48,9 @@
 	NSPersistentStoreCoordinator *persistentStoreCoordinator;
 	NSManagedObjectContext *managedObjectContext;
 	NSManagedObjectContext *mainThreadManagedObjectContext;
+    
+    NSMutableArray *willSaveManagedObjectContextBlocks;
+    NSMutableArray *didSaveManagedObjectContextBlocks;
 
 @protected
 

Extensions/CoreDataStorage/XMPPCoreDataStorage.m

@@ -249,6 +249,9 @@ - (void)commonInit
 	dispatch_queue_set_specific(storageQueue, storageQueueTag, storageQueueTag, NULL);
 
 	myJidCache = [[NSMutableDictionary alloc] init];
+    
+    willSaveManagedObjectContextBlocks = [[NSMutableArray alloc] init];
+    didSaveManagedObjectContextBlocks = [[NSMutableArray alloc] init];
 
 	[[NSNotificationCenter defaultCenter] addObserver:self
 	                                         selector:@selector(updateJidCache:)
@@ -857,27 +860,39 @@ - (void)save
 	// internally checks to see if it has anything to save before it actually does anthing.
 	// So there's no need for us to do it here, especially since this method is usually
 	// called from maybeSave below, which already does this check.
-	
-	[self willSaveManagedObjectContext];
-	
+    
+    for(void (^block)(void) in willSaveManagedObjectContextBlocks) {
+        block();
+    }
+    
+    [willSaveManagedObjectContextBlocks removeAllObjects];
+    
 	NSError *error = nil;
 	if ([[self managedObjectContext] save:&error])
 	{
 		saveCount++;
-		[self didSaveManagedObjectContext];
+        
+        for(void (^block)(void) in didSaveManagedObjectContextBlocks) {
+            block();
+        }
+        
+        [didSaveManagedObjectContextBlocks removeAllObjects];
 	}
 	else
 	{
 		XMPPLogWarn(@"%@: Error saving - %@ %@", [self class], error, [error userInfo]);
 
 		[[self managedObjectContext] rollback];
+        
+        [didSaveManagedObjectContextBlocks removeAllObjects];
 	}
 }
 
 - (void)maybeSave:(int32_t)currentPendingRequests
 {
 	NSAssert(dispatch_get_specific(storageQueueTag), @"Invoked on incorrect queue");
 
+	
 	if ([[self managedObjectContext] hasChanges])
 	{
 		if (currentPendingRequests == 0)
@@ -958,6 +973,30 @@ - (void)scheduleBlock:(dispatch_block_t)block
 	}});
 }
 
+- (void)addWillSaveManagedObjectContextBlock:(void (^)(void))willSaveBlock
+{
+    dispatch_block_t block = ^{
+		[willSaveManagedObjectContextBlocks addObject:[willSaveBlock copy]];
+	};
+	
+	if (dispatch_get_specific(storageQueueTag))
+		block();
+	else
+		dispatch_sync(storageQueue, block);
+}
+
+- (void)addDidSaveManagedObjectContextBlock:(void (^)(void))didSaveBlock
+{
+    dispatch_block_t block = ^{
+		[didSaveManagedObjectContextBlocks addObject:[didSaveBlock copy]];
+	};
+	
+	if (dispatch_get_specific(storageQueueTag))
+		block();
+	else
+		dispatch_sync(storageQueue, block);
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Memory Management
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Extensions/CoreDataStorage/XMPPCoreDataStorageProtected.h

@@ -315,4 +315,20 @@
 **/
 - (void)scheduleBlock:(dispatch_block_t)block;
 
+/**
+ * Sometimes you want to call a method before calling save on a Managed Object Context e.g. willSaveObject:
+ *
+ * addWillSaveManagedObjectContextBlock allows you to add a block of code to be called before saving a Managed Object Context,
+ * without the overhead of having to call save at that moment.
+**/
+- (void)addWillSaveManagedObjectContextBlock:(void (^)(void))willSaveBlock;
+
+/**
+ * Sometimes you want to call a method after calling save on a Managed Object Context e.g. didSaveObject:
+ *
+ * addDidSaveManagedObjectContextBlock allows you to add a block of code to be after saving a Managed Object Context,
+ * without the overhead of having to call save at that moment.
+**/
+- (void)addDidSaveManagedObjectContextBlock:(void (^)(void))didSaveBlock;
+
 @end