Changeset 1179 for trunk/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.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/SapphireTVShowImporter.m (modified) (11 diffs)

trunk/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

@@ -231 +231 @@
 }
 
-- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(SapphireTVShowImportStateData *)state
-{
+- (void)retrievedSearchResuls:(NSXMLDocument *)results forObject:(id)stateObj
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -286 +287 @@
                 SapphireShowChooser *chooser = [[SapphireShowChooser alloc] initWithScene:[delegate chooserScene]];
                 [chooser setShows:shows];
-                [chooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];          
+                [chooser setFileName:[NSString stringByCroppingDirectoryPath:state->path toLength:3]];
                 [chooser setListTitle:BRLocalizedString(@"Select Show Title", @"Prompt the user for showname with a file")];
                 /*And display prompt*/
@@ -307 +308 @@
         {
                 NSString *coverArtPath = [[SapphireMetaDataSupport collectionArtPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"@TV/%@/cover.jpg", [show name]]];
-                BOOL isDir = NO;
                 if(![[NSFileManager defaultManager] fileExistsAtPath:coverArtPath])
                         fetchShowData = YES;
@@ -325 +325 @@
 }
 
-- (void)retrievedShowDetails:(NSXMLDocument *)details forObject:(SapphireTVShowImportStateData *)state
-{
+- (void)retrievedShowDetails:(NSXMLDocument *)details forObject:(id)stateObj
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -408 +409 @@
 }
 
-- (void)retrievedEpisodeList:(NSXMLDocument *)episodeList forObject:(SapphireTVShowImportStateData *)state
-{
+- (void)retrievedEpisodeList:(NSXMLDocument *)episodeList forObject:(id)stateObj
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)stateObj;
         [state->siteScraper setObject:nil];     //Avoid retain loop
         if(cancelled)
@@ -441 +443 @@
 }
 
-- (void)retrievedEpisodeDetails:(NSXMLDocument *)details forObject:(SapphireSingleTVShowEpisodeImportStateData *)state
-{
+- (void)retrievedEpisodeDetails:(NSXMLDocument *)details forObject:(id)stateObj
+{
+        SapphireSingleTVShowEpisodeImportStateData *state = (SapphireSingleTVShowEpisodeImportStateData *)stateObj;
         SapphireTVShowImportStateData *tvState = state->state;
         [state->siteScraper setObject:nil];     //Avoid retain loop
@@ -525 +528 @@
         if(state->episodesCompleted == [infoArray count])
         {
-                for(int i=0; i<[infoArray count]; i++)
+                int i;
+                for(i=0; i<[infoArray count]; i++)
                 {
                         if(![[infoArray objectAtIndex:i] count])
@@ -593 +597 @@
                 return ImportStateNotUpdated;
         //      NSArray *pathComponents = [path pathComponents];
+        NSString *extLessPath = path;
+        if([metaData fileContainerTypeValue] != FILE_CONTAINER_TYPE_VIDEO_TS)
+                extLessPath = [extLessPath stringByDeletingPathExtension];
+
         NSString *fileName = [path lastPathComponent];
         
@@ -704 +712 @@
         {
                 BOOL nfoPathIsDir = NO;
-                NSString *nfoFilePath=[[path stringByDeletingPathExtension] stringByAppendingPathExtension:@"nfo"];
+                NSString *nfoFilePath=[extLessPath stringByAppendingPathExtension:@"nfo"];
                 NSString *showPath = nil;
                 if([[NSFileManager defaultManager] fileExistsAtPath:nfoFilePath isDirectory:&nfoPathIsDir] && !nfoPathIsDir)
@@ -768 +776 @@
 }
 
-- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(SapphireTVShowImportStateData *)state
-{
+- (BOOL)stillNeedsDisplayOfChooser:(BRLayerController <SapphireChooser> *)chooser withContext:(id)context
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)context;
         /*Check for a match done earlier*/
         NSManagedObjectContext *moc = [state->file managedObjectContext];
@@ -782 +791 @@
 }
 
-- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)aChooser withContext:(SapphireTVShowImportStateData *)state;
-{
+- (void)exhumedChooser:(BRLayerController <SapphireChooser> *)aChooser withContext:(id)context
+{
+        SapphireTVShowImportStateData *state = (SapphireTVShowImportStateData *)context;
         if(![aChooser isKindOfClass:[SapphireShowChooser class]])
                 return;