mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

another queue adjustment

This commit is contained in:
Mitchell Livingston 2007-01-09 02:48:25 +00:00
parent 26c79a5d43
commit cc7d0e3caf
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
macosx/Controller.m
View File

@ -1561,7 +1561,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
- (void) torrentStoppedForRatio: (NSNotification *) notification
{
[self applyFilter: nil];
[self updateTorrentsInQueue];
[fInfoController updateInfoStats];
if ([fDefaults boolForKey: @"PlaySeedingSound"])
@ -1581,7 +1581,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[self updateTorrentsInQueue];
}
//will try to start, taking into consideration the start preference
- (void) updateTorrentsInQueue
{
if (![fDefaults boolForKey: @"Queue"])
@ -1600,38 +1599,44 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
}
//determine the number of downloads needed to start
int desiredActive = [fDefaults integerForKey: @"QueueDownloadNumber"];
int desiredDownloadActive = [fDefaults integerForKey: @"QueueDownloadNumber"];
NSEnumerator * enumerator = [fTorrents objectEnumerator];
Torrent * torrent;
while ((torrent = [enumerator nextObject]))
if ([torrent isActive] && ![torrent isSeeding] && ![torrent isError])
{
desiredActive--;
if (desiredActive <= 0)
desiredDownloadActive--;
if (desiredDownloadActive <= 0)
break;
}
//sort torrents by order value
NSArray * sortedTorrents;
if ([fTorrents count] > 1 && desiredDownloadActive > 0)
{
NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
@"orderValue" ascending: YES] autorelease];
NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
NSArray * sortedTorrents = [fTorrents sortedArrayUsingDescriptors: descriptors];
sortedTorrents = [fTorrents sortedArrayUsingDescriptors: descriptors];
[descriptors release];
}
else
sortedTorrents = fTorrents;
enumerator = [sortedTorrents objectEnumerator];
while ((torrent = [enumerator nextObject]))
{
if ([torrent waitingToStart])
if (![torrent isActive] && [torrent waitingToStart])
{
if ([torrent progress] >= 1.0)
[torrent startTransfer];
else if (desiredActive > 0)
else if (desiredDownloadActive > 0)
{
[torrent startTransfer];
if ([torrent isActive])
desiredActive--;
desiredDownloadActive--;
}
else
continue;