Changeset 840

Timestamp:

05/11/09 16:51:19 (16 months 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.

Location:

branches/CoreData/SapphireFrappliance

Files:

• MetaData/SapphireMObjects/SapphireCast.m (modified) (3 diffs)
• MetaData/SapphireMObjects/SapphireDirector.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireEpisode.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireGenre.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireMovie.m (modified) (13 diffs)
• MetaData/SapphireMObjects/SapphireSeason.m (modified) (2 diffs)
• MetaData/SapphireMObjects/SapphireTVShow.m (modified) (1 diff)
• MetaData/Support/SapphireMetaDataSupport.h (modified) (1 diff)
• MetaData/Support/SapphireMetaDataSupport.m (modified) (5 diffs)
• main_debug.m (modified) (5 diffs)

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

@@ -3 +3 @@
 #import "CoreDataSupportFunctions.h"
 #import "SapphireFileSorter.h"
+#import "SapphireMetaDataSupport.h"
 
 @implementation SapphireCast
@@ -64 +65 @@
 }
 
-- (void)removeMoviesObject:(SapphireMovie*)value_
+- (void)checkMajorRole
 {
-        [super removeMoviesObject:value_];
         BOOL currentMajorRole = self.hasMajorRoleValue;
         BOOL majorRole = NO;
@@ -83 +83 @@
 }
 
