Changeset 4143

Timestamp:

Dec 13, 2007, 4:31:38 AM (14 years ago)

Author:

livings124

Message:

display the infinity symbol in stats for ratio when there is upload but no download

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• libtransmission/stats.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/NSStringAdditions.m (modified) (1 diff)
• macosx/StatusBarView.m (modified) (1 diff)

trunk/NEWS

@@ -12 +12 @@
    + Pieces Bar (return of Advanced Bar)
    + Availability Bar (overlay on regular bar)
-   + Leopard: Time Machine will ignore incomplete downloads
    + Display remaining time for seeding transfers
    + Sort by total activity
+   + Leopard: Time Machine will ignore incomplete downloads
    + Leopard: Fix bug where text fields would reject localized decimal values
 - GTK+:

trunk/libtransmission/stats.c

@@ -139 +139 @@
     const struct tr_stats_handle * stats = handle->sessionStats;
     *setme = stats->single;
-    setme->ratio = setme->downloadedBytes ? (double)setme->uploadedBytes / (double)setme->downloadedBytes : TR_RATIO_NA;
+    
+    setme->ratio = setme->downloadedBytes ? (double)setme->uploadedBytes / (double)setme->downloadedBytes
+                                            : ( setme->uploadedBytes ? TR_RATIO_INF : TR_RATIO_NA );
+    
     setme->secondsActive += ( time(NULL) - stats->startTime );
 }

trunk/libtransmission/transmission.h

@@ -700 +700 @@
 
 #define TR_RATIO_NA  -1
+#define TR_RATIO_INF -2
     float               ratio;
     

trunk/macosx/NSStringAdditions.m

@@ -98 +98 @@
     if (ratio == TR_RATIO_NA)
         return NSLocalizedString(@"N/A", "No Ratio");
+    else if (ratio == TR_RATIO_INF)
+        return [NSString stringWithUTF8String: "\xE2\x88\x9E"];
     else if (ratio < 0)
         return NSLocalizedString(@"error", "Ratio invalid");

trunk/macosx/StatusBarView.m

@@ -50 +50 @@
 - (void) setShowOnTiger: (BOOL) show
 {
-    fShow = [NSApp isOnLeopardOrBetter] || show;
+    fShow = show || [NSApp isOnLeopardOrBetter];
 }