Changeset 1291 for trunk

Timestamp:

06/26/10 16:08:51 (2 years ago)

Author:

gbooker

Message:

Added sort by duration and sorting by filesize.

Location:

trunk/SapphireFrappliance/MetaData

Files:

• SapphireMObjects/SapphireDirector.m (modified) (1 diff)
• SapphireMObjects/SapphireGenre.m (modified) (1 diff)
• SapphireMObjects/SapphireSeason.m (modified) (1 diff)
• SapphireMObjects/SapphireTVShow.m (modified) (1 diff)
• Support/SapphireFileSorter.h (modified) (1 diff)
• Support/SapphireFileSorter.m (modified) (5 diffs)
• Support/SapphireMovieDirectory.m (modified) (3 diffs)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirector.m

@@ -10 +10 @@
 + (void)load
 {
-        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireMovieTitleSorter sharedInstance], [SapphireDateSorter sharedInstance], [SapphireMovieIMDBRatingSorter sharedInstance], nil];
+        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireMovieTitleSorter sharedInstance], [SapphireDurationSorter sharedInstance], [SapphireFileSizeSorter sharedInstance], [SapphireDateSorter sharedInstance], [SapphireMovieIMDBRatingSorter sharedInstance], nil];
 }
 

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireGenre.m

@@ -11 +11 @@
 + (void)load
 {
-        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireMovieTitleSorter sharedInstance], [SapphireDateSorter sharedInstance], [SapphireMovieIMDBRatingSorter sharedInstance], nil];
+        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireMovieTitleSorter sharedInstance], [SapphireDurationSorter sharedInstance], [SapphireFileSizeSorter sharedInstance], [SapphireDateSorter sharedInstance], [SapphireMovieIMDBRatingSorter sharedInstance], nil];
 }
 

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSeason.m

@@ -10 +10 @@
 + (void)load
 {
-        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireTVEpisodeSorter sharedInstance], [SapphireDateSorter sharedInstance], nil];
+        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireTVEpisodeSorter sharedInstance], [SapphireDurationSorter sharedInstance], [SapphireFileSizeSorter sharedInstance], [SapphireDateSorter sharedInstance], nil];
 }
 

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.m

@@ -19 +19 @@
 + (void)load
 {
-        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireTVEpisodeSorter sharedInstance], [SapphireDateSorter sharedInstance], nil];
+        allowedSorts = [[NSArray alloc] initWithObjects:[SapphireTVEpisodeSorter sharedInstance], [SapphireDurationSorter sharedInstance], [SapphireFileSizeSorter sharedInstance], [SapphireDateSorter sharedInstance], nil];
 }
 

trunk/SapphireFrappliance/MetaData/Support/SapphireFileSorter.h

@@ -61 +61 @@
 
 @end
+
+@interface SapphireDurationSorter : SapphireFileSorter {
+}
+
+@end
+
+@interface SapphireFileSizeSorter : SapphireFileSorter {
+}
+
+@end

trunk/SapphireFrappliance/MetaData/Support/SapphireFileSorter.m

@@ -34 +34 @@
 @end
 
+SapphireFileMetaData *getFileFromFileOrLink(id file)
+{
+        if([file isKindOfClass:[SapphireFileMetaData class]])
+                return (SapphireFileMetaData *)file;
+        else
+                return ((SapphireFileSymLink *)file).file;      
+}
 
 @implementation SapphireFileSorter
@@ -218 +225 @@
 @end
 
+@implementation SapphireDurationSorter
+
++ (SapphireFileSorter *)sharedInstance
+{
+        static SapphireDurationSorter *shared = nil;
+        if(shared == nil)
+                shared = [[SapphireDurationSorter alloc] init];
+        return shared;
+}
+
+- (NSString *)displayName
+{
+        return BRLocalizedString(@"By Duration", @"[Sort] By Duration");
+}
+
+- (NSString *)displayDescription
+{
+        return BRLocalizedString(@"Sort by Duration.", @"Sort by Duration description");
+}
+
+- (int)sortNumber
+{
+        return 5;
+}
+
+NSComparisonResult fileAndLinkDurationCompare(id file1, id file2, void *context)
+{
+        SapphireFileMetaData *first = getFileFromFileOrLink(file1);
+        SapphireFileMetaData *second = getFileFromFileOrLink(file2);
+        
+        return [first.duration compare:second.duration];
+}
+
+- (void)sortFiles:(NSMutableArray *)files
+{
+        [files sortUsingFunction:fileAndLinkDurationCompare context:nil];
+}
+
+@end
+
+@implementation SapphireFileSizeSorter
+
++ (SapphireFileSorter *)sharedInstance
+{
+        static SapphireFileSizeSorter *shared = nil;
+        if(shared == nil)
+                shared = [[SapphireFileSizeSorter alloc] init];
+        return shared;
+}
+
+- (NSString *)displayName
+{
+        return BRLocalizedString(@"By File Size", @"[Sort] By File Size");
+}
+
+- (NSString *)displayDescription
+{
+        return BRLocalizedString(@"Sort by File Size.", @"Sort by File Size description");
+}
+
+- (int)sortNumber
+{
+        return 6;
+}
+
+NSComparisonResult fileAndLinkSizeCompare(id file1, id file2, void *context)
+{
+        SapphireFileMetaData *first = getFileFromFileOrLink(file1);
+        SapphireFileMetaData *second = getFileFromFileOrLink(file2);
+        
+        return [first.size compare:second.size];
+}
+
+- (void)sortFiles:(NSMutableArray *)files
+{
+        [files sortUsingFunction:fileAndLinkSizeCompare context:nil];
+}
+
+@end
+
 @implementation SapphireDateSorter
 
