Changeset 9958 for trunk/macosx/Controller.m

Timestamp:

Jan 17, 2010, 5:57:54 PM (12 years ago)

Author:

livings124

Message:

don't save the torrent file for magnetized transfers

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -1442 +1442 @@
 - (void) copyTorrentFileForTorrents: (NSMutableArray *) torrents
 {
-    if ([torrents count] <= 0)
+    if ([torrents count] == 0)
     {
         [torrents release];
@@ -1450 +1450 @@
     Torrent * torrent = [torrents objectAtIndex: 0];
     
-    //warn user if torrent file can't be found
-    if (![[NSFileManager defaultManager] fileExistsAtPath: [torrent torrentLocation]])
-    {
-        NSAlert * alert = [[NSAlert alloc] init];
-        [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file copy alert -> button")];
-        [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Copy of \"%@\" Cannot Be Created",
-                                "Torrent file copy alert -> title"), [torrent name]]];
-        [alert setInformativeText: [NSString stringWithFormat: 
-                NSLocalizedString(@"The torrent file (%@) cannot be found.", "Torrent file copy alert -> message"),
-                                    [torrent torrentLocation]]];
-        [alert setAlertStyle: NSWarningAlertStyle];
-        
-        [alert runModal];
-        [alert release];
-        
-        [torrents removeObjectAtIndex: 0];
-        [self copyTorrentFileForTorrents: torrents];
-    }
-    else
+    if (![torrent isMagnet] && [[NSFileManager defaultManager] fileExistsAtPath: [torrent torrentLocation]])
     {
         NSSavePanel * panel = [NSSavePanel savePanel];
@@ -1476 +1458 @@
         [panel beginSheetForDirectory: nil file: [torrent name] modalForWindow: fWindow modalDelegate: self
             didEndSelector: @selector(saveTorrentCopySheetClosed:returnCode:contextInfo:) contextInfo: torrents];
+    }
+    else
+    {
+        if (![torrent isMagnet])
+        {
+            NSAlert * alert = [[NSAlert alloc] init];
+            [alert addButtonWithTitle: NSLocalizedString(@"OK", "Torrent file copy alert -> button")];
+            [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Copy of \"%@\" Cannot Be Created",
+                                    "Torrent file copy alert -> title"), [torrent name]]];
+            [alert setInformativeText: [NSString stringWithFormat: 
+                    NSLocalizedString(@"The torrent file (%@) cannot be found.", "Torrent file copy alert -> message"),
+                                        [torrent torrentLocation]]];
+            [alert setAlertStyle: NSWarningAlertStyle];
+            
+            [alert runModal];
+            [alert release];
+        }
+        
+        [torrents removeObjectAtIndex: 0];
+        [self copyTorrentFileForTorrents: torrents];
     }
 }
@@ -3909 +3911 @@
     //enable copy torrent file item
     if (action == @selector(copyTorrentFiles:))
-        return canUseTable && [fTableView numberOfSelectedRows] > 0;
+    {
+        if (!canUseTable)
+            return NO;
+        
+        for (Torrent * torrent in [fTableView selectedTorrents])
+            if (![torrent isMagnet])
+                return YES;
+        return NO;
+    }
     
     //enable copy torrent file item