Changeset 7388

Timestamp:

Dec 14, 2008, 4:16:37 PM (12 years ago)

Author:

livings124

Message:

skip bad rules instead of asserting - this might help down the road if rules are removed/changed

File:

• trunk/macosx/GroupsController.m (modified) (4 diffs)

trunk/macosx/GroupsController.m

@@ -449 +449 @@
         return NO;
     
-    NSArray * rules = [self autoAssignRulesForIndex: index];
-    if (!rules || [rules count] == 0)
-        return NO;
-    
     const BOOL needAll = [self rulesNeedAllForIndex: index];
-    
-    NSEnumerator * iterator = [rules objectEnumerator];
+    BOOL anyPassed = NO;
+    
+    NSEnumerator * iterator = [[self autoAssignRulesForIndex: index] objectEnumerator];
     NSArray * rule = nil;
     while ((rule = [iterator nextObject]))
@@ -466 +463 @@
             values = [torrent allTrackers: NO];
         else
-            NSAssert1(NO, @"\"%@\" - unknown criteria", type);
-        
-        BOOL match = NO;
+            continue;
         
         NSStringCompareOptions options;
@@ -478 +473 @@
             options = NSCaseInsensitiveSearch;
         else
-            NSAssert2(NO, @"\"%@ - %@\" - unknown criteria", type, place);
+            continue;
+        
+        BOOL match = NO;
         
         NSEnumerator * enumerator = [values objectEnumerator];
         NSString * value;
-        while (!match && (value = [enumerator nextObject]))
+        while ((value = [enumerator nextObject]))
         {
             NSRange result = [value rangeOfString: givenValue options: options];
-            match = result.location != NSNotFound;
+            if (result.location != NSNotFound)
+            {
+                match = YES;
+                anyPassed = YES;
+                break;
+            }
         }
         
@@ -495 +497 @@
     }
     
-    return needAll;
+    return anyPassed && needAll;
 }