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

Timestamp:

04/19/09 17:42:09 (3 years ago)

Author:

gbooker

Message:

Use a separate thread for rescanning a directory and send changes back to main thread. Tricky, but it works.

Files:

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

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

@@ -49 +49 @@
 - (NSDictionary *)changedValuesWithObjectIDs
 {
-        NSMutableDictionary *ret = [[NSMutableDictionary alloc] initWithDictionary:[self changedValues]];
+        NSDictionary *changedValues = [self changedValues];
+        NSMutableDictionary *ret = [[NSMutableDictionary alloc] initWithDictionary:changedValues];
         NSString *key;
-        NSEnumerator *keyEnum = [ret keyEnumerator];
+        NSEnumerator *keyEnum = [changedValues keyEnumerator];
         while((key = [keyEnum nextObject]) != nil)
         {
@@ -187 +188 @@
 - (void) dealloc
 {
+        [mainMoc release];
         [writeTimer invalidate];
         writeTimer = nil;
@@ -328 +330 @@
 - (BOOL)save:(NSManagedObjectContext *)context;
 {
+        if(context != mainMoc)
+        {
+                return YES;
+        }
         if(writeTimer == nil)
         {
@@ -344 +350 @@
         
         return [[SapphireMetaDataSupport sharedInstance] save:context];
+}
+
+- (void)applyChanges:(NSDictionary *)changes
+{
+        [SapphireMetaDataSupport applyChanges:changes toContext:mainMoc];
+}
+
+- (void)applyChangesFromContext:(NSManagedObjectContext *)context
+{
+        if(mainMoc != nil)
+        {
+                NSDictionary *changes = [SapphireMetaDataSupport changesDictionaryForContext:context];
+                [self performSelectorOnMainThread:@selector(applyChanges:) withObject:changes waitUntilDone:YES];
+        }
+}
+
++ (void)applyChangesFromContext:(NSManagedObjectContext *)context
+{
+        [[SapphireMetaDataSupport sharedInstance] applyChangesFromContext:context];
+}
+
+- (void)setMainContext:(NSManagedObjectContext *)moc
+{
+        [mainMoc release];
+        mainMoc = [moc retain];
+}
+
++ (void)setMainContext:(NSManagedObjectContext *)moc
+{
+        [[SapphireMetaDataSupport sharedInstance] setMainContext:moc];
 }