Changeset 3947

Timestamp:

Nov 23, 2007, 5:42:49 PM (14 years ago)

Author:

livings124

Message:

show remaining time for seeding torrents towards ratio

Location:

trunk/macosx

Files:

• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (3 diffs)

trunk/macosx/Torrent.h

@@ -154 +154 @@
 - (float) progressDone;
 - (float) progressLeft;
+
 - (int) eta;
-- (NSString * ) etaString;
+- (int) etaRatio;
+- (NSString * ) etaString: (int) eta;
 
 - (float) notAvailableDesired;

trunk/macosx/Torrent.m

@@ -724 +724 @@
 }
 
-- (NSString * ) etaString
-{
-    int eta = [self eta];
+- (int) etaRatio
+{
+    if (![self isSeeding])
+        return -1;
+    
+    float uploadRate = [self uploadRate];
+    if (uploadRate < 0.1)
+        return -1;
+    
+    float stopRatio = [self actualStopRatio], ratio = [self ratio];
+    if (stopRatio == INVALID || ratio >= stopRatio)
+        return -1;
+    
+    return (float)MAX([self downloadedTotal], [self haveVerified]) * (stopRatio - ratio) / uploadRate / 1024.0;
+}
+
+- (NSString * ) etaString: (int) eta
+{
     if (eta < 0)
         return @"";
@@ -869 +884 @@
     if (fStat->status == TR_STATUS_DOWNLOAD)
     {
-        string = [self eta] >= 0
-            ? [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"), [self etaString]]
+        int eta = [self eta];
+        string = eta >= 0 ? [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"),
+                                [self etaString: eta]]
             : [string stringByAppendingString: NSLocalizedString(@" - remaining time unknown", "Torrent -> progress string")];
     }
+    else if ([self isSeeding] && fRatioSetting != NSOffState)
+    {
+        int eta = [self etaRatio];
+        string = eta >= 0 ? [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"),
+                                [self etaString: eta]]
+            : [string stringByAppendingString: NSLocalizedString(@" - remaining time unknown", "Torrent -> progress string")];
+    }
+    else;
     
     return string;
@@ -1007 +1031 @@
     {
         case TR_STATUS_DOWNLOAD:
-            return [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
+            return [self eta] >= 0 ? [self etaString: [self eta]] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
         
         case TR_STATUS_SEED: