Changeset 452

Timestamp:

Jun 23, 2006, 10:32:01 PM (16 years ago)

Author:

livings124

Message:

Some more work on queueing.

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (9 diffs)
• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (2 diffs)
• PrefsController.m (modified) (1 diff)
• Torrent.m (modified) (3 diffs)

trunk/macosx/Controller.h

@@ -133 +133 @@
 - (void) ratioGlobalChange: (NSNotification *) notification;
 
-- (void) checkWaitingForFinished: (NSNotification *) notification;
-- (void) startSettingChange: (NSNotification *) notification;
+- (void) checkWaitingForStopped: (NSNotification *) notification;
+- (void) checkWaitingForFinished: (Torrent *) finishedTorrent;
+- (void) torrentStartSettingChange: (NSNotification *) notification;
+- (void) globalStartSettingChange: (NSNotification *) notification;
+
+- (void) attemptToStartAuto: (Torrent *) torrent;
 
 - (void) reloadInspector: (NSNotification *) notification;

trunk/macosx/Controller.m

@@ -210 +210 @@
                     name: @"RatioGlobalChange" object: nil];
     
-    [nc addObserver: self selector: @selector(checkWaitingForFinished:)
-                    name: @"TorrentFinishedDownloading" object: nil];
-    
-    [nc addObserver: self selector: @selector(startSettingChange:)
-                    name: @"StartSettingChange" object: nil];
-    
+    //check to start another because of stopped torrent
+    [nc addObserver: self selector: @selector(checkWaitingForStopped:)
+                    name: @"StoppedDownloading" object: nil];
+    
+    //check all torrents for starting
+    [nc addObserver: self selector: @selector(globalStartSettingChange:)
+                    name: @"GlobalStartSettingChange" object: nil];
+
+    //check if torrent should now start
+    [nc addObserver: self selector: @selector(torrentStartSettingChange:)
+                    name: @"TorrentStartSettingChange" object: nil];
+    
+    //change that just impacts the inspector
     [nc addObserver: self selector: @selector(reloadInspector:)
                     name: @"TorrentSettingChange" object: nil];
