Changeset 9227

Timestamp:

Oct 1, 2009, 1:15:37 AM (13 years ago)

Author:

livings124

Message:

#2470 Pasting an address (or list of addresses) into the tracker list should add those trackers

Location:

trunk/macosx

Files:

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

trunk/macosx/InfoWindowController.m

@@ -379 +379 @@
         [self setWebSeedTableHidden: YES animate: YES];
         
+        [fTrackerTable setTorrent: nil];
+        
         [fTrackers release];
         fTrackers = nil;
@@ -468 +470 @@
         }
         
+        [fTrackerTable setTorrent: torrent];
         [fTrackerTable deselectAll: self];
         [fTrackerAddRemoveControl setEnabled: YES forSegment: TRACKER_ADD_TAG];
@@ -1720 +1723 @@
         if ([item isKindOfClass: [NSNumber class]])
         {
-            ++i;
-            for (NSInteger j = i; j < [fTrackers count] && ![[fTrackers objectAtIndex: j] isKindOfClass: [NSNumber class]]; ++j, ++i)
-                [addresses addObject: [[fTrackers objectAtIndex: j] fullAnnounceAddress]];
+            for (++i; i < [fTrackers count] && ![[fTrackers objectAtIndex: i] isKindOfClass: [NSNumber class]]; ++i)
+                [addresses addObject: [[fTrackers objectAtIndex: i] fullAnnounceAddress]];
             --i;
         }

trunk/macosx/Torrent.h

@@ -28 +28 @@
 
 @class FileListNode;
-
-#warning remove!?
-#define STAT_TIME_NONE -1
-#define STAT_TIME_NOW -2
 
 @interface Torrent : NSObject <QLPreviewItem>

trunk/macosx/Torrent.m

@@ -706 +706 @@
 }
 
+#warning check for duplicates?
 - (BOOL) addTrackerToNewTier: (NSString *) tracker
 {

trunk/macosx/TrackerTableView.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 
+@class Torrent;
+
 @interface TrackerTableView : NSTableView
 {
+    //weak references
+    Torrent * fTorrent;
     NSArray * fTrackers;
 }
 
+- (void) setTorrent: (Torrent *) torrent;
 - (void) setTrackers: (NSArray *) trackers;
 
-- (IBAction) copy: (id) sender;
+- (void) copy: (id) sender;
+- (void) paste: (id) sender;
 
 @end

trunk/macosx/TrackerTableView.m

@@ -25 +25 @@
 #import "TrackerTableView.h"
 #import "NSApplicationAdditions.h"
+#import "Torrent.h"
 #import "TrackerNode.h"
 
@@ -35 +36 @@
 }
 
+- (void) setTorrent: (Torrent *) torrent
+{
+    fTorrent = torrent;
+}
+
 - (void) setTrackers: (NSArray *) trackers
 {
@@ -40 +46 @@
 }
 
-- (IBAction) copy: (id) sender
+- (void) copy: (id) sender
 {
     NSMutableArray * addresses = [NSMutableArray arrayWithCapacity: [fTrackers count]];
@@ -72 +78 @@
 }
 
+- (void) paste: (id) sender
+{
+    if (!fTorrent)
+        return;
+    
+    if ([NSApp isOnSnowLeopardOrBetter])
+    {
+        NSArray * items = [[NSPasteboard generalPasteboard] readObjectsForClasses:
+                            [NSArray arrayWithObject: [NSString class]] options: nil];
+        NSAssert(items != nil, @"no string items to paste; should not be able to call this method");
+        
+        BOOL added = NO;
+        for (NSString * pbItem in items)
+        {
+            for (NSString * item in [pbItem componentsSeparatedByString: @"\n"])
+                if ([fTorrent addTrackerToNewTier: item])
+                    added = YES;
+        }
+        
+        //none added
+        if (!added)
+            NSBeep();
+    }
+}
+
 - (BOOL) validateMenuItem: (NSMenuItem *) menuItem
 {
@@ -78 +109 @@
     if (action == @selector(copy:))
         return [self numberOfSelectedRows] > 0;
+    
+    if (action == @selector(paste:))
+        return [[NSPasteboard generalPasteboard] canReadObjectForClasses: [NSArray arrayWithObject: [NSString class]] options: nil];
     
     return YES;