Changeset 734

Timestamp:

01/08/2009 09:03:22 PM (3 years ago)

Author:

gbooker

Message:

Switched the the next version of the metadata.
Fixes #264

Location:

branches/CoreData/SapphireFrappliance

Files:

• FRAppliance/SapphireApplianceController.m (modified) (3 diffs)
• FRAppliance/SapphireMetaDataUpgrading.m (modified) (2 diffs)
• MetaData/Sapphire.xcdatamodeld/SapphireV1.xcdatamodel/elements (modified) (previous)
• MetaData/Sapphire.xcdatamodeld/SapphireV1.xcdatamodel/layout (modified) (previous)
• MetaData/Sapphire.xcdatamodeld/SapphireV2.xcdatamodel/elements (modified) (previous)
• MetaData/Sapphire.xcdatamodeld/SapphireV2.xcdatamodel/layout (modified) (previous)
• MetaData/SapphireMObjects/SapphireCast.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireCast.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireCollectionDirectory.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireCollectionDirectory.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireDirector.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireDirector.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireDirectoryMetaData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireDirectoryMetaData.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireDirectorySymLink.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireDirectorySymLink.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireEpisode.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireEpisode.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireFileMetaData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (6 diffs)
• MetaData/SapphireMObjects/SapphireFileSymLink.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireFileSymLink.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireGenre.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireGenre.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireJoinedFile.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireJoinedFile.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireMovie.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireMovie.m (modified) (6 diffs)
• MetaData/SapphireMObjects/SapphireMoviePoster.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireMoviePoster.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireMovieTranslation.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireMovieTranslation.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireSeason.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireSeason.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireSubEpisode.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireSubEpisode.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVShow.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVShow.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireTVTranslation.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireTVTranslation.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireXMLData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireXMLData.m (modified) (3 diffs)
• MetaData/SapphireMObjects/SapphireXMLEpisodeData.h (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireXMLEpisodeData.m (modified) (1 diff)
• MetaData/SapphireMObjects/SapphireXMLMovieData.h (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireXMLMovieData.m (modified) (3 diffs)
• MetaData/Support/SapphireMetaDataSupport.h (modified) (1 diff)
• MetaData/Support/SapphireMetaDataSupport.m (modified) (2 diffs)
• main_debug.m (modified) (3 diffs)

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

@@ -246 +246 @@
 {
         NSFileManager *fm = [NSFileManager defaultManager];
-        NSString *storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"];
+        NSString *storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireDataV2"];
         BOOL exists = [fm fileExistsAtPath:storeFile];
-        NSString *plistFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.plist"];
-        BOOL oldExists = [fm fileExistsAtPath:plistFile];
+        BOOL oldExists = [fm fileExistsAtPath:[applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"]];
+        oldExists |= [fm fileExistsAtPath:[applicationSupportDir() stringByAppendingPathComponent:@"metaData.plist"]];
         return !exists && oldExists;
 }
@@ -257 +257 @@
 {
         if(storeFile == nil)
-                storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireData"];
+                storeFile = [applicationSupportDir() stringByAppendingPathComponent:@"metaData.sapphireDataV2"];
         NSFileManager *fm = [NSFileManager defaultManager];
         [fm constructPath:[storeFile stringByDeletingLastPathComponent]];
@@ -264 +264 @@
         
         NSString *mopath = [[NSBundle bundleForClass:[self class]] pathForResource:@"Sapphire" ofType:@"momd"];
-        mopath = [mopath stringByAppendingPathComponent:@"SapphireV1.mom"];
+        mopath = [mopath stringByAppendingPathComponent:@"SapphireV2.mom"];
         NSURL *mourl = [NSURL fileURLWithPath:mopath];
         NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:mourl];

branches/CoreData/SapphireFrappliance/FRAppliance/SapphireMetaDataUpgrading.m

@@ -25 +25 @@
 
 @implementation SapphireMetaDataUpgrading
+
+- (id) debugInit
+{
+        self = [super init];
+        
+        moc = [SapphireApplianceController createManagedObjectContextForFile:nil];
+        
+        return self;
+}
 
 - (id) initWithScene: (BRRenderScene *) scene
@@ -112 +121 @@
 }
 
+- (NSManagedObjectContext *)createV1Moc:(NSString *)storeFile
+{
+        NSURL *storeUrl = [NSURL fileURLWithPath:storeFile];
+        NSError *error = nil;
+        
+        NSString *mopath = [[NSBundle bundleForClass:[self class]] pathForResource:@"Sapphire" ofType:@"momd"];
+        mopath = [mopath stringByAppendingPathComponent:@"SapphireV1.mom"];
+        NSURL *mourl = [NSURL fileURLWithPath:mopath];
+        NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:mourl];
+        
+        NSPersistentStoreCoordinator *coord = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
+        if(![coord addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeUrl options:nil error:&error])
+        {
+                SapphireLog(SAPPHIRE_LOG_ALL, SAPPHIRE_LOG_LEVEL_ERROR, @"Could not add store: %@", error);
+                
+                [coord release];
+                [model release];
+                return nil;
+        }
+        
+        NSManagedObjectContext *retmoc = [[NSManagedObjectContext alloc] init];
+        [retmoc setUndoManager:nil];
+        [retmoc setMergePolicy:NSMergeByPropertyObjectTrumpMergePolicy];
+        [retmoc setPersistentStoreCoordinator:coord];
+        
+        [model release];
+        [coord release];
+        
+        return retmoc;  
+}
+
 - (void)doUpgrade:(id)obj
 {
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        NSString *plistFile = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/metaData.plist"];
-        [SapphireMetaDataSupport importPlist:[plistFile stringByDeletingLastPathComponent] intoContext:moc withDisplay:self];
+        NSString *v1StoreFile = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/metaData.sapphireData"];
+        NSFileManager *fm = [NSFileManager defaultManager];
+        if([fm fileExistsAtPath:v1StoreFile])
+        {
+                NSManagedObjectContext *oldContext = [self createV1Moc:v1StoreFile];
+                if(oldContext != nil)
+                        [SapphireMetaDataSupport importV1Store:oldContext intoContext:moc withDisplay:self];
+        }
+        else
+        {
+                NSString *plistFile = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/metaData.plist"];
+                [SapphireMetaDataSupport importPlist:[plistFile stringByDeletingLastPathComponent] intoContext:moc withDisplay:self];
+        }
         [SapphireMetaDataSupport save:moc];
         [self performSelectorOnMainThread:@selector(finished) withObject:nil waitUntilDone:NO];

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCast.h

@@ -6 +6 @@
 + (SapphireCast *)cast:(NSString *)cast inContext:(NSManagedObjectContext *)moc;
 + (SapphireCast *)createCast:(NSString *)cast inContext:(NSManagedObjectContext *)moc;
++ (NSDictionary *)upgradeV1CastFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCast.m

@@ -28 +28 @@
         ret.name = cast;
         return ret;
+}
+
++ (NSDictionary *)upgradeV1CastFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc
+{
+        NSMutableDictionary *lookup = [NSMutableDictionary dictionary];
+        NSArray *oldCast = doFetchRequest(SapphireCastName, oldMoc, nil);
+        NSEnumerator *castEnum = [oldCast objectEnumerator];
+        NSManagedObject *oldCastMember;
+        while((oldCastMember = [castEnum nextObject]) != nil)
+        {
+                SapphireCast *newCastMember = [NSEntityDescription insertNewObjectForEntityForName:SapphireCastName inManagedObjectContext:newMoc];
+                NSString *name = [oldCastMember valueForKey:@"name"];
+                newCastMember.name = name;
+                newCastMember.sortMethod = [oldCastMember valueForKey:@"sortMethod"];
+                newCastMember.hasMajorRole = [oldCastMember valueForKey:@"hasMajorRole"];
+                [lookup setObject:newCastMember forKey:name];
+        }
+        return lookup;
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.h

@@ -7 +7 @@
 + (SapphireCollectionDirectory *)collectionAtPath:(NSString *)path mount:(BOOL)isMount skip:(BOOL)skip hidden:(BOOL)hidden manual:(BOOL)manual inContext:(NSManagedObjectContext *)moc;
 + (SapphireCollectionDirectory *)collectionAtPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
++ (SapphireCollectionDirectory *)upgradeV1CollectionDirectory:(NSManagedObject *)oldCol toContext:(NSManagedObjectContext *)newMoc;
 + (NSArray *)availableCollectionDirectoriesInContext:(NSManagedObjectContext *)moc;
 + (NSArray *)skippedCollectionDirectoriesInContext:(NSManagedObjectContext *)moc;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireCollectionDirectory.m

@@ -36 +36 @@
 {
         return [SapphireCollectionDirectory collectionAtPath:path mount:YES skip:NO hidden:NO manual:NO inContext:moc];
+}
+
++ (SapphireCollectionDirectory *)upgradeV1CollectionDirectory:(NSManagedObject *)oldCol toContext:(NSManagedObjectContext *)newMoc
+{
+        SapphireCollectionDirectory *ret = [NSEntityDescription insertNewObjectForEntityForName:MY_NAME inManagedObjectContext:newMoc];
+        ret.hidden = [oldCol valueForKey:@"hidden"];
+        ret.isMount = [oldCol valueForKey:@"isMount"];
+        ret.manualCollection = [oldCol valueForKey:@"manualCollection"];
+        ret.skip = [oldCol valueForKey:@"skip"];
+        
+        return ret;
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirector.h

@@ -6 +6 @@
 + (SapphireDirector *)createDirector:(NSString *)director inContext:(NSManagedObjectContext *)moc;
 + (SapphireDirector *)director:(NSString *)director inContext:(NSManagedObjectContext *)moc;
++ (NSDictionary *)upgradeV1DirectorsFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirector.m

@@ -29 +29 @@
 }
 
++ (NSDictionary *)upgradeV1DirectorsFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc
+{
+        NSMutableDictionary *lookup = [NSMutableDictionary dictionary];
+        NSArray *oldDirectors = doFetchRequest(SapphireDirectorName, oldMoc, nil);
+        NSEnumerator *directorEnum = [oldDirectors objectEnumerator];
+        NSManagedObject *oldDirector;
+        while((oldDirector = [directorEnum nextObject]) != nil)
+        {
+                SapphireDirector *newDirector = [NSEntityDescription insertNewObjectForEntityForName:SapphireDirectorName inManagedObjectContext:newMoc];
+                NSString *name = [oldDirector valueForKey:@"name"];
+                newDirector.name = name;
+                newDirector.sortMethod = [oldDirector valueForKey:@"sortMethod"];
+                [lookup setObject:newDirector forKey:name];
+        }
+        return lookup;
+}
+
 - (NSPredicate *)metaFileFetchPredicate
 {

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.h

@@ -20 +20 @@
 + (SapphireDirectoryMetaData *)createDirectoryWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
 + (SapphireDirectoryMetaData *)createDirectoryWithPath:(NSString *)path parent:(SapphireDirectoryMetaData *)parent inContext:(NSManagedObjectContext *)moc;
++ (NSDictionary *)upgradeV1DirectoriesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc;
 - (void)insertDictionary:(NSDictionary *)dict withDefer:(NSMutableDictionary *)defer andDisplay:(SapphireMetaDataUpgrading *)display;
 - (void)rescanDirWithExistingDirs:(NSMutableArray *)existingDirs files:(NSMutableArray *)existingFiles symDirs:(NSMutableArray *)existingSymDirs symFiles:(NSMutableArray *)existingSymFiles;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

@@ -12 +12 @@
 #import "SapphireMovie.h"
 #import "NSManagedObject-Extensions.h"
+#import "SapphireCollectionDirectory.h"
 
 @implementation SapphireDirectoryMetaData
@@ -51 +52 @@
 
         return [SapphireDirectoryMetaData internalCreateDirectoryWithPath:path parent:parent inContext:moc];
+}
+
++ (NSDictionary *)upgradeV1DirectoriesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc
+{
+        NSMutableDictionary *lookup = [NSMutableDictionary dictionary];
+        NSArray *dirs = doFetchRequest(SapphireDirectoryMetaDataName, oldMoc, nil);
+        NSEnumerator *dirEnum = [dirs objectEnumerator];
+        NSManagedObjectContext *oldDir;
+        while((oldDir = [dirEnum nextObject]) != nil)
+        {
+                SapphireDirectoryMetaData *newDir = [NSEntityDescription insertNewObjectForEntityForName:SapphireDirectoryMetaDataName inManagedObjectContext:newMoc];
+                NSString *path = [oldDir valueForKey:@"path"];
+                newDir.path = path;
+                NSManagedObject *oldCollection = [newDir valueForKey:@"collectionDirectory"];
+                if(oldCollection != nil)
+                        newDir.collectionDirectory = [SapphireCollectionDirectory upgradeV1CollectionDirectory:oldCollection toContext:newMoc];
+                [lookup setObject:newDir forKey:path];
+        }
+        dirEnum = [dirs objectEnumerator];
+        while((oldDir = [dirEnum nextObject]) != nil)
+        {
+                NSString *path = [oldDir valueForKey:@"path"];
+                NSString *parentPath = [oldDir valueForKeyPath:@"parent.path"];
+                if(parentPath != nil)
+                        ((SapphireDirectoryMetaData *)[lookup objectForKey:path]).parent = [lookup objectForKey:parentPath];
+        }
+        return lookup;
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectorySymLink.h

@@ -6 +6 @@
 + (SapphireDirectorySymLink *)directoryLinkWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
 + (SapphireDirectorySymLink *)createDirectoryLinkWithPath:(NSString *)path toPath:(NSString *)target inContext:(NSManagedObjectContext *)moc;
++ (void)upgradeV1DirLinksFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc directories:(NSDictionary *)dirLookup;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectorySymLink.m

@@ -1 +1 @@
 #import "SapphireDirectorySymLink.h"
 #import "SapphireDirectoryMetaData.h"
+#import "CoreDataSupportFunctions.h"
 
 @implementation SapphireDirectorySymLink
@@ -27 +28 @@
         return ret;
 }
+
++ (void)upgradeV1DirLinksFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc directories:(NSDictionary *)dirLookup
+{
+        NSArray *links = doFetchRequest(SapphireDirectorySymLinkName, oldMoc, nil);
+        NSEnumerator *linkEnum = [links objectEnumerator];
+        NSManagedObject *oldLink;
+        while((oldLink = [linkEnum nextObject]) != nil)
+        {
+                NSString *destinationPath = [oldLink valueForKeyPath:@"directory.path"];
+                SapphireDirectoryMetaData *destination = nil;
+                if(destinationPath != nil)
+                        destination = [dirLookup objectForKey:destinationPath];
+                if(destination == nil)
+                        continue;
+                
+                NSString *containingPath = [oldLink valueForKeyPath:@"containingDirectory.path"];
+                SapphireDirectoryMetaData *containing = nil;
+                if(containingPath != nil)
+                        containing = [dirLookup objectForKey:containingPath];
+                if(containing == nil)
+                        continue;
+                
+                SapphireDirectorySymLink *newLink = [NSEntityDescription insertNewObjectForEntityForName:SapphireDirectorySymLinkName inManagedObjectContext:newMoc];
+                newLink.path = [oldLink valueForKey:@"path"];
+                newLink.directory = destination;
+                newLink.containingDirectory = containing;
+        }
+}
+
 @end

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

@@ -6 +6 @@
         NSArray                 *sortedSubEpisodes;
 }
++ (SapphireEpisode *)episode:(int)ep inSeason:(int)season forShow:(NSString *)show withPath:(NSString *)showPath inContext:(NSManagedObjectContext *)moc;
++ (SapphireEpisode *)episodeTitle:(NSString *)title inSeason:(int)season forShow:(NSString *)show withPath:(NSString *)showPath inContext:(NSManagedObjectContext *)moc;
 + (SapphireEpisode *)episodeWithDictionary:(NSDictionary *)dict inContext:(NSManagedObjectContext *)moc;
++ (void)upgradeV1EpisodesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc file:(NSDictionary *)fileLookup;
 
 - (int)episodeNumberValue;

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

@@ -8 +8 @@
 #import "SapphireXMLData.h"
 #import "SapphireApplianceController.h"
+#import "CoreDataSupportFunctions.h"
 
 @implementation SapphireEpisode
@@ -45 +46 @@
         [ret addSubEpisodesObject:[SapphireSubEpisode createSubEpisodeTitle:title inEpisode:ret]];
         return ret;
+}
+
++ (void)upgradeV1EpisodesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc file:(NSDictionary *)fileLookup
+{
+        NSArray *eps = doFetchRequest(SapphireEpisodeName, oldMoc, nil);
+        NSEnumerator *epEnum = [eps objectEnumerator];
+        NSManagedObject *oldEp;
+        while((oldEp = [epEnum nextObject]) != nil)
+        {
+                NSArray *oldFilePaths = [oldEp valueForKeyPath:@"files.path"];
+                NSEnumerator *pathEnum = [oldFilePaths objectEnumerator];
+                NSString *path;
+                NSMutableSet *newFiles = [NSMutableSet set];
+                while((path = [pathEnum nextObject]) != nil)
+                {
+                        SapphireFileMetaData *newFile = [fileLookup objectForKey:path];
+                        if(newFile != nil)
+                                [newFiles addObject:newFile];
+                }
+                if([newFiles count] == 0)
+                        continue;
+                
+                NSNumber *seasonNum = [oldEp valueForKeyPath:@"season.seasonNumber"];
+                NSString *showName = [oldEp valueForKeyPath:@"tvShow.name"];
+                NSString *showPath = [oldEp valueForKeyPath:@"tvShow.showPath"];
+                
+                SapphireSeason *season = [SapphireSeason season:[seasonNum intValue] forShow:showName withPath:showPath inContext:newMoc];
+                if(season == nil)
+                        continue;
+                
+                SapphireEpisode *newEp = [NSEntityDescription insertNewObjectForEntityForName:SapphireEpisodeName inManagedObjectContext:newMoc];
+                newEp.season = season;
+                newEp.tvShow = season.tvShow;
+                [newEp.filesSet setSet:newFiles];
+                
+                NSEnumerator *subEpEnum = [[oldEp valueForKey:@"subEpisodes"] objectEnumerator];
+                NSManagedObject *subEp;
+                while((subEp = [subEpEnum nextObject]) != nil)
+                        [SapphireSubEpisode upgradeV1SubEpisode:subEp toContext:newMoc inEpisode:newEp];
+        }
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h

@@ -68 +68 @@
 } FileContainerType;
 
+@class SapphireMetaDataUpgrading;
+
 @interface SapphireFileMetaData : _SapphireFileMetaData {}
 + (SapphireFileMetaData *)fileWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
 + (SapphireFileMetaData *)createFileWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
 + (SapphireFileMetaData *)createFileWithPath:(NSString *)path parent:(SapphireDirectoryMetaData *)parent inContext:(NSManagedObjectContext *)moc;
++ (NSDictionary *)upgradeV1FilesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc withMovies:(NSDictionary *)movieLookup directories:(NSDictionary *)dirLookup;
 
 - (void)insertDictionary:(NSDictionary *)dict withDefer:(NSMutableDictionary *)defer;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m

@@ -11 +11 @@
 #import "SapphireFileSymLink.h"
 #import "SapphireSettings.h"
+#import "CoreDataSupportFunctions.h"
 
 #import "SapphireTVShow.h"
@@ -134 +135 @@
         
         return [SapphireFileMetaData internalCreateFileWithPath:path parent:parent inContext:moc];
+}
+
++ (NSDictionary *)upgradeV1FilesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc withMovies:(NSDictionary *)movieLookup directories:(NSDictionary *)dirLookup
+{
+        NSMutableDictionary *lookup = [NSMutableDictionary dictionary];
+        NSArray *files = doFetchRequest(SapphireFileMetaDataName, oldMoc, nil);
+        NSEnumerator *fileEnum = [files objectEnumerator];
+        NSManagedObject *oldFile;
+        while((oldFile = [fileEnum nextObject]) != nil)
+        {
+                SapphireFileMetaData *newFile = [NSEntityDescription insertNewObjectForEntityForName:SapphireFileMetaDataName inManagedObjectContext:newMoc];
+                NSString *path = [oldFile valueForKey:@"path"];
+                newFile.path = path;
+                newFile.parent = [dirLookup objectForKey:[oldFile valueForKeyPath:@"parent.path"]];
+                newFile.audioDescription = [oldFile valueForKey:@"audioDescription"];
+                newFile.audioFormatID = [oldFile valueForKey:@"audioFormatID"];
+                newFile.duration = [oldFile valueForKey:@"duration"];
+                newFile.favorite = [oldFile valueForKey:@"favorite"];
+                newFile.fileClass = [oldFile valueForKey:@"fileClass"];
+                newFile.fileContainerType = [oldFile valueForKey:@"fileContainerType"];
+                newFile.hasVideo = [oldFile valueForKey:@"hasVideo"];
+                newFile.importTypeValue = [[oldFile valueForKey:@"importType"] intValue] & ~IMPORT_TYPE_XML_MASK;
+                newFile.modified = [oldFile valueForKey:@"modified"];
+                newFile.resumeTime = [oldFile valueForKey:@"resumeTime"];
+                newFile.sampleRate = [oldFile valueForKey:@"sampleRate"];
+                newFile.size = [oldFile valueForKey:@"size"];
+                newFile.subtitlesDescription = [oldFile valueForKey:@"subtitlesDescription"];
+                newFile.videoDescription = [oldFile valueForKey:@"videoDescription"];
+                newFile.watched = [oldFile valueForKey:@"watched"];
+                NSNumber *oldMovieNumber = [oldFile valueForKeyPath:@"movie.imdbNumber"];
+                if(oldMovieNumber != nil)
+                        newFile.movie = [movieLookup objectForKey:oldMovieNumber];
+                
+                [lookup setObject:newFile forKey:path];
+        }
+        return lookup;
 }
 
