Changeset 13135

Timestamp:

Jan 7, 2012, 5:08:28 PM (11 years ago)

Author:

livings124

Message:

re-add code (removed in r13132) to remove previous piece information for no-longer-displayed torrents (in a fun new block way!)

File:

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

trunk/macosx/Controller.m

@@ -2032 +2032 @@
 - (void) applyFilter
 {
-    #warning re-add
-    //get all the torrents in the table
-    /*NSMutableArray * previousTorrents;
-    if ([fDisplayedTorrents count] > 0 && [[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [TorrentGroup class]])
-    {
-        previousTorrents = [NSMutableArray array];
-        
-        for (TorrentGroup * group in fDisplayedTorrents)
-            [previousTorrents addObjectsFromArray: [group torrents]];
-    }
-    else
-        previousTorrents = fDisplayedTorrents;*/
-    
     const BOOL onLion = [NSApp isOnLionOrBetter];
     
@@ -2159 +2146 @@
         [fFilterBar setCountAll: [fTorrents count] active: active downloading: downloading seeding: seeding paused: paused];
     
+    #warning could probably be merged with later code somehow
     //clear display cache for not-shown torrents
-    /*[previousTorrents removeObjectsInArray: allTorrents];
-    for (Torrent * torrent in previousTorrents)
-        [torrent setPreviousFinishedPieces: nil];*/
+    if ([fDisplayedTorrents count] > 0)
+    {
+        NSMutableIndexSet * unusedIndexesInAll = [NSMutableIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [allTorrents count])];
+        
+        //for each torrent, removes the previous piece info if it's not in allTorrents, and keeps track of which torrents we already found in allTorrents
+        void (^removePreviousFinishedPieces)(id, NSUInteger, BOOL *) = ^(id objDisplay, NSUInteger idx, BOOL * stop) {
+            const NSUInteger index = [allTorrents indexOfObjectAtIndexes: unusedIndexesInAll options: NSEnumerationConcurrent passingTest: ^BOOL(id objAll, NSUInteger idxAll, BOOL * stopAll) {
+                return objDisplay == objAll;
+            }];
+            
+            if (index == NSNotFound)
+                [(Torrent *)objDisplay setPreviousFinishedPieces: nil];
+            else
+                [unusedIndexesInAll removeIndex: index];
+        };
+        
+        if ([[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [TorrentGroup class]])
+            for (TorrentGroup * group in fDisplayedTorrents)
+                [[group torrents] enumerateObjectsWithOptions: NSEnumerationConcurrent usingBlock: removePreviousFinishedPieces];
+        else
+            [fDisplayedTorrents enumerateObjectsWithOptions: NSEnumerationConcurrent usingBlock: removePreviousFinishedPieces];
+    }
     
     BOOL beganUpdates = NO;