Changeset 8470

Timestamp:

May 22, 2009, 2:08:51 AM (14 years ago)

Author:

livings124

Message:

save internal torrent path to history, and prefer that over the hash when loading on startup

File:

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

trunk/macosx/Torrent.m

@@ -31 +31 @@
 @interface Torrent (Private)
 
-- (id) initWithHash: (NSString *) hashString path: (NSString *) path torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
+- (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
         publicTorrent: (NSNumber *) publicTorrent
         downloadFolder: (NSString *) downloadFolder
@@ -84 +84 @@
         lib: (tr_session *) lib
 {
-    self = [self initWithHash: nil path: path torrentStruct: NULL lib: lib
+    self = [self initWithPath: path hash: nil torrentStruct: NULL lib: lib
             publicTorrent: torrentDelete != TORRENT_FILE_DEFAULT ? [NSNumber numberWithBool: torrentDelete == TORRENT_FILE_SAVE] : nil
             downloadFolder: location
@@ -108 +108 @@
 - (id) initWithTorrentStruct: (tr_torrent *) torrentStruct location: (NSString *) location lib: (tr_session *) lib
 {
-    self = [self initWithHash: nil path: nil torrentStruct: torrentStruct lib: lib
+    self = [self initWithPath: nil hash: nil torrentStruct: torrentStruct lib: lib
             publicTorrent: [NSNumber numberWithBool: NO]
             downloadFolder: location
@@ -119 +119 @@
 - (id) initWithHistory: (NSDictionary *) history lib: (tr_session *) lib forcePause: (BOOL) pause
 {
-    self = [self initWithHash: [history objectForKey: @"TorrentHash"]
-                path: [history objectForKey: @"TorrentPath"] torrentStruct: NULL lib: lib
+    self = [self initWithPath: [history objectForKey: @"InternalTorrentPath"]
+                hash: [history objectForKey: @"TorrentHash"]
+                torrentStruct: NULL lib: lib
                 publicTorrent: [history objectForKey: @"PublicCopy"]
                 downloadFolder: [history objectForKey: @"DownloadFolder"]
@@ -169 +170 @@
 {
     NSMutableDictionary * history = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                    [self torrentLocation], @"InternalTorrentPath",
+                    [self hashString], @"TorrentHash",
                     [NSNumber numberWithBool: fPublicTorrent], @"PublicCopy",
-                    [self hashString], @"TorrentHash",
                     fDownloadFolder, @"DownloadFolder",
                     [NSNumber numberWithBool: fUseIncompleteFolder], @"UseIncompleteFolder",
@@ -1592 +1594 @@
 
 //if a hash is given, attempt to load that; otherwise, attempt to open file at path
-- (id) initWithHash: (NSString *) hashString path: (NSString *) path torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
+- (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct lib: (tr_session *) lib
         publicTorrent: (NSNumber *) publicTorrent
         downloadFolder: (NSString *) downloadFolder
@@ -1636 +1638 @@
         
         tr_info info;
-        if (hashString)
-        {
-            tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
+        if (path)
+        {
+            tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
             if (tr_torrentParse(ctor, &info) == TR_OK)
             {
@@ -1649 +1651 @@
             tr_metainfoFree(&info);
         }
-        if (!fHandle && path)
-        {
-            tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
+        if (!fHandle && hashString) //backup - shouldn't be needed after upgrade to 1.70
+        {
+            tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
             if (tr_torrentParse(ctor, &info) == TR_OK)
             {