Changeset 362

Timestamp:

Jun 15, 2006, 2:35:40 AM (17 years ago)

Author:

livings124

Message:

Should save between launches now, among other things.

Location:

trunk/macosx

Files:

• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• Torrent.m (modified) (11 diffs)

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -14 +14 @@
                 <string>189 691 451 44 0 0 1152 842 </string>
                 <key>456</key>
-                <string>396 374 216 168 0 0 1152 842 </string>
+                <string>396 374 216 206 0 0 1152 842 </string>
                 <key>581</key>
                 <string>324 628 112 68 0 0 1152 842 </string>
@@ -31 +31 @@
         <array>
                 <integer>21</integer>
+                <integer>29</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/Torrent.m

@@ -33 +33 @@
         date: (NSDate *) date stopRatioSetting: (NSNumber *) stopRatioSetting
         ratioLimit: (NSNumber *) ratioLimit;
-- (id) initForSuccessWithDate: (NSDate *) date stopRatioSetting: (NSNumber *)
+- (id) initForSuccessWithPath: (NSString *) path date: (NSDate *) date stopRatioSetting: (NSNumber *)
             stopRatioSetting ratioLimit: (NSNumber *) ratioLimit;
 
@@ -45 +45 @@
 - (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib
 {
+    fPrivateTorrent = [fDefaults boolForKey: @"SavePrivateTorrent"];
+    fPublicTorrent = !fPrivateTorrent || ![fDefaults boolForKey: @"DeleteOriginalTorrent"];
+
     id torrent = [self initWithPath: path lib: lib date: nil
                     stopRatioSetting: nil ratioLimit: nil];
@@ -50 +53 @@
     if (torrent)
     {
-        fPrivateTorrent = [fDefaults boolForKey: @"SavePrivateTorrent"];
-        fPublicTorrent = !fPrivateTorrent || ![fDefaults boolForKey: @"DeleteOriginalTorrent"];
-    
         if (!fPublicTorrent)
         {
             [self trashFile: path];
+            
+            [fPublicTorrentLocation release];
             fPublicTorrentLocation = nil;
         }
-        else
-            fPublicTorrentLocation = [path retain];
     }
     
@@ -67 +67 @@
 - (id) initWithHistory: (NSDictionary *) history lib: (tr_handle_t *) lib
 {
-    //load from saved torrent file if set to, otherwise try to load from where torrent file should be
     id torrent;
     NSNumber * privateCopy, * publicCopy;
@@ -73 +72 @@
     fPublicTorrent = !fPrivateTorrent || ((publicCopy = [history objectForKey: @"PublicCopy"])
                                             && [publicCopy boolValue]);
-    NSString * path = [history objectForKey: @"TorrentPath"];
-    
+    
+    //load from saved torrent file if set to, otherwise try to load from where torrent file should be
     if (fPrivateTorrent)
         torrent = [self initWithHash: [history objectForKey: @"TorrentHash"]
-            path: [history objectForKey: @"TorrentPath"] lib: lib
-            date: [history objectForKey: @"Date"]
+            path: [history objectForKey: @"TorrentPath"]
+            lib: lib date: [history objectForKey: @"Date"]
             stopRatioSetting: [history objectForKey: @"StopRatioSetting"]
             ratioLimit: [history objectForKey: @"RatioLimit"]];
@@ -89 +88 @@
     if (torrent)
     {
-        if (fPublicTorrent)
-            fPublicTorrentLocation = [path retain];
-    
         NSString * downloadFolder;
         if (!(downloadFolder = [history objectForKey: @"DownloadFolder"]))
@@ -120 +116 @@
 
     if (fPublicTorrent)
-        [history setObject: [self torrentLocation] forKey: @"TorrentPath"];
+        [history setObject: [self publicTorrentLocation] forKey: @"TorrentPath"];
     
     return history;
@@ -561 +557 @@
     fLib = lib;
     fDefaults = [NSUserDefaults standardUserDefaults];
-    fPublicTorrentLocation = path;
 
     int error;
@@ -571 +566 @@
     }
 
-    return [self initForSuccessWithDate: date stopRatioSetting: stopRatioSetting ratioLimit: ratioLimit];
+    return [self initForSuccessWithPath: path date: date stopRatioSetting: stopRatioSetting ratioLimit: ratioLimit];
 }
 
@@ -583 +578 @@
     fLib = lib;
     fDefaults = [NSUserDefaults standardUserDefaults];
-    fPublicTorrentLocation = path;
 
     int error;
@@ -592 +586 @@
     }
     
-    return [self initForSuccessWithDate: date stopRatioSetting: stopRatioSetting ratioLimit: ratioLimit];
-}
-
-- (id) initForSuccessWithDate: (NSDate *) date stopRatioSetting: (NSNumber *)
+    return [self initForSuccessWithPath: path date: date stopRatioSetting: stopRatioSetting ratioLimit: ratioLimit];
+}
+
+- (id) initForSuccessWithPath: (NSString *) path date: (NSDate *) date stopRatioSetting: (NSNumber *)
             stopRatioSetting ratioLimit: (NSNumber *) ratioLimit
 {
     fInfo = tr_torrentInfo( fHandle );
+
+    if (path)
+        fPublicTorrentLocation = [path retain];
 
     fDate = date ? [date retain] : [[NSDate alloc] init];