Changeset 1048 for trunk/macosx/Controller.m

Timestamp:

Oct 31, 2006, 9:21:47 PM (16 years ago)

Author:

livings124

Message:

only create temporary torrent if import failed

File:

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

trunk/macosx/Controller.m

@@ -510 +510 @@
     NSString * torrentPath;
     Torrent * torrent;
+    
+    //determine next file that can be opened
     do
     {
@@ -1570 +1572 @@
         if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
         {
-            int error;
-            tr_torrent_t * tempTor = tr_torrentInit(fLib, [[path stringByAppendingPathComponent: file] UTF8String],
-                                                        0, & error);
+            int count = [fTorrents count];
+            [self openFiles: [NSArray arrayWithObject: [path stringByAppendingPathComponent: file]]];
             
-            if (tempTor)
+            //check if torrent was opened
+            if ([fTorrents count] > count)
             {
-                tr_torrentClose(fLib, 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];
+            }
+            else
+            {
+                //create a temporary torrent to check if it didn't import because of error
+                int error;
+                tr_torrent_t * tempTor = tr_torrentInit(fLib, [[path stringByAppendingPathComponent: file] UTF8String],
+                                                    0, & error);
                 
-                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];
-                }
+                if (tempTor)
+                    tr_torrentClose(fLib, tempTor);
+                else if (error != TR_EUNSUPPORTED && error != TR_EDUPLICATE)
+                    [fAutoImportedNames removeObjectIdenticalTo: file]; //can try to import later
+                else;
             }
-            else if (error != TR_EUNSUPPORTED && error != TR_EDUPLICATE)
-                [fAutoImportedNames removeObjectIdenticalTo: file]; //failed to import for unknown reason, so try again later
-            else;
         }
     }