@@ -402 +439 @@
                 [file addFileData:fileMeta];
         }
-        return updated ;
+        return updated;
 }
 
@@ -680 +717 @@
 - (void)setMovie:(SapphireMovie *)movie
 {
-        SapphireMovie *oldMovie = super.movie;
+        SapphireMovie *oldMovie = self.movie;
         super.movie = movie;
         if(movie != nil)
@@ -698 +735 @@
 - (void)setTvEpisode:(SapphireEpisode *)ep
 {
-        SapphireEpisode *oldEp = super.tvEpisode;
+        SapphireEpisode *oldEp = self.tvEpisode;
         super.tvEpisode = ep;
         if(ep != nil)
@@ -709 +746 @@
                 self.xmlData.episode.episode = ep;
         [oldEp clearPredicateCache];
+}
+
+- (void)setXmlData:(SapphireXMLData *)data
+{
+        super.xmlData = data;
+        if(data != nil)
+        {
+                data.episode.episode = self.tvEpisode;
+                data.movie.movie = self.movie;
+        }
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileSymLink.h

@@ -6 +6 @@
 + (SapphireFileSymLink *)fileLinkWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
 + (SapphireFileSymLink *)createFileLinkWithPath:(NSString *)path toPath:(NSString *)target inContext:(NSManagedObjectContext *)moc;
++ (void)upgradeV1FileLinksFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc directories:(NSDictionary *)dirLookup file:(NSDictionary *)fileLookup;
 
 - (NSNumber *)watched;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileSymLink.m

@@ -2 +2 @@
 #import "SapphireFileMetaData.h"
 #import "SapphireDirectoryMetaData.h"
+#import "CoreDataSupportFunctions.h"
 
 @implementation SapphireFileSymLink
@@ -30 +31 @@
 }
 
++ (void)upgradeV1FileLinksFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc directories:(NSDictionary *)dirLookup file:(NSDictionary *)fileLookup
+{
+        NSArray *links = doFetchRequest(SapphireFileSymLinkName, oldMoc, nil);
+        NSEnumerator *linkEnum = [links objectEnumerator];
+        NSManagedObject *oldLink;
+        while((oldLink = [linkEnum nextObject]) != nil)
+        {
+                NSString *destinationPath = [oldLink valueForKeyPath:@"file.path"];
+                SapphireFileMetaData *destination = nil;
+                if(destinationPath != nil)
+                        destination = [fileLookup objectForKey:destinationPath];
+                if(destination == nil)
+                        continue;
+                
+                NSString *containingPath = [oldLink valueForKeyPath:@"containingDirectory.path"];
+                SapphireDirectoryMetaData *containing = nil;
+                if(containingPath != nil)
+                        containing = [dirLookup objectForKey:containingPath];
+                if(containing == nil)
+                        continue;
+                
+                SapphireFileSymLink *newLink = [NSEntityDescription insertNewObjectForEntityForName:SapphireFileSymLinkName inManagedObjectContext:newMoc];
+                newLink.path = [oldLink valueForKey:@"path"];
+                newLink.file = destination;
+                newLink.containingDirectory = containing;
+        }
+}
+
 - (NSNumber *)watched
 {

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireGenre.h

@@ -6 +6 @@
 + (SapphireGenre *)createGenre:(NSString *)genre inContext:(NSManagedObjectContext *)moc;
 + (SapphireGenre *)genre:(NSString *)genre inContext:(NSManagedObjectContext *)moc;
++ (NSDictionary *)upgradeV1GenresFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireGenre.m

@@ -30 +30 @@
 }
 
++ (NSDictionary *)upgradeV1GenresFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc
+{
+        NSMutableDictionary *lookup = [NSMutableDictionary dictionary];
+        NSArray *oldGenres = doFetchRequest(SapphireGenreName, oldMoc, nil);
+        NSEnumerator *genreEnum = [oldGenres objectEnumerator];
+        NSManagedObject *oldGenre;
+        while((oldGenre = [genreEnum nextObject]) != nil)
+        {
+                SapphireGenre *newGenre = [NSEntityDescription insertNewObjectForEntityForName:SapphireGenreName inManagedObjectContext:newMoc];
+                NSString *name = [oldGenre valueForKey:@"name"];
+                newGenre.name = name;
+                newGenre.sortMethod = [oldGenre valueForKey:@"sortMethod"];
+                [lookup setObject:newGenre forKey:name];
+        }
+        return lookup;
+}
+
 - (NSPredicate *)metaFileFetchPredicate
 {

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireJoinedFile.h

@@ -5 +5 @@
 @interface SapphireJoinedFile : _SapphireJoinedFile {}
 + (SapphireJoinedFile *)joinedFileForPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
++ (void)upgradeV1JoinedFileFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc file:(NSDictionary *)fileLookup;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireJoinedFile.m

@@ -18 +18 @@
 }
 
++ (void)upgradeV1JoinedFileFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc file:(NSDictionary *)fileLookup
+{
+        NSArray *joins = doFetchRequest(SapphireJoinedFileName, oldMoc, nil);
+        NSEnumerator *joinEnum = [joins objectEnumerator];
+        NSManagedObject *oldJoin;
+        while((oldJoin = [joinEnum nextObject]) != nil)
+        {
+                NSString *destinationPath = [oldJoin valueForKeyPath:@"file.path"];
+                SapphireFileMetaData *destination = nil;
+                if(destinationPath != nil)
+                        destination = [fileLookup objectForKey:destinationPath];
+                if(destination == nil)
+                        continue;
+                
+                NSArray *containingPaths = [oldJoin valueForKeyPath:@"joinedFiles.path"];
+                NSEnumerator *pathEnum = [containingPaths objectEnumerator];
+                NSString *path;
+                NSMutableSet *joined = [NSMutableSet set];
+                while((path = [pathEnum nextObject]) != nil)
+                {
+                        SapphireFileMetaData *join = [fileLookup objectForKey:path];
+                        if(join != nil)
+                                [joined addObject:join];
+                }
+                if([joined count] == 0)
+                        continue;
+                
+                SapphireJoinedFile *newJoin = [NSEntityDescription insertNewObjectForEntityForName:SapphireJoinedFileName inManagedObjectContext:newMoc];
+                newJoin.file = destination;
+                [newJoin.joinedFilesSet setSet:joined];
+        }
+}
+
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovie.h

@@ -6 +6 @@
 @interface SapphireMovie : _SapphireMovie {}
 + (SapphireMovie *)movieWithIMDB:(int)imdbNumber inContext:(NSManagedObjectContext *)moc;
++ (SapphireMovie *)createMovieWithIMDB:(int)imdbNumber inContext:(NSManagedObjectContext *)moc;
 + (SapphireMovie *)movieWithDictionary:(NSDictionary *)dict inContext:(NSManagedObjectContext *)moc;
++ (SapphireMovie *)movieWithTitle:(NSString *)title inContext:(NSManagedObjectContext *)moc;
++ (SapphireMovie *)createMovieWithTitle:(NSString *)title inContext:(NSManagedObjectContext *)moc;
 + (int)imdbNumberFromString:(NSString *)imdbStr;
++ (NSDictionary *)upgradeV1MoviesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc withCast:(NSDictionary *)cast directors:(NSDictionary *)directors genres:(NSDictionary *)genres;
 
 - (NSArray *)orderedCast;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovie.m

@@ -10 +10 @@
 #import "SapphireXMLData.h"
 #import "NSString-Extensions.h"
+#import "SapphireMovieTranslation.h"
 
 NSString *FILE_DID_CHANGE_MOVIE_NOTIFICATION = @"FileDidChangeMovie";
@@ -40 +41 @@
         ret = [NSEntityDescription insertNewObjectForEntityForName:SapphireMovieName inManagedObjectContext:moc];
         ret.imdbNumber = [NSNumber numberWithInt:imdbNumber];
+        return ret;
+}
+
++ (SapphireMovie *)movieWithTitle:(NSString *)title inContext:(NSManagedObjectContext *)moc
+{
+        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"imdbNumber == nil && title == %@", title];
+        return (SapphireMovie *)doSingleFetchRequest(SapphireMovieName, moc, predicate);
+}
+
++ (SapphireMovie *)createMovieWithTitle:(NSString *)title inContext:(NSManagedObjectContext *)moc
+{
+        SapphireMovie *ret = [SapphireMovie movieWithTitle:title inContext:moc];
+        if(ret != nil)
+                return ret;
+        
+        ret = [NSEntityDescription insertNewObjectForEntityForName:SapphireMovieName inManagedObjectContext:moc];
+        ret.title = title;
+        ret.imdbNumber = nil;
         return ret;
 }
