Changeset 841

Timestamp:

05/26/09 08:33:44 (15 months ago)

Author:

gbooker

Message:

If no filter is being used, just fetch all entities in the virtual directories. Since auto-pruning is now in place, we don't have to worry about empty directories.

Location:

branches/CoreData/SapphireFrappliance

Files:

• FRAppliance/SapphireApplianceController.m (modified) (1 diff)
• MetaData/Support/SapphireMovieDirectory.m (modified) (1 diff)

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

@@ -412 +412 @@
 NSArray *showEntityFetch(NSManagedObjectContext *moc, NSPredicate *filterPredicate)
 {
-        NSPredicate *fetchPredicate = [NSPredicate predicateWithFormat:@"tvEpisode != nil"];
-        NSPredicate *finalPred;
-        if(filterPredicate == nil)
-                finalPred = fetchPredicate;
-        else
-                finalPred = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:filterPredicate, fetchPredicate, nil]];
-        NSArray *files = doFetchRequest(SapphireFileMetaDataName, moc, finalPred);
-
-        NSSet *epIds = [NSSet setWithArray:[files valueForKeyPath:@"tvEpisode.objectID"]];
-        NSPredicate *epPred = [NSPredicate predicateWithFormat:@"SELF IN %@", epIds];
-        NSArray *episodes = doFetchRequest(SapphireEpisodeName, moc, epPred);
-
-        NSSet *showIds = [NSSet setWithArray:[episodes valueForKeyPath:@"tvShow.objectID"]];
-        NSPredicate *showPred = [NSPredicate predicateWithFormat:@"SELF IN %@", showIds];
-
+        NSPredicate *showPred = nil;
+        if(filterPredicate != nil)
+        {
+                NSPredicate *fetchPredicate = [NSPredicate predicateWithFormat:@"tvEpisode != nil"];
+                NSPredicate *finalPred;
+                if(filterPredicate == nil)
+                        finalPred = fetchPredicate;
+                else
+                        finalPred = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:filterPredicate, fetchPredicate, nil]];
+                NSArray *files = doFetchRequest(SapphireFileMetaDataName, moc, finalPred);
+                
+                NSSet *epIds = [NSSet setWithArray:[files valueForKeyPath:@"tvEpisode.objectID"]];
+                NSPredicate *epPred = [NSPredicate predicateWithFormat:@"SELF IN %@", epIds];
+                NSArray *episodes = doFetchRequest(SapphireEpisodeName, moc, epPred);
+                
+                NSSet *showIds = [NSSet setWithArray:[episodes valueForKeyPath:@"tvShow.objectID"]];
+                showPred = [NSPredicate predicateWithFormat:@"SELF IN %@", showIds];
+        }
         return doFetchRequest(SapphireTVShowName, moc, showPred);
 }

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

@@ -35 +35 @@
 NSArray *multiMovieEntityFetch(NSString *name, NSString *keyFromMovie, NSManagedObjectContext *moc, NSPredicate *filterPredicate)
 {
-        NSPredicate *fetchPredicate = [NSPredicate predicateWithFormat:@"movie != nil"];
-        NSPredicate *finalPred;
-        if(filterPredicate == nil)
-                finalPred = fetchPredicate;
-        else
-                finalPred = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:filterPredicate, fetchPredicate, nil]];
-        NSArray *files = doFetchRequest(SapphireFileMetaDataName, moc, finalPred);
-        NSSet *movieIds = [NSSet setWithArray:[files valueForKeyPath:@"movie.objectID"]];
-        
-        NSPredicate *entPred;
-        if([SapphireFrontRowCompat usingTakeTwo] || ![SapphireFrontRowCompat usingFrontRow])
+        NSPredicate *entPred = nil;
+        if(filterPredicate != nil)
         {
-                /*      Damn you Apple for not making take 2 Leopard.  Not only does this make obj C 2 not available,
-                        but it also means that I have to content with a crippled and slower core data.  The else block here
-                        executes on Leopard at several times the speed, but on Tiger throws the exception:
-                        "to-many key not allowed here" even though it can be done through a JOIN in the SQL!!!!!*/
-                NSPredicate *moviePred = [NSPredicate predicateWithFormat:@"SELF IN %@", movieIds];
-                NSArray *movies = doFetchRequest(SapphireMovieName, moc, moviePred);
-                NSArray *entSet = [movies valueForKeyPath:[NSString stringWithFormat:@"@distinctUnionOfSets.%@.objectID", keyFromMovie]];
+                NSPredicate *fetchPredicate = [NSPredicate predicateWithFormat:@"movie != nil"];
+                NSPredicate *finalPred;
+                if(filterPredicate == nil)
+                        finalPred = fetchPredicate;
+                else
+                        finalPred = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:filterPredicate, fetchPredicate, nil]];
+                NSArray *files = doFetchRequest(SapphireFileMetaDataName, moc, finalPred);
+                NSSet *movieIds = [NSSet setWithArray:[files valueForKeyPath:@"movie.objectID"]];
                 
-                entPred = [NSPredicate predicateWithFormat:@"SELF IN %@", entSet];
+                if([SapphireFrontRowCompat usingTakeTwo] || ![SapphireFrontRowCompat usingFrontRow])
+                {
+                        /*      Damn you Apple for not making take 2 Leopard.  Not only does this make obj C 2 not available,
+                         but it also means that I have to content with a crippled and slower core data.  The else block here
+                         executes on Leopard at several times the speed, but on Tiger throws the exception:
+                         "to-many key not allowed here" even though it can be done through a JOIN in the SQL!!!!!*/
+                        NSPredicate *moviePred = [NSPredicate predicateWithFormat:@"SELF IN %@", movieIds];
+                        NSArray *movies = doFetchRequest(SapphireMovieName, moc, moviePred);
+                        NSArray *entSet = [movies valueForKeyPath:[NSString stringWithFormat:@"@distinctUnionOfSets.%@.objectID", keyFromMovie]];
+                        
+                        entPred = [NSPredicate predicateWithFormat:@"SELF IN %@", entSet];
+                }
+                else
+                        entPred = [NSPredicate predicateWithFormat:@"ANY movies IN %@", movieIds];              
         }
-        else
-                entPred = [NSPredicate predicateWithFormat:@"ANY movies IN %@", movieIds];
         return doFetchRequest(name, moc, entPred);
 }