Changeset 628

Show
Ignore:
Timestamp:
07/07/08 20:51:37 (6 months ago)
Author:
gbooker
Message:

Use the better storing mechanism for files with sub episodes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

    r594 r628  
    434434} 
    435435 
    436 - (void)combine:(NSMutableDictionary *)info with:(NSMutableDictionary *)info2 
    437 { 
    438         NSMutableDictionary *tdict = [info2 mutableCopy]; 
    439         [tdict addEntriesFromDictionary:info]; 
    440         NSString *secname = [info2 objectForKey:META_TITLE_KEY]; 
    441         NSString *origname = [info objectForKey:META_TITLE_KEY]; 
    442         if(secname != nil && origname != nil) 
    443                 [tdict setObject:[NSString stringWithFormat:@"%@ / %@", origname, secname] forKey:META_TITLE_KEY]; 
    444  
    445         if([info objectForKey:META_EPISODE_NUMBER_KEY] != nil) 
    446         { 
    447                 NSNumber *secondEp = [info2 objectForKey:META_EPISODE_NUMBER_KEY]; 
    448                 [tdict setObject:secondEp forKey:META_EPISODE_2_NUMBER_KEY]; 
    449         } 
    450         NSString *secdesc = [info2 objectForKey:META_DESCRIPTION_KEY]; 
    451         NSString *origdesc = [info objectForKey:META_DESCRIPTION_KEY]; 
    452         if(secdesc != nil && origdesc != nil) 
    453                 [tdict setObject:[NSString stringWithFormat:@"%@ / %@", origdesc, secdesc] forKey:META_DESCRIPTION_KEY]; 
    454  
    455         if([info objectForKey:META_ABSOLUTE_EP_NUMBER_KEY] != nil) 
    456         { 
    457                 NSNumber *secondEp = [info2 objectForKey:META_ABSOLUTE_EP_NUMBER_KEY]; 
    458                 [tdict setObject:secondEp forKey:META_ABSOLUTE_EP_2_NUMBER_KEY]; 
    459         } 
    460          
    461         [info addEntriesFromDictionary:tdict]; 
    462         [tdict release]; 
    463 } 
    464  
    465436- (ImportState) importMetaData:(SapphireFileMetaData *)metaData 
    466437{ 
    …… 
    625596        } 
    626597         
    627         if(info2 != nil) 
    628                 [self combine:info with:info2]; 
    629598        /*Import the info*/ 
    630599        [info removeObjectForKey:LINK_KEY]; 
     600        NSLog(@"Importing ep %@ %@", info, info2); 
    631601        SapphireEpisode *episode = [SapphireEpisode episodeWithDictionary:info inContext:moc]; 
     602        if(info2 != nil) 
     603                [episode insertAdditionalEpisode:info2]; 
    632604        [metaData setTvEpisode:episode]; 
    633605        [tran setTvShow:[episode tvShow]];