Changeset 10125 for trunk/macosx/InfoWindowController.m

Timestamp:

Feb 7, 2010, 1:51:45 AM (13 years ago)

Author:

livings124

Message:

retrieve peers and webseeds in a single loop

File:

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

trunk/macosx/InfoWindowController.m

@@ -1266 +1266 @@
             
             [fTrackerTable setTrackers: nil];
+            [fTrackerTable deselectAll: self];
             [fTrackerTable reloadData];
         }
@@ -1555 +1556 @@
         [fPeers removeAllObjects];
     
+    if (!fWebSeeds)
+        fWebSeeds = [[NSMutableArray alloc] init];
+    else
+        [fWebSeeds removeAllObjects];
+    
     NSUInteger known = 0, connected = 0, tracker = 0, incoming = 0, cache = 0, pex = 0, dht = 0, ltep = 0,
                 toUs = 0, fromUs = 0;
@@ -1561 +1567 @@
     {
         [fPeers addObjectsFromArray: [torrent peers]];
+        [fWebSeeds addObjectsFromArray: [torrent webSeeds]];
         
         known += [torrent totalPeersKnown];
@@ -1583 +1590 @@
         }
     }
+    
+    [fPeers sortUsingDescriptors: [self peerSortDescriptors]];
+    [fPeerTable reloadData];
+    
+    [fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
+    [fWebSeedTable reloadData];
     
     NSString * knownString = [NSString stringWithFormat: NSLocalizedString(@"%d known", "Inspector -> Peers tab -> peers"), known];
@@ -1640 +1653 @@
         [fConnectedPeersField setStringValue: connectedText];
     }
-    
-    [fPeers sortUsingDescriptors: [self peerSortDescriptors]];
-    [fPeerTable reloadData];
-    
-    if (!fWebSeeds)
-        fWebSeeds = [[NSMutableArray alloc] init];
-    else
-        [fWebSeeds removeAllObjects];
-    
-    for (Torrent * torrent in fTorrents)
-        [fWebSeeds addObjectsFromArray: [torrent webSeeds]];
-    
-    [fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
-    [fWebSeedTable reloadData];
 }