Changeset 3560 for trunk/macosx/Controller.m

Timestamp:

Oct 25, 2007, 8:14:24 PM (15 years ago)

Author:

livings124

Message:

filtering by a search string for tracker now checks all trackers in the announce-list

File:

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

trunk/macosx/Controller.m

@@ -1853 +1853 @@
         filtering = YES;
         
-        #warning check multiple trackers
         NSString * filterType = [fDefaults stringForKey: @"FilterSearchType"];
-        NSString * fullString;
         Torrent * torrent;
+        BOOL filterTracker = [filterType isEqualToString: FILTER_TYPE_TRACKER], remove;
         
         int i;
@@ -1862 +1861 @@
         {
             torrent = [tempTorrents objectAtIndex: i];
-            if ([filterType isEqualToString: FILTER_TYPE_TRACKER])
-                fullString = [torrent trackerAddress];
+            remove = NO;
+            
+            if (filterTracker)
+            {
+                NSEnumerator * trackerEnumerator = [[torrent allTrackers] objectEnumerator], * subTrackerEnumerator;
+                NSArray * subTrackers;
+                NSString * tracker;
+                while (!remove && (subTrackers = [trackerEnumerator nextObject]))
+                {
+                    subTrackerEnumerator = [subTrackers objectEnumerator];
+                    while ((tracker = [subTrackerEnumerator nextObject]))
+                    {
+                        if ([tracker rangeOfString: searchString options: NSCaseInsensitiveSearch].location == NSNotFound)
+                        {
+                            remove = YES;
+                            break;
+                        }
+                    }
+                }
+            }
             else
-                fullString = [torrent name];
+                remove = [[torrent name] rangeOfString: searchString options: NSCaseInsensitiveSearch].location == NSNotFound;
             
-            if ([fullString rangeOfString: searchString options: NSCaseInsensitiveSearch].location == NSNotFound)
+            if (remove)
                 [tempTorrents removeObjectAtIndex: i];
         }