Changeset 820

Timestamp:

04/19/2009 05:42:09 PM (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.

Location:

branches/CoreData/SapphireFrappliance

Files:

• FRAppliance/SapphireApplianceController.h (modified) (1 diff)
• FRAppliance/SapphireApplianceController.m (modified) (6 diffs)
• FRAppliance/SapphireMetaDataUpgrading.m (modified) (1 diff)
• FRAppliance/main_helper.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (2 diffs)
• MetaData/Support/SapphireMetaDataSupport.h (modified) (2 diffs)
• MetaData/Support/SapphireMetaDataSupport.m (modified) (4 diffs)

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.h

@@ -146 +146 @@
  *
  * @param storeFile The file path of the store (must be SQLite), nil for default path
- * @param storeOptions The dictionary of options for the store
  * @return The managed object context, nil if failure
  */
-+ (NSManagedObjectContext *)newManagedObjectContextForFile:(NSString *)storeFile options:(NSDictionary *)storeOptions;
++ (NSManagedObjectContext *)newManagedObjectContextForFile:(NSString *)storeFile;
 
 /*!

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

@@ -278 +278 @@
 
 
-+ (NSManagedObjectContext *)newManagedObjectContextForFile:(NSString *)storeFile options:(NSDictionary *)storeOptions
++ (NSManagedObjectContext *)newManagedObjectContextForFile:(NSString *)storeFile
 {
         if(storeFile == nil)
@@ -293 +293 @@
         
         NSPersistentStoreCoordinator *coord = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
-        if(![coord addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeUrl options:storeOptions error:&error])
+        if(![coord addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeUrl options:nil error:&error])
         {
                 SapphireLog(SAPPHIRE_LOG_ALL, SAPPHIRE_LOG_LEVEL_ERROR, @"Could not add store: %@", error);
@@ -321 +321 @@
         [theme setScene:[self scene]];
         
-        moc = [SapphireApplianceController newManagedObjectContextForFile:nil options:nil];
+        moc = [SapphireApplianceController newManagedObjectContextForFile:nil];
+        [SapphireMetaDataSupport setMainContext:moc];
         if(moc == nil)
         {
@@ -530 +531 @@
 }
 
+- (void)completeRescanOfDir:(NSArray *)filePaths
+{
+        if(![filePaths count])
+                return;
+        
+        [SapphireMetaDataSupport save:moc];
+        NSString *dirPath = [[filePaths objectAtIndex:0] stringByDeletingLastPathComponent];
+        SapphireDirectoryMetaData *dir = [SapphireDirectoryMetaData directoryWithPath:dirPath inContext:moc];
+        [dir addImportFilePaths:filePaths];
+        [[dir delegate] directoryContentsChanged];
+        [dir resumeImport];
+}
+
+
 - (void)rescanDirectory:(NSString *)dirPath
 {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         if(![[NSFileManager defaultManager] isDirectory:dirPath])
                 return;
@@ -540 +556 @@
         dirPath = [dirPath stringByResolvingSymlinksInPath];
         
-        SapphireDirectoryMetaData *dir = [SapphireDirectoryMetaData createDirectoryWithPath:dirPath inContext:moc];
+        NSManagedObjectContext *threadMoc = [SapphireApplianceController newManagedObjectContextForFile:nil];
+        SapphireDirectoryMetaData *dir = [SapphireDirectoryMetaData createDirectoryWithPath:dirPath inContext:threadMoc];
         [dir reloadDirectoryContents];
-        [dir resumeImport];
+        NSArray *paths = [dir importFilePaths];
+        [SapphireMetaDataSupport applyChangesFromContext:threadMoc];
+        [threadMoc release];
+        [self performSelectorOnMainThread:@selector(completeRescanOfDir:) withObject:paths waitUntilDone:NO];
+        [pool drain];
 }
 
@@ -715 +736 @@
 }
 
-
 - (oneway void)rescanDirectory:(NSString *)dirPath
 {
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        [controller performSelectorOnMainThread:@selector(rescanDirectory:) withObject:dirPath waitUntilDone:YES];
+        [NSThread detachNewThreadSelector:@selector(rescanDirectory:) toTarget:controller withObject:dirPath];
         [pool drain];
 }

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireMetaDataUpgrading.m

@@ -139 +139 @@
         NSString *v1StoreFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"];
         NSFileManager *fm = [NSFileManager defaultManager];
-        NSManagedObjectContext *moc = [SapphireApplianceController newManagedObjectContextForFile:nil options:nil];
+        NSManagedObjectContext *moc = [SapphireApplianceController newManagedObjectContextForFile:nil];
         @try {
                 if([fm fileExistsAtPath:v1StoreFile])

branches/CoreData/SapphireFrappliance/FRAppliance/main_helper.m

@@ -24 +24 @@
 
 @interface NSObject (SapphireApplianceControllerAPI)
-- (NSManagedObjectContext *)newManagedObjectContextForFile:(NSString *)storeFile options:(NSDictionary *)storeOptions;
++ (NSManagedObjectContext *)newManagedObjectContextForFile:(NSString *)storeFile;
 @end
 
@@ -56 +56 @@
         
         NSDictionary *storeOptions = [[NSDictionary alloc] initWithObjectsAndKeys:[NSNumber numberWithBool:YES], NSReadOnlyPersistentStoreOption, nil];
-        NSManagedObjectContext *moc = [NSClassFromString(@"SapphireApplianceController") newManagedObjectContextForFile:nil options:storeOptions];
+        NSManagedObjectContext *moc = [NSClassFromString(@"SapphireApplianceController") newManagedObjectContextForFile:nil];
         [storeOptions release];
         if(moc == nil)

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

@@ -88 +88 @@
         
         Basic_Directory_Function_Inits
+        importArray = [[NSMutableArray alloc] init];
         
         return self;
@@ -273 +274 @@
 - (void)rescanDirWithExistingDirs:(NSMutableArray *)existingDirs files:(NSMutableArray *)existingFiles symDirs:(NSMutableArray *)existingSymDirs symFiles:(NSMutableArray *)existingSymFiles;
 {
-        [importArray release];
-        importArray = [[NSMutableArray alloc] init];
+        [importArray removeAllObjects];
 
         NSMutableDictionary *dirs = [[NSMutableDictionary alloc] init];

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

@@ -29 +29 @@
  */
 @interface SapphireMetaDataSupport : NSObject {
-        NSTimer                 *writeTimer;            /*!< @brief The timer to agregate writes*/
-        NSTimeInterval  interval;                       /*!< @brief The write interval*/
-        BOOL                    locked;                         /*!< @brief Was the DB locked during the last save*/
+        NSManagedObjectContext  *mainMoc;                       /*!< @brief The main context*/
+        NSTimer                                 *writeTimer;            /*!< @brief The timer to agregate writes*/
+        NSTimeInterval                  interval;                       /*!< @brief The write interval*/
+        BOOL                                    locked;                         /*!< @brief Was the DB locked during the last save*/
 }
 
@@ -51 +52 @@
  */
 + (BOOL)save:(NSManagedObjectContext *)context;
+
+/*!
+ * @brief Save changes in a context in the main context
+ *
+ * @param context The context with changes to save
+ */
++ (void)applyChangesFromContext:(NSManagedObjectContext *)context;
+
+/*!
+ * @brief Sets the main context
+ *
+ * @param moc the main context
+ */
++ (void)setMainContext:(NSManagedObjectContext *)moc;
 
 /*!

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];
 }