Changeset 9213

Timestamp:

Sep 28, 2009, 3:16:23 PM (13 years ago)

Author:

livings124

Message:

show N/A for peer counts when there hasn't been a scrape/announce yet

Location:

trunk

Files:

• libtransmission/announcer.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (3 diffs)
• macosx/TrackerCell.m (modified) (1 diff)

trunk/libtransmission/announcer.c

@@ -317 +317 @@
     tracker->scrape = tr_strdup( scrape );
     generateKeyParam( tracker->key_param, KEYLEN );
+    tracker->seederCount = -1;
+    tracker->leecherCount = -1;
+    tracker->downloadCount = -1;
     return tracker;
 }

trunk/libtransmission/transmission.h

@@ -1233 +1233 @@
 typedef struct
 {
-    /* how many downloads this tracker knows of */
+    /* how many downloads this tracker knows of (-1 means it does not know) */
     int downloadCount;
 
@@ -1294 +1294 @@
     time_t lastScrapeTime;
 
-    /* number of leechers this tracker knows of */
+    /* number of leechers this tracker knows of (-1 means it does not know) */
     int leecherCount;
 
@@ -1305 +1305 @@
     time_t nextScrapeTime;
 
-    /* number of seeders this tracker knows of */
+    /* number of seeders this tracker knows of (-1 means it does not know) */
     int seederCount;
 

trunk/macosx/TrackerCell.m

@@ -135 +135 @@
     
     //count strings
-    NSString * seederBaseString = [NSLocalizedString(@"Seeders", "tracker peer stat") stringByAppendingFormat: @": %d",
-                                    [node totalSeeders]];
+    NSString * seederBaseString = [NSLocalizedString(@"Seeders", "tracker peer stat") stringByAppendingFormat: @": %@",
+                                    [node totalSeeders] != -1 ? [NSString stringWithFormat: @"%d", [node totalSeeders]]
+                                                                : NSLocalizedString(@"N/A", "tracker peer stat")];
     NSAttributedString * seederString = [self attributedStatusWithString: seederBaseString color: statusColor];
     const NSRect seederRect = [self rectForCountWithString: seederString withAboveRect: nameRect inBounds: cellFrame];
     [seederString drawInRect: seederRect];
     
-    NSString * leecherBaseString = [NSLocalizedString(@"Leechers", "tracker peer stat") stringByAppendingFormat: @": %d",
-                                    [node totalLeechers]];
+    NSString * leecherBaseString = [NSLocalizedString(@"Leechers", "tracker peer stat") stringByAppendingFormat: @": %@",
+                                    [node totalLeechers] != -1 ? [NSString stringWithFormat: @"%d", [node totalLeechers]]
+                                                                : NSLocalizedString(@"N/A", "tracker peer stat")];
     NSAttributedString * leecherString = [self attributedStatusWithString: leecherBaseString color: statusColor];
     const NSRect leecherRect = [self rectForCountWithString: leecherString withAboveRect: seederRect inBounds: cellFrame];
     [leecherString drawInRect: leecherRect];
     
-    NSString * downloadedBaseString = [NSLocalizedString(@"Downloaded", "tracker peer stat") stringByAppendingFormat: @": %d",
-                                    [node totalDownloaded]];
+    NSString * downloadedBaseString = [NSLocalizedString(@"Downloaded", "tracker peer stat") stringByAppendingFormat: @": %@",
+                                            [node totalDownloaded] != -1 ? [NSString stringWithFormat: @"%d", [node totalDownloaded]]
+                                                                        : NSLocalizedString(@"N/A", "tracker peer stat")];
     NSAttributedString * downloadedString = [self attributedStatusWithString: downloadedBaseString color: statusColor];
     const NSRect downloadedRect = [self rectForCountWithString: downloadedString withAboveRect: leecherRect inBounds: cellFrame];