+- (BOOL)shouldDelete
+{
+        return [self.moviesSet count] == 0;
+}
+
+-(void)removeMovies:(NSSet*)removedMovies
+{
+        [super removeMovies:removedMovies];
+        if([self.moviesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+        else
+                [self checkMajorRole];
+}
+
+- (void)removeMoviesObject:(SapphireMovie *)removedMovie
+{
+        [super removeMoviesObject:removedMovie];
+        if([self.moviesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+        else
+                [self checkMajorRole];
+}
+
 @end

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

@@ -2 +2 @@
 #import "CoreDataSupportFunctions.h"
 #import "SapphireFileSorter.h"
+#import "SapphireMetaDataSupport.h"
 
 @implementation SapphireDirector
@@ -62 +63 @@
 }
 
+- (BOOL)shouldDelete
+{
+        return [self.moviesSet count] == 0;
+}
+
+-(void)removeMovies:(NSSet*)removedMovies
+{
+        [super removeMovies:removedMovies];
+        if([self.moviesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
+- (void)removeMoviesObject:(SapphireMovie *)removedMovie
+{
+        [super removeMoviesObject:removedMovie];
+        if([self.moviesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
 @end

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

@@ -342 +342 @@
 }
 
+- (BOOL)shouldDelete
+{
+        return [self.filesSet count] == 0;
+}
+
 -(void)removeFiles:(NSSet*)removeFiles
 {
         [super removeFiles:removeFiles];
-        [self clearPredicateCache];
+        if([self.filesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+        else
+                [self clearPredicateCache];
 }
 
@@ -357 +365 @@
 {
         [super removeFilesObject:removeFile];
-        [self clearPredicateCache];
+        if([self.filesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+        else
+                [self clearPredicateCache];
 }
 

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

@@ -3 +3 @@
 #import "SapphireFileSorter.h"
 #import "SapphireMovie.h"
+#import "SapphireMetaDataSupport.h"
 
 @implementation SapphireGenre
@@ -63 +64 @@
 }
 
+- (BOOL)shouldDelete
+{
+        return [self.moviesSet count] == 0;
+}
+
+-(void)removeMovies:(NSSet*)removedMovies
+{
+        [super removeMovies:removedMovies];
+        if([self.moviesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
+- (void)removeMoviesObject:(SapphireMovie *)removedMovie
+{
+        [super removeMoviesObject:removedMovie];
+        if([self.moviesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
 @end

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];
 }
 

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

@@ -2 +2 @@
 #import "SapphireTVShow.h"
 #import "SapphireFileSorter.h"
+#import "SapphireMetaDataSupport.h"
 
 @implementation SapphireSeason
@@ -82 +83 @@
 }
 
+- (BOOL)shouldDelete
+{
+        return [self.episodesSet count] == 0;
+}
+
+-(void)removeEpisodes:(NSSet*)removedEpisodes
+{
+        [super removeEpisodes:removedEpisodes];
+        if([self.episodesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
+- (void)removeEpisodesObject:(SapphireEpisode*)removedEpisode
+{
+        [super removeEpisodesObject:removedEpisode];
+        if([self.episodesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
 @end

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

@@ -128 +128 @@
 }
 
+- (BOOL)shouldDelete
+{
+        return [self.episodesSet count] == 0;
+}
+
+-(void)removeEpisodes:(NSSet*)removedEpisodes
+{
+        [super removeEpisodes:removedEpisodes];
+        if([self.episodesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
+- (void)removeEpisodesObject:(SapphireEpisode*)removedEpisode
+{
+        [super removeEpisodesObject:removedEpisode];
+        if([self.episodesSet count] == 0)
+                [SapphireMetaDataSupport setObjectForPendingDelete:self];
+}
+
 @end

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

@@ -44 +44 @@
  */
 + (void)pruneMetaData:(NSManagedObjectContext *)moc;
+
+/*!
+ * @brief Sets an object up for pending delete
+ *
+ * Any object added to this set will be first checked before delete.  The check is calling selector
+ * shouldDelete and if returns YES, performs the delete, otherwise it is removed from set.
+ *
+ * @param objectToDelete The object to delete
+ */
++ (void)setObjectForPendingDelete:(NSManagedObject *)objectToDelete;
 
 /*!

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

@@ -40 +40 @@
 #import "SapphireSeason.h"
 #import "CoreDataSupportFunctions.h"
+
+@interface NSManagedObject (deleteDelegate)
+- (BOOL)shouldDelete;
+@end
+
 
 @interface NSManagedObject (ChangePersistence)
@@ -140 +145 @@
 
 static NSSet *coverArtExtentions = nil;
+static NSMutableSet *pendingDeleteObjects = nil;
 
 NSString *searchCoverArtExtForPath(NSString *path)
@@ -173 +179 @@
                                                   @"png",
                                                   @"gif",
-                                                  nil]; 
+                                                  nil];
+        pendingDeleteObjects = [[NSMutableSet alloc] init];
 }
 
@@ -258 +265 @@
 }
 
++ (void)setObjectForPendingDelete:(NSManagedObject *)objectToDelete
+{
+        [pendingDeleteObjects addObject:objectToDelete];
+}
+
+/*!
+ * @brief Deletes pending objects
+ *
+ * Deletes all objects in the pending queue, but calls shouldDelete first to make sure it should
+ * be deleted.  This is also used as a hack to work around CD apparent inability to make KVO
+ * notifications during an object delete when it is within an KVO notification.
+ */
++ (void)deletePendingObjects
+{
+        NSManagedObjectContext *mainMoc = [SapphireMetaDataSupport sharedInstance]->mainMoc;
+        [mainMoc processPendingChanges];                
+        while([pendingDeleteObjects count])
+        {
+                NSManagedObject *obj;
+                NSSet *pendingObjects = [pendingDeleteObjects copy];
+                [pendingDeleteObjects removeAllObjects];
+                NSEnumerator *objEnum = [pendingObjects objectEnumerator];
+                while((obj = [objEnum nextObject]) != nil)
+                {
+                        if([obj isDeleted])
+                                continue;
+                        if([obj managedObjectContext] != mainMoc)
+                                continue;
+                        if(![obj respondsToSelector:@selector(shouldDelete)] || [obj shouldDelete])
+                                [mainMoc deleteObject:obj];
+                }
+                [pendingObjects release];
+                [mainMoc processPendingChanges];                
+        }
+}
+
 - (void)realWriteMetaData:(NSTimer *)timer
 {
@@ -274 +317 @@
         BOOL success = NO;
         @try {
+                [SapphireMetaDataSupport deletePendingObjects];
                 success = [context save:&error];
         }

branches/CoreData/SapphireFrappliance/main_debug.m

@@ -38 +38 @@
 #import "SapphireMetaDataSupport.h"
 #import "SapphireAllImporter.h"
+#import "SapphireTVShow.h"
+#import "SapphireGenre.h"
+#import "SapphireCast.h"
+#import "SapphireDirector.h"
+#import "SapphireXMLData.h"
 
 void overrideApplicationSupportdir(NSString *override);
@@ -96 +101 @@
 @end
 
+@interface SapphireMetaDataSupport (debug)
++ (void)deletePendingObjects;
+@end
+
+
 
 
@@ -112 +122 @@
         
 //      overrideApplicationSupportdir([NSHomeDirectory() stringByAppendingPathComponent:@"Documents/Frontrow"]);
-#define TESTING_UPGRADE
+//#define TESTING_UPGRADE
 #ifdef TESTING_UPGRADE
         {
@@ -198 +208 @@
         }
 #endif
-#define TESTING_DIRECTORY_RESCAN
+//#define TESTING_DIRECTORY_RESCAN
 #ifdef TESTING_DIRECTORY_RESCAN
         {
@@ -209 +219 @@
         }
 #endif
+#define TESTING_AUTO_PRUNING
+#ifdef TESTING_AUTO_PRUNING
+        {
+                SapphireFileMetaData *file = [SapphireFileMetaData fileWithPath:@"/Users/gbooker/Movies/MovieTests/Little Einsteins.avi" inContext:moc];
+                SapphireXMLData *xml = [file xmlData];
+                [moc deleteObject:xml];
+                [SapphireMetaDataSupport deletePendingObjects];
+                SapphireDirectoryMetaData *dir = [SapphireDirectoryMetaData directoryWithPath:@"/Users/gbooker/Movies/MovieTests" inContext:moc];
+                [moc deleteObject:dir];
+                [SapphireMetaDataSupport deletePendingObjects];
+                dir = [SapphireDirectoryMetaData directoryWithPath:@"/Users/gbooker/Movies/TVShowsTests" inContext:moc];
+                [moc deleteObject:dir];
+                [SapphireMetaDataSupport deletePendingObjects];
+                NSArray *allMovies = doFetchRequest(SapphireMovieName, moc, nil);
+                NSArray *allShows = doFetchRequest(SapphireTVShowName, moc, nil);
+                NSArray *allGenres = doFetchRequest(SapphireGenreName, moc, nil);
+                NSArray *allCast = doFetchRequest(SapphireCastName, moc, nil);
+                NSArray *allDirectors = doFetchRequest(SapphireDirectorName, moc, nil);
+                
+                NSLog(@"Movies: %@\nShows: %@\nCast: %@\nGenres: %@\nDirectors: %@", allMovies, allShows, allCast, allGenres, allDirectors);
+        }
+#endif
         
         [pool release];