Changeset 966

Timestamp:

11/16/09 20:07:37 (10 months ago)

Author:

gbooker

Message:

Made the virtual directory importer more global and at completed the custom virtual directory setup for tv directories.
Refs #313

Location:

trunk/SapphireFrappliance

Files:

• FRAppliance/SapphireApplianceController.h (modified) (2 diffs)
• FRAppliance/SapphireApplianceController.m (modified) (5 diffs)
• MetaData/SapphireMObjects/SapphireTVShow.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVShow.m (modified) (1 diff)
• MetaData/Support/SapphireCustomVirtualDirectoryImporter.m (modified) (4 diffs)
• MetaData/Support/SapphireMovieDirectory.h (modified) (2 diffs)
• MetaData/Support/SapphireMovieDirectory.m (modified) (4 diffs)
• MetaData/Support/SapphireTVDirectory.h (added)
• MetaData/Support/SapphireTVDirectory.m (added)
• Sapphire.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/SapphireFrappliance/FRAppliance/SapphireApplianceController.h

@@ -23 +23 @@
 #define DISTRIBUTED_MESSAGES_PORT 15473
 
-@class SapphireSettings, SapphireTheme, SapphireLeopardOnly, SapphireImporterDataMenu, SapphireBrowser, SapphireDistributedMessagesReceiver;
+@class SapphireSettings, SapphireTheme, SapphireLeopardOnly, SapphireImporterDataMenu, SapphireBrowser, SapphireDistributedMessagesReceiver, SapphireCustomVirtualDirectoryImporter;
 
 extern NSString *SAPPHIRE_MANAGED_OBJECT_CONTEXT_CLOSING;