@@ -240 +327 @@
 - (int)sortNumber
 {
-        return 5;
+        return 7;
 }
 
@@ -246 +333 @@
 {
         /*Resolve link and try to sort by episodes*/
-        SapphireFileMetaData *first;
-        if([file1 isKindOfClass:[SapphireFileMetaData class]])
-                first = (SapphireFileMetaData *)file1;
-        else
-                first = ((SapphireFileSymLink *)file1).file;
-        
-        SapphireFileMetaData *second;
-        if([file2 isKindOfClass:[SapphireFileMetaData class]])
-                second = (SapphireFileMetaData *)file2;
-        else
-                second = ((SapphireFileSymLink *)file2).file;
+        SapphireFileMetaData *first = getFileFromFileOrLink(file1);
+        SapphireFileMetaData *second = getFileFromFileOrLink(file2);
         
         NSComparisonResult result = [first episodeAirDateCompare:second];
@@ -299 +377 @@
 - (int)sortNumber
 {
-        return 6;
+        return 8;
 }
 

trunk/SapphireFrappliance/MetaData/Support/SapphireMovieDirectory.m

@@ -123 +123 @@
         SapphireFileSorter *imdbRankSort = [SapphireMovieIMDBTop250RankSorter sharedInstance];
         SapphireFileSorter *awardSort = [SapphireMovieAcademyAwardSorter sharedInstance];
+        SapphireFileSorter *durationSort = [SapphireDurationSorter sharedInstance];
+        SapphireFileSorter *sizeSort = [SapphireFileSizeSorter sharedInstance];
         SapphireFileSorter *dateSort = [SapphireDateSorter sharedInstance];
         SapphireFileSorter *imdbRatingSort = [SapphireMovieIMDBRatingSorter sharedInstance];
@@ -132 +134 @@
         [all setPath:VIRTUAL_DIR_ALL_PATH];
         [all setCoverArtPath:moviePath];
-        [all setFileSorters:[NSArray arrayWithObjects:titleSort, dateSort, imdbRatingSort, nil]];
+        [all setFileSorters:[NSArray arrayWithObjects:titleSort, durationSort, sizeSort, dateSort, imdbRatingSort, nil]];
         [genre setPath:VIRTUAL_DIR_GENRE_PATH];
         [genre setCoverArtPath:moviePath];
@@ -144 +146 @@
         [top250 setPath:VIRTUAL_DIR_TOP250_PATH];
         [top250 setCoverArtPath:moviePath];
-        [top250 setFileSorters:[NSArray arrayWithObjects:imdbRankSort, titleSort, dateSort, imdbRatingSort, nil]];
+        [top250 setFileSorters:[NSArray arrayWithObjects:imdbRankSort, titleSort, durationSort, sizeSort, dateSort, imdbRatingSort, nil]];
         [oscar setPath:VIRTUAL_DIR_OSCAR_PATH];
         [oscar setCoverArtPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"AMPAS_Oscar_H" ofType:@"png"]];
-        [oscar setFileSorters:[NSArray arrayWithObjects:awardSort, titleSort, dateSort, imdbRatingSort, nil]];
+        [oscar setFileSorters:[NSArray arrayWithObjects:awardSort, titleSort, durationSort, sizeSort, dateSort, imdbRatingSort, nil]];
         [subDirs makeObjectsPerformSelector:@selector(setNotificationName:) withObject:MOVIE_DID_CHANGE_PREDICATE_MATCHING];
         Basic_Directory_Function_Inits