Changeset 10190

Timestamp:

Feb 13, 2010, 4:30:47 AM (12 years ago)

Author:

livings124

Message:

add the ability to remove trackers when multiple torrents are selected

Location:

trunk/macosx

Files:

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

trunk/macosx/InfoWindowController.m

@@ -762 +762 @@
 {
     if ([notification object] == fTrackerTable)
-        [fTrackerAddRemoveControl setEnabled: [fTorrents count] == 1 && [fTrackerTable numberOfSelectedRows] > 0
-            forSegment: TRACKER_REMOVE_TAG];
+        [fTrackerAddRemoveControl setEnabled: [fTrackerTable numberOfSelectedRows] > 0 forSegment: TRACKER_REMOVE_TAG];
 }
 
@@ -1795 +1794 @@
 - (void) removeTrackers
 {
-    NSMutableIndexSet * removeIdentifiers = [NSMutableIndexSet indexSet];
+    NSMutableDictionary * removeIdentifiers = [NSMutableDictionary dictionary];
     
     NSIndexSet * selectedIndexes = [fTrackerTable selectedRowIndexes];
@@ -1805 +1804 @@
         {
             if (groupSelected || [selectedIndexes containsIndex: i])
-                [removeIdentifiers addIndex: [(TrackerNode *)object identifier]];
+            {
+                Torrent * torrent = [(TrackerNode *)object torrent];
+                NSMutableIndexSet * removeIndexSet;
+                if (!(removeIndexSet = [removeIdentifiers objectForKey: torrent]))
+                {
+                    removeIndexSet = [NSMutableIndexSet indexSet];
+                    [removeIdentifiers setObject: removeIndexSet forKey: torrent];
+                }
+                
+                [removeIndexSet addIndex: [(TrackerNode *)object identifier]];
+            }
         }
         else
@@ -1849 +1858 @@
     }
     
-    Torrent * torrent = [fTorrents objectAtIndex: 0];
-    [torrent removeTrackersWithIdentifiers: removeIdentifiers];
+    for (Torrent * torrent in removeIdentifiers)
+        [torrent removeTrackersWithIdentifiers: [removeIdentifiers objectForKey: torrent]];
     
     //reset table with either new or old value
     [fTrackers release];
-    fTrackers = [[torrent allTrackerStats] retain];
+    fTrackers = [[NSMutableArray alloc] init];
+    for (Torrent * torrent in fTorrents)
+        [fTrackers addObjectsFromArray: [torrent allTrackerStats]];
     
     [fTrackerTable setTrackers: fTrackers];

trunk/macosx/Torrent.h

@@ -30 +30 @@
 
 #warning uncomment
-@interface Torrent : NSObject //<QLPreviewItem>
+@interface Torrent : NSObject <NSCopying>//, QLPreviewItem>
 {
     tr_torrent * fHandle;

trunk/macosx/Torrent.m

@@ -198 +198 @@
 }
 
+- (id) copyWithZone: (NSZone *) zone
+{
+    return [self retain];
+}
+
 - (void) closeRemoveTorrent
 {
@@ -601 +606 @@
         }
         
-        TrackerNode * tracker = [[TrackerNode alloc] initWithTrackerStat: &stats[i]];
+        TrackerNode * tracker = [[TrackerNode alloc] initWithTrackerStat: &stats[i] torrent: self];
         [trackers addObject: tracker];
         [tracker release];

trunk/macosx/TrackerNode.h

@@ -26 +26 @@
 #import <transmission.h>
 
+@class Torrent;
+
 @interface TrackerNode : NSObject
 {
     tr_tracker_stat fStat;
+    
+    Torrent * fTorrent; //weak reference
 }
 
-- (id) initWithTrackerStat: (tr_tracker_stat *) stat;
+- (id) initWithTrackerStat: (tr_tracker_stat *) stat torrent: (Torrent *) torrent;
 
 - (NSString *) host;
@@ -39 +43 @@
 
 - (NSUInteger) identifier;
+
+- (Torrent *) torrent;
 
 - (NSInteger) totalSeeders;

trunk/macosx/TrackerNode.m

@@ -29 +29 @@
 @implementation TrackerNode
 
-- (id) initWithTrackerStat: (tr_tracker_stat *) stat
+- (id) initWithTrackerStat: (tr_tracker_stat *) stat torrent: (Torrent *) torrent
 {
     if ((self = [super init]))
     {
         fStat = *stat;
+        fTorrent = torrent;
     }
     
@@ -68 +69 @@
 {
     return fStat.id;
+}
+
+- (Torrent *) torrent
+{
+    return fTorrent;
 }