Changeset 491

Timestamp:

02/14/2008 08:51:37 PM (4 years ago)

Author:

gbooker

Message:

Patch to select the directory instead of the filename for movie searches. Thanks to Stephan in ticket #120
Fixes #120

Location:

trunk/SapphireFrappliance

Files:

• SapphireMovieImporter.m (modified) (6 diffs)
• SapphireSettings.h (modified) (1 diff)
• SapphireSettings.m (modified) (7 diffs)

trunk/SapphireFrappliance/SapphireMovieImporter.m

@@ -27 +27 @@
 #import <SapphireCompatClasses/SapphireFrontRowCompat.h>
 #import "SapphireShowChooser.h"
+#import "SapphireSettings.h"
 
 #define VERSION_KEY                                     @"Version"
@@ -664 +665 @@
         if(![self isMovieCandidate:metaData])
                 return IMPORT_STATE_NOT_UPDATED;
-        /*Get fineName*/
         NSString *path = [metaData path];
         NSString *fileName = [path lastPathComponent];
+        /*choose between file or directory name for lookup */
+        NSString *lookupName;
+        if([[SapphireSettings sharedSettings] dirLookup])
+                lookupName = [[path stringByDeletingLastPathComponent] lastPathComponent];
+        else
+                lookupName = fileName;
         if([metaData fileClass]==FILE_CLASS_TV_SHOW) /* File is a TV Show - skip it */
                 return IMPORT_STATE_NOT_UPDATED;
@@ -673 +679 @@
         NSString *movieDataLink = nil ;
         /*Check to see if we know this movie*/
-        NSMutableDictionary *dict=[movieTranslations objectForKey:[[fileName lowercaseString] stringByDeletingPathExtension]];
+        NSMutableDictionary *dict=[movieTranslations objectForKey:[[lookupName lowercaseString] stringByDeletingPathExtension]];
         if(dict == nil)
         {
@@ -680 +686 @@
                         return IMPORT_STATE_NOT_UPDATED;
                 /*Ask the user what movie this is*/
-                NSArray *movies = [self searchResultsForMovie:fileName];
+                NSArray *movies = [self searchResultsForMovie:lookupName];
                 /* No need to prompt the user for an empty set */
                 if(movies==nil)
@@ -692 +698 @@
                 SapphireMovieChooser *chooser = [[SapphireMovieChooser alloc] initWithScene:[dataMenu scene]];
                 [chooser setMovies:movies];
-                [chooser setFileName:fileName];         
+                [chooser setFileName:lookupName];               
                 [chooser setListTitle:BRLocalizedString(@"Select Movie Title", @"Prompt the user for title of movie")];
                 /*And display prompt*/
@@ -751 +757 @@
                                 [self downloadPosterCandidates:posters];
                                 [posterChooser setPosters:posters] ;
-                                [posterChooser setFileName:fileName];
+                                [posterChooser setFileName:lookupName];
                                 [posterChooser setListTitle:BRLocalizedString(@"Select Movie Poster", @"Prompt the user for poster selection")];
                                 [[dataMenu stack] pushController:posterChooser];

trunk/SapphireFrappliance/SapphireSettings.h

@@ -143 +143 @@
 
 /*!
+ * @brief Returns whether to use directory based lookup
+ *
+ * @return YES if set, NO otherwise
+ */
+- (BOOL)dirLookup;
+
+/*!
  * @brief Returns the index of the last predicate used
  *

trunk/SapphireFrappliance/SapphireSettings.m

@@ -51 +51 @@
 #define ENABLE_FAST_SWITCHING_KEY       @"EnableFastSwitching"
 #define USE_AC3_PASSTHROUGH                     @"EnableAC3Passthrough"
+#define ENABLE_DIR_LOOKUP                       @"EnableDirLookup"
 #define DISABLE_ANON_KEY                        @"DisableAnonymousReporting"
 #define LAST_PREDICATE                          @"LastPredicate"
@@ -90 +91 @@
                                                                                                 BRLocalizedString(@"  Fast Directory Switching", @"Don't rescan directories upon entry and used cached data"),
                                                                                                 BRLocalizedString(@"  Enable AC3 Passthrough", @"Enable AC3 Passthrough menu item"),
+                                                                                                BRLocalizedString(@"  Use Directory Lookup", @"Use directory names instead of filename for movie lookup"),
                                                                                                 BRLocalizedString(@"  Disable Anonymous Reporting", @"Disable the anonymous reporting for aid in future features"), nil];
         
@@ -109 +111 @@
                                                                                                 BRLocalizedString(@"Tells Sapphire that when using a filter, use the cached data to setup directories rather than scanning the directories themselves for new files.", @"Fast Directory Switching description"),
                                                                                                 BRLocalizedString(@"Tells Sapphire that you have an AC3 decoder and to enable passthrough of the full audio information to the decoder. This is how you get 5.1 output.", @"Enable AC3 Passthrough description"),
+                                                                                                BRLocalizedString(@"Tells Sapphire that you want to use directory instead of filenames for movie lookup", @"Enable Directory lookup description"),
                                                                                                 BRLocalizedString(@"Tells Sapphire to not report any anonymous information on how you use Sapphire. Anonymous reporting enables us to improve the plugin for future use.", @"Disable the anonymous reporting description"), nil];
                 
@@ -127 +130 @@
                                                                                                         ENABLE_FAST_SWITCHING_KEY,
                                                                                                         USE_AC3_PASSTHROUGH,
+                                                                                                        ENABLE_DIR_LOOKUP,
                                                                                                         DISABLE_ANON_KEY, nil];
         SapphireTheme *theme = [SapphireTheme sharedTheme];
@@ -145 +149 @@
                                                                                                 [theme gem:FAST_GEM_KEY],
                                                                                                 [theme gem:AC3_GEM_KEY],
+                                                                                                [theme gem:IMDB_GEM_KEY],
                                                                                                 [theme gem:REPORT_GEM_KEY], nil];               
         
@@ -161 +166 @@
                 [NSNumber numberWithBool:YES], ENABLE_FAST_SWITCHING_KEY,
                 [NSNumber numberWithBool:NO], USE_AC3_PASSTHROUGH,
+                [NSNumber numberWithBool:NO], ENABLE_DIR_LOOKUP,
                 [NSNumber numberWithBool:NO], DISABLE_ANON_KEY,
                 [NSNumber numberWithInt:NSNotFound], LAST_PREDICATE,
@@ -282 +288 @@
         return [self boolForKey:ENABLE_FAST_SWITCHING_KEY];
 
+}
+
+- (BOOL)dirLookup
+{
+        return [self boolForKey:ENABLE_DIR_LOOKUP];
+        
 }