Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-25 04:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Getting closer to a perfected queue.

Browse Source
This commit is contained in:
Mitchell Livingston
2006-06-24 18:28:50 +00:00
parent b79e503e1a
commit b057efe9fa
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
macosx/Controller.m
View File

@@ -578,8 +578,15 @@ static void sleepCallBack(void * controller, io_service_t y,
- (void) confirmRemove: (NSArray *) torrents
deleteData: (BOOL) deleteData deleteTorrent: (BOOL) deleteTorrent
{
Torrent * torrent;
//don't want any of these starting then stopping
NSEnumerator * enumerator = [torrents objectEnumerator];
Torrent * torrent;
while ((torrent = [enumerator nextObject]))
[torrent setWaitToStart: NO];
NSNumber * lowestOrderValue = [NSNumber numberWithInt: [torrents count]], * currentOrederValue;
enumerator = [torrents objectEnumerator];
while ((torrent = [enumerator nextObject]))
{
[torrent stopTransfer];
@@ -588,11 +595,31 @@ static void sleepCallBack(void * controller, io_service_t y,
[torrent trashData];
if (deleteTorrent)
[torrent trashTorrent];
//determine lowest order value
currentOrederValue = [torrent orderValue];
if ([lowestOrderValue compare: currentOrederValue] == NSOrderedDescending)
lowestOrderValue = currentOrederValue;
[torrent removeForever];
[fTorrents removeObject: torrent];
}
[torrents release];
//reset the order values if necessary
if ([lowestOrderValue intValue] < [fTorrents count])
{
NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
@"orderValue" ascending: YES] autorelease];
NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
NSArray * tempTorrents = [fTorrents sortedArrayUsingDescriptors: descriptors];
[descriptors release];
int i;
for (i = [lowestOrderValue intValue]; i < [tempTorrents count]; i++)
[[tempTorrents objectAtIndex: i] setOrderValue: i];
}
[self torrentNumberChanged];
[fTableView deselectAll: nil];