Changeset 9312

Timestamp:

Oct 16, 2009, 11:02:55 PM (13 years ago)

Author:

livings124

Message:

small adjustments to the queue

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (6 diffs)
• en.lproj/Localizable.strings (modified) (2 diffs)

trunk/macosx/Controller.h

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

trunk/macosx/Controller.m

@@ -1689 +1689 @@
 - (void) updateTorrentsInQueue
 {
-    BOOL download = [fDefaults boolForKey: @"Queue"],
-        seed = [fDefaults boolForKey: @"QueueSeed"];
-    
-    NSInteger desiredDownloadActive = [self numToStartFromQueue: YES],
-        desiredSeedActive = [self numToStartFromQueue: NO];
+    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 (!download || desiredDownloadActive > 0)
+                if (desiredDownloadActive > 0)
                 {
                     [torrent startTransfer];
                     if ([torrent isActive])
-                        desiredDownloadActive--;
+                        --desiredDownloadActive;
                     [torrent update];
                 }
@@ -1711 +1711 @@
             else
             {
-                if (!seed || desiredSeedActive > 0)
+                if (desiredSeedActive > 0)
                 {
                     [torrent startTransfer];
                     if ([torrent isActive])
-                        desiredSeedActive--;
+                        --desiredSeedActive;
                     [torrent update];
                 }
@@ -1727 +1727 @@
 }
 
-- (NSInteger) numToStartFromQueue: (BOOL) downloadQueue
+- (NSUInteger) numToStartFromQueue: (BOOL) downloadQueue
 {
     if (![fDefaults boolForKey: downloadQueue ? @"Queue" : @"QueueSeed"])
         return 0;
     
-    NSInteger desired = [fDefaults integerForKey: downloadQueue ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
+    NSUInteger desired = [fDefaults integerForKey: downloadQueue ? @"QueueDownloadNumber" : @"QueueSeedNumber"];
         
     for (Torrent * torrent in fTorrents)
     {
+        if (desired == 0)
+            break;
+        
         if ([torrent isChecking])
-        {
-            desired--;
-            if (desired <= 0)
-                return 0;
-        }
+            --desired;
         else if ([torrent isActive] && ![torrent isStalled] && ![torrent isError])
         {
             if ([torrent allDownloaded] != downloadQueue)
-            {
-                desired--;
-                if (desired <= 0)
-                    return 0;
-            }
+                --desired;
         }
         else;
@@ -1787 +1782 @@
             object: [[torrent downloadFolder] stringByAppendingPathComponent: [torrent name]]];
         
-        if ([fDefaults boolForKey: @"QueueSeed"] && [self numToStartFromQueue: NO] <= 0)
+        if ([self numToStartFromQueue: NO] == 0)
         {
             [torrent stopTransfer];
@@ -1802 +1797 @@
     if ([torrent isActive])
     {
-        if ([fDefaults boolForKey: @"Queue"] && [self numToStartFromQueue: YES] <= 0)
+        if ([self numToStartFromQueue: YES] == 0)
         {
             [torrent stopTransfer];
@@ -3569 +3564 @@
             default:
                 NSAssert1(NO, @"Unknown sort tag received: %d", [menuItem tag]);
-                return;
+                return NO;
         }
         

trunk/macosx/en.lproj/Localizable.strings

@@ -720 +720 @@
 "Resume the transfer right away" = "Resume the transfer right away";
 
-/* Torrent cell -> button info */
-"Reveal the data file in Finder" = "Reveal the data file in Finder";
-
 /* Stats window -> label */
 "Running Time" = "Running Time";
@@ -791 +788 @@
 "Show Status Bar" = "Show Status Bar";
 
+/* Torrent cell -> button info */
+"Show the data file in Finder" = "Show the data file in Finder";
+
 /* Status Bar -> speed tooltip */
 "Speed Limit" = "Speed Limit";