Changeset 10097

Timestamp:

Feb 5, 2010, 2:51:42 AM (12 years ago)

Author:

livings124

Message:

#2860 Display trackers for all selected torrents in the inspector

Location:

trunk/macosx

Files:

• DragOverlayWindow.m (modified) (2 diffs)
• InfoWindowController.m (modified) (12 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (2 diffs)
• TrackerTableView.m (modified) (3 diffs)

trunk/macosx/DragOverlayWindow.m

@@ -37 +37 @@
 - (id) initWithLib: (tr_session *) lib forWindow: (NSWindow *) window
 {
-    if ((self = ([super initWithContentRect: NSZeroRect styleMask: NSBorderlessWindowMask
+    if ((self = ([super initWithContentRect: [window frame] styleMask: NSBorderlessWindowMask
                     backing: NSBackingStoreBuffered defer: NO])))
     {
@@ -67 +67 @@
         
         [window addChildWindow: self ordered: NSWindowAbove];
-        [self setFrame: [window frame] display: NO];
         
         [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resizeWindow)

trunk/macosx/InfoWindowController.m

@@ -676 +676 @@
     }
     else if (tableView == fTrackerTable)
-    {
-        id item = [fTrackers objectAtIndex: row];
-        
-        if ([item isKindOfClass: [NSNumber class]])
-            return [NSString stringWithFormat: NSLocalizedString(@"Tier %d", "Inspector -> tracker table"), [item integerValue]];
-        else
-            return item;
-    }
+        return [fTrackers objectAtIndex: row];
     return nil;
 }
@@ -702 +695 @@
     if (tableView == fTrackerTable)
     {
-        if ([[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]])
+        if (![[fTrackers objectAtIndex: row] isKindOfClass: [TrackerNode class]] && [tableView editedRow] != row)
             return TRACKER_GROUP_SEPARATOR_HEIGHT;
     }
@@ -757 +750 @@
 {
     if ([notification object] == fTrackerTable)
-    {
-        NSInteger numSelected = [fTrackerTable numberOfSelectedRows];
-        [fTrackerAddRemoveControl setEnabled: numSelected > 0 forSegment: TRACKER_REMOVE_TAG];
-    }
+        [fTrackerAddRemoveControl setEnabled: [fTorrents count] == 1 && [fTrackerTable numberOfSelectedRows] > 0
+            forSegment: TRACKER_REMOVE_TAG];
 }
 
@@ -766 +757 @@
 {
     if (tableView == fTrackerTable)
-        return [[fTrackers objectAtIndex: row] isKindOfClass: [NSNumber class]];
+        return ![[fTrackers objectAtIndex: row] isKindOfClass: [TrackerNode class]] && [tableView editedRow] != row;
     return NO;
 }
@@ -858 +849 @@
     {
         id node = [fTrackers objectAtIndex: row];
-        if (![node isKindOfClass: [NSNumber class]])
+        if ([node isKindOfClass: [TrackerNode class]])
             return [(TrackerNode *)node fullAnnounceAddress];
     }
@@ -883 +874 @@
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackerStats] retain];
+    fTrackers = [[torrent allTrackerStatsWithTransferName: NO] retain];
     
     [fTrackerTable setTrackers: fTrackers];
@@ -1486 +1477 @@
 - (void) updateInfoTracker
 {
-    if ([fTorrents count] != 1)
+    if ([fTorrents count] == 0)
         return;
-    Torrent * torrent = [fTorrents objectAtIndex: 0];
     
     //get updated tracker stats
     if ([fTrackerTable editedRow] == -1)
     {
+        const BOOL multiple = [fTorrents count] != 1;
+        
         [fTrackers release];
-        fTrackers = [[torrent allTrackerStats] retain];
+        fTrackers = [[NSMutableArray alloc] init];
+        for (Torrent * torrent in fTorrents)
+            [fTrackers addObjectsFromArray: [torrent allTrackerStatsWithTransferName: multiple]];
         
         [fTrackerTable setTrackers: fTrackers];
@@ -1501 +1495 @@
     else
     {
+        NSAssert1([fTorrents count] == 1, @"Attempting to add tracker with %d transfers selected", [fTorrents count]);
+        
         if ([NSApp isOnSnowLeopardOrBetter])
         {
@@ -1507 +1503 @@
             
             [fTrackers release];
-            fTrackers = [[torrent allTrackerStats] retain];
+            fTrackers = [[[fTorrents objectAtIndex: 0] allTrackerStatsWithTransferName: NO] retain];
             [fTrackers addObjectsFromArray: tierAndTrackerBeingAdded];
             
@@ -1718 +1714 @@
     [[self window] makeKeyWindow];
     
-    [fTrackers addObject: [NSNumber numberWithInt: [(TrackerNode *)[fTrackers lastObject] tier]+1]];
+    [fTrackers addObject: NSLocalizedString(@"New Tier", "inspector -> add tracker")];
     [fTrackers addObject: @""];
     
@@ -1736 +1732 @@
     {
         id object = [fTrackers objectAtIndex: i];
-        if ([object isKindOfClass: [NSNumber class]])
+        if ([object isKindOfClass: [TrackerNode class]])
+        {
+            if (groupSelected || [selectedIndexes containsIndex: i])
+                [removeIdentifiers addIndex: [(TrackerNode *)object identifier]];
+        }
+        else
         {
             groupSelected = [selectedIndexes containsIndex: i];
             if (!groupSelected && i > [selectedIndexes lastIndex])
                 break;
-        }
-        else
-        {
-            if (groupSelected || [selectedIndexes containsIndex: i])
-                [removeIdentifiers addIndex: [(TrackerNode *)object identifier]];
         }
     }
@@ -1788 +1784 @@
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackerStats] retain];
+    fTrackers = [[torrent allTrackerStatsWithTransferName: NO] retain];
     
     [fTrackerTable setTrackers: fTrackers];

trunk/macosx/Torrent.h

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

trunk/macosx/Torrent.m

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

trunk/macosx/TrackerTableView.m

@@ -53 +53 @@
     {
         id item = [fTrackers objectAtIndex: i];
-        if ([item isKindOfClass: [NSNumber class]])
-        {
-            for (++i; i < [fTrackers count] && ![[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]; ++i)
+        if (![item isKindOfClass: [TrackerNode class]])
+        {
+            for (++i; i < [fTrackers count] && [[fTrackers objectAtIndex: i] isKindOfClass: [TrackerNode class]]; ++i)
                 [addresses addObject: [(TrackerNode *)[fTrackers objectAtIndex: i] fullAnnounceAddress]];
             --i;
@@ -142 +142 @@
     {
         //determine what the first row color should be
-        if (![[fTrackers objectAtIndex: rows.location] isKindOfClass: [NSNumber class]])
+        if ([[fTrackers objectAtIndex: rows.location] isKindOfClass: [TrackerNode class]] || [self editedRow] == rows.location)
         {
             for (NSInteger i = rows.location-1; i>=0; i--)
             {
-                if ([[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
+                if (![[fTrackers objectAtIndex: i] isKindOfClass: [TrackerNode class]])
                     break;
                 start = !start;
@@ -160 +160 @@
         for (i = rows.location; i < NSMaxRange(rows); i++)
         {
-            if ([[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]])
+            if (![[fTrackers objectAtIndex: i] isKindOfClass: [TrackerNode class]] && [self editedRow] != i)
             {
                 start = YES;