Changeset 10073 for trunk/macosx/Controller.m

Timestamp:

Feb 2, 2010, 1:47:22 AM (12 years ago)

Author:

livings124

Message:

#2720 When adding a duplicate magnet link, display an appropriate error message instead of a generic message

File:

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

trunk/macosx/Controller.m

@@ -946 +946 @@
 - (void) openMagnet: (NSString *) address
 {
+    tr_torrent * duplicateTorrent;
+    if ((duplicateTorrent = tr_torrentFindFromMagnetLink(fLib, [address UTF8String])))
+    {
+        const tr_info * info = tr_torrentInfo(duplicateTorrent);
+        NSString * name = (info != NULL && info->name != NULL) ? [NSString stringWithUTF8String: info->name] : nil;
+        [self duplicateOpenMagnetAlert: address transferName: name];
+        return;
+    }
+    
     Torrent * torrent;
     if (!(torrent = [[Torrent alloc] initWithMagnetAddress: address location: nil lib: fLib]))
@@ -1084 +1093 @@
     
     NSAlert * alert = [[NSAlert alloc] init];
-    [alert setMessageText: NSLocalizedString(@"Adding magnetized transfer failed", "Magnet link failed -> title")];
+    [alert setMessageText: NSLocalizedString(@"Adding magnetized transfer failed.", "Magnet link failed -> title")];
     [alert setInformativeText: [NSString stringWithFormat: NSLocalizedString(@"There was an error when adding the magnet link \"%@\"."
                                 " The transfer will not occur.", "Magnet link failed -> message"), address]];
@@ -1109 +1118 @@
     [alert setAlertStyle: NSWarningAlertStyle];
     [alert addButtonWithTitle: NSLocalizedString(@"OK", "Open duplicate alert -> button")];
+    [alert setShowsSuppressionButton: YES];
+    
+    [alert runModal];
+    if ([[alert suppressionButton] state])
+        [fDefaults setBool: NO forKey: @"WarningDuplicate"];
+    [alert release];
+}
+
+- (void) duplicateOpenMagnetAlert: (NSString *) address transferName: (NSString *) name
+{
+    if (![fDefaults boolForKey: @"WarningDuplicate"])
+        return;
+    
+    NSAlert * alert = [[NSAlert alloc] init];
+    if (name)
+        [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"A transfer of \"%@\" already exists.",
+                                "Open duplicate magnet alert -> title"), name]];
+    else
+        [alert setMessageText: NSLocalizedString(@"Magnet link is a duplicate of an existing transfer.",
+                                "Open duplicate magnet alert -> title")];
+    [alert setInformativeText: [NSString stringWithFormat:
+            NSLocalizedString(@"The magnet link  \"%@\" cannot be added because it is a duplicate of an already existing transfer.",
+                            "Open duplicate magnet alert -> message"), address]];
+    [alert setAlertStyle: NSWarningAlertStyle];
+    [alert addButtonWithTitle: NSLocalizedString(@"OK", "Open duplicate magnet alert -> button")];
     [alert setShowsSuppressionButton: YES];