mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

get rid of duplicate address code, and display the tracker announce/scrape correctly

This commit is contained in:
Mitchell Livingston 2008-04-24 06:35:21 +00:00
parent 84515d4fb5
commit 59552d05e2
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
macosx/InfoWindowController.m
View File

@ -1046,7 +1046,7 @@ typedef enum
Torrent * torrent = [fTorrents objectAtIndex: 0]; Torrent * torrent = [fTorrents objectAtIndex: 0];
[fTrackerField setStringValue: [torrent trackerAddress]]; [fTrackerField setStringValue: [torrent trackerAddressAnnounce]];
NSString * location = [torrent dataLocation]; NSString * location = [torrent dataLocation];
[fDataLocationField setStringValue: [location stringByAbbreviatingWithTildeInPath]]; [fDataLocationField setStringValue: [location stringByAbbreviatingWithTildeInPath]];
@ -1129,7 +1129,7 @@ typedef enum
Torrent * torrent = [fTorrents objectAtIndex: 0]; Torrent * torrent = [fTorrents objectAtIndex: 0];
//announce fields //announce fields
NSString * announceAddress = [[torrent trackerAddress] stringByAppendingString: [torrent trackerAddressAnnounce]]; NSString * announceAddress = [torrent trackerAddressAnnounce];
[fAnnounceAddressField setStringValue: announceAddress]; [fAnnounceAddressField setStringValue: announceAddress];
[fAnnounceAddressField setToolTip: announceAddress]; [fAnnounceAddressField setToolTip: announceAddress];
@ -1144,10 +1144,9 @@ typedef enum
[fAnnounceNextField setStringValue: announceNext > 0 ? [NSString timeString: announceNext showSeconds: YES] : @""]; [fAnnounceNextField setStringValue: announceNext > 0 ? [NSString timeString: announceNext showSeconds: YES] : @""];
//scrape fields //scrape fields
NSString * scrapeAddressTail; NSString * scrapeAddress;
if ((scrapeAddressTail = [torrent trackerAddressScrape])) if ((scrapeAddress = [torrent trackerAddressScrape]))
{ {
NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: scrapeAddressTail];
[fScrapeAddressField setStringValue: scrapeAddress]; [fScrapeAddressField setStringValue: scrapeAddress];
[fScrapeAddressField setToolTip: scrapeAddress]; [fScrapeAddressField setToolTip: scrapeAddress];
} }

1
macosx/Torrent.h
View File

@ -139,7 +139,6 @@ typedef enum
- (uint64_t) size; - (uint64_t) size;
- (uint64_t) sizeLeft; - (uint64_t) sizeLeft;
- (NSString *) trackerAddress;
- (NSString *) trackerAddressAnnounce; - (NSString *) trackerAddressAnnounce;
- (NSDate *) lastAnnounceTime; - (NSDate *) lastAnnounceTime;
- (int) nextAnnounceTime; - (int) nextAnnounceTime;

6
macosx/Torrent.m
View File

@ -718,12 +718,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return fStat->leftUntilDone; return fStat->leftUntilDone;
} }
- (NSString *) trackerAddress
{
return [NSString stringWithUTF8String: fStat->tracker->announce];
}
#warning now redundant
- (NSString *) trackerAddressAnnounce - (NSString *) trackerAddressAnnounce
{ {
return [NSString stringWithUTF8String: fStat->tracker->announce]; return [NSString stringWithUTF8String: fStat->tracker->announce];