Changeset 588 for branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireBasicDirectoryFunctions.h

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/Support/SapphireBasicDirectoryFunctions.h (modified) (8 diffs)

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

@@ -23 +23 @@
 
 #ifndef RECURSIVE_FUNCTIONS_ALREADY_DEFINED
-/*Function to invoke a command on all files in a subtree*/
-- (void)invokeRecursivelyOnFiles:(NSInvocation *)fileInv
+- (void)invokeOnAllFiles:(NSInvocation *)fileInv
 {
         NSArray *files = [self metaFiles];
@@ -43 +42 @@
         if(fetchPred != nil)
         {
-                NSPredicate *final = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:pred, fetchPred, nil]];
+                NSPredicate *final = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:pred, fetchPred, filterPredicate, nil]];
                 return entityExists(SapphireFileMetaDataName, [self managedObjectContext], final);      
         }
@@ -61 +60 @@
         {
                 id <SapphireDirectory> dir = [self metaDataForDirectory:[dirs objectAtIndex:i]];
-                if(dir != nil && [dir checkPredicate:pred])
+                if(dir != nil && [dir containsFileMatchingPredicate:pred])
                         return YES;
         }
@@ -86 +85 @@
 #endif
 
-- (BOOL)internalWatchedValue
+- (BOOL)containsFileMatchingPredicate:(NSPredicate *)pred
 {
-        return ![self checkPredicate:[SapphireApplianceController unwatchedPredicate]];
-}
-
-- (BOOL)watchedValue
-{
-        if(watchedCache != nil)
-                return [watchedCache boolValue];
-        BOOL ret = [self internalWatchedValue];
-        watchedCache = [[NSNumber alloc] initWithBool:ret];
+        id key = filterPredicate;
+        if(filterPredicate == nil)
+                key = [NSNull null];
+        NSMutableDictionary *cacheForFilter = [predicateCache objectForKey:key];
+        if(cacheForFilter == nil)
+        {
+                cacheForFilter = [[NSMutableDictionary alloc] init];
+                [predicateCache setObject:cacheForFilter forKey:key];
+                [cacheForFilter release];
+        }
+        NSNumber *cache = [cacheForFilter objectForKey:pred];
+        if(cache != nil)
+                return [cache boolValue];
+        
+        BOOL ret = [self checkPredicate:pred];
+        [cacheForFilter setObject:[NSNumber numberWithBool:ret] forKey:pred];
         return ret;
 }
 
-- (NSNumber *)watched
+- (BOOL)containsFileMatchingFilterPredicate:(NSPredicate *)pred
 {
-        if(watchedCache != nil)
-                return watchedCache;
-        NSNumber *ret = [NSNumber numberWithBool:[self internalWatchedValue]];
-        watchedCache = [ret retain];
+        NSPredicate *tpred = filterPredicate;
+        filterPredicate = nil;
+        BOOL ret = [self checkPredicate:pred];
+        filterPredicate = tpred;
+        
         return ret;
-}
-
-- (void)setWatchedValue:(BOOL)watched
-{
-        [self setWatched:[NSNumber numberWithBool:watched]];
-}
-
-- (void)setWatched:(NSNumber *)watched
-{
-        SEL select = @selector(setWatched:);
-        NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[SapphireFileMetaData class] instanceMethodSignatureForSelector:select]];
-        [inv setSelector:select];
-        [inv setArgument:&watched atIndex:2];
-        [self invokeRecursivelyOnFiles:inv];
-        [SapphireMetaDataSupport save:[self managedObjectContext]];
-        [watchedCache release];
-        watchedCache = [watched retain];
-}
-
-- (BOOL)internalFavoriteValue
-{
-        return [self checkPredicate:[SapphireApplianceController favoritePredicate]];
-}
-
-- (BOOL)favoriteValue
-{
-        if(favoriteCache != nil)
-                return [favoriteCache boolValue];
-        BOOL ret = [self internalFavoriteValue];
-        favoriteCache = [[NSNumber alloc] initWithBool:ret];
-        return ret;
-}
-
-- (NSNumber *)favorite
-{
-        if(favoriteCache != nil)
-                return favoriteCache;
-        NSNumber *ret = [NSNumber numberWithBool:[self internalFavoriteValue]];
-        favoriteCache = [ret retain];
-        return ret;
-}
-
-- (void)setFavoriteValue:(BOOL)favorite
-{
-        [self setFavorite:[NSNumber numberWithBool:favorite]];
-}
-
-- (void)setFavorite:(NSNumber *)favorite
-{
-        SEL select = @selector(setFavorite:);
-        NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[SapphireFileMetaData class] instanceMethodSignatureForSelector:select]];
-        [inv setSelector:select];
-        [inv setArgument:&favorite atIndex:2];
-        [self invokeRecursivelyOnFiles:inv];
-        [SapphireMetaDataSupport save:[self managedObjectContext]];
-        [favoriteCache release];
-        favoriteCache = [favorite retain];
 }
 
 - (void)clearPredicateCache
 {
-        BOOL report = NO;
         id <SapphireDirectory> myParentDir = [self parentDirectory];
+        [predicateCache removeAllObjects];
+/*      BOOL report = NO;
         if(watchedCache != nil)
         {
@@ -188 +139 @@
                         report = YES;
         }
-        if(report)
+        if(report)*/
                 [myParentDir clearPredicateCache];
 }
@@ -196 +147 @@
         [filterPredicate release];
         filterPredicate = [predicate retain];
-        [self clearPredicateCache];
 }
 
@@ -234 +184 @@
         NSNumber *num = [NSNumber numberWithInt:mask];
         [inv setArgument:&num atIndex:2];
-        [self invokeRecursivelyOnFiles:inv];
+        [self invokeOnAllFiles:inv];
         [SapphireMetaDataSupport save:[self managedObjectContext]];
 }
@@ -243 +193 @@
         NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[SapphireFileMetaData class] instanceMethodSignatureForSelector:select]];
         [inv setSelector:select];
-        [self invokeRecursivelyOnFiles:inv];
+        [self invokeOnAllFiles:inv];
         [SapphireMetaDataSupport save:[self managedObjectContext]];
 }