Changeset 12612

Timestamp:

Aug 2, 2011, 12:43:26 PM (12 years ago)

Author:

livings124

Message:

first go at bringing the libT queue to the Mac client

Location:

trunk/macosx

Files:

• AddMagnetWindowController.m (modified) (1 diff)
• AddWindowController.m (modified) (1 diff)
• Controller.h (modified) (1 diff)
• Controller.m (modified) (18 diffs)
• PrefsController.m (modified) (4 diffs)
• Torrent.h (modified) (3 diffs)
• Torrent.m (modified) (23 diffs)

trunk/macosx/AddMagnetWindowController.m

@@ -200 +200 @@
 - (void) confirmAdd
 {
-    [fTorrent setWaitToStart: [fStartCheck state] == NSOnState];
     [fTorrent setGroupValue: fGroupValue];
+    
+    if ([fStartCheck state] == NSOnState)
+        [fTorrent startTransfer];
     
     [self close];

trunk/macosx/AddWindowController.m

@@ -288 +288 @@
     [fTimer invalidate];
     fTimer = nil;
-    
-    [fTorrent setWaitToStart: [fStartCheck state] == NSOnState];
     [fTorrent setGroupValue: fGroupValue];
     
     if (fTorrentFile && [fDeleteCheck state] == NSOnState)
         [Torrent trashFile: fTorrentFile];
+    
+    if ([fStartCheck state] == NSOnState)
+        [fTorrent startTransfer];
     
     [fFileController setTorrent: nil]; //avoid a crash when window tries to update

trunk/macosx/Controller.h

@@ -186 +186 @@
 
 - (void) updateTorrentsInQueue;
-- (NSUInteger) numToStartFromQueue: (BOOL) downloadQueue;
 
 - (void) torrentFinishedDownloading: (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -287 +287 @@
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_DOWNLOAD_DIR, [[[fDefaults stringForKey: @"DownloadFolder"]
                                                                     stringByExpandingTildeInPath] UTF8String]);
+        tr_bencDictAddBool(&settings, TR_PREFS_KEY_DOWNLOAD_QUEUE_ENABLED, [fDefaults boolForKey: @"Queue"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_DOWNLOAD_QUEUE_SIZE, [fDefaults integerForKey: @"QueueDownloadNumber"]);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_IDLE_LIMIT, [fDefaults integerForKey: @"IdleLimitMinutes"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_IDLE_LIMIT_ENABLED, [fDefaults boolForKey: @"IdleLimitCheck"]);
@@ -308 +310 @@
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_PEX_ENABLED, [fDefaults boolForKey: @"PEXGlobal"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_PORT_FORWARDING, [fDefaults boolForKey: @"NatTraversal"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_QUEUE_STALLED_MINUTES, [fDefaults integerForKey: @"StalledMinutes"]);
         tr_bencDictAddReal(&settings, TR_PREFS_KEY_RATIO, [fDefaults floatForKey: @"RatioLimit"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_RATIO_ENABLED, [fDefaults boolForKey: @"RatioCheck"]);
@@ -316 +319 @@
         tr_bencDictAddStr(&settings, TR_PREFS_KEY_RPC_USERNAME,  [[fDefaults stringForKey: @"RPCUsername"] UTF8String]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_RPC_WHITELIST_ENABLED,  [fDefaults boolForKey: @"RPCUseWhitelist"]);
+        tr_bencDictAddBool(&settings, TR_PREFS_KEY_SEED_QUEUE_ENABLED, [fDefaults boolForKey: @"QueueSeed"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_SEED_QUEUE_SIZE, [fDefaults integerForKey: @"QueueSeedNumber"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_START, [fDefaults boolForKey: @"AutoStartDownload"]);
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_SCRIPT_TORRENT_DONE_ENABLED, [fDefaults boolForKey: @"DoneScriptEnabled"]);
@@ -447 +452 @@
     if (history)
     {
+        NSMutableArray * waitToStartTorrents = [NSMutableArray arrayWithCapacity: (([history count] > 0 && !fPauseOnLaunch) ? [history count]-1 : 0)]; //theoretical max without doing a lot of work
+        
         for (NSDictionary * historyItem in history)
         {
@@ -453 +460 @@
             {
                 [fTorrents addObject: torrent];
+                
+                NSNumber * waitToStart;
+                if (!fPauseOnLaunch && (waitToStart = [historyItem objectForKey: @"WaitToStart"]) && [waitToStart boolValue])
+                    [waitToStartTorrents addObject: torrent];
+                
                 [torrent release];
             }
         }
+        
+        //now that all are loaded, let's set those in the queue to waiting
+        for (Torrent * torrent in waitToStartTorrents)
+            [torrent startTransfer];
     }
     
@@ -491 +507 @@
                     name: @"MakeWindowKey" object: nil];
     
+#warning look at this
     [nc addObserver: self selector: @selector(updateTorrentsInQueue)
                     name: @"UpdateQueue" object: nil];
@@ -882 +899 @@
         else
         {
-            [torrent setWaitToStart: [fDefaults boolForKey: @"AutoStartDownload"]];
+            if ([fDefaults boolForKey: @"AutoStartDownload"])
+                [torrent startTransfer];
             
             [torrent update];
@@ -951 +969 @@
     else
     {
-        [torrent setWaitToStart: [fDefaults boolForKey: @"AutoStartDownload"]];
+        if ([fDefaults boolForKey: @"AutoStartDownload"])
+            [torrent startTransfer];
         
         [torrent update];
@@ -1176 +1195 @@
 {
     for (Torrent * torrent in torrents)
-        [torrent setWaitToStart: YES];
+        [torrent startTransfer];
     
     [self updateTorrentsInQueue];
@@ -1191 +1210 @@
     
     for (Torrent * torrent in fTorrents)
-        if (![torrent isActive] && [torrent waitingToStart])
+        if ([torrent waitingToStart])
             [torrents addObject: torrent];
     
@@ -1201 +1220 @@
     //iterate through instead of all at once to ensure no conflicts
     for (Torrent * torrent in torrents)
-    {
-        tr_inf( "restarting a torrent in resumeTorrentsNoWait" );
-        [torrent startTransfer];
-    }
-    
+        [torrent startTransferNoQueue];
+    
+    #warning change to updateTorrentsInQueue?
     [self updateUI];
     [self applyFilter];
@@ -1224 +1241 @@
 - (void) stopTorrents: (NSArray *) torrents
 {
+#warning look into stopping all without starting any
     //don't want any of these starting then stopping
-    for (Torrent * torrent in torrents)
-        [torrent setWaitToStart: NO];
+    /*for (Torrent * torrent in torrents)
+        [torrent setWaitToStart: NO];*/
 
     [torrents makeObjectsPerformSelector: @selector(stopTransfer)];
@@ -1325 +1343 @@
     [selectedValues removeObjectsInArray: torrents];
     
+#warning look into stopping all without starting any
     //don't want any of these starting then stopping
-    for (Torrent * torrent in torrents)
-        [torrent setWaitToStart: NO];
+    /*for (Torrent * torrent in torrents)
+        [torrent setWaitToStart: NO];*/
     
     [fTorrents removeObjectsInArray: torrents];
@@ -1708 +1727 @@
 }
 
+#warning rename? remove?
 - (void) updateTorrentsInQueue
 {
-    NSUInteger desiredDownloadActive = [fDefaults boolForKey: @"Queue"] ? [self numToStartFromQueue: YES] : NSUIntegerMax,
-                desiredSeedActive = [fDefaults boolForKey: @"QueueSeed"] ? [self numToStartFromQueue: NO] : NSUIntegerMax;
-    
-    for (Torrent * torrent in fTorrents)
-    {
-        if (desiredDownloadActive == 0 && desiredSeedActive == 0)
-            break;
-        
-        if (![torrent isActive] && ![torrent isChecking] && [torrent waitingToStart])
-        {
-            if (![torrent allDownloaded])
-            {
-                if (desiredDownloadActive > 0)
-                {
-                    tr_inf( "restarting download torrent in mac queue" );
-                    [torrent startTransfer];
-                    if ([torrent isActive])
-                        --desiredDownloadActive;
-                    [torrent update];
-                }
-            }
-            else
-            {
-                if (desiredSeedActive > 0)
-                {
-                    tr_inf( "restarting seed torrent in mac queue" );
-                    [torrent startTransfer];
-                    if ([torrent isActive])
-                        --desiredSeedActive;
-                    [torrent update];
-                }
-            }
-        }
-    }
-    
     [self updateUI];
     [self applyFilter];
     [[fWindow toolbar] validateVisibleItems];
     [self updateTorrentHistory];
-}
-
-- (NSUInteger) numToStartFromQueue: (BOOL) downloadQueue
-{
-    if (![fDefaults boolForKey: downloadQueue ? @"Queue" : @"QueueSeed"])
-        return 0;
-    
-    NSUInteger desired = [fDefaults integerForKey: downloadQueue ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
-        
-    for (Torrent * torrent in fTorrents)
-    {
-        if (desired == 0)
-            break;
-        
-        if ([torrent isChecking])
-            --desired;
-        else if ([torrent isActive] && ![torrent isStalled] && ![torrent isError])
-        {
-            if ([torrent allDownloaded] != downloadQueue)
-                --desired;
-        }
-        else;
-    }
-    
-    return desired;
 }
 
@@ -1809 +1769 @@
         [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"com.apple.DownloadFileFinished"
             object: [torrent dataLocation]];
-        
-        if ([torrent isActive] && [fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] == 0)
-        {
-            [torrent stopTransfer];
-            [torrent setWaitToStart: YES];
-        }
     }
     
@@ -1820 +1774 @@
 }
 
+#warning remove?
 - (void) torrentRestartedDownloading: (NSNotification *) notification
 {
-    Torrent * torrent = [notification object];
-    if ([torrent isActive] && [fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] == 0)
-    {
-        [torrent stopTransfer];
-        [torrent setWaitToStart: YES];
-    }
-    
     [self updateTorrentsInQueue];
 }
@@ -2701 +2649 @@
             NSUInteger insertIndex = topTorrent ? [fTorrents indexOfObject: topTorrent] + 1 : 0;
             NSIndexSet * insertIndexes = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(insertIndex, [movingTorrents count])];
+            for (Torrent * torrent in movingTorrents)
+                [torrent setQueueIndex: insertIndex++];
             [fTorrents insertObjects: movingTorrents atIndexes: insertIndexes];
         }
@@ -4165 +4115 @@
 }
 
+#warning handle queue state changes
 - (void) rpcCallback: (tr_rpc_callback_type) type forTorrentStruct: (struct tr_torrent *) torrentStruct
 {

trunk/macosx/PrefsController.m

@@ -763 +763 @@
 - (void) setQueue: (id) sender
 {
+    //let's just do both - easier that way
+    tr_sessionSetQueueEnabled(fHandle, TR_DOWN, [fDefaults boolForKey: @"Queue"]);
+    tr_sessionSetQueueEnabled(fHandle, TR_UP, [fDefaults boolForKey: @"QueueSeed"]);
+    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
 }
@@ -768 +772 @@
 - (void) setQueueNumber: (id) sender
 {
-    [fDefaults setInteger: [sender intValue] forKey: sender == fQueueDownloadField ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
-    [self setQueue: nil];
+    const NSInteger number = [sender intValue];
+    const BOOL seed = sender == fQueueSeedField;
+    
+    [fDefaults setInteger: number forKey: seed ? @"QueueSeedNumber" : @"QueueDownloadNumber"];
+    
+    tr_sessionSetQueueSize(fHandle, seed ? TR_UP : TR_DOWN, number);
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
 }
 
 - (void) setStalled: (id) sender
 {
+#warning do something here
+    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
 }
@@ -780 +792 @@
 {
     [fDefaults setInteger: [sender intValue] forKey: @"StalledMinutes"];
-    [self setStalled: nil];
+    tr_sessionSetQueueStalledMinutes(fHandle, [fDefaults integerForKey: @"StalledMinutes"]);
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
 }
 
@@ -1222 +1236 @@
     [fDefaults setInteger: idleLimitMin forKey: @"IdleLimitMinutes"];
     
+    //queue
+    const BOOL downloadQueue = tr_sessionGetQueueEnabled(fHandle, TR_DOWN);
+    [fDefaults setBool: downloadQueue forKey: @"Queue"];
+    
+    const int downloadQueueNum = tr_sessionGetQueueSize(fHandle, TR_DOWN);
+    [fDefaults setInteger: downloadQueueNum forKey: @"QueueDownloadNumber"];
+    
+    const BOOL seedQueue = tr_sessionGetQueueEnabled(fHandle, TR_UP);
+    [fDefaults setBool: seedQueue forKey: @"QueueSeed"];
+    [fDefaults setBool: downloadQueue forKey: @"Queue"];
+    
+    const int seedQueueNum = tr_sessionGetQueueSize(fHandle, TR_UP);
+    [fDefaults setInteger: seedQueueNum forKey: @"QueueSeedNumber"];
+    
     //done script
     const BOOL doneScriptEnabled = tr_sessionIsTorrentDoneScriptEnabled(fHandle);

trunk/macosx/Torrent.h

@@ -48 +48 @@
     NSDate * fPreviousFinishedIndexesDate;
     
-    BOOL fWaitToStart, fStalled;
-    
     NSInteger fGroupValue;
     
@@ -74 +72 @@
 - (void) getAmountFinished: (float *) tab size: (NSInteger) size;
 - (NSIndexSet *) previousFinishedPieces;
--(void) setPreviousFinishedPieces: (NSIndexSet *) indexes;
+- (void) setPreviousFinishedPieces: (NSIndexSet *) indexes;
 
 - (void) update;
 
+- (void) startTransferNoQueue;
 - (void) startTransfer;
 - (void) stopTransfer;
 - (void) sleep;
 - (void) wakeUp;
+
+- (void) setQueueIndex: (NSUInteger) index;
 
 - (void) manualAnnounce;
@@ -113 +114 @@
 - (uint16_t) maxPeerConnect;
 
-- (void) setWaitToStart: (BOOL) wait;
 - (BOOL) waitingToStart;
 

trunk/macosx/Torrent.m

@@ -38 +38 @@
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct
         magnetAddress: (NSString *) magnetAddress lib: (tr_session *) lib
-        waitToStart: (NSNumber *) waitToStart
         groupValue: (NSNumber *) groupValue
         timeMachineExcludeLocation: (NSString *) timeMachineExclude
@@ -104 +103 @@
 {
     self = [self initWithPath: path hash: nil torrentStruct: NULL magnetAddress: nil lib: lib
-            waitToStart: nil groupValue: nil
+            groupValue: nil
             timeMachineExcludeLocation: nil
             downloadFolder: location
@@ -120 +119 @@
 {
     self = [self initWithPath: nil hash: nil torrentStruct: torrentStruct magnetAddress: nil lib: lib
-            waitToStart: nil groupValue: nil
+            groupValue: nil
             timeMachineExcludeLocation: nil
             downloadFolder: location
@@ -131 +130 @@
 {
     self = [self initWithPath: nil hash: nil torrentStruct: nil magnetAddress: address
-            lib: lib waitToStart: nil groupValue: nil
+            lib: lib groupValue: nil
             timeMachineExcludeLocation: nil
             downloadFolder: location legacyIncompleteFolder: nil];
@@ -145 +144 @@
                 magnetAddress: nil
                 lib: lib
-                waitToStart: [history objectForKey: @"WaitToStart"]
                 groupValue: [history objectForKey: @"GroupValue"]
                 timeMachineExcludeLocation: [history objectForKey: @"TimeMachineExcludeLocation"]
@@ -159 +157 @@
         {
             fStat = tr_torrentStat(fHandle);
-            [self startTransfer];
+            [self startTransferNoQueue];
         }
+        
+        //fWaitToStart = waitToStart && [waitToStart boolValue];
+        
         
         //upgrading from versions < 1.30: get old added, activity, and done dates
@@ -195 +196 @@
                                         [self hashString], @"TorrentHash",
                                         [NSNumber numberWithBool: [self isActive]], @"Active",
-                                        [NSNumber numberWithBool: fWaitToStart], @"WaitToStart",
+                                        [NSNumber numberWithBool: [self waitingToStart]], @"WaitToStart",
                                         [NSNumber numberWithInt: fGroupValue], @"GroupValue", nil];
     
@@ -290 +291 @@
 - (void) update
 {
-    //get previous status values before update
-    BOOL wasChecking = NO, wasError = NO, wasStalled = NO;
-    if (fStat != NULL)
-    {
-        wasChecking = [self isChecking];
-        wasError = [self isError];
-        wasStalled = fStalled;
-    }
-    
     fStat = tr_torrentStat(fHandle);
-    
-    //check if stalled (stored because based on time and needs to check if it was previously stalled)
-    fStalled = [self isActive] && [fDefaults boolForKey: @"CheckStalled"]
-                && [self stalledMinutes] > [fDefaults integerForKey: @"StalledMinutes"];
-    
-    //update queue for checking (from downloading to seeding), stalled, or error
-    if ((wasChecking && ![self isChecking]) || (wasStalled != fStalled) || (!wasError && [self isError] && [self isActive]))
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
     
     //when the data first appears, update time machine exclusion
@@ -314 +298 @@
 }
 
+- (void) startTransferNoQueue
+{
+    if (![self isActive] && [self alertForRemainingDiskSpace])
+    {
+        tr_torrentStartNow(fHandle);
+        [self update];
+        
+        //capture, specifically, stop-seeding settings changing to unlimited
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
+    }
+}
+
+#warning merge
 - (void) startTransfer
 {
-    fWaitToStart = NO;
-    
-    if (![self isActive] && [self alertForRemainingDiskSpace])
-    {
-        tr_ninf( fInfo->name, "restarting via startTransfer" );
+    if (![self isActive] && ![self waitingToStart] && [self alertForRemainingDiskSpace])
+    {
         tr_torrentStart(fHandle);
         [self update];
@@ -331 +325 @@
 - (void) stopTransfer
 {
-    fWaitToStart = NO;
-    
-    if ([self isActive])
+    if ([self isActive] || [self waitingToStart])
     {
         tr_torrentStop(fHandle);
         [self update];
         
+        #warning still needed?
         [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
     }
@@ -357 +350 @@
 }
 
+- (void) setQueueIndex: (NSUInteger) index
+{
+    tr_torrentSetQueuePosition(fHandle, index);
+}
+
 - (void) manualAnnounce
 {
@@ -476 +474 @@
     return tr_torrentGetPeerLimit(fHandle);
 }
-
-- (void) setWaitToStart: (BOOL) wait
-{
-    fWaitToStart = wait;
-}
-
 - (BOOL) waitingToStart
 {
-    return fWaitToStart;
+    return fStat->activity == TR_STATUS_DOWNLOAD_WAIT || fStat->activity == TR_STATUS_SEED_WAIT;
 }
 
@@ -623 +615 @@
 - (NSString *) name
 {
+#warning remove
+    //return [NSString stringWithFormat: @"%d  %@", fStat->queuePosition, [NSString stringWithUTF8String: fInfo->name]];
     return fInfo->name != NULL ? [NSString stringWithUTF8String: fInfo->name] : fHashString;
 }
@@ -841 +835 @@
 - (BOOL) isActive
 {
-    return fStat->activity != TR_STATUS_STOPPED;
+    return fStat->activity != TR_STATUS_STOPPED && fStat->activity != TR_STATUS_DOWNLOAD_WAIT && fStat->activity != TR_STATUS_SEED_WAIT;
 }
 
@@ -1051 +1045 @@
         {
             case TR_STATUS_STOPPED:
-                if (fWaitToStart)
-                {
-                    string = ![self allDownloaded]
-                            ? [NSLocalizedString(@"Waiting to download", "Torrent -> status string") stringByAppendingEllipsis]
-                            : [NSLocalizedString(@"Waiting to seed", "Torrent -> status string") stringByAppendingEllipsis];
-                }
-                else if ([self isFinishedSeeding])
+                if ([self isFinishedSeeding])
                     string = NSLocalizedString(@"Seeding complete", "Torrent -> status string");
                 else
                     string = NSLocalizedString(@"Paused", "Torrent -> status string");
                 break;
-
+            
+            case TR_STATUS_DOWNLOAD_WAIT:
+                string = [NSLocalizedString(@"Waiting to download", "Torrent -> status string") stringByAppendingEllipsis];
+                break;
+                
+            case TR_STATUS_SEED_WAIT:
+                string = [NSLocalizedString(@"Waiting to seed", "Torrent -> status string") stringByAppendingEllipsis];
+                break;
+            
             case TR_STATUS_CHECK_WAIT:
                 string = [NSLocalizedString(@"Waiting to check existing data", "Torrent -> status string") stringByAppendingEllipsis];
@@ -1105 +1101 @@
         }
         
-        if (fStalled)
+        if ([self isStalled])
             string = [NSLocalizedString(@"Stalled", "Torrent -> status string") stringByAppendingFormat: @", %@", string];
     }
@@ -1131 +1127 @@
     {
         case TR_STATUS_STOPPED:
-            if (fWaitToStart)
-            {
-                string = ![self allDownloaded]
-                        ? [NSLocalizedString(@"Waiting to download", "Torrent -> status string") stringByAppendingEllipsis]
-                        : [NSLocalizedString(@"Waiting to seed", "Torrent -> status string") stringByAppendingEllipsis];
-            }
-            else if ([self isFinishedSeeding])
+            if ([self isFinishedSeeding])
                 string = NSLocalizedString(@"Seeding complete", "Torrent -> status string");
             else
                 string = NSLocalizedString(@"Paused", "Torrent -> status string");
             break;
+        
+        case TR_STATUS_DOWNLOAD_WAIT:
+            string = [NSLocalizedString(@"Waiting to download", "Torrent -> status string") stringByAppendingEllipsis];
+            
+        case TR_STATUS_SEED_WAIT:
+            string = [NSLocalizedString(@"Waiting to seed", "Torrent -> status string") stringByAppendingEllipsis];
 
         case TR_STATUS_CHECK_WAIT:
@@ -1181 +1177 @@
     {
         case TR_STATUS_STOPPED:
+        case TR_STATUS_DOWNLOAD_WAIT:
+        case TR_STATUS_SEED_WAIT:
         {
             NSString * string = NSLocalizedString(@"Paused", "Torrent -> status string");
             
             NSString * extra = nil;
-            if (fWaitToStart)
+            if ([self waitingToStart])
             {
-                extra = ![self allDownloaded]
+                extra = fStat->activity == TR_STATUS_DOWNLOAD_WAIT 
                         ? NSLocalizedString(@"Waiting to download", "Torrent -> status string")
                         : NSLocalizedString(@"Waiting to seed", "Torrent -> status string");
@@ -1211 +1209 @@
         case TR_STATUS_SEED:
             return NSLocalizedString(@"Seeding", "Torrent -> status string");
-        
-        default:
-            NSAssert1(NO, @"Unknown activity %d for state string", fStat->activity);
-            return nil;
     }
 }
@@ -1537 +1531 @@
 - (BOOL) isStalled
 {
-    return fStalled;
+    return fStat->isStalled;
 }
 
@@ -1568 +1562 @@
     if (![self isActive]) //paused
     {
-        if (fWaitToStart)
+        if ([self waitingToStart])
             return 1;
         else
@@ -1614 +1608 @@
 - (id) initWithPath: (NSString *) path hash: (NSString *) hashString torrentStruct: (tr_torrent *) torrentStruct
         magnetAddress: (NSString *) magnetAddress lib: (tr_session *) lib
-        waitToStart: (NSNumber *) waitToStart
         groupValue: (NSNumber *) groupValue
         timeMachineExcludeLocation: (NSString *) timeMachineExclude
@@ -1670 +1663 @@
     fHashString = [[NSString alloc] initWithUTF8String: fInfo->hashString];
     
-    fWaitToStart = waitToStart && [waitToStart boolValue];
     fResumeOnWake = NO;