kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wrote dealloc for SpotlightPlaylistEntry. Still need to find large leak.

CQTexperiment
matthewleon 2008-03-08 23:47:29 +00:00
parent ed261fb51a
commit 2124066761
3 changed files with 525 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1039
Spotlight/SpotlightPanel.xib
View File

File diff suppressed because it is too large Load Diff

17
Spotlight/SpotlightPlaylistEntry.m
View File

@ -43,11 +43,7 @@ static NSDictionary *importKeys;
+ (SpotlightPlaylistEntry *)playlistEntryWithMetadataItem:(NSMetadataItem *)metadataItem + (SpotlightPlaylistEntry *)playlistEntryWithMetadataItem:(NSMetadataItem *)metadataItem
{ {
SpotlightPlaylistEntry *entry = [[[SpotlightPlaylistEntry alloc] init] autorelease]; SpotlightPlaylistEntry *entry = [[[SpotlightPlaylistEntry alloc]init]autorelease];
// Dictionary of the metadata values
NSDictionary *songAttributes =
[metadataItem valuesForAttributes:[importKeys allKeys]];
// loop through the keys we want to extract // loop through the keys we want to extract
for (NSString *mdKey in importKeys) { for (NSString *mdKey in importKeys) {
@ -55,7 +51,7 @@ static NSDictionary *importKeys;
// Just copy the object from metadata // Just copy the object from metadata
if ([importTarget isKindOfClass:[NSString class]]) if ([importTarget isKindOfClass:[NSString class]])
{ {
[entry setValue: [songAttributes objectForKey:mdKey] [entry setValue: [metadataItem valueForAttribute:mdKey]
forKey: importTarget]; forKey: importTarget];
} }
// Transform the value in metadata before copying it in // Transform the value in metadata before copying it in
@ -65,7 +61,7 @@ static NSDictionary *importKeys;
NSValueTransformer *transformer = NSValueTransformer *transformer =
[NSValueTransformer valueTransformerForName:[importTarget objectAtIndex:1]]; [NSValueTransformer valueTransformerForName:[importTarget objectAtIndex:1]];
id transformedValue = [transformer transformedValue: id transformedValue = [transformer transformedValue:
[songAttributes objectForKey:mdKey]]; [metadataItem valueForAttribute:mdKey]];
[entry setValue:transformedValue forKey: importKey]; [entry setValue:transformedValue forKey: importKey];
} }
// The importKeys dictionary contains something strange... // The importKeys dictionary contains something strange...
@ -85,6 +81,13 @@ static NSDictionary *importKeys;
return Nil; return Nil;
} }
- (void)dealloc
{
spotlightTrack = Nil;
length = Nil;
[super dealloc];
}
@synthesize length; @synthesize length;
@synthesize spotlightTrack; @synthesize spotlightTrack;

5
Spotlight/SpotlightWindowController.m
View File

@ -40,8 +40,6 @@ static NSPredicate * musicOnlyPredicate = nil;
NSValueTransformer *stringToSearchScopeTransformer = [[[StringToSearchScopeTransformer alloc]init]autorelease]; NSValueTransformer *stringToSearchScopeTransformer = [[[StringToSearchScopeTransformer alloc]init]autorelease];
[NSValueTransformer setValueTransformer:stringToSearchScopeTransformer forName:@"StringToSearchScopeTransformer"]; [NSValueTransformer setValueTransformer:stringToSearchScopeTransformer forName:@"StringToSearchScopeTransformer"];
[NSMetadataQuery exposeBinding:@"searchScopes"];
} }
- (void)registerDefaults - (void)registerDefaults
@ -237,7 +235,7 @@ static NSPredicate * musicOnlyPredicate = nil;
else else
{ {
NSString * wildcardString = [NSString stringWithFormat:@"*%@*", parsingString]; NSString * wildcardString = [NSString stringWithFormat:@"*%@*", parsingString];
NSPredicate * pred =[NSPredicate predicateWithFormat:@"(kMDItemTitle LIKE[cd] %@) OR (kMDItemAlbum LIKE[cd] %@) OR (kMDItemAuthors LIKE[cd] %@)", NSPredicate * pred = [NSPredicate predicateWithFormat:@"(kMDItemTitle LIKE[cd] %@) OR (kMDItemAlbum LIKE[cd] %@) OR (kMDItemAuthors LIKE[cd] %@)",
wildcardString, wildcardString, wildcardString]; wildcardString, wildcardString, wildcardString];
[subpredicates addObject: pred]; [subpredicates addObject: pred];
} }
@ -269,7 +267,6 @@ static NSPredicate * musicOnlyPredicate = nil;
{ {
self.query = nil; self.query = nil;
self.searchString = nil; self.searchString = nil;
[musicOnlyPredicate release];
[super dealloc]; [super dealloc];
} }