@@ -324 +331 @@
     if (code == NSOKButton)
     {
-        //setup for autostart
-        NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
-        BOOL waitToStart = [startSetting isEqualToString: @"Wait"];
-        int desiredActive, active = 0;
-        if (waitToStart)
-        {
-            desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
-            Torrent * tempTorrent;
-            NSEnumerator * enumerator = [fTorrents objectEnumerator];
-            while ((tempTorrent = [enumerator nextObject]))
-                if ([tempTorrent isActive] && ![tempTorrent isSeeding])
-                    active++;
-        }
-    
         [torrent setDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
-        if ((waitToStart && active < desiredActive) || [startSetting isEqualToString: @"Start"])
-            [torrent startTransfer];
+        [self attemptToStartAuto: torrent];
         [fTorrents addObject: torrent];
+        [torrent update];
         
         [self torrentNumberChanged];
@@ -352 +345 @@
 {
     NSString * downloadChoice = [fDefaults stringForKey: @"DownloadChoice"], * torrentPath;
-    
-    //setup for autostart
-    NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
-    BOOL waitToStart = [startSetting isEqualToString: @"Wait"];
-    int desiredActive, active = 0;
-    if (waitToStart && ![downloadChoice isEqualToString: @"Ask"])
-    {
-        desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
-        Torrent * tempTorrent;
-        NSEnumerator * enumerator = [fTorrents objectEnumerator];
-        while ((tempTorrent = [enumerator nextObject]))
-            if ([tempTorrent isActive] && ![tempTorrent isSeeding])
-                active++;
-    }
-    
     Torrent * torrent;
     NSEnumerator * enumerator = [filenames objectEnumerator];
@@ -403 +381 @@
 
             [torrent setDownloadFolder: folder];
-            #warning should check if transfer was already done
-            if ((waitToStart && active < desiredActive) || [startSetting isEqualToString: @"Start"])
-            {
-                [torrent startTransfer];
-                active++;
-            }
+            [self attemptToStartAuto: torrent];
             [fTorrents addObject: torrent];
+            [torrent update];
         }
         
@@ -745 +719 @@
         if ([torrent justFinished])
         {
+            [self checkWaitingForFinished: torrent];
+        
             //notifications
             [self notifyGrowl: [torrent name]];
@@ -939 +915 @@
 }
 
-- (void) checkWaitingForFinished: (NSNotification *) notification
+- (void) checkWaitingForStopped: (NSNotification *) notification
+{
+    [self checkWaitingForFinished: [notification object]];
+}
+
+- (void) checkWaitingForFinished: (Torrent *) finishedTorrent
 {
     //don't try to start a transfer if there should be none waiting
@@ -952 +933 @@
     {
         //ignore the torrent just stopped; for some reason it is not marked instantly as not active
-        if (torrent == [notification object])
+        if (torrent == finishedTorrent)
             continue;
     
@@ -981 +962 @@
 }
 
-- (void) startSettingChange: (NSNotification *) notification
+- (void) globalStartSettingChange: (NSNotification *) notification
 {
     NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
@@ -1049 +1030 @@
 }
 
+- (void) torrentStartSettingChange: (NSNotification *) notification
+{
+    [self attemptToStartAuto: [notification object]];
+
+    [self updateUI: nil];
+    [self updateTorrentHistory];
+}
+
+//will try to start, taking into consideration the start preference
+- (void) attemptToStartAuto: (Torrent *) torrent
+{
+    #warning should check if transfer was already done
+    if (![torrent waitingToStart])
+        return;
+
+    NSString * startSetting = [fDefaults stringForKey: @"StartSetting"];
+    if ([startSetting isEqualToString: @"Wait"])
+    {
+        int desiredActive = [fDefaults integerForKey: @"WaitToStartNumber"];
+        
+        Torrent * tempTorrent;
+        NSEnumerator * enumerator = [fTorrents objectEnumerator];
+        while ((tempTorrent = [enumerator nextObject]))
+            if ([tempTorrent isActive] && ![tempTorrent isSeeding])
+            {
+                desiredActive--;
+                if (desiredActive <= 0)
+                    return;
+            }
+        
+        [torrent startTransfer];
+    }
+    else if ([startSetting isEqualToString: @"Start"])
+        [torrent startTransfer];
+    else;
+}
+
 - (void) reloadInspector: (NSNotification *) notification
 {

trunk/macosx/InfoWindowController.m

@@ -198 +198 @@
         [fWaitToStartButton setState: [torrent waitingToStart]];
         
-        [fWaitToStartButton setEnabled: ![torrent isActive] && [torrent progress] < 1.0
-            && [[[NSUserDefaults standardUserDefaults] stringForKey: @"StartSetting"] isEqualToString: @"Wait"]];
+        #warning disable if actively downloading or finished
+        [fWaitToStartButton setEnabled:
+            [[[NSUserDefaults standardUserDefaults] stringForKey: @"StartSetting"] isEqualToString: @"Wait"]];
     }
     else
@@ -471 +472 @@
 - (void) setWaitToStart: (id) sender
 {
-    BOOL wait = [sender state];
-
     Torrent * torrent;
     NSEnumerator * enumerator = [fTorrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
-        [torrent setWaitToStart: wait];
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"StartSettingChange" object: self];
+        [torrent setWaitToStart: [sender state]];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentStartSettingChange" object: torrent];
 }
 

trunk/macosx/PrefsController.m

@@ -453 +453 @@
         [fDefaults setInteger: waitNumber forKey: @"WaitToStartNumber"];
     
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"StartSettingChange" object: self];
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"GlobalStartSettingChange" object: self];
 }
 

trunk/macosx/Torrent.m

@@ -244 +244 @@
     
         tr_torrentStop(fHandle);
-        
+
         if (!wasSeeding)
-            [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
+            [[NSNotificationCenter defaultCenter] postNotificationName: @"StoppedDownloading" object: self];
     }
 }
@@ -453 +453 @@
 - (BOOL) justFinished
 {
-    BOOL finished = tr_getFinished(fHandle);
-    if (finished)
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
-    
-    return finished;
+    return tr_getFinished(fHandle);
 }
 
@@ -598 +594 @@
     
     fWaitToStart = waitToStart ? [waitToStart boolValue]
-                    : [[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Wait"];
+                    : ![[fDefaults stringForKey: @"StartSetting"] isEqualToString: @"Manual"];
     
     NSString * fileType = fInfo->multifile ? NSFileTypeForHFSTypeCode('fldr') : [[self name] pathExtension];