Changeset 10112 for trunk/macosx/InfoWindowController.m

Timestamp:

Feb 6, 2010, 3:42:18 PM (12 years ago)

Author:

livings124

Message:

slight efficiency improvements for peers and webseeds in the inspector

File:

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

trunk/macosx/InfoWindowController.m

@@ -736 +736 @@
         if (fPeers)
         {
-            NSArray * oldPeers = fPeers;
-            fPeers = [[fPeers sortedArrayUsingDescriptors: [self peerSortDescriptors]] retain];
-            [oldPeers release];
+            [fPeers sortUsingDescriptors: [self peerSortDescriptors]];
             [tableView reloadData];
         }
@@ -746 +744 @@
         if (fWebSeeds)
         {
-            NSArray * oldWebSeeds = fWebSeeds;
-            fWebSeeds = [[fWebSeeds sortedArrayUsingDescriptors: [fWebSeedTable sortDescriptors]] retain];
-            [oldWebSeeds release];
+            [fWebSeeds sortUsingDescriptors: [fWebSeedTable sortDescriptors]];
             [tableView reloadData];
         }
@@ -1258 +1254 @@
             [fPeersConnectField setStringValue: @""];
             [fPeersConnectLabel setEnabled: NO];
-        
+            
             [fPeers release];
             fPeers = nil;
@@ -1390 +1386 @@
     [fFileFilterField setStringValue: @""];
     
-    [fWebSeeds release];
-    fWebSeeds = nil;
-    
+    //reset webseeds here, since it might be hidden regardless of number selected
     BOOL hasWebSeeds = NO;
     for (Torrent * torrent in fTorrents)
+    {
         if ([torrent webSeedCount] > 0)
         {
@@ -1400 +1395 @@
             break;
         }
+    }
     
     if (!hasWebSeeds)
+    {
+        [fWebSeeds release];
+        fWebSeeds = nil;
         [fWebSeedTable reloadData];
+    }
     [self setWebSeedTableHidden: !hasWebSeeds animate: YES];
     
@@ -1547 +1547 @@
         return;
     
-    [fPeers release];
-    fPeers = [[NSMutableArray alloc] init];
+    if (!fPeers)
+        fPeers = [[NSMutableArray alloc] init];
+    else
+        [fPeers removeAllObjects];
     
     NSUInteger known = 0, connected = 0, tracker = 0, incoming = 0, cache = 0, pex = 0, dht = 0, ltep = 0,
@@ -1639 +1641 @@
     [fPeerTable reloadData];
     
-    [fWebSeeds release];
-    fWebSeeds = [[NSMutableArray alloc] init];
+    if (!fWebSeeds)
+        fWebSeeds = [[NSMutableArray alloc] init];
+    else
+        [fWebSeeds removeAllObjects];
     
     for (Torrent * torrent in fTorrents)