Merge pull request #956 from eddielee6/master

Fixed issue where search did not take into account the users preference for game names.
OpenEmu · Dec 31, 2013 · 442d434 · 442d434
2 parents 153fb71 + 0503fd4
commit 442d434
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/OpenEmu/OECollectionViewController.m b/OpenEmu/OECollectionViewController.m
@@ -545,7 +545,20 @@ - (void)viewDidAppear
 #pragma mark Toolbar Actions
 - (IBAction)search:(id)sender
 {
-    NSPredicate *pred = [[sender stringValue] isEqualToString:@""]?nil:[NSPredicate predicateWithFormat:@"name contains[cd] %@", [sender stringValue]];
+    NSString *searchTerm = [sender stringValue];
+    NSArray *tokens = [searchTerm componentsSeparatedByCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+
+    NSMutableArray *predarray = [NSMutableArray array];
+    for(NSString *token in tokens)
+    {
+        if(token.length > 0)
+        {
+            NSPredicate *predicate = [NSPredicate predicateWithFormat:@"displayName contains[cd] %@", token];
+            [predarray addObject:predicate];
+        }
+    }
+    NSPredicate *pred = [NSCompoundPredicate andPredicateWithSubpredicates:predarray];
+
     [gamesController setFilterPredicate:pred];
 
     [listView reloadData];