Changeset 588 for branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

Timestamp:

06/13/08 15:57:37 (4 years ago)

Author:

gbooker

Message:

Changed the filtering method and the check for unwatched/favorite. This new system is far more powerful, and should actually be faster too. Implemented a bit more caching to help speed as well.

Files:

• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (5 diffs)

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

@@ -80 +80 @@
 }
 
+- (id)initWithEntity:(NSEntityDescription *)entity insertIntoManagedObjectContext:(NSManagedObjectContext *)context
+{
+        self = [super initWithEntity:entity insertIntoManagedObjectContext:context];
+        if(self == nil)
+                return self;
+        
+        Basic_Directory_Function_Inits
+        
+        return self;
+}       
+
 - (void) dealloc
 {
@@ -212 +223 @@
         NSArray *candidates = [[self.metaDirsSet allObjects] filteredArrayUsingPredicate:pred];
         if([candidates count])
-                return [candidates objectAtIndex:0];
-        
-        candidates  = [[self.linkedDirsSet allObjects] filteredArrayUsingPredicate:pred];
-        if([candidates count])
-                return ((SapphireDirectorySymLink *)[candidates objectAtIndex:0]).directory;
+                ret = [candidates objectAtIndex:0];
+        else
+        {
+                candidates  = [[self.linkedDirsSet allObjects] filteredArrayUsingPredicate:pred];
+                if([candidates count])
+                        ret = ((SapphireDirectorySymLink *)[candidates objectAtIndex:0]).directory;             
+        }
+        [ret setFilterPredicate:filterPredicate];
         
         return nil;
@@ -387 +401 @@
                 for(i=0; i<count; i++)
                 {
-                        if(![[allDirs objectAtIndex:i] checkPredicate:filterPredicate])
+                        if(![[allDirs objectAtIndex:i] containsFileMatchingFilterPredicate:filterPredicate])
                         {
                                 [allDirs removeObjectAtIndex:i];
@@ -402 +416 @@
                 {
                         SapphireDirectorySymLink *link = [linkedDirsObjects objectAtIndex:i];
-                        if([[link directory] checkPredicate:filterPredicate])
+                        if([[link directory] containsFileMatchingFilterPredicate:filterPredicate])
                                 [allDirs addObject:link];
                 }
@@ -442 +456 @@
 }
 
-/*Function to invoke a command on all files in a subtree*/
-- (void)invokeRecursivelyOnFiles:(NSInvocation *)fileInv
+- (void)invokeOnAllFiles:(NSInvocation *)fileInv
 {
         NSManagedObjectContext *moc = [self managedObjectContext];