Changeset 1165 for branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

Timestamp:

02/23/2010 04:51:22 PM (2 years ago)

Author:

gbooker

Message:

Better handle files without extensions and preserve the lookup name better.
Fixes #283

Files:

• branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m (modified) (14 diffs)

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -32 +32 @@
 #import "SapphireURLLoader.h"
 #import "SapphireScraper.h"
+#import "NSString-Extensions.h"
 
 @interface SapphireMovieImportStateData : SapphireImportStateData
@@ -157 +158 @@
                 SapphireFileMetaData *metaData = state->file;
                 NSManagedObjectContext *moc = [metaData managedObjectContext];
-                NSString *lookupName = [[state->lookupName lowercaseString] stringByDeletingPathExtension];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:lookupName inContext:moc];
+                SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                 [tran setIMDBLink:[[movies objectAtIndex:0] objectForKey:movieTranslationLinkKey]];
                 [self getMovieResultsForState:state translation:tran];
@@ -167 +167 @@
                 SapphireMovieChooser *chooser = [[SapphireMovieChooser alloc] initWithScene:[delegate chooserScene]];
                 [chooser setMovies:movies];
-                [chooser setFileName:state->lookupName];                
+                [chooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];
                 [chooser setListTitle:BRLocalizedString(@"Select Movie Title", @"Prompt the user for title of movie")];
                 /*And display prompt*/
@@ -265 +265 @@
                 [infoIMDB setObject:movieTitle forKey:META_MOVIE_TITLE_KEY];
         
-        NSString *movieTranslationString = [[state->lookupName lowercaseString] stringByDeletingPathExtension];
         SapphireFileMetaData *metaData = state->file;
         NSManagedObjectContext *moc = [metaData managedObjectContext];
-        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:movieTranslationString inContext:moc];
+        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
         SapphireMovie *movie = [SapphireMovie movieWithDictionary:infoIMDB inContext:moc];
         if(movie == nil)
@@ -342 +341 @@
                 {
                         [posterChooser setPosters:previews];
-                        [posterChooser setFileName:state->lookupName];
+                        [posterChooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];
                         [posterChooser setFile:state->file];
                         [posterChooser setListTitle:BRLocalizedString(@"Select Movie Poster", @"Prompt the user for poster selection")];
@@ -430 +429 @@
                 return ImportStateNotUpdated;
         SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DEBUG, @"Going to movie import %@", path);
-        NSString *fileName = [path lastPathComponent];
+        NSString *extLessPath = path;
+        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+                extLessPath = [extLessPath stringByDeletingPathExtension];
+        
         /*choose between file or directory name for lookup */
         NSString *lookupName;
         if([[SapphireSettings sharedSettings] dirLookup])
-                lookupName = [[path stringByDeletingLastPathComponent] lastPathComponent];
-        else
-                lookupName = fileName;
+                lookupName = [[[path stringByDeletingLastPathComponent] lastPathComponent] lowercaseString];
+        else
+                lookupName = [[extLessPath lastPathComponent] lowercaseString];
         
         SapphireSiteMovieScraper *siteScraper = [[[SapphireSiteMovieScraper alloc] initWithMovieScraper:scraper delegate:self loader:[SapphireApplianceController urlLoader]] autorelease];
@@ -444 +446 @@
         NSString *movieDataLink = nil ;
         /*Check to see if we know this movie*/
-        NSString *movieTranslationString = [[lookupName lowercaseString] stringByDeletingPathExtension];
-        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DETAIL, @"Searching for movie %@", movieTranslationString);
+        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DETAIL, @"Searching for movie %@", state->lookupName);
         NSManagedObjectContext *moc = [metaData managedObjectContext];
-        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:movieTranslationString inContext:moc];
+        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
         int searchIMDBNumber = [metaData searchIMDBNumber];
         if(searchIMDBNumber > 0)
         {
                 if(!tran)
-                        tran = [SapphireMovieTranslation createMovieTranslationWithName:movieTranslationString inContext:moc];
+                        tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                 [tran setIMDBLink:[NSString stringWithFormat:@"/title/tt%08d", searchIMDBNumber]];
         }
@@ -458 +459 @@
         {
                 BOOL nfoPathIsDir = NO;
-                NSString *nfoFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"nfo"];
+                NSString *nfoFilePath=[extLessPath stringByAppendingPathExtension:@"nfo"];
                 NSString *moviePath = nil;
                 if([[NSFileManager defaultManager] fileExistsAtPath:nfoFilePath isDirectory:&nfoPathIsDir] && !nfoPathIsDir)
@@ -472 +473 @@
                         
                         /*Look for a year in the title*/
-                        NSString *searchStr = [lookupName stringByDeletingPathExtension];
-                        NSScanner *titleYearScanner = [NSScanner scannerWithString:searchStr];
+                        NSScanner *titleYearScanner = [NSScanner scannerWithString:state->lookupName];
                         NSString *normalTitle = nil;
                         int year = 0;
@@ -486 +486 @@
                         if(!success)
                         {
-                                normalTitle = searchStr;
+                                normalTitle = state->lookupName;
                         }
                         else
@@ -537 +537 @@
                 SapphireMovieChooser *movieChooser = (SapphireMovieChooser *)chooser;
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
-                NSString *filename = [[[movieChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:filename inContext:moc];
+                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
                 if([tran IMDBLink])
                 {
@@ -548 +547 @@
         {
                 SapphirePosterChooser *posterChooser = (SapphirePosterChooser *)chooser;
-                NSString *filename = [[[posterChooser fileName] lowercaseString] stringByDeletingPathExtension];
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:filename inContext:moc];
+                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
                 if([[tran selectedPoster] link])
                 {
@@ -585 +583 @@
                         /*They selected a movie title, save the translation and write it*/
                         NSDictionary *movie = [[movieChooser movies] objectAtIndex:selection];
-                        NSString *filename = [[[movieChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:filename inContext:moc];
+                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                         /* Add IMDB Key */
                         [tran setIMDBLink:[movie objectForKey:movieTranslationLinkKey]];
@@ -605 +602 @@
                 else
                 {
-                        NSString *filename = [[[posterChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:filename inContext:moc];
+                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
                         [tran setSelectedPosterIndexValue:selectedPoster];
                         [self saveMoviePosterAtURL:[[tran posterAtIndex:selectedPoster] link] forTranslation:tran];