Changeset 840 for branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataSupport.m

Timestamp:

05/11/2009 04:51:19 PM (3 years ago)

Author:

gbooker

Message:

Delete unused objects as they become unused so as to not need the prune call later. This will help accelerate things later. Also, handled XML a bit better.

Files:

• branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataSupport.m (modified) (5 diffs)

branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataSupport.m

@@ -40 +40 @@
 #import "SapphireSeason.h"
 #import "CoreDataSupportFunctions.h"
+
+@interface NSManagedObject (deleteDelegate)
+- (BOOL)shouldDelete;
+@end
+
 
 @interface NSManagedObject (ChangePersistence)
@@ -140 +145 @@
 
 static NSSet *coverArtExtentions = nil;
+static NSMutableSet *pendingDeleteObjects = nil;
 
 NSString *searchCoverArtExtForPath(NSString *path)
@@ -173 +179 @@
                                                   @"png",
                                                   @"gif",
-                                                  nil]; 
+                                                  nil];
+        pendingDeleteObjects = [[NSMutableSet alloc] init];
 }
 
@@ -258 +265 @@
 }
 
++ (void)setObjectForPendingDelete:(NSManagedObject *)objectToDelete
+{
+        [pendingDeleteObjects addObject:objectToDelete];
+}
+
+/*!
+ * @brief Deletes pending objects
+ *
+ * Deletes all objects in the pending queue, but calls shouldDelete first to make sure it should
+ * be deleted.  This is also used as a hack to work around CD apparent inability to make KVO
+ * notifications during an object delete when it is within an KVO notification.
+ */
++ (void)deletePendingObjects
+{
+        NSManagedObjectContext *mainMoc = [SapphireMetaDataSupport sharedInstance]->mainMoc;
+        [mainMoc processPendingChanges];                
+        while([pendingDeleteObjects count])
+        {
+                NSManagedObject *obj;
+                NSSet *pendingObjects = [pendingDeleteObjects copy];
+                [pendingDeleteObjects removeAllObjects];
+                NSEnumerator *objEnum = [pendingObjects objectEnumerator];
+                while((obj = [objEnum nextObject]) != nil)
+                {
+                        if([obj isDeleted])
+                                continue;
+                        if([obj managedObjectContext] != mainMoc)
+                                continue;
+                        if(![obj respondsToSelector:@selector(shouldDelete)] || [obj shouldDelete])
+                                [mainMoc deleteObject:obj];
+                }
+                [pendingObjects release];
+                [mainMoc processPendingChanges];                
+        }
+}
+
 - (void)realWriteMetaData:(NSTimer *)timer
 {
@@ -274 +317 @@
         BOOL success = NO;
         @try {
+                [SapphireMetaDataSupport deletePendingObjects];
                 success = [context save:&error];
         }