@@ -98 +117 @@
 }
 
++ (NSDictionary *)upgradeV1MoviesFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc withCast:(NSDictionary *)cast directors:(NSDictionary *)directors genres:(NSDictionary *)genres
+{
+        NSMutableDictionary *lookup = [NSMutableDictionary dictionary];
+        NSArray *oldMovies = doFetchRequest(SapphireMovieName, oldMoc, nil);
+        NSEnumerator *movieEnum = [oldMovies objectEnumerator];
+        NSManagedObject *oldMovie;
+        while((oldMovie = [movieEnum nextObject]) != nil)
+        {
+                SapphireMovie *newMovie = [NSEntityDescription insertNewObjectForEntityForName:SapphireMovieName inManagedObjectContext:newMoc];
+                NSNumber *imdbNumber = [oldMovie valueForKey:@"imdbNumber"];
+                newMovie.imdbNumber = imdbNumber;
+                newMovie.imdbRating = [oldMovie valueForKey:@"imdbRating"];
+                newMovie.imdbTop250Ranking = [oldMovie valueForKey:@"imdbTop250Ranking"];
+                newMovie.MPAARating = [oldMovie valueForKey:@"MPAARating"];
+                newMovie.orderedCastData = [oldMovie valueForKey:@"orderedCastData"];
+                newMovie.orderedDirectorsData = [oldMovie valueForKey:@"orderedDirectorsData"];
+                newMovie.orderedGenresData = [oldMovie valueForKey:@"orderedGenresData"];
+                newMovie.oscarsWon = [oldMovie valueForKey:@"oscarsWon"];
+                newMovie.plot = [oldMovie valueForKey:@"plot"];
+                newMovie.releaseDate = [oldMovie valueForKey:@"releaseDate"];
+                newMovie.title = [oldMovie valueForKey:@"title"];
+                NSArray *castNames = [oldMovie valueForKeyPath:@"cast.name"];
+                NSEnumerator *castEnum = [castNames objectEnumerator];
+                NSString *name;
+                NSMutableSet *objSet = [NSMutableSet set];
+                while((name = [castEnum nextObject]) != nil)
+                {
+                        [objSet addObject:[cast objectForKey:name]];
+                }
+                [newMovie.castSet setSet:objSet];
+                NSArray *directorNames = [oldMovie valueForKeyPath:@"directors.name"];
+                NSEnumerator *directorEnum = [directorNames objectEnumerator];
+                objSet = [NSMutableSet set];
+                while((name = [directorEnum nextObject]) != nil)
+                {
+                        [objSet addObject:[directors objectForKey:name]];
+                }
+                [newMovie.directorsSet setSet:objSet];
+                NSArray *genreNames = [oldMovie valueForKeyPath:@"genres.name"];
+                NSEnumerator *genreEnum = [genreNames objectEnumerator];
+                objSet = [NSMutableSet set];
+                while((name = [genreEnum nextObject]) != nil)
+                {
+                        [objSet addObject:[genres objectForKey:name]];
+                }
+                [newMovie.genresSet setSet:objSet];
+                
+                NSEnumerator *translationEnum = [[oldMovie valueForKey:@"translations"] objectEnumerator];
+                NSManagedObject *translation;
+                while((translation = [translationEnum nextObject]) != nil)
+                {
+                        [SapphireMovieTranslation upgradeV1MovieTranslation:translation toMovie:newMovie];
+                }
+                [lookup setObject:newMovie forKey:imdbNumber];
+        }
+        return lookup;
+}
+
 - (NSComparisonResult)releaseDateCompare:(SapphireMovie *)other
 {
@@ -275 +352 @@
         checkOrderedData(orderedCast, overridden);
         if(![overridden count])
-        {
                 self.overriddenCastData = nil;
+        else
+        {
+                NSArray *names = [overridden valueForKey:@"name"];
+                self.overriddenCastData = [NSKeyedArchiver archivedDataWithRootObject:names];
         }
         [self setPrimitiveValue:nil forKey:ORDERED_CAST_KEY];
@@ -287 +367 @@
         checkOrderedData(orderedGenres, overridden);
         if(![overridden count])
-        {
                 self.overriddenGenresData = nil;
+        else
+        {
+                NSArray *names = [overridden valueForKey:@"name"];
+                self.overriddenGenresData = [NSKeyedArchiver archivedDataWithRootObject:names];
         }
         [self setPrimitiveValue:nil forKey:ORDERED_GENRES_KEY];
@@ -299 +382 @@
         checkOrderedData(orderedDirectors, overridden);
         if(![overridden count])
-        {
                 self.overriddenDirectorsData = nil;
+        else
+        {
+                NSArray *names = [overridden valueForKey:@"name"];
+                self.overriddenDirectorsData = [NSKeyedArchiver archivedDataWithRootObject:names];
         }
         [self setPrimitiveValue:nil forKey:ORDERED_DIRECTOR_KEY];

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMoviePoster.h

@@ -5 +5 @@
 @interface SapphireMoviePoster : _SapphireMoviePoster {}
 + (SapphireMoviePoster *)createPosterWithLink:(NSString *)link index:(int)index translation:(SapphireMovieTranslation *)translation inContext:(NSManagedObjectContext *)moc;
++ (SapphireMoviePoster *)upgradeV1MoviePoster:(NSManagedObject *)oldTran toTranslation:(SapphireMovieTranslation *)translation;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMoviePoster.m

@@ -13 +13 @@
 }
 
++ (SapphireMoviePoster *)upgradeV1MoviePoster:(NSManagedObject *)oldTran toTranslation:(SapphireMovieTranslation *)translation
+{
+        NSManagedObjectContext *newMoc = [translation managedObjectContext];
+        SapphireMoviePoster *ret = [NSEntityDescription insertNewObjectForEntityForName:SapphireMoviePosterName inManagedObjectContext:newMoc];
+        ret.link = [oldTran valueForKey:@"link"];
+        ret.index = [oldTran valueForKey:@"index"];
+        ret.movieTranslation = translation;
+        return ret;
+}
+
 - (NSComparisonResult)compare:(SapphireMoviePoster *)other
 {

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovieTranslation.h

@@ -8 +8 @@
 + (SapphireMovieTranslation *)movieTranslationWithName:(NSString *)name inContext:(NSManagedObjectContext *)moc;
 + (SapphireMovieTranslation *)createMovieTranslationWithName:(NSString *)name inContext:(NSManagedObjectContext *)moc;
++ (SapphireMovieTranslation *)upgradeV1MovieTranslation:(NSManagedObject *)oldTran toMovie:(SapphireMovie *)movie;
 
 - (NSArray *)orderedPosters;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovieTranslation.m

@@ -1 +1 @@
 #import "SapphireMovieTranslation.h"
 #import "CoreDataSupportFunctions.h"
+#import "SapphireMoviePoster.h"
 
 @implementation SapphireMovieTranslation
@@ -22 +23 @@
 }
 
++ (SapphireMovieTranslation *)upgradeV1MovieTranslation:(NSManagedObject *)oldTran toMovie:(SapphireMovie *)movie
+{
+        NSManagedObjectContext *newMoc = [movie managedObjectContext];
+        
+        SapphireMovieTranslation *ret = [NSEntityDescription insertNewObjectForEntityForName:SapphireMovieTranslationName inManagedObjectContext:newMoc];
+        ret.IMDBLink = [oldTran valueForKey:@"IMDBLink"];
+        ret.IMPLink = [oldTran valueForKey:@"IMPLink"];
+        ret.name = [oldTran valueForKey:@"name"];
+        ret.selectedPosterIndex = [oldTran valueForKey:@"selectedPosterIndex"];
+        ret.movie = movie;
+        
+        NSEnumerator *posterEnum = [[oldTran valueForKey:@"posters"] objectEnumerator];
+        NSManagedObject *oldPoster;
+        while((oldPoster = [posterEnum nextObject]) != nil)
+        {
+                [SapphireMoviePoster upgradeV1MoviePoster:oldPoster toTranslation:ret];
+        }
+        return ret;
+}
 
 - (SapphireMoviePoster *)selectedPoster

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSeason.h

@@ -5 +5 @@
 @interface SapphireSeason : _SapphireSeason {}
 + (SapphireSeason *)season:(int)season forShow:(NSString *)show withPath:(NSString *)showPath inContext:(NSManagedObjectContext *)moc;
++ (SapphireSeason *)upgradeV1Season:(NSManagedObject *)oldSeason toShow:(SapphireTVShow *)show;
 
 - (NSComparisonResult)compare:(SapphireSeason *)other;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSeason.m

@@ -23 +23 @@
         ret.tvShow = tvshow;
         ret.seasonNumber = [NSNumber numberWithInt:season];
+        return ret;
+}
+
++ (SapphireSeason *)upgradeV1Season:(NSManagedObject *)oldSeason toShow:(SapphireTVShow *)show
+{
+        NSManagedObjectContext *newMoc = [show managedObjectContext];
+        
+        SapphireSeason *ret = [NSEntityDescription insertNewObjectForEntityForName:SapphireSeasonName inManagedObjectContext:newMoc];
+        ret.seasonDescription = [oldSeason valueForKey:@"seasonDescription"];
+        ret.seasonNumber = [oldSeason valueForKey:@"seasonNumber"];
+        ret.tvShow = show;
         return ret;
 }

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireSubEpisode.h

@@ -8 +8 @@
 + (SapphireSubEpisode *)createSubEpisode:(int)subNum inEpisode:(SapphireEpisode *)ep;
 + (SapphireSubEpisode *)createSubEpisodeTitle:(NSString *)title inEpisode:(SapphireEpisode *)ep;
++ (void)upgradeV1SubEpisode:(NSManagedObject *)oldEp toContext:(NSManagedObjectContext *)newMoc inEpisode:(SapphireEpisode *)ep;
 
 - (void)insertDictionary:(NSDictionary *)dict epIndex:(int)index;

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

@@ -55 +55 @@
         ret.episodeTitle = title;
         return ret;             
+}
+
++ (void)upgradeV1SubEpisode:(NSManagedObject *)oldEp toContext:(NSManagedObjectContext *)newMoc inEpisode:(SapphireEpisode *)ep
+{
+        SapphireSubEpisode *newEp = [NSEntityDescription insertNewObjectForEntityForName:SapphireSubEpisodeName inManagedObjectContext:newMoc];
+        newEp.absoluteEpisodeNumber = [oldEp valueForKey:@"absoluteEpisodeNumber"];
+        newEp.airDate = [oldEp valueForKey:@"airDate"];
+        newEp.episodeDescription = [oldEp valueForKey:@"episodeDescription"];
+        newEp.episodeNumber = [oldEp valueForKey:@"episodeNumber"];
+        newEp.episodeTitle = [oldEp valueForKey:@"episodeTitle"];
+        newEp.episode = ep;
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.h

@@ -6 +6 @@
 + (SapphireTVShow *)show:(NSString *)show withPath:(NSString *)showPath inContext:(NSManagedObjectContext *)moc;
 + (SapphireTVShow *)showWithPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
++ (void)upgradeV1ShowsFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc;
 
 - (NSComparisonResult)compare:(SapphireTVShow *)other;

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVShow.m

@@ -7 +7 @@
 #import "NSString-Extensions.h"
 #import "SapphireFileSorter.h"
+#import "SapphireTVTranslation.h"
 
 @implementation SapphireTVShow
@@ -38 +39 @@
         NSPredicate *predicate = [NSPredicate predicateWithFormat:@"showPath == %@", path];
         return (SapphireTVShow *)doSingleFetchRequest(SapphireTVShowName, moc, predicate);
+}
+
++ (void)upgradeV1ShowsFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc
+{
+        NSArray *oldShows = doFetchRequest(SapphireTVShowName, oldMoc, nil);
+        NSEnumerator *showEnum = [oldShows objectEnumerator];
+        NSManagedObject *oldShow;
+        while((oldShow = [showEnum nextObject]) != nil)
+        {
+                SapphireTVShow *newShow = [NSEntityDescription insertNewObjectForEntityForName:SapphireTVShowName inManagedObjectContext:newMoc];
+                newShow.name = [oldShow valueForKey:@"name"];
+                newShow.showDescription = [oldShow valueForKey:@"showDescription"];
+                newShow.showID = [oldShow valueForKey:@"showID"];
+                newShow.showPath = [oldShow valueForKey:@"showPath"];
+                
+                NSEnumerator *translationEnum = [[oldShow valueForKey:@"translations"] objectEnumerator];
+                NSManagedObject *translation;
+                while((translation = [translationEnum nextObject]) != nil)
+                {
+                        [SapphireTVTranslation upgradeV1TVTranslation:translation toShow:newShow];
+                }
+                
+                NSEnumerator *seasonEnum = [[oldShow valueForKey:@"seasons"] objectEnumerator];
+                NSManagedObject *season;
+                while((season = [seasonEnum nextObject]) != nil)
+                {
+                        [SapphireSeason upgradeV1Season:season toShow:newShow]; 
+                }
+        }
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVTranslation.h

@@ -6 +6 @@
 + (SapphireTVTranslation *)tvTranslationForName:(NSString *)name inContext:(NSManagedObjectContext *)moc;
 + (SapphireTVTranslation *)createTVTranslationForName:(NSString *)name withPath:(NSString *)path inContext:(NSManagedObjectContext *)moc;
++ (SapphireTVTranslation *)upgradeV1TVTranslation:(NSManagedObject *)oldTran toShow:(SapphireTVShow *)show;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireTVTranslation.m

@@ -23 +23 @@
 }
 
++ (SapphireTVTranslation *)upgradeV1TVTranslation:(NSManagedObject *)oldTran toShow:(SapphireTVShow *)show
+{
+        NSManagedObjectContext *newMoc = [show managedObjectContext];
+        
+        SapphireTVTranslation *ret = [NSEntityDescription insertNewObjectForEntityForName:SapphireTVTranslationName inManagedObjectContext:newMoc];
+        ret.name = [oldTran valueForKey:@"name"];
+        ret.showPath = [oldTran valueForKey:@"showPath"];
+        ret.tvShow = show;
+        return ret;
+}
+
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLData.h

@@ -15 +15 @@
         }
 @interface SapphireXMLData : _SapphireXMLData {}
