Changeset 588

Timestamp:

06/13/2008 03:57:37 PM (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.

Location:

branches/CoreData/SapphireFrappliance

Files:

• Browser/SapphireBrowser.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireCategoryDirectory.m (modified) (4 diffs)
• MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (5 diffs)
• MetaData/SapphireMarkMenu.m (modified) (1 diff)
• MetaData/Support/SapphireBasicDirectoryFunctions.h (modified) (8 diffs)
• MetaData/Support/SapphireBasicDirectoryFunctionsDefines.h (modified) (1 diff)
• MetaData/Support/SapphireDirectory.h (modified) (2 diffs)
• MetaData/Support/SapphireDirectory.m (added)
• MetaData/Support/SapphireEntityDirectory.m (modified) (2 diffs)
• MetaData/Support/SapphireFilteredFileDirectory.m (modified) (1 diff)
• MetaData/Support/SapphireMovieCategories.m (modified) (1 diff)
• MetaData/Support/SapphireMovieDirectory.m (modified) (2 diffs)
• MetaData/Support/SapphireObjectDirectory.m (modified) (1 diff)
• Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)

branches/CoreData/SapphireFrappliance/Browser/SapphireBrowser.m

@@ -310 +310 @@
                 result = [SapphireFrontRowCompat textMenuItemForScene:scene folder:YES];
                 id <SapphireDirectory> meta = [metaData metaDataForDirectory:name];
-                watched = [meta watchedValue];
-                favorite = [meta favoriteValue];
+                watched = ![meta containsFileMatchingPredicate:[SapphireApplianceController unwatchedPredicate]];
+                favorite = [meta containsFileMatchingPredicate:[SapphireApplianceController favoritePredicate]];
         }
         /*Check for a file next*/

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

@@ -14 +14 @@
         cachedDirs = [[NSMutableArray alloc] init];
         cachedMetaFiles = [[NSMutableArray alloc] init];
-        
+        Basic_Directory_Function_Inits
+
         return self;
 }
@@ -90 +91 @@
         NSMutableArray *dirs = [[[self valueForKeyPath:dirsKey] allObjects] mutableCopy];
         if(filterPredicate != nil)
-                [dirs filterUsingPredicate:filterPredicate];
+        {
+                int i, count = [dirs count];
+                for(i=0; i<count; i++)
+                {
+                        id <SapphireDirectory> dir = [dirs objectAtIndex:i];
+                        if(![dir containsFileMatchingFilterPredicate:filterPredicate])
+                        {
+                                [dirs removeObjectAtIndex:i];
+                                i--;
+                                count--;
+                        }
+                }
+        }
 
         [cachedMetaFiles setArray:dirs];
@@ -193 +206 @@
 }
 
-- (void)invokeRecursivelyOnFiles:(NSInvocation *)fileInv
+- (void)invokeOnAllFiles:(NSInvocation *)fileInv
 {
         NSArray *files = cachedMetaFiles;
@@ -214 +227 @@
         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);      
         }

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

branches/CoreData/SapphireFrappliance/MetaData/SapphireMarkMenu.m

