Changeset 3207 for trunk/macosx/Torrent.m

Timestamp:

Sep 27, 2007, 9:02:25 PM (15 years ago)

Author:

livings124

Message:

clean up some of the new display string code

File:

• trunk/macosx/Torrent.m (modified) (5 diffs)

trunk/macosx/Torrent.m

@@ -780 +780 @@
 }
 
+- (NSString * ) etaString
+{
+    int eta = [self eta];
+    if (eta < 0)
+        return @"";
+    
+    NSString * timeString;
+    if (eta < 60)
+        return [NSString stringWithFormat: NSLocalizedString(@"%d sec", "Torrent -> remaining time"), eta];
+    else if (eta < 3600) //60 * 60
+        return [NSString stringWithFormat: NSLocalizedString(@"%d min %d sec", "Torrent -> remaining time"),
+                                                eta / 60, eta % 60];
+    else if (eta < 86400) //24 * 60 * 60
+        return [NSString stringWithFormat: NSLocalizedString(@"%d hr %d min", "Torrent -> remaining time"),
+                                                eta / 3600, (eta / 60) % 60];
+    else
+    {
+        int days = eta / 86400;
+        if (days > 1)
+            return [NSString stringWithFormat: NSLocalizedString(@"%d days %d hr", "Torrent -> remaining time"),
+                                                    days, (eta / 3600) % 24];
+        else
+            return [NSString stringWithFormat: NSLocalizedString(@"1 day %d hr", "Torrent -> remaining time"),
+                                                    (eta / 3600) % 24];
+    }
+}
+
 - (float) notAvailableDesired
 {//NSLog(@"not available %f", (float)(fStat->desiredSize - fStat->desiredAvailable) / [self size]);
@@ -916 +943 @@
     if (fStat->status == TR_STATUS_DOWNLOAD)
     {
-        #warning combine
         int eta = [self eta];
-        if (eta < 0)
+        if (eta >= 0)
+            string = [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"),
+                        [self etaString]];
+        else
             string = [string stringByAppendingString: NSLocalizedString(@" - remaining time unknown", "Torrent -> progress string")];
-        else
-        {
-            NSString * timeString;
-            if (eta < 60)
-                timeString = [NSString stringWithFormat: NSLocalizedString(@"%d sec", "Torrent -> remaining time"), eta];
-            else if (eta < 3600) //60 * 60
-                timeString = [NSString stringWithFormat: NSLocalizedString(@"%d min %d sec", "Torrent -> remaining time"),
-                                                        eta / 60, eta % 60];
-            else if (eta < 86400) //24 * 60 * 60
-                timeString = [NSString stringWithFormat: NSLocalizedString(@"%d hr %d min", "Torrent -> remaining time"),
-                                                        eta / 3600, (eta / 60) % 60];
-            else
-            {
-                int days = eta / 86400;
-                if (days > 1)
-                    timeString = [NSString stringWithFormat: NSLocalizedString(@"%d days %d hr", "Torrent -> remaining time"),
-                                                            days, (eta / 3600) % 24];
-                else
-                    timeString = [NSString stringWithFormat: NSLocalizedString(@"1 day %d hr", "Torrent -> remaining time"),
-                                                            (eta / 3600) % 24];
-            }
-            
-            string = [string stringByAppendingFormat: NSLocalizedString(@" - %@ remaining", "Torrent -> progress string"), timeString];
-        }
     }
     
@@ -1008 +1013 @@
     
     //create strings for error or stalled
-    #warning why fError
-    if (fError)
+    if ([self isError])
     {
         NSString * errorString = [self errorMessage];
@@ -1068 +1072 @@
                                     "Torrent -> status string"), 100.0 * fStat->recheckProgress];
             
-            fChecking = YES;
-            
             break;
 
@@ -1124 +1126 @@
         case TR_STATUS_DOWNLOAD:
             
-            eta = [self eta];
-            if (eta < 0)
-               string = NSLocalizedString(@"Unknown", "Torrent -> remaining time");
-            else
-            {
-                if (eta < 60)
-                    string = [NSString stringWithFormat: NSLocalizedString(@"%d sec", "Torrent -> remaining time"), eta];
-                else if (eta < 3600) //60 * 60
-                    string = [NSString stringWithFormat: NSLocalizedString(@"%d min %d sec", "Torrent -> remaining time"),
-                                                            eta / 60, eta % 60];
-                else if (eta < 86400) //24 * 60 * 60
-                    string = [NSString stringWithFormat: NSLocalizedString(@"%d hr %d min", "Torrent -> remaining time"),
-                                                            eta / 3600, (eta / 60) % 60];
-                else
-                {
-                                        days = eta / 86400;
-                    if (days > 1)
-                        string = [NSString stringWithFormat: NSLocalizedString(@"%d days %d hr", "Torrent -> remaining time"),
-                                                                days, (eta / 3600) % 24];
-                    else
-                        string = [NSString stringWithFormat: NSLocalizedString(@"1 day %d hr", "Torrent -> remaining time"),
-                                                                (eta / 3600) % 24];
-                }
-            }
+            string = [self eta] >= 0 ? [self etaString] : NSLocalizedString(@"Unknown", "Torrent -> remaining time");
             
             break;