Changeset 7318

Timestamp:

Dec 8, 2008, 4:11:08 AM (13 years ago)

Author:

livings124

Message:

auto-group considers all trackers

Location:

trunk/macosx

Files:

• GroupsController.m (modified) (2 diffs)
• GroupsPrefsController.m (modified) (1 diff)

trunk/macosx/GroupsController.m

@@ -443 +443 @@
     while ((rule = [iterator nextObject]))
     {
-        NSString * type = [rule objectAtIndex: 0], * place = [rule objectAtIndex: 1], * match = [rule objectAtIndex: 2],
-                * value = nil;
+        NSString * type = [rule objectAtIndex: 0], * place = [rule objectAtIndex: 1], * givenValue = [rule objectAtIndex: 2];
+        NSArray * values;
         if ([type isEqualToString: @"title"])
-            value = [torrent name];
+            values = [NSArray arrayWithObject: [torrent name]];
         else if ([type isEqualToString: @"tracker"])
-        {
-            #warning consider all trackers
-            value = [torrent trackerAddressAnnounce];
-        }
+            values = [torrent allTrackers: NO];
         else
             continue;
@@ -458 +455 @@
         if ([place isEqualToString: @"ends"])
             options += NSBackwardsSearch;
-        
-        NSRange result = [value rangeOfString: match options: options];
-        if ([place isEqualToString: @"begins"])
+        BOOL match = NO;
+        
+        NSEnumerator * enumerator = [values objectEnumerator];
+        NSString * value;
+        while (!match && (value = [enumerator nextObject]))
         {
-            if (result.location != 0)
-                return NO;
+            NSRange result = [value rangeOfString: givenValue options: options];
+            if ([place isEqualToString: @"begins"])
+            {
+                if (result.location == 0)
+                    match = YES;
+            }
+            else if ([place isEqualToString: @"contains"])
+            {
+                if (result.location != NSNotFound)
+                    match = YES;
+            }
+            else if ([place isEqualToString: @"ends"])
+            {
+                if (NSMaxRange(result) == [value length])
+                    match = YES;
+            }
+            else
+                break;
         }
-        else if ([place isEqualToString: @"contains"])
-        {
-            if (result.location == NSNotFound)
-                return NO;
-        }
-        else if ([place isEqualToString: @"ends"])
-        {
-            if (NSMaxRange(result) == [value length])
-                return NO;
-        }
-        else
-            continue;
+        
+        if (!match)
+            return NO;
     }
     return YES;

trunk/macosx/GroupsPrefsController.m

@@ -227 +227 @@
         [[GroupsController groups] setCustomDownloadLocation: path forIndex: index];
         [[GroupsController groups] setUsesCustomDownloadLocation: YES forIndex: index];
-        [self updateSelectedGroup]; // update the popup's icon/title
+        [self updateSelectedGroup]; //update the popup's icon/title
     }
     else if (!path)