Changeset 299

Timestamp:

Jun 8, 2006, 6:59:04 AM (17 years ago)

Author:

livings124

Message:

As far as I can see this is now working. Some cosmetic touchups are needed for the interface and it needs a bit more testing, but it's getting there...

Location:

branches/save_torrent_files

Files:

• libtransmission/metainfo.c (modified) (1 diff)
• macosx/Torrent.h (modified) (1 diff)
• macosx/Torrent.m (modified) (8 diffs)

branches/save_torrent_files/libtransmission/metainfo.c

@@ -121 +121 @@
         if( !file )
         {
-            fprintf( stderr, "Could not open file (%s)\n", inf->torrent );
+            fprintf( stderr, "Could not open file (%s) (%s)\n", inf->torrent, strerror(errno) );
             tr_bencFree( &meta );
             free( buf );

branches/save_torrent_files/macosx/Torrent.h

@@ -40 +40 @@
     NSDate       * fDate;
     
-    BOOL        fPrivateSaved;
+    BOOL        fPrivateTorrent;
 
     NSUserDefaults  * fDefaults;

branches/save_torrent_files/macosx/Torrent.m

@@ -44 +44 @@
 
 - (id) initWithPath: (NSString *) path lib: (tr_handle_t *) lib
-{NSLog(path);
+{
     id torrent = [self initWithPath: path lib: lib date: nil
                     stopRatioSetting: nil ratioLimit: nil];
@@ -51 +51 @@
         return nil;
 
-    if (fPrivateSaved && [fDefaults boolForKey: @"DeleteOriginalTorrent"])
+    if (fPrivateTorrent && [fDefaults boolForKey: @"DeleteOriginalTorrent"])
         [self trashPath: path];
     
@@ -59 +59 @@
 - (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
     NSNumber * privateCopy;
     if ((privateCopy = [history objectForKey: @"PrivateCopy"]) && [privateCopy boolValue])
@@ -89 +90 @@
 {
     NSMutableDictionary * history = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                    [NSNumber numberWithBool: fPrivateSaved], @"PrivateCopy",
+                    [NSNumber numberWithBool: fPrivateTorrent], @"PrivateCopy",
                     [self downloadFolder], @"DownloadFolder",
                     [self isActive] ? @"NO" : @"YES", @"Paused",
@@ -96 +97 @@
                     [NSNumber numberWithFloat: fRatioLimit], @"RatioLimit", nil];
             
-    if (fPrivateSaved)
+    if (fPrivateTorrent)
+        [history setObject: [self hashString] forKey: @"TorrentHash"];
+    else
         [history setObject: [self torrentLocation] forKey: @"TorrentPath"];
-    else
-        [history setObject: [self hashString] forKey: @"TorrentHash"];
     
     return history;
@@ -240 +241 @@
 - (void) removeForever
 {
-    tr_torrentRemoveSaved(fHandle);
+    if (fInfo->flags & TR_FSAVEPRIVATE)
+        tr_torrentRemoveSaved(fHandle);
 }
 
@@ -508 +510 @@
     fDefaults = [NSUserDefaults standardUserDefaults];
 
-    fPrivateSaved = [fDefaults boolForKey: @"SavePrivateTorrent"];
+    fPrivateTorrent = [fDefaults boolForKey: @"SavePrivateTorrent"];
 
     int error;
     if (!path || !(fHandle = tr_torrentInit(fLib, [path UTF8String],
-                    fPrivateSaved ? TR_FSAVEPRIVATE : 0, & error)))
+                    fPrivateTorrent ? TR_FSAVEPRIVATE : 0, & error)))
     {
         [self release];
@@ -530 +532 @@
     fDefaults = [NSUserDefaults standardUserDefaults];
     
-    fPrivateSaved = YES;
+    fPrivateTorrent = YES;
 
     int error;