Changeset 586

Timestamp:

06/11/2008 02:23:43 PM (4 years ago)

Author:

gbooker

Message:

Cleaned up some of the sorting

Location:

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects

Files:

• SapphireDirectoryMetaData.m (modified) (3 diffs)
• SapphireFileMetaData.h (modified) (1 diff)
• SapphireFileMetaData.m (modified) (2 diffs)
• SapphireFileSymLink.m (modified) (1 diff)

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

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h

@@ -73 +73 @@
 - (void)insertDictionary:(NSDictionary *)dict withDefer:(NSMutableDictionary *)defer;
 - (NSComparisonResult) episodeCompare:(SapphireFileMetaData *)other;
+- (NSComparisonResult) movieCompare:(SapphireFileMetaData *)other;
 
 /*!

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

@@ -197 +197 @@
                 return NSOrderedDescending;
 
-        return [self.path compare:other.path];
+        return NSOrderedSame;
 }
 
@@ -213 +213 @@
                 return NSOrderedDescending;
         
-        return [self.path compare:other.path];
+        return NSOrderedSame;
 }
 

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

@@ -55 +55 @@
 }
 
-- (NSComparisonResult) episodeCompare:(SapphireFileMetaData *)other
-{
-        return [self.file episodeCompare:other];
-}
-
 @end