Changeset 1167

Timestamp:

02/24/2010 02:32:27 PM (2 years ago)

Author:

gbooker

Message:

Some corrections to importer so that it saves data properly.

Files:

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

branches/PlayerFramework/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

@@ -38 +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
 
@@ -58 +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
 
@@ -66 +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;
@@ -158 +175 @@
                 SapphireFileMetaData *metaData = state->file;
                 NSManagedObjectContext *moc = [metaData managedObjectContext];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
+                SapphireMovieTranslation *tran = [state createTranslationInContext:moc];
                 [tran setIMDBLink:[[movies objectAtIndex:0] objectForKey:movieTranslationLinkKey]];
-                [self getMovieResultsForState:state translation:tran];
+                [self getMovieResultsForState:state];
         }
         else
@@ -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;
@@ -267 +285 @@
         SapphireFileMetaData *metaData = state->file;
         NSManagedObjectContext *moc = [metaData managedObjectContext];
-        SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
         SapphireMovie *movie = [SapphireMovie movieWithDictionary:infoIMDB inContext:moc];
         if(movie == nil)
@@ -275 +292 @@
                 return;
         }
-        [tran setMovie:movie];
+        [state->translation setMovie:movie];
         [metaData setMovie:movie];
         
@@ -285 +302 @@
         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])
         {
@@ -329 +347 @@
                 }
         }
-        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]];
@@ -449 +472 @@
         NSManagedObjectContext *moc = [metaData managedObjectContext];
         SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
+        [state setTranslation:tran];
         int searchIMDBNumber = [metaData searchIMDBNumber];
         if(searchIMDBNumber > 0)
         {
                 if(!tran)
-                        tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName inContext:moc];
+                        tran = [state createTranslationInContext:moc];
                 [tran setIMDBLink:[NSString stringWithFormat:@"/title/tt%08d", searchIMDBNumber]];
         }
@@ -465 +489 @@
                 
                 if([moviePath length])
+                {
+                        if(tran == nil)
+                                tran = [state createTranslationInContext:moc];
                         [tran setIMDBLink:moviePath];
+                }
                 else
                 {
@@ -504 +532 @@
         {       
                 [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;
 }
@@ -538 +569 @@
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
                 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;
                 }
@@ -548 +581 @@
                 SapphirePosterChooser *posterChooser = (SapphirePosterChooser *)chooser;
                 NSManagedObjectContext *moc = [state->file managedObjectContext];
-                SapphireMovieTranslation *tran = [SapphireMovieTranslation movieTranslationWithName:state->lookupName inContext:moc];
+                SapphireMovieTranslation *tran = state->translation;
                 if([[tran selectedPoster] link])
                 {
@@ -583 +616 @@
                         /*They selected a movie title, save the translation and write it*/
                         NSDictionary *movie = [[movieChooser movies] objectAtIndex:selection];
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName 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];
@@ -602 +635 @@
                 else
                 {
-                        SapphireMovieTranslation *tran = [SapphireMovieTranslation createMovieTranslationWithName:state->lookupName 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];
         }