Changeset 9342 for trunk/macosx/Controller.m

Timestamp:

Oct 21, 2009, 1:01:14 PM (13 years ago)

Author:

livings124

Message:

use libtransmission for moving, incomplete directory, and directory controlling in general (still rough around the edges)

File:

• trunk/macosx/Controller.m (modified) (9 diffs)

trunk/macosx/Controller.m

@@ -264 +264 @@
         
         tr_benc settings;
-        tr_bencInitDict(&settings, 34);
+        tr_bencInitDict(&settings, 36);
         const char * configDir = tr_getDefaultConfigDir("Transmission");
         tr_sessionGetDefaultSettings(configDir, &settings);
@@ -291 +291 @@
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_DOWNLOAD_DIR, [[[fDefaults stringForKey: @"DownloadFolder"]
                                                                     stringByExpandingTildeInPath] UTF8String]);
+        tr_bencDictAddStr(&settings, TR_PREFS_KEY_INCOMPLETE_DIR, [[[fDefaults stringForKey: @"IncompleteDownloadFolder"]
+                                                                    stringByExpandingTildeInPath] UTF8String]);
+        tr_bencDictAddBool(&settings, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]);
         
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_MSGLEVEL, [fDefaults integerForKey: @"MessageLevel"]);
@@ -941 +944 @@
             continue;
         
-        //change the location if the group calls for it (this has to wait until after the torrent is create)
+        //change the location if the group calls for it (this has to wait until after the torrent is created)
         if (!lockDestination && [[GroupsController groups] usesCustomDownloadLocationForIndex: [torrent groupValue]])
         {
             location = [[GroupsController groups] customDownloadLocationForIndex: [torrent groupValue]];
-            [torrent changeDownloadFolder: location];
+            [torrent changeDownloadFolderBeforeUsing: location];
         }
         
@@ -1465 +1468 @@
         NSMutableArray * paths = [NSMutableArray arrayWithCapacity: [selected count]];
         for (Torrent * torrent in [fTableView selectedTorrents])
-            [paths addObject: [NSURL fileURLWithPath: [torrent dataLocation]]];
+        {
+            NSString * location = [torrent dataLocation];
+            if (location)
+                [paths addObject: [NSURL fileURLWithPath: location]];
+        }
         
         [[NSWorkspace sharedWorkspace] activateFileViewerSelectingURLs: paths];
@@ -1472 +1479 @@
     {
         for (Torrent * torrent in selected)
-            [[NSWorkspace sharedWorkspace] selectFile: [torrent dataLocation] inFileViewerRootedAtPath: nil];
+        {
+            NSString * location = [torrent dataLocation];
+            if (location)
+                [[NSWorkspace sharedWorkspace] selectFile: location inFileViewerRootedAtPath: nil];
+        }
     }
 }
@@ -1770 +1781 @@
         }
         
+        #warning dataLocation could return nil
         NSDictionary * clickContext = [NSDictionary dictionaryWithObjectsAndKeys: GROWL_DOWNLOAD_COMPLETE, @"Type",
                                         [torrent dataLocation] , @"Location", nil];
@@ -1781 +1793 @@
         //bounce download stack
         [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"com.apple.DownloadFileFinished"
-            object: [[torrent downloadFolder] stringByAppendingPathComponent: [torrent name]]];
+            object: [torrent dataLocation]];
         
         if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] == 0)
@@ -1831 +1843 @@
     }
     
+    #warning dataLocation could return nil
     NSDictionary * clickContext = [NSDictionary dictionaryWithObjectsAndKeys: GROWL_SEEDING_COMPLETE, @"Type",
                                     [torrent dataLocation], @"Location", nil];
@@ -3143 +3156 @@
     
     for (Torrent * torrent in selectedTorrents)
-        if (([torrent isFolder] || [torrent isComplete]) && [[NSFileManager defaultManager] fileExistsAtPath: [torrent dataLocation]])
+        if (([torrent isFolder] || [torrent isComplete]) && [torrent dataLocation])
             [qlArray addObject: torrent];