Changeset 5937

Timestamp:

May 26, 2008, 11:23:07 PM (14 years ago)

Author:

livings124

Message:

prepare Torrent.[mh] for rpc

Location:

trunk/macosx

Files:

• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (6 diffs)

trunk/macosx/Torrent.h

@@ -73 +73 @@
 - (id) initWithPath: (NSString *) path location: (NSString *) location deleteTorrentFile: (torrentFileState) torrentDelete
         lib: (tr_handle *) lib;
-- (id) initWithData: (NSData *) data location: (NSString *) location lib: (tr_handle *) lib;
+- (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_handle *) lib;
 - (id) initWithHistory: (NSDictionary *) history lib: (tr_handle *) lib;
 

trunk/macosx/Torrent.m

@@ -31 +31 @@
 @interface Torrent (Private)
 
-- (id) initWithHash: (NSString *) hashString path: (NSString *) path data: (NSData *) data lib: (tr_handle *) lib
+- (id) initWithHash: (NSString *) hashString path: (NSString *) path torrentStruct: (tr_torrent *) torrentStruct lib: (tr_handle *) lib
         publicTorrent: (NSNumber *) publicTorrent
         downloadFolder: (NSString *) downloadFolder
@@ -71 +71 @@
         lib: (tr_handle *) lib
 {
-    self = [self initWithHash: nil path: path data: nil lib: lib
+    self = [self initWithHash: nil path: path torrentStruct: NULL lib: lib
             publicTorrent: torrentDelete != TORRENT_FILE_DEFAULT
                             ? [NSNumber numberWithBool: torrentDelete == TORRENT_FILE_SAVE] : nil
@@ -89 +89 @@
 }
 
-- (id) initWithData: (NSData *) data location: (NSString *) location lib: (tr_handle *) lib
-{
-    self = [self initWithHash: nil path: nil data: data lib: lib
-            publicTorrent: nil
+- (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_handle *) lib
+{
+    self = [self initWithHash: nil path: nil torrentStruct: torrentStruct lib: lib
+            publicTorrent: [NSNumber numberWithBool: NO]
             downloadFolder: location
             useIncompleteFolder: nil incompleteFolder: nil
@@ -106 +106 @@
 {
     self = [self initWithHash: [history objectForKey: @"TorrentHash"]
-                path: [history objectForKey: @"TorrentPath"] data: nil lib: lib
+                path: [history objectForKey: @"TorrentPath"] torrentStruct: NULL lib: lib
                 publicTorrent: [history objectForKey: @"PublicCopy"]
                 downloadFolder: [history objectForKey: @"DownloadFolder"]
@@ -1526 +1526 @@
 
 //if a hash is given, attempt to load that; otherwise, attempt to open file at path
-- (id) initWithHash: (NSString *) hashString path: (NSString *) path data: (NSData *) data lib: (tr_handle *) lib
+- (id) initWithHash: (NSString *) hashString path: (NSString *) path torrentStruct: (tr_torrent *) torrentStruct lib: (tr_handle *) lib
         publicTorrent: (NSNumber *) publicTorrent
         downloadFolder: (NSString *) downloadFolder
@@ -1556 +1556 @@
     }
     
-    //set libtransmission settings for initialization
-    tr_ctor * ctor = tr_ctorNew(lib);
-    tr_ctorSetPaused(ctor, TR_FORCE, YES);
-    tr_ctorSetPeerLimit(ctor, TR_FALLBACK, [fDefaults integerForKey: @"PeersTorrent"]);
-    
-    tr_info info;
-    int error;
-    if (hashString)
-    {
-        tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
-        if (tr_torrentParse(lib, ctor, &info) == TR_OK)
-        {
-            NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
+    if (torrentStruct)
+    {
+        fHandle = torrentStruct;
+        
+        const tr_info * info = tr_torrentInfo(fHandle);
+        NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info->name]]
                                                 ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
-            
-            fHandle = tr_torrentNew(lib, ctor, &error);
-        }
-        tr_metainfoFree(&info);
-    }
-    if (!fHandle && path)
-    {
-        tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
-        if (tr_torrentParse(lib, ctor, &info) == TR_OK)
-        {
-            NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
-                                                ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
-            
-            fHandle = tr_torrentNew(lib, ctor, &error);
-        }
-        tr_metainfoFree(&info);
-    }
-    if (!fHandle && data)
-    {
-        tr_ctorSetMetainfo(ctor, [data bytes], [data length]);
-        if (tr_torrentParse(lib, ctor, &info) == TR_OK)
-        {
-            NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
-                                                ? fIncompleteFolder : fDownloadFolder;
-            tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
-            
-            fHandle = tr_torrentNew(lib, ctor, &error);
-        }
-        tr_metainfoFree(&info);
-    }
-    
-    tr_ctorFree(ctor);
-    
-    if (!fHandle)
-    {
-        [self release];
-        return nil;
+        tr_torrentSetDownloadDir(fHandle, [currentDownloadFolder UTF8String]);
+        tr_metainfoFree(info);
+    }
+    else
+    {
+        //set libtransmission settings for initialization
+        tr_ctor * ctor = tr_ctorNew(lib);
+        tr_ctorSetPaused(ctor, TR_FORCE, YES);
+        tr_ctorSetPeerLimit(ctor, TR_FALLBACK, [fDefaults integerForKey: @"PeersTorrent"]);
+        
+        tr_info info;
+        if (hashString)
+        {
+            tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
+            if (tr_torrentParse(lib, ctor, &info) == TR_OK)
+            {
+                NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
+                                                    ? fIncompleteFolder : fDownloadFolder;
+                tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
+                
+                fHandle = tr_torrentNew(lib, ctor, NULL);
+            }
+            tr_metainfoFree(&info);
+        }
+        if (!fHandle && path)
+        {
+            tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
+            if (tr_torrentParse(lib, ctor, &info) == TR_OK)
+            {
+                NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
+                                                    ? fIncompleteFolder : fDownloadFolder;
+                tr_ctorSetDownloadDir(ctor, TR_FORCE, [currentDownloadFolder UTF8String]);
+                
+                fHandle = tr_torrentNew(lib, ctor, NULL);
+            }
+            tr_metainfoFree(&info);
+        }
+        
+        tr_ctorFree(ctor);
+        
+        if (!fHandle)
+        {
+            [self release];
+            return nil;
+        }
     }