@@ -403 +403 @@
                 {
                         case COMMAND_MARK_WATCHED:
-                                [dirMeta setWatchedValue:YES];
+                                setSubtreeToWatched(dirMeta, YES);
                                 break;
                         case COMMAND_MARK_UNWATCHED:
-                                [dirMeta setWatchedValue:YES];
+                                setSubtreeToWatched(dirMeta, NO);
                                 break;
                         case COMMAND_MARK_FAVORITE:
-                                [dirMeta setFavoriteValue:YES];
+                                setSubtreeToFavorite(dirMeta, YES);
                                 break;
                         case COMMAND_MARK_NOT_FAVORITE:
-                                [dirMeta setFavoriteValue:NO];
+                                setSubtreeToFavorite(dirMeta, NO);
                                 break;
                         case COMMAND_MARK_TO_REFETCH_TV:
-                                [dirMeta setToReimportFromMask:IMPORT_TYPE_TVSHOW_MASK];
+                                setSubtreeToReimportFromMask(dirMeta, IMPORT_TYPE_TVSHOW_MASK);
                                 break;
                         case COMMAND_MARK_TO_REFETCH_MOVIE:
-                                [dirMeta setToReimportFromMask:IMPORT_TYPE_MOVIE_MASK];
+                                setSubtreeToReimportFromMask(dirMeta, IMPORT_TYPE_MOVIE_MASK);
                                 break;
                         case COMMAND_MARK_TO_DELETE_METADATA:
-                                [dirMeta clearMetaData];
+                                setSubtreeToClearMetaData(dirMeta);
                                 break;
                         case COMMAND_TOGGLE_SKIP:

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

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

@@ -26 +26 @@
         NSPredicate                                             *filterPredicate;               /*!< @brief The filter to apply to this directory*/\
         id <SapphireMetaDataDelegate>   delegate;                               /*!< @brief The delegate to inform of changes*/\
-        NSNumber                                                *watchedCache;                  /*!< @brief Cached value of watched predicate*/\
-        NSNumber                                                *favoriteCache;                 /*!< @brief Cached value of favorite predicate*/\
+        NSMutableDictionary                             *predicateCache;                /*!< @brief Cached value of watched, favorite, and other predicates*/\
+
+
+#define Basic_Directory_Function_Inits \
+        predicateCache = [[NSMutableDictionary alloc] init];\
+
 
 #define Basic_Directory_Function_Deallocs \
         [filterPredicate release];\
         [delegate release];\
-        [watchedCache release];\
-        [favoriteCache release];
+        [predicateCache release];\
+

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

@@ -175 +175 @@
 
 /*!
- * @brief Returns if directory contains any unwatched files
- *
- * @return YES if all files are watched, NO otherwise
- */
-- (BOOL)watchedValue;
-
-/*!
- * @brief Returns if directory contains any unwatched files
- *
- * @return an NSNumber with a YES if all files are watched, NO otherwise
- */
-- (NSNumber *)watched;
-
-/*!
- * @brief Set subtree as watched with restriction as to predicate.  Does not follow symlinks
- *
- * @param watched YES if set to watched, NO if set to unwatched
- */
-- (void)setWatchedValue:(BOOL)watched;
-
-/*!
- * @brief Set subtree as watched with restriction as to predicate.  Does not follow symlinks
- *
- * @param watched An NSNumber that is YES if set to watched, NO if set to unwatched
- */
-- (void)setWatched:(NSNumber *)watched;
-
-/*!
- * @brief Returns if directory contains any favorite files
- *
- * @return YES if any files are favorite, NO otherwise
- */
-- (BOOL)favoriteValue;
-
-/*!
- * @brief Returns if directory contains any favorite files
- *
- * @return an NSNumber with a YES if any files are favorite, NO otherwise
- */
-- (NSNumber *)favorite;
-
-/*!
- * @brief Set subtree as favorite with restriction as to predicate.  Does not follow symlinks
- *
- * @param favorite YES if set to favorite, NO if set to not-favorite
- */
-- (void)setFavoriteValue:(BOOL)favorite;
-
-/*!
- * @brief Set subtree as favorite with restriction as to predicate.  Does not follow symlinks
- *
- * @param favorite An NSNumber that is YES if set to favorite, NO if set to not-favorite
- */
-- (void)setFavorite:(NSNumber *)favorite;
-
-/*!
  * @brief Check to see if any filtered files match the predicate
  *
  * @param pred The predicate to check
  */
-- (BOOL)checkPredicate:(NSPredicate *)pred;
-
-/*!
- * @brief Set subtree to re-import from the specified source with restriction as to predicate.  Does not follow symlinks
- *
- * @param source The source on which to re-import
- */
-- (void)setToReimportFromMask:(int)mask;
-
-/*!
- * @brief Clear metadata for an entire subtree with restriction as to predicate.  Does not follow symlinks
- */
-- (void)clearMetaData;
+- (BOOL)containsFileMatchingPredicate:(NSPredicate *)pred;
+
+/*!
+ * @brief Checks to see if directory contains any files with filter
+ *
+ * @param filter The filter predicate to test
+ */
+- (BOOL)containsFileMatchingFilterPredicate:(NSPredicate *)pred;
+
+/*!
+ * @brief Invoke a command on all files contained within this directory within filter
+ *
+ * @param fileInv The invokation to invoke
+ */
+- (void)invokeOnAllFiles:(NSInvocation *)fileInv;
 
 /*!
@@ -305 +251 @@
 - (void)clearPredicateCache;
 
-@end
+/*!
+ * @brief The managed object context
+ *
+ * @return The managed object context for the metadata
+ */
+- (NSManagedObjectContext *)managedObjectContext;
+
+@end
+
+/*!
+ * @brief Set subtree to watched or unwatched with restriction as to predicate.  Does not follow symlinks
+ *
+ * @param dir The subtree
+ * @param watched YES if watched, NO otherwise
+ */
+void setSubtreeToWatched(id <SapphireDirectory> dir, BOOL watched);
+
+/*!
+ * @brief Set subtree to favorite or not favorite with restriction as to predicate.  Does not follow symlinks
+ *
+ * @param dir The subtree
+ * @param favorite YES if favorite, NO otherwise
+ */
+void setSubtreeToFavorite(id <SapphireDirectory> dir, BOOL favorite);
+
+/*!
+ * @brief Set subtree to re-import from the specified source with restriction as to predicate.  Does not follow symlinks
+ *
+ * @param dir The subtree
+ * @param mask The source(s) on which to re-import
+ */
+void setSubtreeToReimportFromMask(id <SapphireDirectory> dir, int mask);
+
+/*!
+ * @brief Clear metadata for an entire subtree with restriction as to predicate.  Does not follow symlinks
+ */
+void setSubtreeToClearMetaData(id <SapphireDirectory> dir);

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

@@ -34 +34 @@
         moc = [context retain];
         nameKey = [@"name" retain];
+        Basic_Directory_Function_Inits
         
         return self;
@@ -102 +103 @@
         {
                 id obj = [objects objectAtIndex:i];
-                if(filterPredicate != nil && ![obj checkPredicate:filterPredicate])
+                if(filterPredicate != nil && ![obj containsFileMatchingFilterPredicate:filterPredicate])
                         continue;
                 NSString *key = [obj valueForKey:nameKey];

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

@@ -33 +33 @@
         moc = [context retain];
         fetchPredicate = [pred retain];
+        Basic_Directory_Function_Inits
         
         return self;

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

@@ -47 +47 @@
         [directors release];
         [genres release];
-        
+        Basic_Directory_Function_Inits
+
         return self;
 }

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

@@ -79 +79 @@
         [oscar setPath:@"@MOVIES/Academy Award Winning"];
         [oscar setNameKey:@"movie.title"];
-        
+        Basic_Directory_Function_Inits
+
         return self;
 }
