Changeset 934

Timestamp:

10/14/2009 11:11:11 PM (2 years ago)

Author:

gbooker

Message:

XML based virtual movie directories. Patch by skyy99_1111
Fixes #313

Location:

trunk/SapphireFrappliance

Files:

• MetaData/SapphireMObjects/SapphireEpisode.m (modified) (1 diff)
• MetaData/Support/SapphireMovieDirectory.h (modified) (2 diffs)
• MetaData/Support/SapphireMovieDirectory.m (modified) (6 diffs)
• MetaData/Support/SapphireMovieVirtualDirectory.h (added)
• MetaData/Support/SapphireMovieVirtualDirectory.m (added)
• MetaData/Support/SapphireMovieVirtualDirectoryImporter.h (added)
• MetaData/Support/SapphireMovieVirtualDirectoryImporter.m (added)
• Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)
• main_debug.m (modified) (3 diffs)

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireEpisode.m

@@ -151 +151 @@
         {
                 NSEnumerator *otherEps = [dictionaries objectEnumerator];
-                NSDictionary *epDict = [otherEps nextObject]; //Skip first
+                NSDictionary *epDict = nil;
+                [otherEps nextObject]; //Skip first
                 while((epDict = [otherEps nextObject]) != nil)
                         [ret insertAdditionalEpisode:epDict];

trunk/SapphireFrappliance/MetaData/Support/SapphireMovieDirectory.h

@@ -22 +22 @@
 #import "SapphireBasicDirectoryFunctionsDefines.h"
 
+@class SapphireMovieVirtualDirectoryImporter;
+
 /*!
  * @brief The base movies virtual directory
@@ -29 +31 @@
 @interface SapphireMovieDirectory : NSObject <SapphireDirectory> {
         NSManagedObjectContext                  *moc;                           /*!< @brief The context*/
-        NSArray                                                 *subDirs;                       /*!< @brief The sub-directory objects*/
-        NSArray                                                 *names;                         /*!< @brief The sub-directory names*/
+        NSArray                                                 *originalSubDirs;       /*!< @brief The static sub-directory objects*/
+        NSArray                                                 *originalNames;         /*!< @brief The static sub-directory names*/
+        NSMutableArray                                  *subDirs;                       /*!< @brief The sub-directory objects*/
+        NSMutableArray                                  *names;                         /*!< @brief The sub-directory names*/
+        NSArray                                                 *virtualDirs;           /*!< @brief The virtual directories last imported*/
+        NSArray                                                 *defaultSorters;        /*!< @brief The list of default file sorters*/
+        SapphireMovieVirtualDirectoryImporter   *vdImport;      /*!< @brief The virtial directory importer*/
         Basic_Directory_Function_Instance_Variables
 }

trunk/SapphireFrappliance/MetaData/Support/SapphireMovieDirectory.m

@@ -27 +27 @@
 #import "SapphireBasicDirectoryFunctionsImports.h"
 #import "SapphireFileSorter.h"
-
+#import "SapphireMovieVirtualDirectoryImporter.h"
+#import "SapphireMovieVirtualDirectory.h"
 #import "SapphireMovie.h"
 #import "SapphireCast.h"
@@ -89 +90 @@
         
         moc = [context retain];
-
+        
+        /*Define the static virtual directories*/
         NSPredicate *allPred = [NSPredicate predicateWithFormat:@"movie != nil"];
         SapphireFilteredFileDirectory *all = [[SapphireFilteredFileDirectory alloc] initWithPredicate:allPred Context:moc];
@@ -99 +101 @@
         NSPredicate *oscarPred = [NSPredicate predicateWithFormat:@"movie.oscarsWon != 0"];
         SapphireFilteredFileDirectory *oscar = [[SapphireFilteredFileDirectory alloc] initWithPredicate:oscarPred Context:moc];