++ (void)upgradeV1XMLFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc file:(NSDictionary *)fileLookup;
 - (void)insertDictionary:(NSDictionary *)dict;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLData.m

@@ -6 +6 @@
 #import "SapphireGenre.h"
 #import "SapphireDirector.h"
+#import "CoreDataSupportFunctions.h"
 
 #define MODIFIED_KEY                            @"Modified"
@@ -11 +12 @@
 
 @implementation SapphireXMLData
+
++ (void)upgradeV1XMLFromContext:(NSManagedObjectContext *)oldMoc toContext:(NSManagedObjectContext *)newMoc file:(NSDictionary *)fileLookup
+{
+        NSArray *xmls = doFetchRequest(SapphireXMLDataName, oldMoc, nil);
+        NSEnumerator *xmlEnum = [xmls objectEnumerator];
+        NSManagedObject *oldXML;
+        while((oldXML = [xmlEnum nextObject]) != nil)
+        {
+                NSString *path = [oldXML valueForKeyPath:@"file.path"];
+                SapphireFileMetaData *file = nil;
+                if(path != nil)
+                        file = [fileLookup objectForKey:path];
+                if(file == nil)
+                        continue;
+                
+                SapphireXMLData *newXML = [NSEntityDescription insertNewObjectForEntityForName:SapphireXMLDataName inManagedObjectContext:newMoc];
+                newXML.contentDescription = [oldXML valueForKey:@"contentDescription"];
+                newXML.fileClass = [oldXML valueForKey:@"fileClass"];
+                newXML.modified = [oldXML valueForKey:@"modified"];
+                newXML.summary = [oldXML valueForKey:@"summary"];
+                newXML.title = [oldXML valueForKey:@"title"];
+                
+                NSManagedObject *epXML = [oldXML valueForKey:@"episode"];
+                if(epXML != nil)
+                        [SapphireXMLEpisodeData upgradeV1XMLEp:epXML toContext:newMoc inData:newXML];
+                NSManagedObject *movieXML = [oldXML valueForKey:@"movie"];
+                if(movieXML != nil)
+                        [SapphireXMLMovieData upgradeV1XMLMovie:movieXML toContext:newMoc inData:newXML];
+                file.xmlData = newXML;
+                
+                SapphireXMLEpisodeData *episode = newXML.episode;
+                if(episode != nil && episode.episode == nil)
+                        [episode constructEpisode];
+                SapphireXMLMovieData *movie = newXML.movie;
+                if(movie != nil && movie.movie == nil)
+                        [movie constructMovie];
+        }
+}
 
 - (SapphireXMLEpisodeData *)episodeXMLData
