Changeset 840 for branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovie.m

Timestamp:

05/11/2009 04:51:19 PM (3 years ago)

Author:

gbooker

Message:

Delete unused objects as they become unused so as to not need the prune call later. This will help accelerate things later. Also, handled XML a bit better.

Files:

• branches/CoreData/SapphireFrappliance/MetaData/SapphireMObjects/SapphireMovie.m (modified) (13 diffs)

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

@@ -271 +271 @@
                         while((name = [nameEnum nextObject]) != nil)
                         {
-                                SapphireCast *aCast = [SapphireCast cast:name inContext:moc];
+                                SapphireCast *aCast = [SapphireCast createCast:name inContext:moc];
                                 if(aCast != nil)
                                         [mutRet addObject:aCast];
@@ -290 +290 @@
         NSArray *arc = [ordered valueForKey:@"name"];
         [self setValue:[NSKeyedArchiver archivedDataWithRootObject:arc] forKey:ORDERED_CAST_DATA];
-        [self.castSet setSet:[NSSet setWithArray:ordered]];
+        [self setValue:[NSSet setWithArray:ordered] forKey:@"cast"];
         int i, count=[ordered count];
         if(count > 10)
@@ -319 +319 @@
                         while((genre = [genreEnum nextObject]) != nil)
                         {
-                                SapphireGenre *aGenre = [SapphireGenre genre:genre inContext:moc];
+                                SapphireGenre *aGenre = [SapphireGenre createGenre:genre inContext:moc];
                                 if(aGenre != nil)
                                         [mutRet addObject:aGenre];
@@ -338 +338 @@
         NSArray *arc = [ordered valueForKey:@"name"];
         [self setValue:[NSKeyedArchiver archivedDataWithRootObject:arc] forKey:ORDERED_GENRES_DATA];
-        [self.genresSet addObjectsFromArray:ordered];
+        [self setValue:[NSSet setWithArray:ordered] forKey:@"genres"];
 }
 
@@ -360 +360 @@
                         while((name = [nameEnum nextObject]) != nil)
                         {
-                                SapphireDirector *aDir = [SapphireDirector director:name inContext:moc];
+                                SapphireDirector *aDir = [SapphireDirector createDirector:name inContext:moc];
                                 if(aDir != nil)
                                         [mutRet addObject:aDir];
@@ -379 +379 @@
         NSArray *arc = [ordered valueForKey:@"name"];
         [self setValue:[NSKeyedArchiver archivedDataWithRootObject:arc] forKey:ORDERED_DIRECTOR_DATA];
-        [self.directorsSet addObjectsFromArray:ordered];
+        [self setValue:[NSSet setWithArray:ordered] forKey:@"directors"];
 }
 
@@ -402 +402 @@
         }
         [self setPrimitiveValue:nil forKey:ORDERED_CAST_KEY];
-        [self.castSet setSet:[NSSet setWithArray:self.orderedCast]];
+        [self setValue:[NSSet setWithArray:self.orderedCast] forKey:@"cast"];
 }
 
@@ -417 +417 @@
         }
         [self setPrimitiveValue:nil forKey:ORDERED_GENRES_KEY];
-        [self.genresSet setSet:[NSSet setWithArray:self.orderedGenres]];
+        [self setValue:[NSSet setWithArray:self.orderedGenres] forKey:@"genres"];
 }
 
@@ -432 +432 @@
         }
         [self setPrimitiveValue:nil forKey:ORDERED_DIRECTOR_KEY];
-        [self.directorsSet setSet:[NSSet setWithArray:self.orderedDirectors]];
+        [self setValue:[NSSet setWithArray:self.orderedDirectors] forKey:@"directors"];
 }
 
@@ -451 +451 @@
 {
         [super removeXml:removedXMLs];
-        [self checkXMLOverridenSets];
+        //This can occur during a delete propogation, which appears to have KVO completely broken; workaround
+        [SapphireMetaDataSupport setObjectForPendingDelete:self];
 }
 
@@ -463 +464 @@
 {
         [super removeXmlObject:removedXML];
-        [self checkXMLOverridenSets];
+        //This can occur during a delete propogation, which appears to have KVO completely broken; workaround
+        [SapphireMetaDataSupport setObjectForPendingDelete:self];
 }
 
@@ -575 +577 @@
 }
 
+- (BOOL)shouldDelete
+{
+        if([self.filesSet count] == 0)
+                return YES;
+        
+        [self checkXMLOverridenSets];
+        return NO;
+}
+
 -(void)removeFiles:(NSSet*)removeFiles
 {
         [super removeFiles:removeFiles];
-        [self clearPredicateCache];
+        if([self.filesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+        else
+                [self clearPredicateCache];
 }
 
@@ -590 +604 @@
 {
         [super removeFilesObject:removeFile];
-        [self clearPredicateCache];
+        if([self.filesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+        else
+                [self clearPredicateCache];
 }