Changeset 1196

Show
Ignore:
Timestamp:
02/28/2010 04:02:52 PM (2 years ago)
Author:
gbooker
Message:

Reorder cast director genre to genre, director, cast in movie directory.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/SapphireFrappliance/MetaData/Support/SapphireMovieDirectory.m

    r966 r1196  
    9494        NSPredicate *allPred = [NSPredicate predicateWithFormat:@"movie != nil"]; 
    9595        SapphireFilteredFileDirectory *all = [[SapphireFilteredFileDirectory alloc] initWithPredicate:allPred Context:moc]; 
     96        SapphireEntityDirectory *genre = [[SapphireEntityDirectory alloc] initWithEntityFetch:genreEntityFetch inContext:moc]; 
     97        SapphireEntityDirectory *director = [[SapphireEntityDirectory alloc] initWithEntityFetch:directorEntityFetch inContext:moc]; 
    9698        SapphireEntityDirectory *cast = [[SapphireEntityDirectory alloc] initWithEntityFetch:castEntityFetch inContext:moc]; 
    97         SapphireEntityDirectory *director = [[SapphireEntityDirectory alloc] initWithEntityFetch:directorEntityFetch inContext:moc]; 
    98         SapphireEntityDirectory *genre = [[SapphireEntityDirectory alloc] initWithEntityFetch:genreEntityFetch inContext:moc]; 
    9999        NSPredicate *top250Pred = [NSPredicate predicateWithFormat:@"movie.imdbTop250Ranking != 0"]; 
    100100        SapphireFilteredFileDirectory *top250 = [[SapphireFilteredFileDirectory alloc] initWithPredicate:top250Pred Context:moc]; 
     
    104104        originalSubDirs = [[NSArray alloc] initWithObjects: 
    105105                                           all, 
     106                                           genre, 
     107                                           director, 
    106108                                           cast, 
    107                                            director, 
    108                                            genre, 
    109109                                           top250, 
    110110                                           oscar, 
     
    113113        originalNames = [[NSArray alloc] initWithObjects: 
    114114                                         BRLocalizedString( @"All Movies", @"Select all movies" ), 
     115                                         BRLocalizedString( @"By Genre", @"Select movies based on genre" ), 
     116                                         BRLocalizedString( @"By Director", @"Select movies based on director" ), 
    115117                                         BRLocalizedString( @"By Cast", @"Select movies based on cast members" ), 
    116                                          BRLocalizedString( @"By Director", @"Select movies based on director" ), 
    117                                          BRLocalizedString( @"By Genre", @"Select movies based on genre" ), 
    118118                                         BRLocalizedString( @"IMDB Top 250", @"Show movies in IMDb Top 250 only" ), 
    119119                                         BRLocalizedString( @"Academy Award Winning", @"Show Oscar winning movies only" ), 
     
    133133        [all setCoverArtPath:moviePath]; 
    134134        [all setFileSorters:[NSArray arrayWithObjects:titleSort, dateSort, imdbRatingSort, nil]]; 
     135        [genre setPath:VIRTUAL_DIR_GENRE_PATH]; 
     136        [genre setCoverArtPath:moviePath]; 
     137        [genre setMetaFileFetchPredicate:[NSPredicate predicateWithFormat:@"movie != nil AND ANY movie.genres != nil"]]; 
     138        [director setPath:VIRTUAL_DIR_DIRECTOR_PATH]; 
     139        [director setCoverArtPath:moviePath]; 
     140        [director setMetaFileFetchPredicate:[NSPredicate predicateWithFormat:@"movie != nil AND ANY movie.directors != nil"]]; 
    135141        [cast setPath:VIRTUAL_DIR_CAST_PATH]; 
    136142        [cast setCoverArtPath:moviePath]; 
    137143        [cast setMetaFileFetchPredicate:[NSPredicate predicateWithFormat:@"movie != nil AND ANY movie.#cast != nil"]]; 
    138         [director setPath:VIRTUAL_DIR_DIRECTOR_PATH]; 
    139         [director setCoverArtPath:moviePath]; 
    140         [director setMetaFileFetchPredicate:[NSPredicate predicateWithFormat:@"movie != nil AND ANY movie.directors != nil"]]; 
    141         [genre setPath:VIRTUAL_DIR_GENRE_PATH]; 
    142         [genre setCoverArtPath:moviePath]; 
    143         [genre setMetaFileFetchPredicate:[NSPredicate predicateWithFormat:@"movie != nil AND ANY movie.genres != nil"]]; 
    144144        [top250 setPath:VIRTUAL_DIR_TOP250_PATH]; 
    145145        [top250 setCoverArtPath:moviePath]; 
     
    152152 
    153153        [all release]; 
     154        [genre release]; 
     155        [director release]; 
    154156        [cast release]; 
    155         [director release]; 
    156         [genre release]; 
    157157        [top250 release]; 
    158158        [oscar release];