Changeset 4231

Timestamp:

Dec 20, 2007, 1:06:55 AM (14 years ago)

Author:

livings124

Message:

a little more streamlining

File:

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

trunk/macosx/Controller.m

@@ -1822 +1822 @@
     int downloading = 0, seeding = 0, paused = 0;
     NSString * filterType = [fDefaults stringForKey: @"Filter"];
-    BOOL filterDownload = [filterType isEqualToString: FILTER_DOWNLOAD],
-        filterSeed = [filterType isEqualToString: FILTER_SEED],
-        filterPause = [filterType isEqualToString: FILTER_PAUSE];
-    
-    int groupFilter = [fDefaults integerForKey: @"FilterGroup"];
+    BOOL filterDownload = NO, filterSeed = NO, filterPause = NO, filterStatus = YES;
+    if ([filterType isEqualToString: FILTER_DOWNLOAD])
+        filterDownload = YES;
+    else if ([filterType isEqualToString: FILTER_SEED])
+        filterSeed = YES;
+    else if ([filterType isEqualToString: FILTER_PAUSE])
+        filterPause = YES;
+    else
+        filterStatus = NO;
+    
+    int groupFilterValue = [fDefaults integerForKey: @"FilterGroup"];
+    BOOL filterGroup = groupFilterValue != GROUP_FILTER_ALL_TAG;
+    
     NSString * searchString = [fSearchFilterField stringValue];
-    
-    BOOL filterStatus = filterDownload || filterSeed || filterPause,
-        filterGroup = groupFilter != GROUP_FILTER_ALL_TAG,
-        filterText = [searchString length] > 0;
-    
-    BOOL filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
+    BOOL filterText = [searchString length] > 0,
+        filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
     
     NSMutableIndexSet * indexes = [NSMutableIndexSet indexSet];
@@ -1870 +1874 @@
         //checkGroup
         if (filterGroup)
-            if ([torrent groupValue] != groupFilter)
+            if ([torrent groupValue] != groupFilterValue)
                 continue;