Changeset 3216 for trunk/macosx/Torrent.m

Timestamp:

Sep 28, 2007, 1:42:28 PM (15 years ago)

Author:

livings124

Message:

combine some progress string code and release an attributes dictionary when it's not needed

File:

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

trunk/macosx/Torrent.m

@@ -955 +955 @@
                     string = [NSString stringWithFormat: NSLocalizedString(@"Downloading from %d of 1 peer",
                                                     "Torrent -> status string"), [self peersSendingToUs]];
+                
+                string = [string stringByAppendingFormat: @" - DL: %@, UL: %@",
+                            [NSString stringForSpeed: [self downloadRate]], [NSString stringForSpeed: [self uploadRate]]];
                 break;
 
@@ -965 +968 @@
                     string = [NSString stringWithFormat: NSLocalizedString(@"Seeding to %d of 1 peer", "Torrent -> status string"),
                                                     [self peersGettingFromUs]];
+                    
+                
+                string = [string stringByAppendingFormat: @" - UL: %@", [NSString stringForSpeed: [self uploadRate]]];
                 break;
 
@@ -977 +983 @@
         if (fStalled)
             string = [NSLocalizedString(@"Stalled, ", "Torrent -> status string") stringByAppendingString: string];
-    }
-    
-    if ([self isActive] && ![self isChecking])
-    {
-        NSString * stringToAppend;
-        if (![self allDownloaded])
-            stringToAppend = [NSString stringWithFormat: NSLocalizedString(@"DL: %@, ", "Torrent -> status string"),
-                                [NSString stringForSpeed: [self downloadRate]]];
-        else
-            stringToAppend = @"";
-        
-        string = [string stringByAppendingFormat: @" - %@UL: %@", stringToAppend, [NSString stringForSpeed: [self uploadRate]]];
     }