@@ -133 +172 @@
         if(value != nil)
                 self.fileClass = value;
+        
+        tv = self.episode;
+        if(tv != nil && tv.episode == nil)
+                [tv constructEpisode];
+        movie = self.movie;
+        if(movie != nil && movie.movie == nil)
+                [movie constructMovie]; 
 }
 

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLEpisodeData.h

@@ -4 +4 @@
 
 @interface SapphireXMLEpisodeData : _SapphireXMLEpisodeData {}
+
++ (void)upgradeV1XMLEp:(NSManagedObject *)oldEp toContext:(NSManagedObjectContext *)newMoc inData:(SapphireXMLData *)data;
+- (void)constructEpisode;
+
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLEpisodeData.m

@@ -1 +1 @@
 #import "SapphireXMLEpisodeData.h"
+#import "SapphireXMLData.h"
+#import "SapphireEpisode.h"
+#import "SapphireFileMetaData.h"
 
 @implementation SapphireXMLEpisodeData
 
-// Custom logic goes here.
++ (void)upgradeV1XMLEp:(NSManagedObject *)oldEp toContext:(NSManagedObjectContext *)newMoc inData:(SapphireXMLData *)data
+{
+        SapphireXMLEpisodeData *newData = [NSEntityDescription insertNewObjectForEntityForName:SapphireXMLEpisodeDataName inManagedObjectContext:newMoc];
+        
+        newData.absoluteEpisodeNumber = [oldEp valueForKey:@"absoluteEpisodeNumber"];
+        newData.episodeNumber = [oldEp valueForKey:@"episodeNumber"];
+        newData.lastEpisodeNumber = [oldEp valueForKey:@"lastEpisodeNumber"];
+        newData.searchEpisode = [oldEp valueForKey:@"searchEpisode"];
+        newData.searchLastEpisodeNumber = [oldEp valueForKey:@"searchLastEpisodeNumber"];
+        newData.searchSeasonNumber = [oldEp valueForKey:@"searchSeasonNumber"];
+        newData.searchShowName = [oldEp valueForKey:@"searchShowName"];
+        newData.xml = data;
+}
+
+- (void)constructEpisode
+{
+        int season = self.searchSeasonNumberValue;
+        NSString *show = self.searchShowName;
+        
+        if(season == 0 || show == nil)
+                return;
+        
+        int ep = self.searchEpisodeValue;
+        NSString *title = self.xml.title;
+        
+        SapphireEpisode *ret;
+        if(ep != 0)
+        {
+                ret = [SapphireEpisode episode:ep inSeason:season forShow:show withPath:nil inContext:[self managedObjectContext]];
+        }
+        else if(title != nil)
+        {
+                ret = [SapphireEpisode episodeTitle:title inSeason:season forShow:show withPath:nil inContext:[self managedObjectContext]];
+        }
+        else
+                return;
+        
+        self.episode = ret;
+        self.xml.file.tvEpisode = ret;
+}
 
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLMovieData.h

