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

Timestamp:

06/11/08 14:23:43 (4 years ago)

Author:

gbooker

Message:

Cleaned up some of the sorting

Files:

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

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

@@ -162 +162 @@
 }
 
-NSComparisonResult fileAndLinkEpisodeCompare(id file1, id file2)
+NSComparisonResult fileAndLinkEpisodeCompare(id file1, id file2, void *context)
 {
         /*Resolve link and try to sort by episodes*/
@@ -178 +178 @@
         
         NSComparisonResult result = [first episodeCompare:second];
+        if(result != NSOrderedSame)
+                return result;
+        
+        result = [first movieCompare:second];
         if(result != NSOrderedSame)
                 return result;
@@ -364 +368 @@
         if(filterPredicate != nil)
                 [allFiles filterUsingPredicate:filterPredicate];
-        [allFiles sortUsingSelector:@selector(episodeCompare:)];
+        [allFiles sortUsingFunction:fileAndLinkEpisodeCompare context:nil];
         [cachedFiles release];
         cachedFiles = [[NSMutableArray alloc] init];