Changeset 1767

Timestamp:

Apr 20, 2007, 11:51:15 PM (15 years ago)

Author:

livings124

Message:

expand the last commit a bit so that ratio is calculated with the actual downloaded amount if amount downloaded in T is 0. This should eliminate ever showing infinity for ratio.

Location:

trunk

Files:

• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/StringAdditions.m (modified) (1 diff)
• macosx/Torrent.m (modified) (2 diffs)

trunk/libtransmission/torrent.c

@@ -462 +462 @@
     if( s->downloaded == 0 )
     {
-        //if seeding without ever downloading, calculate ratio from total size
-        if( s->progress >= 1.0 )
-        {
-            s->ratio = (float)s->uploaded / (float)inf->totalSize;
+        //if some is downloaded without a downloaded value, calculate ratio from total size
+        if( s->progress > 0.0 )
+        {
+            s->ratio = (float)s->uploaded / ((float)inf->totalSize * s->progress);
         }
         else
         {
-            s->ratio = s->uploaded == 0 ? TR_RATIO_NA : TR_RATIO_INF;
+            s->ratio = TR_RATIO_NA;
         }
     }

trunk/libtransmission/transmission.h

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

trunk/macosx/StringAdditions.m

@@ -106 +106 @@
     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");
+    else;
     
     if (ratio < 10.0)

trunk/macosx/Torrent.m

@@ -290 +290 @@
     
     //check to stop for ratio
-    float stopRatio, ratio;
+    float stopRatio;
     if ([self isSeeding] && (stopRatio = [self actualStopRatio]) != INVALID
-                        && ((ratio = [self ratio]) >= stopRatio || ratio == TR_RATIO_INF))
+                        && [self ratio] >= stopRatio)
     {
         [self stopTransfer];
@@ -1257 +1257 @@
 - (NSNumber *) ratioSortKey
 {
-    float ratio = [self ratio];
-    if (ratio == TR_RATIO_INF)
-        return [NSNumber numberWithInt: 999999999]; //this should hopefully be big enough
-    else
-        return [NSNumber numberWithFloat: [self ratio]];
+    return [NSNumber numberWithFloat: [self ratio]];
 }