-        
-        subDirs = [[NSArray alloc] initWithObjects:
-                           all,
-                           cast,
-                           director,
-                           genre,
-                           top250,
-                           oscar,
-                           nil];
-        names = [[NSArray alloc] initWithObjects:
-                           BRLocalizedString( @"All Movies", @"Select all movies" ),
-                           BRLocalizedString( @"By Cast", @"Select movies based on cast members" ),
-                           BRLocalizedString( @"By Director", @"Select movies based on director" ),
-                           BRLocalizedString( @"By Genre", @"Select movies based on genre" ),
-                           BRLocalizedString( @"IMDB Top 250", @"Show movies in IMDb Top 250 only" ),
-                           BRLocalizedString( @"Academy Award Winning", @"Show Oscar winning movies only" ),
-                           nil];
-        
+
+        originalSubDirs = [[NSArray alloc] initWithObjects:
+                                           all,
+                                           cast,
+                                           director,
+                                           genre,
+                                           top250,
+                                           oscar,
+                                           nil];
+        
+        originalNames = [[NSArray alloc] initWithObjects:
+                                         BRLocalizedString( @"All Movies", @"Select all movies" ),
+                                         BRLocalizedString( @"By Cast", @"Select movies based on cast members" ),
+                                         BRLocalizedString( @"By Director", @"Select movies based on director" ),
+                                         BRLocalizedString( @"By Genre", @"Select movies based on genre" ),
+                                         BRLocalizedString( @"IMDB Top 250", @"Show movies in IMDb Top 250 only" ),
+                                         BRLocalizedString( @"Academy Award Winning", @"Show Oscar winning movies only" ),
+                                         nil];
+                                         
         SapphireFileSorter *titleSort = [SapphireMovieTitleSorter sharedInstance];
         SapphireFileSorter *imdbRankSort = [SapphireMovieIMDBTop250RankSorter sharedInstance];
@@ -124 +127 @@
         
         NSString *moviePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"video_H" ofType:@"png"];
-        
+        vdImport = [[SapphireMovieVirtualDirectoryImporter alloc] initWithPath:[applicationSupportDir() stringByAppendingPathComponent:@"virtualDirs.xml"]];
+        defaultSorters = [[NSArray alloc] initWithObjects:titleSort, dateSort, imdbRatingSort, nil];
+        
+        /*Finish the static directory setup*/
         [all setPath:VIRTUAL_DIR_ALL_PATH];
         [all setCoverArtPath:moviePath];
@@ -157 +163 @@
 - (void) dealloc
 {
+        [originalSubDirs release];
+        [originalNames release];
         [subDirs release];
         [names release];
+        [virtualDirs release];
+        [defaultSorters release];
+        [vdImport release];
         Basic_Directory_Function_Deallocs
         [super dealloc];
@@ -209 +220 @@
 - (void)reloadDirectoryContents
 {
+        /*Import any defined movie virtual directories*/
+        NSArray *newVirtualDirs = [vdImport virtualDirectories];
+        if(![virtualDirs isEqualToArray:newVirtualDirs])
+        {
+                [virtualDirs release];
+                [names release];
+                [subDirs release];
+                virtualDirs = [newVirtualDirs retain];
+                names = [originalNames mutableCopy];
+                subDirs = [originalSubDirs mutableCopy];
+                
+                NSString *moviePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"video_H" ofType:@"png"];
+                NSEnumerator *mvdEnum = [newVirtualDirs objectEnumerator];
+                SapphireMovieVirtualDirectory *virtualDir;
+                while((virtualDir = [mvdEnum nextObject]) != nil)
+                {
+                        SapphireFilteredFileDirectory *custom = [[SapphireFilteredFileDirectory alloc] initWithPredicate:[virtualDir predicate] Context:moc];
+                        [subDirs addObject:custom];
+                        [names addObject:BRLocalizedString([virtualDir title], [virtualDir description])];
+                        [custom setPath:[[VIRTUAL_DIR_ROOT_PATH stringByAppendingString:@"/"] stringByAppendingString:[virtualDir description]]];
+                        [custom setCoverArtPath:moviePath]; // Change this to be part of the XML?
+                        [custom setFileSorters:defaultSorters];
+                        NSLog(@"Added %@, %@: %@", [names lastObject], [virtualDir predicate],[subDirs lastObject]);
+                        [custom release];
+                }
+        }
+        
         [subDirs makeObjectsPerformSelector:@selector(setFilterPredicate:) withObject:filterPredicate];
         [delegate directoryContentsChanged];

trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

@@ -54 +54 @@
                 38FAFC320C012A7800853CFE /* SapphireAppliance.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FAFC2F0C012A7800853CFE /* SapphireAppliance.m */; };
                 38FAFC330C012A7800853CFE /* SapphireBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 38FAFC310C012A7800853CFE /* SapphireBrowser.m */; };
