Changeset 9209

Timestamp:

Sep 28, 2009, 2:13:20 PM (13 years ago)

Author:

livings124

Message:

don't use a NSCache until we go 10.6-only

Location:

trunk/macosx

Files:

• TrackerCell.m (modified) (3 diffs)
• TrackerNode.h (modified) (1 diff)
• TrackerNode.m (modified) (1 diff)

trunk/macosx/TrackerCell.m

@@ -52 +52 @@
 
 //make the favicons accessible to all tracker cells
-NSCache * fTrackerIconCache;
-NSMutableDictionary * fTrackerIconCacheLeopard;
+#warning make NSCache when 10.6-only
+NSMutableDictionary * fTrackerIconCache;
 NSMutableSet * fTrackerIconLoading;
 
 + (void) initialize
 {
-    if ([NSApp isOnSnowLeopardOrBetter])
-        fTrackerIconCache = [[NSCache alloc] init];
-    else
-        fTrackerIconCacheLeopard = [[NSMutableDictionary alloc] init];
+    fTrackerIconCache = [[NSMutableDictionary alloc] init];
     fTrackerIconLoading = [[NSMutableSet alloc] init];
 }
@@ -165 +162 @@
         baseAddress = [NSString stringWithFormat: @"http://%@", [hostComponents lastObject]];
     
-    id icon = [NSApp isOnSnowLeopardOrBetter] ? [fTrackerIconCache objectForKey: baseAddress]
-                                            : [fTrackerIconCacheLeopard objectForKey: baseAddress];
+    id icon = [fTrackerIconCache objectForKey: baseAddress];
     if (!icon && ![fTrackerIconLoading containsObject: baseAddress])
     {
@@ -189 +185 @@
     if (icon)
     {
-        [NSApp isOnSnowLeopardOrBetter] ? [fTrackerIconCache setObject: icon forKey: baseAddress]
-                                        : [fTrackerIconCacheLeopard setObject: icon forKey: baseAddress];
+        [fTrackerIconCache setObject: icon forKey: baseAddress];
         [icon release];
     }
     else
-    {
-        [NSApp isOnSnowLeopardOrBetter] ? [fTrackerIconCache setObject: [NSNull null] forKey: baseAddress]
-                                        : [fTrackerIconCacheLeopard setObject: [NSNull null] forKey: baseAddress];
-    }
+        [fTrackerIconCache setObject: [NSNull null] forKey: baseAddress];
     
     [fTrackerIconLoading removeObject: baseAddress];

trunk/macosx/TrackerNode.h

@@ -36 +36 @@
 - (NSString *) fullAnnounceAddress;
 
+- (NSInteger) totalSeeders;
+- (NSInteger) totalLeechers;
+- (NSInteger) totalDownloaded;
+
 - (NSString *) lastAnnounceStatusString;
 - (NSString *) nextAnnounceStatusString;

trunk/macosx/TrackerNode.m

@@ -53 +53 @@
 {
     return [NSString stringWithUTF8String: fStat.announce];
+}
+
+- (NSInteger) totalSeeders
+{
+    return fStat.seederCount;
+}
+
+- (NSInteger) totalLeechers
+{
+    return fStat.leecherCount;
+}
+
+- (NSInteger) totalDownloaded
+{
+    return fStat.downloadCount;
 }