Changeset 5678

Timestamp:

Apr 24, 2008, 6:35:21 AM (15 years ago)

Author:

livings124

Message:

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

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (3 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (1 diff)

trunk/macosx/InfoWindowController.m

@@ -1047 +1047 @@
     Torrent * torrent = [fTorrents objectAtIndex: 0];
     
-    [fTrackerField setStringValue: [torrent trackerAddress]];
+    [fTrackerField setStringValue: [torrent trackerAddressAnnounce]];
     
     NSString * location = [torrent dataLocation];
@@ -1130 +1130 @@
     
     //announce fields
-    NSString * announceAddress = [[torrent trackerAddress] stringByAppendingString: [torrent trackerAddressAnnounce]];
+    NSString * announceAddress = [torrent trackerAddressAnnounce];
     [fAnnounceAddressField setStringValue: announceAddress];
     [fAnnounceAddressField setToolTip: announceAddress];
@@ -1145 +1145 @@
     
     //scrape fields
-    NSString * scrapeAddressTail;
-    if ((scrapeAddressTail = [torrent trackerAddressScrape]))
-    {
-        NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: scrapeAddressTail];
+    NSString * scrapeAddress;
+    if ((scrapeAddress = [torrent trackerAddressScrape]))
+    {
         [fScrapeAddressField setStringValue: scrapeAddress];
         [fScrapeAddressField setToolTip: scrapeAddress];

trunk/macosx/Torrent.h

@@ -140 +140 @@
 - (uint64_t) sizeLeft;
 
-- (NSString *) trackerAddress;
 - (NSString *) trackerAddressAnnounce;
 - (NSDate *) lastAnnounceTime;

trunk/macosx/Torrent.m

@@ -719 +719 @@
 }
 
-- (NSString *) trackerAddress
-{
-    return [NSString stringWithUTF8String: fStat->tracker->announce];
-}
-
-#warning now redundant
 - (NSString *) trackerAddressAnnounce
 {