Changeset 1179 for trunk/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

Timestamp:

02/25/10 17:31:35 (2 years ago)

Author:

gbooker

Message:

Merged changes from the branch back to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m (modified) (25 diffs)

trunk/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -32 +32 @@
 #import "SapphireURLLoader.h"
 #import "SapphireScraper.h"
+#import "NSString-Extensions.h"
 
 @interface SapphireMovieImportStateData : SapphireImportStateData
@@ -37 +38 @@
 @public
         SapphireSiteMovieScraper        *siteScraper;
+        SapphireMovieTranslation        *translation;
 }
 - (id)initWithFile:(SapphireFileMetaData *)aFile atPath:(NSString *)aPath scraper:(SapphireSiteMovieScraper *)siteScaper;
+- (void)setTranslation:(SapphireMovieTranslation *)aTranslation;
+- (SapphireMovieTranslation *)createTranslationInContext:(NSManagedObjectContext *)moc;
 @end
 
@@ -57 +61 @@
 {
         [siteScraper release];
+        [translation release];
         [super dealloc];
 }
 
+- (void)setTranslation:(SapphireMovieTranslation *)aTranslation
+{
+        [translation autorelease];
+        translation = [aTranslation retain];
+}
+
+- (SapphireMovieTranslation *)createTranslationInContext:(NSManagedObjectContext *)moc
+{
+        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:lookupName inContext:moc];
+        [self setTranslation:tran];
+        return tran;
+}
+
 @end
 
@@ -65 +83 @@
 
 @interface SapphireMovieImporter ()
-- (void)getMovieResultsForState:(SapphireMovieImportStateData *)state translation:(SapphireMovieTranslation *)tran;
-- (void)getMoviePostersForState:(SapphireMovieImportStateData *)state translation:(SapphireMovieTranslation *)tran thumbElements:(NSArray *)thumbElements;
+- (void)getMovieResultsForState:(SapphireMovieImportStateData *)state;
+- (void)getMoviePostersForState:(SapphireMovieImportStateData *)state thumbElements:(NSArray *)thumbElements;
 - (void)saveMoviePosterAtURL:(NSString *)url forTranslation:(SapphireMovieTranslation *)tran;
 - (void)completeWithState:(SapphireMovieImportStateData *)state withStatus:(ImportState)status importComplete:(BOOL)importComplete;
@@ -79 +97 @@
                 return self;
         
-        NSError *error = nil;
         scraper = [[SapphireScraper scrapperWithName:@"IMDb.com"] retain];
         
@@ -102 +119 @@
 }
 
-- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(SapphireMovieImportStateData *)state
-{
+- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(id)stateObj
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -157 +175 @@
                 SapphireFileMetaData *metaData = state->file;
                 NSManagedObjectContext *moc = [metaData managedObjectContext];
-                NSString *lookupName = [[state->lookupName lowercaseString] stringByDeletingPathExtension];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:lookupName inContext:moc];
+                SapphireMovieTranslation *tran = [state createTranslationInContext:moc];
                 [tran setIMDBLink:[[movies objectAtIndex:0] objectForKey:movieTranslationLinkKey]];
-                [self getMovieResultsForState:state translation:tran];
+                [self getMovieResultsForState:state];
         }
         else
@@ -167 +184 @@
                 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*/
@@ -176 +193 @@
 }
 
-- (void)getMovieResultsForState:(SapphireMovieImportStateData *)state translation:(SapphireMovieTranslation *)tran
-{
+- (void)getMovieResultsForState:(SapphireMovieImportStateData *)state
+{
+        SapphireMovieTranslation *tran = state->translation;
         NSString *link = [tran IMDBLink];
         SapphireSiteMovieScraper *siteScraper = state->siteScraper;
@@ -188 +206 @@
 }
 
-- (void)retrievedMovieDetails:(NSXMLDocument *)details forObject:(SapphireMovieImportStateData *)state
-{
+- (void)retrievedMovieDetails:(NSXMLDocument *)details forObject:(id)stateObj
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
 
@@ -265 +284 @@
                 [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];
         SapphireMovie *movie = [SapphireMovie movieWithDictionary:infoIMDB inContext:moc];
         if(movie == nil)
@@ -276 +293 @@
                 return;
         }
-        [tran setMovie:movie];
+        [state->translation setMovie:movie];
         [metaData setMovie:movie];
         
@@ -286 +303 @@
         BOOL canDisplay = [delegate canDisplayChooser];
         if(canDisplay && [thumbs count])
-                [self getMoviePostersForState:state translation:tran thumbElements:thumbs];
+                [self getMoviePostersForState:state thumbElements:thumbs];
         else
                 [self completeWithState:state withStatus:ImportStateUpdated importComplete:canDisplay];
 }
 
