Changeset 491 for trunk/SapphireFrappliance/SapphireMovieImporter.m

Timestamp:

02/14/08 20:51:37 (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

Files:

• trunk/SapphireFrappliance/SapphireMovieImporter.m (modified) (6 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];