Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

small streamline of filter code

Browse Source
This commit is contained in:
Mitchell Livingston
2008-12-29 02:39:41 +00:00
parent ae61a1469d
commit 269b7d650e
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
macosx/Controller.m
View File

@@ -1806,7 +1806,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
- (void) sortTorrentsIgnoreSelected
{
NSString * sortType = [fDefaults stringForKey: @"Sort"];
BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
const BOOL asc = ![fDefaults boolForKey: @"SortReverse"];
NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"orderValue" ascending: asc] autorelease];
@@ -1885,7 +1885,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
{
//get all the torrents in the table
NSMutableArray * previousTorrents;
if ([fDisplayedTorrents count] > 0 && ![[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [Torrent class]])
if ([fDisplayedTorrents count] > 0 && [[fDisplayedTorrents objectAtIndex: 0] isKindOfClass: [TorrentGroup class]])
{
previousTorrents = [NSMutableArray array];
@@ -1918,14 +1918,11 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
BOOL filterText = [searchString length] > 0,
filterTracker = filterText && [[fDefaults stringForKey: @"FilterSearchType"] isEqualToString: FILTER_TYPE_TRACKER];
NSMutableIndexSet * indexes = [NSMutableIndexSet indexSet];
NSMutableArray * allTorrents = [NSMutableArray arrayWithCapacity: [fTorrents count]];
//get count of each type
NSInteger index = -1;
for (Torrent * torrent in fTorrents)
{
index++;
//check status
if ([torrent isActive] && ![torrent isCheckingWaiting])
{
@@ -1987,11 +1984,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
}
}
[indexes addIndex: index];
[allTorrents addObject: torrent];
}
NSArray * allTorrents = [fTorrents objectsAtIndexes: indexes];
//set button tooltips
[fNoFilterButton setCount: [fTorrents count]];
[fActiveFilterButton setCount: active];
@@ -2015,7 +2010,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[fDisplayedTorrents removeAllObjects];
NSSortDescriptor * groupDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"groupOrderValue" ascending: YES] autorelease];
allTorrents = [allTorrents sortedArrayUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
[allTorrents sortUsingDescriptors: [NSArray arrayWithObject: groupDescriptor]];
NSMutableArray * groupTorrents;
NSInteger lastGroupValue = -2, currentOldGroupIndex = 0;