-- (void)getMoviePostersForState:(SapphireMovieImportStateData *)state translation:(SapphireMovieTranslation *)tran thumbElements:(NSArray *)thumbElements;
+- (void)getMoviePostersForState:(SapphireMovieImportStateData *)state thumbElements:(NSArray *)thumbElements;
 {
         NSMutableArray *previews = [NSMutableArray arrayWithCapacity:[thumbElements count]];
+        SapphireMovieTranslation *tran = state->translation;
         if([thumbElements count])
         {
                 int index = 0;
                 NSManagedObjectContext *moc = [tran managedObjectContext];
+                //Redoing posters, get rid of old ones
+                [tran setSelectedPosterIndex:nil];
+                NSEnumerator *posterEnum = [[tran postersSet] objectEnumerator];
+                SapphireMoviePoster *poster;
+                while((poster = [posterEnum nextObject]) != nil)
+                        [moc deleteObject:poster];
+                
                 NSEnumerator *thumbEnum = [thumbElements objectEnumerator];
                 NSXMLElement *thumb;
@@ -330 +355 @@
                 }
         }
-        if([previews count])
+        if([tran selectedPoster])
+        {
+                [self saveMoviePosterAtURL:[[tran selectedPoster] link] forTranslation:tran];
+                [self completeWithState:state withStatus:ImportStateUpdated importComplete:YES];
+        }
+        else if([previews count])
         {
                 SapphirePosterChooser *posterChooser = [[SapphirePosterChooser alloc] initWithScene:[delegate chooserScene]];
@@ -342 +372 @@
                 {
                         [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 +460 @@
                 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];
         SapphireMovieImportStateData *state = [[[SapphireMovieImportStateData alloc] initWithFile:metaData atPath:path scraper:siteScraper] autorelease];
         [state setLookupName:lookupName];
-        /*Get the movie title*/
-        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);
+        
+        /*Look for a year in the title*/
+        NSScanner *titleYearScanner = [NSScanner scannerWithString:state->lookupName];
+        NSString *normalTitle = nil;
+        int year = 0;
+        BOOL success = YES;
+        success &= [titleYearScanner scanUpToString:@"(" intoString:&normalTitle];
+        success &= [titleYearScanner scanString:@"(" intoString:nil];
+        success &= [titleYearScanner scanInt:&year];
+        success &= [titleYearScanner scanString:@")" intoString:nil];
+        
+        NSString *yearStr = nil;
+        if(success)
+        {
+                yearStr = [NSString stringWithFormat:@"%d", year];
+                if([normalTitle hasSuffix:@" "])
+                   normalTitle = [normalTitle substringToIndex:[normalTitle length]-1];
+                [state setLookupName:normalTitle];
+        }
+        
+        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];
+        [state setTranslation:tran];
         int searchIMDBNumber = [metaData searchIMDBNumber];
         if(searchIMDBNumber > 0)
         {
                 if(!tran)
-                        tran = [SapphireMovieTranslation createMovieTranslationWithName:movieTranslationString inContext:moc];
+                        tran = [state createTranslationInContext:moc];
                 [tran setIMDBLink:[NSString stringWithFormat:@"/title/tt%08d", searchIMDBNumber]];
         }
@@ -458 +509 @@
         {
                 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)
@@ -464 +515 @@
                 
                 if([moviePath length])
