mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-31 03:12:44 +00:00
Code Issues Releases Wiki Activity

better use of the cache object for tracker favicons, so if an icon is removed from the cache, it will be fetched again the next time it's needed

Browse source
This commit is contained in:
Mitchell Livingston 2009-09-21 12:55:04 +00:00
parent 0b39cd5f29
commit 8fd3fd8c2a
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macosx/InfoWindowController.h
View file

@ -78,7 +78,7 @@
* fPeersConnectField;
NSCache * fTrackerIconCache;
NSMutableSet * fTrackerIconLoaded;
NSMutableSet * fTrackerIconLoading;
NSString * fInitialString;

37
macosx/InfoWindowController.m
View file

@ -195,7 +195,7 @@ typedef enum
if ([NSApp isOnSnowLeopardOrBetter])
{
fTrackerIconCache = [[NSCache alloc] init];
fTrackerIconLoaded = [[NSMutableSet alloc] init];
fTrackerIconLoading = [[NSMutableSet alloc] init];
}
else
[fTrackerTable removeTableColumn: [fTrackerTable tableColumnWithIdentifier: @"Icon"]];
@ -238,7 +238,7 @@ typedef enum
[fWebSeedTableAnimation release];
[fTrackerIconCache release];
[fTrackerIconLoaded release];
[fTrackerIconLoading release];
[fPreviewPanel release];
@ -929,21 +929,21 @@ typedef enum
NSArray * hostComponents = [[address host] componentsSeparatedByString: @"."];
//let's try getting the favicon without using any subdomains
NSURL * favIconUrl;
NSString * baseAddress;
if ([hostComponents count] > 1)
favIconUrl = [NSURL URLWithString: [NSString stringWithFormat: @"%@://%@.%@/favicon.ico", [address scheme],
[hostComponents objectAtIndex: [hostComponents count] - 2], [hostComponents lastObject]]];
baseAddress = [NSString stringWithFormat: @"%@://%@.%@", [address scheme],
[hostComponents objectAtIndex: [hostComponents count] - 2], [hostComponents lastObject]];
else
favIconUrl = [NSURL URLWithString: [NSString stringWithFormat: @"%@://%@/favicon.ico", [address scheme],
[hostComponents lastObject]]];
baseAddress = [NSString stringWithFormat: @"%@://%@", [address scheme], [hostComponents lastObject]];
NSImage * icon = nil;
if ([fTrackerIconLoaded containsObject: favIconUrl])
icon = [fTrackerIconCache objectForKey: favIconUrl];
else
[NSThread detachNewThreadSelector: @selector(loadTrackerIcon:) toTarget: self withObject: favIconUrl];
id icon = [fTrackerIconCache objectForKey: baseAddress];
if (!icon && ![fTrackerIconLoading containsObject: baseAddress])
{
[fTrackerIconLoading addObject: baseAddress];
[NSThread detachNewThreadSelector: @selector(loadTrackerIcon:) toTarget: self withObject: baseAddress];
}
return icon;
return (icon && icon != [NSNull null]) ? icon : nil;
}
if ([ident isEqualToString: @"Address"])
return item;
@ -953,19 +953,22 @@ typedef enum
return nil;
}
- (void) loadTrackerIcon: (NSURL *) favIconUrl
- (void) loadTrackerIcon: (NSString *) baseAddress
{
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
[fTrackerIconLoaded addObject: favIconUrl];
NSURL * favIconUrl = [NSURL URLWithString: [baseAddress stringByAppendingString: @"/favicon.ico"]];
NSImage * icon = [[NSImage alloc] initWithContentsOfURL: favIconUrl];
if (icon)
{
[fTrackerIconCache setObject: icon forKey: favIconUrl];
[fTrackerIconCache setObject: icon forKey: baseAddress];
[icon release];
}
else
[fTrackerIconCache setObject: [NSNull null] forKey: baseAddress];
[fTrackerIconLoading removeObject: baseAddress];
[pool drain];
}