+                5941C04710786EB2004C887B /* SapphireMovieVirtualDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 5941C03A10786DD5004C887B /* SapphireMovieVirtualDirectory.m */; };
+                5941C04810786ECA004C887B /* SapphireMovieVirtualDirectoryImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5941C03C10786DD5004C887B /* SapphireMovieVirtualDirectoryImporter.m */; };
                 805420AA0F94FA7E002D2DBF /* NSImage-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 805420A90F94FA7E002D2DBF /* NSImage-Extensions.m */; };
                 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
@@ -361 +363 @@
                 38FAFC300C012A7800853CFE /* SapphireAppliance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SapphireAppliance.h; sourceTree = "<group>"; };
                 38FAFC310C012A7800853CFE /* SapphireBrowser.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SapphireBrowser.m; sourceTree = "<group>"; };
+                5941C03910786DD5004C887B /* SapphireMovieVirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireMovieVirtualDirectory.h; sourceTree = "<group>"; };
+                5941C03A10786DD5004C887B /* SapphireMovieVirtualDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireMovieVirtualDirectory.m; sourceTree = "<group>"; };
+                5941C03B10786DD5004C887B /* SapphireMovieVirtualDirectoryImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireMovieVirtualDirectoryImporter.h; sourceTree = "<group>"; };
+                5941C03C10786DD5004C887B /* SapphireMovieVirtualDirectoryImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireMovieVirtualDirectoryImporter.m; sourceTree = "<group>"; };
                 805420A80F94FA7E002D2DBF /* NSImage-Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage-Extensions.h"; sourceTree = "<group>"; };
                 805420A90F94FA7E002D2DBF /* NSImage-Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSImage-Extensions.m"; sourceTree = "<group>"; };
@@ -994 +1000 @@
                         isa = PBXGroup;
                         children = (
+                                5941C03910786DD5004C887B /* SapphireMovieVirtualDirectory.h */,
+                                5941C03A10786DD5004C887B /* SapphireMovieVirtualDirectory.m */,
+                                5941C03B10786DD5004C887B /* SapphireMovieVirtualDirectoryImporter.h */,
+                                5941C03C10786DD5004C887B /* SapphireMovieVirtualDirectoryImporter.m */,
                                 F5C55EC20DE90F3900661563 /* CoreDataSupportFunctions.h */,
                                 F5C55EC30DE90F3900661563 /* CoreDataSupportFunctions.m */,
@@ -1382 +1392 @@
                                 805420AA0F94FA7E002D2DBF /* NSImage-Extensions.m in Sources */,
                                 F5505DC71040864D0064D392 /* SapphireAudioNowPlayingController.m in Sources */,
+                                5941C04710786EB2004C887B /* SapphireMovieVirtualDirectory.m in Sources */,
+                                5941C04810786ECA004C887B /* SapphireMovieVirtualDirectoryImporter.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireFrappliance/main_debug.m

@@ -43 +43 @@
 #import "SapphireDirector.h"
 #import "SapphireXMLData.h"
+#import "SapphireMovieDirectory.h"
 
 void overrideApplicationSupportdir(NSString *override);
@@ -259 +260 @@
         }
 #endif
-#define TESTING_MULTIPLE_AND_SINGLE_TV_SHOW_IMPORT
+//#define TESTING_MULTIPLE_AND_SINGLE_TV_SHOW_IMPORT
 #ifdef TESTING_MULTIPLE_AND_SINGLE_TV_SHOW_IMPORT
         {
@@ -271 +272 @@
         }
 #endif
+#define TESTING_MOVIE_VIRTUAL_DIRS_IN_XML
+#ifdef TESTING_MOVIE_VIRTUAL_DIRS_IN_XML
+        {
+                SapphireMovieDirectory *movieDir = [[SapphireMovieDirectory alloc] initWithContext:moc];
+                [movieDir reloadDirectoryContents];
+                [movieDir reloadDirectoryContents];
+                [movieDir release];
+        }
+#endif
         
         [moc release];