+                {
+                        if(tran == nil)
+                                tran = [state createTranslationInContext:moc];
                         [tran setIMDBLink:moviePath];
+                }
                 else
                 {
@@ -471 +526 @@
                                 return ImportStateNotUpdated;
                         
-                        /*Look for a year in the title*/
-                        NSString *searchStr = [lookupName stringByDeletingPathExtension];
-                        NSScanner *titleYearScanner = [NSScanner scannerWithString:searchStr];
-                        NSString *normalTitle = nil;
-                        int year = 0;
-                        BOOL success = YES;
-                        success &= [titleYearScanner scanUpToString:@"(" intoString:&normalTitle];
-                        NSString *junk = nil;
-                        success &= [titleYearScanner scanString:@"(" intoString:nil];
-                        success &= [titleYearScanner scanInt:&year];
-                        success &= [titleYearScanner scanString:@")" intoString:nil];
-                        
-                        NSString *yearStr = nil;
-                        if(!success)
-                        {
-                                normalTitle = searchStr;
-                        }
-                        else
-                                yearStr = [NSString stringWithFormat:@"%d", year];
-                        
-                        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DEBUG, @"Searching for %@ with year %@", normalTitle, yearStr);
+                        SapphireLog(SAPPHIRE_LOG_IMPORT, SAPPHIRE_LOG_LEVEL_DEBUG, @"Searching for %@ with year %@", state->lookupName, yearStr);
                         
                         /*Ask the user what movie this is*/
                         [siteScraper setObject:state];
-                        [siteScraper searchForMovieName:normalTitle year:yearStr];
+                        [siteScraper searchForMovieName:state->lookupName year:yearStr];
                         return ImportStateBackground;
                 }
@@ -504 +539 @@
         {       
                 [metaData setMovie:movie];
-                return ImportStateUpdated;
-        }
-        [self getMovieResultsForState:state translation:tran];
+                if([tran selectedPoster] != nil)
+                        return ImportStateUpdated;
+                [self getMoviePostersForState:state thumbElements:[NSArray array]];
+                return ImportStateBackground;
+        }
+        [self getMovieResultsForState:state];
         return ImportStateBackground;
 }
@@ -531 +569 @@
 }
 
-- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(SapphireMovieImportStateData *)state
-{
+- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(id)context
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)context;
         if([chooser isKindOfClass:[SapphireMovieChooser class]])
         {
-                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)
+                        [state setTranslation:tran];
                 if([tran IMDBLink])
                 {
-                        [self getMovieResultsForState:state translation:tran];
+                        [self getMovieResultsForState:state];
                         return NO;
                 }
@@ -547 +586 @@
         else if([chooser isKindOfClass:[SapphirePosterChooser class]])
         {
-                SapphirePosterChooser *posterChooser = (SapphirePosterChooser *)chooser;
-                NSString *filename = [[[posterChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                NSManagedObjectContext *moc = [state->file managedObjectContext];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:filename inContext:moc];
+                SapphireMovieTranslation *tran = state->translation;
                 if([[tran selectedPoster] link])
                 {
@@ -561 +597 @@
 }
 
-- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(SapphireMovieImportStateData *)state
-{
+- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(id)context
+{
+        SapphireMovieImportStateData *state = (SapphireMovieImportStateData *)context;
         /*See if it was a movie chooser*/
         if([chooser isKindOfClass:[SapphireMovieChooser class]])
@@ -585 +622 @@
                         /*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 = [state createTranslationInContext:moc];
                         /* Add IMDB Key */
                         [tran setIMDBLink:[movie objectForKey:movieTranslationLinkKey]];
                         /*We can resume now*/
-                        [self getMovieResultsForState:state translation:tran];
+                        [self getMovieResultsForState:state];
                 }
                 [SapphireMetaDataSupport save:moc];
@@ -605 +641 @@
                 else
                 {
-                        NSString *filename = [[[posterChooser fileName] lowercaseString] stringByDeletingPathExtension];
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:filename inContext:moc];
+                        SapphireMovieTranslation *tran = state->translation;
                         [tran setSelectedPosterIndexValue:selectedPoster];
-                        [self saveMoviePosterAtURL:[[tran posterAtIndex:selectedPoster] link] forTranslation:tran];
+                        [self saveMoviePosterAtURL:[[tran selectedPoster] link] forTranslation:tran];
                         [self completeWithState:state withStatus:ImportStateUpdated importComplete:YES];
                 }
-                posterChooser = nil;
                 [SapphireMetaDataSupport save:moc];
         }