Changeset 7521

Timestamp:

Dec 29, 2008, 2:39:41 AM (12 years ago)

Author:

livings124

Message:

small streamline of filter code

File:

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

trunk/macosx/Controller.m

@@ -1807 +1807 @@
 {
     NSString * sortType = [fDefaults stringForKey: @"Sort"];
-    BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
+    const BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
     
     NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"orderValue" ascending: asc] autorelease];
@@ -1886 +1886 @@
     //get all the torrents in the table
     NSMutableArray * previousTorrents;
-    if ([fDisplayedTorrents count] > 0 && ![[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [Torrent class]])
+    if ([fDisplayedTorrents count] > 0 && [[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [TorrentGroup class]])
     {
         previousTorrents = [NSMutableArray array];
@@ -1919 +1919 @@
         filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
     
-    NSMutableIndexSet * indexes = [NSMutableIndexSet indexSet];
+    NSMutableArray * allTorrents = [NSMutableArray arrayWithCapacity: [fTorrents count]];
     
     //get count of each type
-    NSInteger index = -1;
     for (Torrent * torrent in fTorrents)
     {
-        index++;
-        
         //check status
         if ([torrent isActive] && ![torrent isCheckingWaiting])
@@ -1988 +1985 @@
         }
         
-        [indexes addIndex: index];
-    }
-    
-    NSArray * allTorrents = [fTorrents objectsAtIndexes: indexes];
+        [allTorrents addObject: torrent];
+    }
     
     //set button tooltips
@@ -2016 +2011 @@
         
         NSSortDescriptor * groupDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"groupOrderValue" ascending: YES] autorelease];
-        allTorrents = [allTorrents sortedArrayUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
+        [allTorrents sortUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
         
         NSMutableArray * groupTorrents;