@@ -4 +4 @@
 
 @interface SapphireXMLMovieData : _SapphireXMLMovieData {}
++ (void)upgradeV1XMLMovie:(NSManagedObject *)oldMovie toContext:(NSManagedObjectContext *)newMoc inData:(SapphireXMLData *)data;
 - (NSArray *)orderedCast;
 - (void)setOrderedCast:(NSArray *)ordered;
@@ -10 +11 @@
 - (NSArray *)orderedDirectors;
 - (void)setOrderedDirectors:(NSArray *)ordered;
+- (void)constructMovie;
 @end

branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireXMLMovieData.m

@@ -5 +5 @@
 #import "SapphireMovie.h"
 #import "SapphireFileMetaData.h"
+#import "SapphireXMLData.h"
 
 #define ORDERED_CAST_KEY                @"orderedCast"
@@ -14 +15 @@
 
 @implementation SapphireXMLMovieData
+
++ (void)upgradeV1XMLMovie:(NSManagedObject *)oldMovie toContext:(NSManagedObjectContext *)newMoc inData:(SapphireXMLData *)data
+{
+        SapphireXMLMovieData *newMovie = [NSEntityDescription insertNewObjectForEntityForName:SapphireXMLMovieDataName inManagedObjectContext:newMoc];
+        newMovie.orderedCastData = [oldMovie valueForKey:@"orderedCastData"];
+        newMovie.orderedDirectorsData = [oldMovie valueForKey:@"orderedDirectorsData"];
+        newMovie.orderedGenresData = [oldMovie valueForKey:@"orderedGenresData"];
+        newMovie.xml = data;
+}
 
 - (NSArray *)orderedCast