@@ -141 +141 @@
 
 /*!
+ * @brief Gets the current custom virtual directory importer
+ *
+ * @return The current custom virtual directory importer
+ */
++ (SapphireCustomVirtualDirectoryImporter *)customVirtualDirectoryImporter;
+
+/*!
  * @brief Log an exception to the console
  *

trunk/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

@@ -27 +27 @@
 #import "SapphireBrowser.h"
 #import "SapphireDirectoryMetaData.h"
-#import "SapphireFileMetaData.h"
 #import "SapphireSettings.h"
 #import "SapphireTheme.h"
 #import "SapphireCollectionDirectory.h"
-#import "CoreDataSupportFunctions.h"
-#import "SapphireEpisode.h"
 
 #import "SapphireImporterDataMenu.h"
@@ -43 +40 @@
 #import "SapphireMetaDataSupport.h"
 #import "SapphireEntityDirectory.h"
-#import "SapphireTVShow.h"
 #import "SapphireMovieDirectory.h"
 #import "SapphireMarkMenu.h"
 #import "SapphireDisplayMenu.h"
 #import "SapphireAudioNowPlayingController.h"
+#import "SapphireTVDirectory.h"
+#import "SapphireCustomVirtualDirectoryImporter.h"
 
 #import "NSFileManager-Extensions.h"
@@ -248 +246 @@
 }
 
++ (SapphireCustomVirtualDirectoryImporter *)customVirtualDirectoryImporter
+{
+        static SapphireCustomVirtualDirectoryImporter *customVirtualDirectoryImporter = nil;
+        if(customVirtualDirectoryImporter == nil)
+                customVirtualDirectoryImporter = [[SapphireCustomVirtualDirectoryImporter alloc] initWithPath:[applicationSupportDir() stringByAppendingPathComponent:@"virtualDirs.xml"]];
+        return customVirtualDirectoryImporter;
+}
+
 + (void)logException:(NSException *)e
 {
@@ -368 +374 @@
         SapphireSetLogLevel(SAPPHIRE_LOG_ALL, SAPPHIRE_LOG_LEVEL_ERROR);
         SapphireSetLogLevel(SAPPHIRE_LOG_METADATA_STORE, SAPPHIRE_LOG_LEVEL_DEBUG);
+        SapphireSetLogLevel(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_INFO);
         
         distributed = [[SapphireDistributedMessagesReceiver alloc] initWithController:self];
@@ -431 +438 @@
 }
 
-NSArray *showEntityFetch(NSManagedObjectContext *moc, NSPredicate *filterPredicate)
-{
-        NSPredicate *showPred = nil;
-        if(filterPredicate != nil)
-        {
-                NSPredicate *fetchPredicate = [NSPredicate predicateWithFormat:@"tvEpisode != nil"];
-                NSPredicate *finalPred;
-                if(filterPredicate == nil)
-                        finalPred = fetchPredicate;
-                else
-                        finalPred = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:filterPredicate, fetchPredicate, nil]];
-                NSArray *files = doFetchRequest(SapphireFileMetaDataName, moc, finalPred);
-                
-                NSSet *epIds = [NSSet setWithArray:[files valueForKeyPath:@"tvEpisode.objectID"]];
-                NSPredicate *epPred = [NSPredicate predicateWithFormat:@"SELF IN %@", epIds];
-                NSArray *episodes = doFetchRequest(SapphireEpisodeName, moc, epPred);
-                
-                NSSet *showIds = [NSSet setWithArray:[episodes valueForKeyPath:@"tvShow.objectID"]];
-                showPred = [NSPredicate predicateWithFormat:@"SELF IN %@", showIds];
-        }
-        return doFetchRequest(SapphireTVShowName, moc, showPred);
-}
-
 - (SapphireBrowser *)tvBrowser
 {
         BRTexture *predicateGem = [SapphireApplianceController gemForPredicate:[SapphireApplianceController predicate]];
-        SapphireEntityDirectory *tvDir = [[SapphireEntityDirectory alloc] initWithEntityFetch:showEntityFetch inContext:moc];
-        [tvDir setMetaFileFetchPredicate:[NSPredicate predicateWithFormat:@"tvEpisode != nil"]];
+        SapphireTVDirectory *tvDir = [[SapphireTVDirectory alloc] initWithContext:moc];
         SapphireBrowser *tvBrowser = [[SapphireBrowser alloc] initWithScene:[self scene] metaData:tvDir];
         [tvDir release];

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.h

@@ -7 +7 @@
 + (SapphireTVShow *)showWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
 + (void)upgradeV1ShowsFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc;
++ (NSArray *)sortMethods;
 
 - (NSComparisonResult)compare:(SapphireTVShow *)other;

trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.m

@@ -68 +68 @@
                 }
         }
+}
+
++ (NSArray *)sortMethods
+{
+        return allowedSorts;
 }
 

trunk/SapphireFrappliance/MetaData/Support/SapphireCustomVirtualDirectoryImporter.m

@@ -73 +73 @@
 //TVShow specifice attributes
 #define TV_SHOW_SEASON_ELEM                             @"season"
-#define TV_SHOW_SHOW_ELEM                               @"showTitle"
+#define TV_SHOW_SHOW_ELEM                               @"showtitle"
 #define TV_SHOW_EPISODE_ELEM                    @"episode"
-#define TV_SHOW_ABS_EPISODE_ELEM                @"episodeNumber"
+#define TV_SHOW_ABS_EPISODE_ELEM                @"episodenumber"
 #define TV_SHOW_EPISODE_TITLE_ELEM              @"title"
 #define TV_SHOW_EPISODE_DESC_ELEM               @"description"
-#define TV_SHOW_AIR_DATE_ELEM                   @"airDate"
+#define TV_SHOW_AIR_DATE_ELEM                   @"airdate"
 
 typedef enum {
@@ -171 +171 @@
                                                                                 [SapphireCommandWrapper commandWithType:CommandTypeFormatElementString formatString:@"ANY tvEpisode.subEpisodes.episodeTitle"], TV_SHOW_EPISODE_TITLE_ELEM,
                                                                                 [SapphireCommandWrapper commandWithType:CommandTypeFormatElementString formatString:@"ANY tvEpisode.subEpisodes.episodeDescription"], TV_SHOW_EPISODE_DESC_ELEM,
-                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatIntValue formatString:@"tvEpisode.season.seasonNumber"], TV_SHOW_SEASON_ELEM,
-                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatIntValue formatString:@"ANY tvEpisode.subEpisodes.episodeNumber"], TV_SHOW_EPISODE_ELEM,
-                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatIntValue formatString:@"ANY tvEpisode.subEpisodes.episodeNumber"], TV_SHOW_ABS_EPISODE_ELEM,
-                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatNSDateValue formatString:@"ANY tvEpisode.subEpisodes.airDate"], TV_SHOW_AIR_DATE_ELEM,
+                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatIntValue formatString:@"tvEpisode.season.seasonNumber == %d"], TV_SHOW_SEASON_ELEM,
+                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatIntValue formatString:@"ANY tvEpisode.subEpisodes.episodeNumber == %d"], TV_SHOW_EPISODE_ELEM,
+                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatIntValue formatString:@"ANY tvEpisode.subEpisodes.episodeNumber == %d"], TV_SHOW_ABS_EPISODE_ELEM,
+                                                                                [SapphireCommandWrapper commandWithType:CommandTypeFormatNSDateValue formatString:@"ANY tvEpisode.subEpisodes.airDate >= %@"], TV_SHOW_AIR_DATE_ELEM,
                                                                                 nil];
                 
@@ -221 +221 @@
         {
                 matchPred = [NSCompoundPredicate andPredicateWithSubpredicates:[NSArray arrayWithObjects:basePredicate, matchPred, nil]];
-                SapphireLog(SAPPHIRE_LOG_ALL, SAPPHIRE_LOG_LEVEL_INFO, @"Creating virtual directory with filter: %@", matchPred);
+                SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_INFO, @"Creating virtual directory with filter: %@", matchPred);
                 [virtualDir setPredicate:matchPred];
         }
@@ -235 +235 @@
 {
         /*Check for XML file*/
