Changeset 9156

Timestamp:

Sep 21, 2009, 12:55:04 PM (13 years ago)

Author:

livings124

Message:

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

Location:

trunk/macosx

Files:

• InfoWindowController.h (modified) (1 diff)
• InfoWindowController.m (modified) (4 diffs)

trunk/macosx/InfoWindowController.h

@@ -79 +79 @@
     
     NSCache * fTrackerIconCache;
-    NSMutableSet * fTrackerIconLoaded;
+    NSMutableSet * fTrackerIconLoading;
     
     NSString * fInitialString;

trunk/macosx/InfoWindowController.m

@@ -196 +196 @@
     {
         fTrackerIconCache = [[NSCache alloc] init];
-        fTrackerIconLoaded = [[NSMutableSet alloc] init];
+        fTrackerIconLoading = [[NSMutableSet alloc] init];
     }
     else
@@ -239 +239 @@
     
     [fTrackerIconCache release];
-    [fTrackerIconLoaded release];
+    [fTrackerIconLoading release];
     
     [fPreviewPanel release];
@@ -930 +930 @@
             
             //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]]];
-            
-            NSImage * icon = nil;
-            if ([fTrackerIconLoaded containsObject: favIconUrl])
-                icon = [fTrackerIconCache objectForKey: favIconUrl];
-            else
-                [NSThread detachNewThreadSelector: @selector(loadTrackerIcon:) toTarget: self withObject: favIconUrl];
-            
-            return icon;
+                baseAddress = [NSString stringWithFormat: @"%@://%@", [address scheme], [hostComponents lastObject]];
+            
+            id icon = [fTrackerIconCache objectForKey: baseAddress];
+            if (!icon && ![fTrackerIconLoading containsObject: baseAddress])
+            {
+                [fTrackerIconLoading addObject: baseAddress];
+                [NSThread detachNewThreadSelector: @selector(loadTrackerIcon:) toTarget: self withObject: baseAddress];
+            }
+            
+            return (icon && icon != [NSNull null]) ? icon : nil;
         }
         if ([ident isEqualToString: @"Address"])
@@ -954 +954 @@
 }
 
-- (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];
 }