[1235] allow the adding of trackers with leading and trailing whitespace

This commit is contained in:
Mitchell Livingston 2008-09-06 13:37:33 +00:00
parent 55a01eea2c
commit fbea64b8ae
4 changed files with 20 additions and 0 deletions

View File

@ -311,6 +311,8 @@
{ {
NSString * tracker = (NSString *)object; NSString * tracker = (NSString *)object;
tracker = [tracker stringByTrimmingWhitespace];
if ([tracker rangeOfString: @"://"].location == NSNotFound) if ([tracker rangeOfString: @"://"].location == NSNotFound)
tracker = [@"http://" stringByAppendingString: tracker]; tracker = [@"http://" stringByAppendingString: tracker];

View File

@ -29,6 +29,8 @@
+ (NSString *) ellipsis; + (NSString *) ellipsis;
- (NSString *) stringByAppendingEllipsis; - (NSString *) stringByAppendingEllipsis;
- (NSString *) stringByTrimmingWhitespace;
+ (NSString *) stringForFileSize: (uint64_t) size; + (NSString *) stringForFileSize: (uint64_t) size;
+ (NSString *) stringForSpeed: (float) speed; + (NSString *) stringForSpeed: (float) speed;

View File

@ -38,6 +38,19 @@
return [self stringByAppendingString: [NSString ellipsis]]; return [self stringByAppendingString: [NSString ellipsis]];
} }
- (NSString *) stringByTrimmingWhitespace
{
NSString * newString = self;
while ([newString length] > 0 && [[NSCharacterSet whitespaceAndNewlineCharacterSet] characterIsMember:
[newString characterAtIndex: [newString length] - 1]])
newString = [newString substringToIndex: [newString length] - 1];
while ([newString length] > 0 && [[NSCharacterSet whitespaceAndNewlineCharacterSet] characterIsMember:
[newString characterAtIndex: 0]])
newString = [newString substringFromIndex: 1];
return newString;
}
+ (NSString *) stringForFileSize: (uint64_t) size + (NSString *) stringForFileSize: (uint64_t) size
{ {
if (size < 1024) if (size < 1024)

View File

@ -808,6 +808,9 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
i--; i--;
NSString * tracker = [trackers objectAtIndex: i]; NSString * tracker = [trackers objectAtIndex: i];
tracker = [tracker stringByTrimmingWhitespace];
if ([tracker rangeOfString: @"://"].location == NSNotFound) if ([tracker rangeOfString: @"://"].location == NSNotFound)
{ {
tracker = [@"http://" stringByAppendingString: tracker]; tracker = [@"http://" stringByAppendingString: tracker];