-        SapphireLog(SAPPHIRE_LOG_ALL, SAPPHIRE_LOG_LEVEL_DETAIL, @"Looking for file: %@", path);
+        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DETAIL, @"Looking for file: %@", path);
         NSFileManager *fm = [NSFileManager defaultManager];
         BOOL xmlPathIsDir = NO;

trunk/SapphireFrappliance/MetaData/Support/SapphireMovieDirectory.h

@@ -22 +22 @@
 #import "SapphireBasicDirectoryFunctionsDefines.h"
 
-@class SapphireMovieVirtualDirectoryImporter;
-
 /*!
  * @brief The base movies virtual directory
@@ -37 +35 @@
         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

@@ -127 +127 @@
         
         NSString *moviePath = [[NSBundle bundleForClass:[self class]] pathForResource:@"video_H" ofType:@"png"];
-        vdImport = [[SapphireCustomVirtualDirectoryImporter alloc] initWithPath:[applicationSupportDir() stringByAppendingPathComponent:@"virtualDirs.xml"]];
         defaultSorters = [[NSArray alloc] initWithObjects:titleSort, dateSort, imdbRatingSort, nil];
         
@@ -169 +168 @@
         [virtualDirs release];
         [defaultSorters release];
-        [vdImport release];
         Basic_Directory_Function_Deallocs
         [super dealloc];
@@ -221 +219 @@
 {
         /*Import any defined movie virtual directories*/
-        NSArray *newVirtualDirs = [vdImport movieVirtualDirectories];
+        NSArray *newVirtualDirs = [[SapphireApplianceController customVirtualDirectoryImporter] movieVirtualDirectories];
         if(![virtualDirs isEqualToArray:newVirtualDirs])
         {
@@ -238 +236 @@
                         SapphireFilteredFileDirectory *custom = [[SapphireFilteredFileDirectory alloc] initWithPredicate:[virtualDir predicate] Context:moc];
                         [subDirs addObject:custom];
-                        [names addObject:BRLocalizedString([virtualDir title], [virtualDir description])];
+                        [names addObject:[virtualDir title]];
                         [custom setPath:[[VIRTUAL_DIR_ROOT_PATH stringByAppendingString:@"/"] stringByAppendingString:[virtualDir description]]];
                         [custom setCoverArtPath:moviePath]; // Change this to be part of the XML?

trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

@@ -63 +63 @@
                 F50040110D1998FA003FEA08 /* SapphireLeopardFileEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = F500400F0D1998FA003FEA08 /* SapphireLeopardFileEvents.m */; };
                 F50044160D19A268003FEA08 /* LeopardOnly.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F5003FF90D19980B003FEA08 /* LeopardOnly.framework */; };
+                F506593110B22EC800D0F1FE /* SapphireTVDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F506593010B22EC800D0F1FE /* SapphireTVDirectory.m */; };
                 F51BFC1B0D26ACAD00E22363 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56A19480C3170870022918E /* AppKit.framework */; };
                 F51BFC1C0D26ACAD00E22363 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 089C1672FE841209C02AAC07 /* Foundation.framework */; };
@@ -393 +394 @@
                 F500400E0D1998FA003FEA08 /* SapphireLeopardFileEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireLeopardFileEvents.h; sourceTree = "<group>"; };
                 F500400F0D1998FA003FEA08 /* SapphireLeopardFileEvents.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireLeopardFileEvents.m; sourceTree = "<group>"; };
+                F506592F10B22EC800D0F1FE /* SapphireTVDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireTVDirectory.h; sourceTree = "<group>"; };
+                F506593010B22EC800D0F1FE /* SapphireTVDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireTVDirectory.m; sourceTree = "<group>"; };
                 F5185B400D1344D700712020 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
                 F51BFD2D0D26BDF300E22363 /* SapphireCompatibilityClasses.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SapphireCompatibilityClasses.xcodeproj; path = ../SapphireCompatibilityClasses/SapphireCompatibilityClasses.xcodeproj; sourceTree = "<group>"; };
@@ -1048 +1051 @@
                                 F5C55ECC0DE90F7000661563 /* SapphireObjectDirectory.h */,
                                 F5C55ECD0DE90F7000661563 /* SapphireObjectDirectory.m */,
+                                F506592F10B22EC800D0F1FE /* SapphireTVDirectory.h */,
+                                F506593010B22EC800D0F1FE /* SapphireTVDirectory.m */,
                         );
                         path = Support;
@@ -1425 +1430 @@
                                 5941C04810786ECA004C887B /* SapphireCustomVirtualDirectoryImporter.m in Sources */,
                                 F5A9A89510A7A69600BA95CD /* NSXMLDocument-Extensions.m in Sources */,
+                                F506593110B22EC800D0F1FE /* SapphireTVDirectory.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;