Changeset 1046

Timestamp:

Oct 31, 2006, 8:53:10 PM (16 years ago)

Author:

livings124

Message:

autoimport can now tell if not opening was a result of the torrent already existing or not being supported

File:

• trunk/macosx/Controller.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -1570 +1570 @@
         if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
         {
-            oldCount = [fTorrents count];
-            [self openFiles: [NSArray arrayWithObject: [path stringByAppendingPathComponent: file]]];
+            int error;
+            tr_torrent_t * tempTor = tr_torrentInit(fLib, [path UTF8String], 0, & error);
             
-            //import only actually happened if the torrent array is larger
-            if (oldCount < [fTorrents count])
+            if (tempTor)
             {
-                [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added",
-                    "Growl notification title") description: file
-                    notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
+                tr_torrentClose(fLib, tempTor);
+                
+                int count = [fTorrents count];
+                [self openFiles: [NSArray arrayWithObject: [path stringByAppendingPathComponent: file]]];
+                
+                //check if torrent was opened
+                if ([fTorrents count] > count)
+                {
+                    [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added",
+                        "Growl notification title") description: file
+                        notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
+                }
             }
-            else
-                [fAutoImportedNames removeObjectIdenticalTo: file]; //failed to import, possibly because not fully downloaded
+            else if (error != TR_EUNSUPPORTED || error != TR_EDUPLICATE)
+                [fAutoImportedNames removeObjectIdenticalTo: file]; //failed to import for unknown reason, so try again later
+            else;
         }
     }