Changeset 1309

Show
Ignore:
Timestamp:
08/08/10 14:20:25 (22 months ago)
Author:
gbooker
Message:

Don' t trash directories which are collections and only rescan directories which actually exist on the file-system.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireDirectoryMetaData.m

    r1299 r1309  
    421421        { 
    422422                [existingDirs removeObject:object]; 
    423                 [moc deleteObject:object]; 
     423                SapphireDirectoryMetaData *dir = (SapphireDirectoryMetaData *)object; 
     424                if(dir.collectionDirectory == nil) 
     425                        [moc deleteObject:object]; 
    424426                modified = YES; 
    425427        } 
    … …  
    465467        NSMutableArray *linkedDirs = [[self.linkedDirsSet allObjects] mutableCopy]; 
    466468         
    467         [self rescanDirWithExistingDirs:fetchedDirs files:fetchedFiles symDirs:linkedDirs symFiles:linkedFiles]; 
     469        if([[NSFileManager defaultManager] isDirectory:self.path]) 
     470                [self rescanDirWithExistingDirs:fetchedDirs files:fetchedFiles symDirs:linkedDirs symFiles:linkedFiles]; 
    468471         
    469472        NSMutableArray *allFiles = [fetchedFiles mutableCopy];