Changeset 414

Show
Ignore:
Timestamp:
12/19/07 20:53:07 (1 year ago)
Author:
gbooker
Message:

Do collection directories by a set, removes the need to uniqueObjects n the array. Removed the category from the target, but still in the project in case it is useful later.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Sapphire.xcodeproj/project.pbxproj

    r412 r414  
    8181                F5EA8FCE0C30459400B1EC7D /* SapphireMarkMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = F5EA8FCD0C30459400B1EC7D /* SapphireMarkMenu.m */; }; 
    8282                F5EA91350C3063F500B1EC7D /* SapphireMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = F5EA91340C3063F500B1EC7D /* SapphireMedia.m */; }; 
    83                 F5FB82E40D18065F0018E4C9 /* NSArray-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FB82E30D18065F0018E4C9 /* NSArray-Extensions.m */; }; 
    8483                F5FDA1A20CE27CE700812CE5 /* BRLayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FD9F150CE27B9C00812CE5 /* BRLayerController.m */; }; 
    8584                F5FDA1A30CE27CF000812CE5 /* BackRow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38FAF9B50C0129E400853CFE /* BackRow.framework */; }; 
    …… 
    840839                                F5B418380D0B1EA100BDD361 /* SapphireImportHelper.m in Sources */, 
    841840                                FE076E410D0CCAA40053FF1A /* NSFileManager-Extensions.m in Sources */, 
    842                                 F5FB82E40D18065F0018E4C9 /* NSArray-Extensions.m in Sources */, 
    843841                        ); 
    844842                        runOnlyForDeploymentPostprocessing = 0; 

  • trunk/SapphireMetaData.m

    r411 r414  
    2727#import "SapphireMetaDataScanner.h" 
    2828#import "SapphireImportHelper.h" 
    29 #import "NSArray-Extensions.h" 
    3029 
    3130//Structure Specific Keys 
    …… 
    526525{ 
    527526        NSWorkspace *mywork = [NSWorkspace sharedWorkspace]; 
    528         NSMutableArray *ret = [[mywork mountedLocalVolumePaths] mutableCopy]; 
    529         [ret removeObject:@"/mnt"]; 
    530         [ret removeObject:@"/CIFS"]; 
    531         [ret removeObject:NSHomeDirectory()]; 
    532         [ret addObject:[NSHomeDirectory() stringByAppendingPathComponent:@"Movies"]]; 
    533         [ret addObjectsFromArray:collectionDirs]; 
    534         [ret uniqueObjects]; 
     527        NSMutableSet *colSet = [NSMutableSet setWithArray:[mywork mountedLocalVolumePaths]]; 
     528        [colSet removeObject:@"/mnt"]; 
     529        [colSet removeObject:@"/CIFS"]; 
     530        [colSet removeObject:NSHomeDirectory()]; 
     531        [colSet addObject:[NSHomeDirectory() stringByAppendingPathComponent:@"Movies"]]; 
     532        [colSet addObjectsFromArray:collectionDirs]; 
     533        NSMutableArray *ret = [[colSet allObjects] mutableCopy]; 
    535534        [ret sortUsingSelector:@selector(compare:)]; 
    536535        return [ret autorelease];