Changeset 5004

Timestamp:

Feb 11, 2008, 12:16:47 AM (14 years ago)

Author:

livings124

Message:

insignificant filtering improvements

File:

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

trunk/macosx/Controller.m

@@ -1805 +1805 @@
     }
     else
-        previousTorrents = [NSMutableArray arrayWithArray: fDisplayedTorrents];
+        previousTorrents = fDisplayedTorrents;
     
     NSArray * selectedValues = [fTableView selectedValues];
@@ -1909 +1909 @@
     }
     
-    [fDisplayedTorrents setArray: [fTorrents objectsAtIndexes: indexes]];
+    NSArray * allTorrents = [fTorrents objectsAtIndexes: indexes];
     
     //set button tooltips
@@ -1919 +1919 @@
     
     //clear display cache for not-shown torrents
-    [previousTorrents removeObjectsInArray: fDisplayedTorrents];
+    [previousTorrents removeObjectsInArray: allTorrents];
     enumerator = [previousTorrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
@@ -1929 +1929 @@
     {
         NSSortDescriptor * groupDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"groupOrderValue" ascending: YES] autorelease];
-        [fDisplayedTorrents sortUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
+        allTorrents = [allTorrents sortedArrayUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
         
         NSMutableArray * groups = [NSMutableArray array], * groupTorrents;
         int oldGroupValue = -2;
-        for (i = 0; i < [fDisplayedTorrents count]; i++)
-        {
-            Torrent * torrent = [fDisplayedTorrents objectAtIndex: i];
+        for (i = 0; i < [allTorrents count]; i++)
+        {
+            Torrent * torrent = [allTorrents objectAtIndex: i];
             int groupValue = [torrent groupValue];
             if (groupValue != oldGroupValue)
@@ -1952 +1952 @@
         [fDisplayedTorrents setArray: groups];
     }
+    else
+        [fDisplayedTorrents setArray: allTorrents];
     
     //actually sort