@@ -153 +163 @@
 }
 
+- (void)constructMovie
+{
+        int imdbNumber = self.searchIMDBNumberValue;
+        NSString *title = self.xml.title;
+        SapphireMovie *ret;
+        if(imdbNumber != 0)
+                ret = [SapphireMovie createMovieWithIMDB:imdbNumber inContext:[self managedObjectContext]];
+        else if(title != nil)
+                ret = [SapphireMovie createMovieWithTitle:title inContext:[self managedObjectContext]];
+        else
+                return;
+        
+        self.movie = ret;
+        self.xml.file.movie = ret;
+}
+
 @end

branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataSupport.h

@@ -52 +52 @@
  * @brief Import the old plist into the context
  *
+ * @param v1Context The context to use for old objects
+ * @param context The context to use for new objects
+ * @param display The display for UI feedback
+ */
++ (void)importV1Store:(NSManagedObjectContext *)v1Context intoContext:(NSManagedObjectContext *)context withDisplay:(SapphireMetaDataUpgrading *)display;
+
+/*!
+ * @brief Import the old plist into the context
+ *
  * @param configDir The directory containing old configuration files
  * @param context The context to use for new objects

branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMetaDataSupport.m

@@ -31 +31 @@
 #import "SapphireTVShow.h"
 #import "SapphireMetaDataUpgrading.h"
+#import "SapphireDirector.h"
+#import "SapphireGenre.h"
+#import "SapphireDirectorySymLink.h"
+#import "SapphireFileSymLink.h"
+#import "SapphireEpisode.h"
+#import "SapphireXMLData.h"
 
 #define META_VERSION_KEY                        @"Version"
@@ -172 +178 @@
 {
         return [[SapphireMetaDataSupport sharedInstance] wasLocked];
+}
+
++ (void)importV1Store:(NSManagedObjectContext *)v1Context intoContext:(NSManagedObjectContext *)context withDisplay:(SapphireMetaDataUpgrading *)display
+{
+        [display setCurrentFile:@"Upgrading Cast"];
+        NSDictionary *castLookup = [SapphireCast upgradeV1CastFromContext:v1Context toContext:context];
+        [display setCurrentFile:@"Upgrading Directors"];
+        NSDictionary *directorLookup = [SapphireDirector upgradeV1DirectorsFromContext:v1Context toContext:context];
+        [display setCurrentFile:@"Upgrading Genres"];
+        NSDictionary *genreLookup = [SapphireGenre upgradeV1GenresFromContext:v1Context toContext:context];
+        [display setCurrentFile:@"Upgrading Movies"];
+        NSDictionary *movieLookup = [SapphireMovie upgradeV1MoviesFromContext:v1Context toContext:context withCast:castLookup directors:directorLookup genres:genreLookup];
+        [display setCurrentFile:@"Upgrading Shows"];
+        [SapphireTVShow upgradeV1ShowsFromContext:v1Context toContext:context];
+        [display setCurrentFile:@"Upgrading Directories"];
+        NSDictionary *dirLookup = [SapphireDirectoryMetaData upgradeV1DirectoriesFromContext:v1Context toContext:context];
+        [display setCurrentFile:@"Upgrading Files"];
+        NSDictionary *fileLookup = [SapphireFileMetaData upgradeV1FilesFromContext:v1Context toContext:context withMovies:movieLookup directories:dirLookup];
+        [display setCurrentFile:@"Upgrading SymLinks"];
+        [SapphireDirectorySymLink upgradeV1DirLinksFromContext:v1Context toContext:context directories:dirLookup];
+        [SapphireFileSymLink upgradeV1FileLinksFromContext:v1Context toContext:context directories:dirLookup file:fileLookup];
+        [display setCurrentFile:@"Upgrading Joined Files"];
+        [SapphireJoinedFile upgradeV1JoinedFileFromContext:v1Context toContext:context file:fileLookup];
+        [display setCurrentFile:@"Upgrading Episodes"];
+        [SapphireEpisode upgradeV1EpisodesFromContext:v1Context toContext:context file:fileLookup];
+        [display setCurrentFile:@"Upgrading XML"];
+        [SapphireXMLData upgradeV1XMLFromContext:v1Context toContext:context file:fileLookup];
 }
 

branches/CoreData/SapphireFrappliance/main_debug.m

@@ -28 +28 @@
 #import "SapphireDirectoryMetaData.h"
 #import "SapphireApplianceController.h"
+#import "SapphireMetaDataUpgrading.h"
 
 @interface TestFileScanning : NSObject <SapphireMetaDataScannerDelegate>
@@ -80 +81 @@
 @end
 
+@interface SapphireMetaDataUpgrading (debug)
+- (id)debugInit;
+- (void)doUpgrade:(id)obj;
+@end
+
+
 
 int main(int argc, char *argv[])
@@ -92 +99 @@
         [bundle load];
         
-//      NSString *storeFile = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/metaData.sapphireData"];
-        NSString *storeFile = @"/Volumes/frontrow/Library/Application Support/Sapphire/metaData.sapphireData";
-        BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:storeFile];
-        if(!exists)
-                return 0;
-        
-        NSManagedObjectContext *moc = [SapphireApplianceController createManagedObjectContextForFile:storeFile];
+//      NSString *storeFile = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/Sapphire/metaData.sapphireDataV2"];
+////    NSString *storeFile = @"/Volumes/frontrow/Library/Application Support/Sapphire/metaData.sapphireData";
+//      BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:storeFile];
+//      if(!exists)
+//              return 0;
+//      
+//      NSManagedObjectContext *moc = [SapphireApplianceController createManagedObjectContextForFile:storeFile];
         
         //Debug code goes here:
-#define TESTING_FILE_SCANNING
+#define TESTING_UPGRADE
+#ifdef TESTING_UPGRADE
+        BOOL needed = [SapphireApplianceController upgradeNeeded];
+        SapphireMetaDataUpgrading *upgrade = [[SapphireMetaDataUpgrading alloc] debugInit];
+        [upgrade doUpgrade:nil];
+#endif
+//#define TESTING_FILE_SCANNING
 #ifdef TESTING_FILE_SCANNING
         NSMutableArray *collections = [[SapphireCollectionDirectory allCollectionsInContext:moc] mutableCopy];