Changeset 2238

Timestamp:

Jun 29, 2007, 11:11:58 PM (15 years ago)

Author:

livings124

Message:

show a warning when trying to open a duplicate torrent

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (7 diffs)
• InfoWindowController.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -112 +112 @@
 - (void) openFilesAskWithDict:  (NSDictionary *) dictionary;
 - (void) openShowSheet:         (id) sender;
+
+- (void) duplicateOpenAlert: (NSString *) name;
+
 - (void) openURL:               (NSURL *) torrentURL;
 - (void) openURLEndSheet:       (id) sender;

trunk/macosx/Controller.m

@@ -704 +704 @@
     Torrent * torrent;
     NSString * torrentPath;
+    tr_info_t info;
     NSEnumerator * enumerator = [filenames objectEnumerator];
     while ((torrentPath = [enumerator nextObject]))
@@ -715 +716 @@
             location = [torrentPath stringByDeletingLastPathComponent];
         
+        if (tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info) == TR_EDUPLICATE)
+        {
+            [self duplicateOpenAlert: [NSString stringWithUTF8String: info.name]];
+            tr_metainfoFree(&info);
+            continue;
+        }
+        tr_metainfoFree(&info);
+        
         if (!(torrent = [[Torrent alloc] initWithPath: torrentPath location: location forceDeleteTorrent: delete lib: fLib]))
             continue;
@@ -777 +786 @@
     {
         torrentPath = [files objectAtIndex: 0];
-        if (tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info) == TR_OK)
+        canAdd = tr_torrentParse(fLib, [torrentPath UTF8String], NULL, &info);
+        if (canAdd == TR_OK)
             break;
+        else if (canAdd == TR_EDUPLICATE)
+            [self duplicateOpenAlert: [NSString stringWithUTF8String: info.name]];
+        else;
         
         tr_metainfoFree(&info);
@@ -817 +830 @@
     {
         NSString * torrentPath = [dictionary objectForKey: @"Path"];
-        Torrent * torrent = [[Torrent alloc] initWithPath: torrentPath
-                            location: [[openPanel filenames] objectAtIndex: 0]
+        Torrent * torrent = [[Torrent alloc] initWithPath: torrentPath location: [[openPanel filenames] objectAtIndex: 0]
                             forceDeleteTorrent: [[dictionary objectForKey: @"Delete"] boolValue] lib: fLib];
         
@@ -881 +893 @@
     
     [dictionary release];
+}
+
+- (void) duplicateOpenAlert: (NSString *) name
+{
+    NSAlert * alert = [[NSAlert alloc] init];
+    [alert addButtonWithTitle: NSLocalizedString(@"OK", "Open duplicate alert -> button")];
+    [alert setMessageText: [NSString stringWithFormat: NSLocalizedString(@"Transfer of \"%@\" is already running.",
+                            "Open duplicate alert -> title"), name]];
+    [alert setInformativeText:
+            NSLocalizedString(@"The torrent file cannot be opened because it is a duplicate of an already running transfer.",
+                            "Open duplicate alert -> message")];
+    [alert setAlertStyle: NSWarningAlertStyle];
+    
+    [alert runModal];
+    [alert release];
 }
 
@@ -1285 +1312 @@
     Torrent * torrent;
     while ((torrent = [enumerator nextObject]))
-    {
         [torrent resetCache];
-    }
+    
     #warning reset queue?
 }
@@ -2001 +2027 @@
     }
     
-    NSEnumerator * enumerator;
-    if (![[fDefaults stringForKey: @"DownloadChoice"] isEqualToString: @"Ask"])
-    {
-        enumerator = [newNames objectEnumerator];
-        int count;
-        while ((file = [enumerator nextObject]))
-        {
-            count = [fTorrents count];
+    BOOL ask = [[fDefaults stringForKey: @"DownloadChoice"] isEqualToString: @"Ask"];
+    
+    NSEnumerator * enumerator = [newNames objectEnumerator];
+    int canAdd, count;
+    while ((file = [enumerator nextObject]))
+    {
+        canAdd = tr_torrentParse(fLib, [file UTF8String], NULL, NULL);
+        if (canAdd == TR_OK)
+        {
+            if (!ask)
+                count = [fTorrents count];
             [self openFiles: [NSArray arrayWithObject: file]];
             
             //check if torrent was opened
-            if ([fTorrents count] > count)
+            if (!ask && [fTorrents count] > count)
                 [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added",
                     "Growl notification title") description: [file lastPathComponent]
                     notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
         }
-    }
-    else
-        [self openFiles: newNames];
-    
-    //check if an import fails because of an error so it can be tried again
-    enumerator = [newNames objectEnumerator];
-    while ((file = [enumerator nextObject]))
-        if (tr_torrentParse(fLib, [file UTF8String], NULL, NULL) == TR_EINVALID)
+        else if (canAdd == TR_EINVALID)
             [fAutoImportedNames removeObject: [file lastPathComponent]];
+        else;
+    }
     
     [newNames release];

trunk/macosx/InfoWindowController.m

@@ -952 +952 @@
 }
 
-#warning need?
 - (void) setFileOutlineHoverRowForEvent: (NSEvent *) event
 {