Changeset 1553

Timestamp:

Mar 8, 2007, 8:15:24 PM (16 years ago)

Author:

livings124

Message:

simplify peer string creation

File:

• branches/pex/macosx/InfoWindowController.m (modified) (1 diff)

branches/pex/macosx/InfoWindowController.m

@@ -386 +386 @@
     if (active)
     {
-        int left = [torrent totalPeers], count;
-        NSMutableString * connected = [NSMutableString stringWithFormat:
-                                        NSLocalizedString(@"%d Connected", "Inspector -> Peers tab -> peers"), left];
-        
-        if (left > 0)
+        int total = [torrent totalPeers];
+        NSString * connected = [NSString stringWithFormat:
+                                NSLocalizedString(@"%d Connected", "Inspector -> Peers tab -> peers"), total];
+        
+        if (total > 0)
         {
-            [connected appendString: @": "];
+            NSMutableArray * components = [NSMutableArray arrayWithCapacity: 4];
+            int count;
             if ((count = [torrent totalPeersTracker]) > 0)
-            {
-                [connected appendFormat: NSLocalizedString(@"%d tracker", "Inspector -> Peers tab -> peers"), count];
-                if ((left -= count) > 0)
-                    [connected appendString: @", "];
-            }
-            if (left > 0 && (count = [torrent totalPeersIncoming]) > 0)
-            {
-                [connected appendFormat: NSLocalizedString(@"%d incoming", "Inspector -> Peers tab -> peers"), count];
-                if ((left -= count) > 0)
-                    [connected appendString: @", "];
-            }
-            if (left > 0 && (count = [torrent totalPeersPex]) > 0)
-            {
-                [connected appendFormat: NSLocalizedString(@"%d PEX", "Inspector -> Peers tab -> peers"), count];
-                if ((left -= count) > 0)
-                    [connected appendString: @", "];
-            }
-            if (left > 0 && (count = [torrent totalPeersCache]) > 0)
-                [connected appendFormat: NSLocalizedString(@"%d cache", "Inspector -> Peers tab -> peers"), count];
+                [components addObject: [NSString stringWithFormat:
+                                        NSLocalizedString(@"%d tracker", "Inspector -> Peers tab -> peers"), count]];
+            if ((count = [torrent totalPeersIncoming]) > 0)
+                [components addObject: [NSString stringWithFormat:
+                                        NSLocalizedString(@"%d incoming", "Inspector -> Peers tab -> peers"), count]];
+            if ((count = [torrent totalPeersPex]) > 0)
+                [components addObject: [NSString stringWithFormat:
+                                        NSLocalizedString(@"%d PEX", "Inspector -> Peers tab -> peers"), count]];
+            if ((count = [torrent totalPeersCache]) > 0)
+                [components addObject: [NSString stringWithFormat:
+                                        NSLocalizedString(@"%d cache", "Inspector -> Peers tab -> peers"), count]];
+            
+            connected = [NSString stringWithFormat: @"%@: %@", connected, [components componentsJoinedByString: @", "]];
         }
+        
         [fConnectedPeersField setStringValue: connected];
     }