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

removed redundant queueing code

This commit is contained in:
Mitchell Livingston 2007-01-09 04:23:35 +00:00
parent cae91090cc
commit a7b2d268c0
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
macosx/Controller.m
View File

@ -1140,38 +1140,27 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
BOOL download = [fDefaults boolForKey: @"Queue"], BOOL download = [fDefaults boolForKey: @"Queue"],
seed = [fDefaults boolForKey: @"QueueSeed"]; seed = [fDefaults boolForKey: @"QueueSeed"];
if (!download && !seed)
{
NSEnumerator * enumerator = [fTorrents objectEnumerator];
Torrent * torrent;
while ((torrent = [enumerator nextObject]))
if (![torrent isActive] && [torrent waitingToStart])
[torrent startTransfer];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
return;
}
//determine the number of downloads needed to start //determine the number of downloads needed to start
int desiredDownloadActive = download ? [fDefaults integerForKey: @"QueueDownloadNumber"] : 0, int desiredDownloadActive = download ? [fDefaults integerForKey: @"QueueDownloadNumber"] : 0,
desiredSeedActive = seed ? [fDefaults integerForKey: @"QueueSeedNumber"] : 0; desiredSeedActive = seed ? [fDefaults integerForKey: @"QueueSeedNumber"] : 0;
NSEnumerator * enumerator = [fTorrents objectEnumerator];
Torrent * torrent; Torrent * torrent;
while ((torrent = [enumerator nextObject])) NSEnumerator * enumerator;
if ([torrent isActive] && ![torrent isError]) if (download || seed)
{ {
if ([torrent progress] < 1.0) enumerator = [fTorrents objectEnumerator];
desiredDownloadActive--; while ((torrent = [enumerator nextObject]))
else if ([torrent isActive] && ![torrent isError])
desiredSeedActive--; {
if ([torrent progress] < 1.0)
if (desiredDownloadActive <= 0 && desiredSeedActive <= 0) desiredDownloadActive--;
break; else
} desiredSeedActive--;
if (desiredDownloadActive <= 0 && desiredSeedActive <= 0)
break;
}
}
//sort torrents by order value //sort torrents by order value
NSArray * sortedTorrents; NSArray * sortedTorrents;
@ -1259,7 +1248,6 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
{ {
[torrent stopTransfer]; [torrent stopTransfer];
[torrent setWaitToStart: YES]; [torrent setWaitToStart: YES];
[torrent update];
} }
} }