Changeset 2169

Timestamp:

Jun 20, 2007, 12:54:05 AM (15 years ago)

Author:

livings124

Message:

simplify some of the repetitive queue code a bit

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (5 diffs)
• Torrent.m (modified) (1 diff)

trunk/macosx/Controller.h

@@ -168 +168 @@
 
 - (void) updateTorrentsInQueue;
+- (int) numToStartFromQueue: (BOOL) downloadQueue;
 
 - (void) torrentFinishedDownloading: (NSNotification *) notification;
 - (void) torrentRestartedDownloading: (NSNotification *) notification;
+
 - (void) updateTorrentHistory;
 

trunk/macosx/Controller.m

@@ -1377 +1377 @@
         seed = [fDefaults boolForKey: @"QueueSeed"];
     
-    //determine the number of downloads needed to start
-    int desiredDownloadActive = download ? [fDefaults integerForKey: @"QueueDownloadNumber"] : 0,
-        desiredSeedActive = seed ? [fDefaults integerForKey: @"QueueSeedNumber"] : 0;
-    
-    Torrent * torrent;
-    NSEnumerator * enumerator;
-    if (download || seed)
-    {
-        enumerator = [fTorrents objectEnumerator];
-        while ((torrent = [enumerator nextObject]))
-            if ([torrent isActive] && ![torrent isStalled] && ![torrent isError])
-            {
-                if ([torrent allDownloaded])
-                    desiredSeedActive--;
-                else
-                    desiredDownloadActive--;
-                
-                if (desiredDownloadActive <= 0 && desiredSeedActive <= 0)
-                    break;
-            }
-    }
+    int desiredDownloadActive = [self numToStartFromQueue: YES],
+        desiredSeedActive = [self numToStartFromQueue: NO];
     
     //sort torrents by order value
@@ -1413 +1394 @@
         sortedTorrents = fTorrents;
 
-    enumerator = [sortedTorrents objectEnumerator];
+    Torrent * torrent;
+    NSEnumerator * enumerator = [sortedTorrents objectEnumerator];
     while ((torrent = [enumerator nextObject]))
     {
@@ -1446 +1428 @@
 }
 
+- (int) numToStartFromQueue: (BOOL) downloadQueue
+{
+    if (![fDefaults boolForKey: downloadQueue ? @"Queue" : @"QueueSeed"])
+        return 0;
+    
+    int desired = [fDefaults integerForKey: downloadQueue ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
+        
+    Torrent * torrent;
+    NSEnumerator * enumerator = [fTorrents objectEnumerator];
+    while ((torrent = [enumerator nextObject]))
+        if ([torrent isActive] && ![torrent isStalled] && ![torrent isError])
+        {
+            if ([torrent allDownloaded] != downloadQueue)
+            {
+                desired--;
+                if (desired <= 0)
+                    return 0;
+            }
+        }
+    
+    return desired;
+}
+
 - (void) torrentFinishedDownloading: (NSNotification *) notification
 {
@@ -1468 +1473 @@
         [fBadger incrementCompleted];
     
-    #warning make better
-    if ([fDefaults boolForKey: @"QueueSeed"])
+    if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] <= 0)
     {
         [torrent stopTransfer];
@@ -1484 +1488 @@
     [fInfoController updateInfoStats];
     
-    #warning make better
-    if ([fDefaults boolForKey: @"Queue"])
+    if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] <= 0)
     {
         [torrent stopTransfer];

trunk/macosx/Torrent.m

@@ -1370 +1370 @@
     }
     
-    #warning when going seeding to download, update queue
     [self update];
-    [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self]; //for paused torrents
+    if ([self isPaused])
+        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self]; //for paused torrents
 }