Changeset 8473

Timestamp:

May 22, 2009, 2:52:28 AM (14 years ago)

Author:

livings124

Message:

cleanup last commit(s)

File:

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

trunk/macosx/Torrent.m

@@ -1593 +1593 @@
 @implementation Torrent (Private)
 
-//if a hash is given, attempt to load that; otherwise, attempt to open file at path
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
         publicTorrent: (NSNumber *) publicTorrent
@@ -1637 +1636 @@
         tr_ctorSetPeerLimit(ctor, TR_FALLBACK, [fDefaults integerForKey: @"PeersTorrent"]);
         
-        tr_info info;
         int result = TR_EINVALID;
         if (path)
-        {
-            tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
+            result = tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
+        
+        //backup - shouldn't be needed after upgrade to 1.62
+        if (result != TR_OK && hashString)
+            tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
+        
+        if (result == TR_OK)
+        {
+            tr_info info;
             result = tr_torrentParse(ctor, &info);
-        }
-        if (result != TR_OK && hashString) //backup - shouldn't be needed after upgrade to 1.70
-        {
-            tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
-            result = tr_torrentParse(ctor, &info);
-        }
-        
-        if (result == TR_OK)
-        {
-            NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
-                                                ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
             
-            fHandle = tr_torrentNew(ctor, NULL);
-        }
-        if (result != TR_EINVALID)
-            tr_metainfoFree(&info);
+            if (result == TR_OK)
+            {
+                NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
+                                                    ? fIncompleteFolder : fDownloadFolder;
+                tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
+                
+                fHandle = tr_torrentNew(ctor, NULL);
+            }
+            if (result != TR_EINVALID)
+                tr_metainfoFree(&info);
+        }
         
         tr_ctorFree(ctor);