Changeset 627

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

Made an easier way to import sub episodes from the importer and forced a less hacky way to import from the old plist

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireEpisode.h

    r599 r627  
    1313- (NSComparisonResult)compare:(SapphireEpisode *)other; 
    1414- (NSComparisonResult)airDateCompare:(SapphireEpisode *)other; 
     15 
     16- (void)insertAdditionalEpisode:(NSDictionary *)dict; 
    1517 
    1618/*! 

  • branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireEpisode.m

    r599 r627  
    4747{ 
    4848        SapphireSubEpisode *sub = [self.subEpisodesSet anyObject]; 
    49         [sub insertDictionary:dict epIndex:0]; 
    5049        int secondEp = [[dict objectForKey:META_EPISODE_2_NUMBER_KEY] intValue]; 
     50        int setIndex = -1; 
     51        if(secondEp != 0) 
     52                setIndex = 0; 
     53        [sub insertDictionary:dict epIndex:setIndex]; 
    5154        if(secondEp != 0) 
    5255        { 
    …… 
    180183} 
    181184 
     185- (void)insertAdditionalEpisode:(NSDictionary *)dict 
     186{ 
     187        SapphireSubEpisode *sub = [SapphireSubEpisode createSubEpisode:[[dict objectForKey:META_EPISODE_NUMBER_KEY] intValue] inEpisode:self]; 
     188        [sub insertDictionary:dict epIndex:-1]; 
     189        [self addSubEpisodesObject:sub]; 
     190} 
     191 
    182192- (NSString *)path 
    183193{ 

  • branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSubEpisode.m

    r578 r627  
    4343                titleSplitIndex = [title length]; 
    4444         
    45         if(index == 0) 
     45        if(index == -1) 
     46        { 
     47                self.absoluteEpisodeNumber = [dict objectForKey:META_ABSOLUTE_EP_NUMBER_KEY]; 
     48                self.episodeDescription = desc; 
     49                self.episodeTitle = title; 
     50        } 
     51        else if(index == 0) 
    4652        { 
    4753                self.absoluteEpisodeNumber = [dict objectForKey:META_ABSOLUTE_EP_NUMBER_KEY];