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

don't add tier separators when getting the tracker list when they aren't used

Browse Source
This commit is contained in:
Mitchell Livingston
2008-03-21 21:07:31 +00:00
parent 0a4e7bcfa3
commit ae2420422d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
macosx/Controller.m
View File

@@ -1885,12 +1885,11 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
if (filterTracker)
{
BOOL removeTextField = YES;
NSEnumerator * trackerEnumerator = [[torrent allTrackers] objectEnumerator];
NSEnumerator * trackerEnumerator = [[torrent allTrackers: NO] objectEnumerator];
id tracker;
while (tracker = [trackerEnumerator nextObject])
while ((tracker = [trackerEnumerator nextObject]))
{
if (![tracker isKindOfClass: [NSNumber class]]
&& [tracker rangeOfString: searchString options: NSCaseInsensitiveSearch].location != NSNotFound)
if ([tracker rangeOfString: searchString options: NSCaseInsensitiveSearch].location != NSNotFound)
{
removeTextField = NO;
break;

2
macosx/InfoWindowController.m
View File

@@ -423,7 +423,7 @@ typedef enum
//get trackers for table
[fTrackers release];
fTrackers = [[torrent allTrackers] retain];
fTrackers = [[torrent allTrackers: YES] retain];
}
//update stats and settings

2
macosx/Torrent.h
View File

@@ -151,7 +151,7 @@ typedef enum
- (int) nextScrapeTime;
- (NSString *) scrapeResponse;
- (NSArray *) allTrackers;
- (NSArray *) allTrackers: (BOOL) separators;
- (NSString *) comment;
- (NSString *) creator;

5
macosx/Torrent.m
View File

@@ -762,14 +762,15 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return [NSString stringWithUTF8String: fStat->tracker_stat.scrapeResponse];
}
- (NSArray *) allTrackers
- (NSArray *) allTrackers: (BOOL) separators
{
NSMutableArray * allTrackers = [NSMutableArray array];
int i, j;
for (i = 0; i < fInfo->trackerTiers; i++)
{
[allTrackers addObject: [NSNumber numberWithInt: i]];
if (separators)
[allTrackers addObject: [NSNumber numberWithInt: i]];
for (j = 0; j < fInfo->trackerList[i].count; j++)
[allTrackers addObject: [NSString stringWithFormat: @"http://%s:%d",
fInfo->trackerList[i].list[j].address, fInfo->trackerList[i].list[j].port]];