Changeset 683

Show
Ignore:
Timestamp:
10/07/08 19:44:58 (3 months ago)
Author:
gbooker
Message:

Improved method of faulting things

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r670 r683  
    33#import "SapphireFileSorter.h" 
    44#import "CoreDataSupportFunctions.h" 
     5#import "NSManagedObject-Extensions.h" 
    56 
    67@implementation SapphireCategoryDirectory 
    …… 
    179180} 
    180181 
    181 - (void)refreshAllObjects 
     182- (void)faultAllObjects 
    182183{ 
    183184        NSManagedObjectContext *moc = [self managedObjectContext]; 
    …… 
    188189        while((obj = [objEnum nextObject]) != nil) 
    189190        { 
    190                 [moc refreshObject:obj mergeChanges:NO]; 
    191         } 
    192  
    193         [moc refreshObject:self mergeChanges:NO]; 
     191                [obj faultOjbectInContext:moc]; 
     192        } 
     193 
     194        [self faultOjbectInContext:moc]; 
    194195} 
    195196 

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

    r665 r683  
    1111#import "SapphireSubEpisode.h" 
    1212#import "SapphireMovie.h" 
     13#import "NSManagedObject-Extensions.h" 
    1314 
    1415@implementation SapphireDirectoryMetaData 
    …… 
    643644} 
    644645 
    645 - (void)refreshAllObjects 
     646- (void)faultAllObjects 
    646647{ 
    647648        if([self isFault] || delegate != nil) 
    …… 
    653654        objEnum = [self.metaFilesSet objectEnumerator]; 
    654655        while((obj = [objEnum nextObject]) != nil) 
    655                 [moc refreshObject:obj mergeChanges:NO]; 
     656                [obj faultOjbectInContext:moc]; 
    656657         
    657658        objEnum = [self.metaDirsSet objectEnumerator]; 
    658659        while((obj = [objEnum nextObject]) != nil) 
    659                 [(SapphireDirectoryMetaData *)obj refreshAllObjects]; 
     660                [obj faultOjbectInContext:moc]; 
    660661         
    661662        objEnum = [self.linkedFilesSet objectEnumerator]; 
    …… 
    664665                SapphireFileSymLink *link = (SapphireFileSymLink *)obj; 
    665666                if(![link isFault]) 
    666                         [moc refreshObject:link.file mergeChanges:NO]; 
    667                 [moc refreshObject:link mergeChanges:NO]; 
     667                { 
     668                        [link.file faultOjbectInContext:moc]; 
     669                        [link faultOjbectInContext:moc]; 
     670                } 
    668671        } 
    669672         
    …… 
    673676                SapphireDirectorySymLink *link = (SapphireDirectorySymLink *)obj; 
    674677                if(![link isFault]) 
    675                         [link.directory refreshAllObjects]; 
    676                 [moc refreshObject:link mergeChanges:NO]; 
    677         } 
    678          
    679         [moc refreshObject:self mergeChanges:NO]; 
     678                { 
     679                        [link.directory faultOjbectInContext:moc]; 
     680                        [link faultOjbectInContext:moc]; 
     681                } 
     682        } 
     683         
     684        [self faultOjbectInContext:moc]; 
    680685} 
    681686 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireBasicDirectoryFunctions.h

    r598 r683  
    170170        delegate = newDelegate; 
    171171        if(delegate == nil) 
    172                 [self refreshAllObjects]; 
     172                [self faultAllObjects]; 
    173173} 
    174174 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireDirectory.h

    r670 r683  
    259259 
    260260/*! 
    261  * @brief Refresh all managed objects directly in this directory 
     261 * @brief Turn all managed objects directly in this directory into faults 
    262262 * 
    263263 * This function turns the managed objects into faults.  This means when they are next referenced, 
    264264 * they will refetch data from the store.  It is also used to allow core data to free memory 
    265265 */ 
    266 - (void)refreshAllObjects; 
     266- (void)faultAllObjects; 
    267267 
    268268/*! 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireEntityDirectory.m

    r626 r683  
    2222#import "CoreDataSupportFunctions.h" 
    2323#import "SapphireBasicDirectoryFunctionsImports.h" 
     24#import "NSManagedObject-Extensions.h" 
    2425 
    2526@implementation SapphireEntityDirectory 
    …… 
    147148} 
    148149 
    149 - (void)refreshAllObjects 
     150- (void)faultAllObjects 
    150151{ 
    151152        NSEnumerator *objEnum; 
    …… 
    155156        while((obj = [objEnum nextObject]) != nil) 
    156157        { 
    157                 [moc refreshObject:obj mergeChanges:NO]; 
     158                [obj faultOjbectInContext:moc]; 
    158159        } 
    159160} 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireFilteredFileDirectory.m

    r620 r683  
    2323#import "SapphireBasicDirectoryFunctionsImports.h" 
    2424#import "SapphireFileSorter.h" 
     25#import "NSManagedObject-Extensions.h" 
    2526 
    2627@implementation SapphireFilteredFileDirectory 
    …… 
    170171} 
    171172 
    172 - (void)refreshAllObjects 
     173- (void)faultAllObjects 
    173174{ 
    174175        NSEnumerator *objEnum; 
    …… 
    178179        while((obj = [objEnum nextObject]) != nil) 
    179180        { 
    180                 [moc refreshObject:obj mergeChanges:NO]; 
     181                [obj faultOjbectInContext:moc]; 
    181182        } 
    182183} 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMovieCategories.m

    r620 r683  
    2323#import "SapphireObjectDirectory.h" 
    2424#import "SapphireBasicDirectoryFunctionsImports.h" 
     25#import "NSManagedObject-Extensions.h" 
    2526 
    2627@implementation SapphireMovieCategories 
    …… 
    109110} 
    110111 
    111 - (void)refreshAllObjects 
     112- (void)faultAllObjects 
    112113{ 
    113         [[movie managedObjectContext] refreshObject:movie mergeChanges:NO]; 
     114        [movie faultOjbectInContext:[movie managedObjectContext]]; 
    114115} 
    115116 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireMovieDirectory.m

    r626 r683  
    215215} 
    216216 
    217 - (void)refreshAllObjects 
     217- (void)faultAllObjects 
    218218{ 
    219219} 

  • branches/CoreData/SapphireFrappliance/MetaData/Support/SapphireObjectDirectory.m

    r620 r683  
    2222#import "SapphireCategoryDirectory.h" 
    2323#import "SapphireBasicDirectoryFunctionsImports.h" 
     24#import "NSManagedObject-Extensions.h" 
    2425 
    2526@implementation SapphireObjectDirectory 
    …… 
    110111} 
    111112 
    112 - (void)refreshAllObjects 
     113- (void)faultAllObjects 
    113114{ 
    114         [[containingDirectory managedObjectContext] refreshObject:containingDirectory mergeChanges:NO]; 
     115        [containingDirectory faultOjbectInContext:[containingDirectory managedObjectContext]]; 
    115116} 
    116117 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.h

    r650 r683  
    119119        int                                                             collectionIndex;                /*!< @brief The current index in the directories*/ 
    120120        NSMutableArray                                  *importItems;                   /*!< @brief The items remaining to import*/ 
     121        NSArray                                                 *allItems;                              /*!< @brief The list of all items imported*/ 
    121122        NSMutableSet                                    *skipSet;                               /*!< @brief The directories to skip*/ 
    122123        NSTimer                                                 *importTimer;                   /*!< @brief The timer to do the next import (so we don't freeze the UI)*/ 

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

    r658 r683  
    2929#import "NSString-Extensions.h" 
    3030#import "SapphireMetaDataSupport.h" 
     31#import "NSManagedObject-Extensions.h" 
    3132 
    3233@interface BRLayerController (compatounth) 
    …… 
    8889        [importer release]; 
    8990        [buttonTitle release]; 
     91        [allItems release]; 
    9092        [super dealloc]; 
    9193} 
    …… 
    234236                return; 
    235237        } 
     238        allItems = [importItems copy]; 
    236239        updated = 0 ; 
    237240        current = 0; 
    …… 
    323326                [SapphireMetaDataSupport save:moc]; 
    324327                 
    325                 NSEnumerator *colEnum = [collectionDirectories objectEnumerator]; 
    326                 SapphireCollectionDirectory *col; 
    327                 while((col = [colEnum nextObject]) != nil) 
    328                         [col.directory refreshAllObjects]; 
     328                NSManagedObject *obj; 
     329                NSEnumerator *objEnum = [allItems objectEnumerator]; 
     330                while((obj = [objEnum nextObject]) != nil) 
     331                        [obj faultOjbectInContext:moc]; 
    329332        } 
    330333        else 

  • branches/CoreData/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

    r653 r683  
    8888                F56B765E0C3837CE00E934AA /* SapphireShowChooser.m in Sources */ = {isa = PBXBuildFile; fileRef = F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */; }; 
    8989                F56B77D70C3858B400E934AA /* DefaultPreview.png in Resources */ = {isa = PBXBuildFile; fileRef = F56B77D60C3858B400E934AA /* DefaultPreview.png */; }; 
     90                F571B7AE0E9C360500B7FD9D /* NSManagedObject-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F571B7AD0E9C360500B7FD9D /* NSManagedObject-Extensions.m */; }; 
    9091                F59B29D10D9E8C6E002D5DBD /* NSArray-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FB82E30D18065F0018E4C9 /* NSArray-Extensions.m */; }; 
    9192                F59BB8CD0DF3B1A300EC11A2 /* _SapphireXMLMovieData.m in Sources */ = {isa = PBXBuildFile; fileRef = F59BB8C90DF3B1A300EC11A2 /* _SapphireXMLMovieData.m */; }; 
    …… 
    374375                F56B765D0C3837CE00E934AA /* SapphireShowChooser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireShowChooser.m; sourceTree = "<group>"; }; 
    375376                F56B77D60C3858B400E934AA /* DefaultPreview.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DefaultPreview.png; sourceTree = "<group>"; }; 
     377                F571B7AC0E9C360500B7FD9D /* NSManagedObject-Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObject-Extensions.h"; sourceTree = "<group>"; }; 
     378                F571B7AD0E9C360500B7FD9D /* NSManagedObject-Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObject-Extensions.m"; sourceTree = "<group>"; }; 
    376379                F59BB8C90DF3B1A300EC11A2 /* _SapphireXMLMovieData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _SapphireXMLMovieData.m; sourceTree = "<group>"; }; 
    377380                F59BB8CA0DF3B1A300EC11A2 /* _SapphireXMLMovieData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _SapphireXMLMovieData.h; sourceTree = "<group>"; }; 
    …… 
    752755                                FE076E3E0D0CCAA40053FF1A /* NSFileManager-Extensions.h */, 
    753756                                FE076E3F0D0CCAA40053FF1A /* NSFileManager-Extensions.m */, 
     757                                F571B7AC0E9C360500B7FD9D /* NSManagedObject-Extensions.h */, 
     758                                F571B7AD0E9C360500B7FD9D /* NSManagedObject-Extensions.m */, 
    754759                                F56B74D40C3753E300E934AA /* NSString-Extensions.h */, 
    755760                                F56B74D50C3753E300E934AA /* NSString-Extensions.m */, 
    …… 
    12631268                                F54A5FFA0E07089500F9827C /* SapphireFileSorter.m in Sources */, 
    12641269                                F54A60CC0E0860A200F9827C /* SapphireDisplayMenu.m in Sources */, 
     1270                                F571B7AE0E9C360500B7FD9D /* NSManagedObject-Extensions.m in Sources */, 
    12651271                        ); 
    12661272                        runOnlyForDeploymentPostprocessing = 0;