Changeset 10105

Timestamp:

Feb 6, 2010, 2:35:27 AM (12 years ago)

Author:

livings124

Message:

improve how tracker tiers are sent to the inspector code

Location:

trunk/macosx

Files:

• InfoWindowController.m (modified) (5 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TrackerNode.m (modified) (2 diffs)

trunk/macosx/InfoWindowController.m

@@ -676 +676 @@
     }
     else if (tableView == fTrackerTable)
-        return [fTrackers objectAtIndex: row];
+    {
+        id item = [fTrackers objectAtIndex: row]; 
+        
+        if (![item isKindOfClass: [TrackerNode class]])
+        {
+            NSString * tierString = [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"),
+                                        [[item objectForKey: @"Tier"] integerValue]];
+            if ([fTorrents count] > 1)
+                tierString = [tierString stringByAppendingFormat: @" - %@", [item objectForKey: @"Name"]];
+            return tierString;
+        }
+        else
+            return item;
+    }
     return nil;
 }
@@ -874 +887 @@
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackerStatsWithTransferName: NO] retain];
+    fTrackers = [[torrent allTrackerStats] retain];
     
     [fTrackerTable setTrackers: fTrackers];
@@ -1483 +1496 @@
     if ([fTrackerTable editedRow] == -1)
     {
-        const BOOL multiple = [fTorrents count] != 1;
-        
         [fTrackers release];
-        fTrackers = [[NSMutableArray alloc] init];
-        for (Torrent * torrent in fTorrents)
-            [fTrackers addObjectsFromArray: [torrent allTrackerStatsWithTransferName: multiple]];
+        
+        if ([fTorrents count] == 1)
+            fTrackers = [[[fTorrents objectAtIndex: 0] allTrackerStats] retain];
+        else
+        {
+            fTrackers = [[NSMutableArray alloc] init];
+            for (Torrent * torrent in fTorrents)
+                [fTrackers addObjectsFromArray: [torrent allTrackerStats]];
+        }
         
         [fTrackerTable setTrackers: fTrackers];
@@ -1503 +1520 @@
             
             [fTrackers release];
-            fTrackers = [[[fTorrents objectAtIndex: 0] allTrackerStatsWithTransferName: NO] retain];
+            fTrackers = [[[fTorrents objectAtIndex: 0] allTrackerStats] retain];
             [fTrackers addObjectsFromArray: tierAndTrackerBeingAdded];
             
@@ -1784 +1801 @@
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackerStatsWithTransferName: NO] retain];
+    fTrackers = [[torrent allTrackerStats] retain];
     
     [fTrackerTable setTrackers: fTrackers];

trunk/macosx/Torrent.h

@@ -129 +129 @@
 - (uint64_t) sizeLeft;
 
-- (NSMutableArray *) allTrackerStatsWithTransferName: (BOOL) includeTransferName;
+- (NSMutableArray *) allTrackerStats;
 - (NSArray *) allTrackersFlat; //used by GroupRules
 - (BOOL) addTrackerToNewTier: (NSString *) tracker;

trunk/macosx/Torrent.m

@@ -584 +584 @@
 }
 
-- (NSMutableArray *) allTrackerStatsWithTransferName: (BOOL) includeTransferName
+- (NSMutableArray *) allTrackerStats
 {
     int count;
@@ -596 +596 @@
         if (stats[i].tier != prevTier)
         {
-            NSString * tierString = [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"),
-                                        stats[i].tier];
-            if (includeTransferName)
-                tierString = [tierString stringByAppendingFormat: @" - %@", [self name]];
-            
-            [trackers addObject: tierString];
+            [trackers addObject: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInteger: stats[i].tier], @"Tier",
+                                    [self name], @"Name", nil]];
             prevTier = stats[i].tier;
         }

trunk/macosx/TrackerNode.m

@@ -105 +105 @@
     NSString * baseString;
     if (fStat.hasAnnounced && fStat.lastAnnounceTimedOut)
-    {
         baseString = [NSLocalizedString(@"Announce timed out", "Tracker last announce") stringByAppendingFormat: @": %@", dateString];
-    }
     else if (fStat.hasAnnounced && !fStat.lastAnnounceSucceeded)
     {
         baseString = NSLocalizedString(@"Announce error", "Tracker last announce");
+        
         NSString * errorString = [NSString stringWithUTF8String: fStat.lastAnnounceResult];
-        
         if ([errorString isEqualToString: @""])
             baseString = [baseString stringByAppendingFormat: @": %@", dateString];
@@ -182 +180 @@
     {
         baseString = NSLocalizedString(@"Scrape error", "Tracker last scrape");
+        
         NSString * errorString = [NSString stringWithUTF8String: fStat.lastScrapeResult];
-        
         if ([errorString isEqualToString: @""])
             baseString = [baseString stringByAppendingFormat: @": %@", dateString];