@@ -105 +106 @@
         for(i=0; i<count; i++)
         {
-                if([[subDirs objectAtIndex:i] checkPredicate:filterPredicate])
+                if([[subDirs objectAtIndex:i] containsFileMatchingFilterPredicate:filterPredicate])
                         [ret addObject:[names objectAtIndex:i]];
         }

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

@@ -34 +34 @@
         value = [key retain];
         cachedDirs = [[NSArray alloc] init];
-        
+        Basic_Directory_Function_Inits
+
         return self;
 }

branches/CoreData/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

@@ -70 +70 @@
                 F535C7440DF2353900716DA9 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F535C7420DF2353900716DA9 /* CoreData.framework */; };
                 F541CBF50D9C2D19002F9278 /* SapphireRadioSetting.m in Sources */ = {isa = PBXBuildFile; fileRef = F541CBF40D9C2D19002F9278 /* SapphireRadioSetting.m */; };
+                F544602A0E030D5100311C03 /* SapphireDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F54460290E030D5100311C03 /* SapphireDirectory.m */; };
                 F565A1FD0C5BE81F00AE7110 /* SapphireAudioPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = F565A1FC0C5BE81F00AE7110 /* SapphireAudioPlayer.m */; };
                 F565A34A0C5BF69D00AE7110 /* SapphireAudioMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = F565A3490C5BF69D00AE7110 /* SapphireAudioMedia.m */; };
@@ -340 +341 @@
                 F541CBF30D9C2D19002F9278 /* SapphireRadioSetting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireRadioSetting.h; sourceTree = "<group>"; };
                 F541CBF40D9C2D19002F9278 /* SapphireRadioSetting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireRadioSetting.m; sourceTree = "<group>"; };
+                F54460290E030D5100311C03 /* SapphireDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireDirectory.m; sourceTree = "<group>"; };
                 F565A1FB0C5BE81F00AE7110 /* SapphireAudioPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireAudioPlayer.h; sourceTree = "<group>"; };
                 F565A1FC0C5BE81F00AE7110 /* SapphireAudioPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireAudioPlayer.m; sourceTree = "<group>"; };
@@ -894 +896 @@
                                 F5241ECB0DFDBD0200A0083F /* SapphireBasicDirectoryFunctionsImports.h */,
                                 F5C55EC70DE90F7000661563 /* SapphireDirectory.h */,
+                                F54460290E030D5100311C03 /* SapphireDirectory.m */,
                                 F52949C90DEB809E004F8F4F /* SapphireEntityDirectory.h */,
                                 F52949CA0DEB809E004F8F4F /* SapphireEntityDirectory.m */,
@@ -1212 +1215 @@
                                 F59BB9180DF43C3E00EC11A2 /* SapphireMetaDataUpgrading.m in Sources */,
                                 F59BBB1C0DF4E2B900EC11A2 /* SapphireFilteredFileDirectory.m in Sources */,
+                                F544602A0E030D5100311C03 /* SapphireDirectory.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;