mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-09 21:54:09 +00:00
Code Issues Releases Wiki Activity

simplify queueing core a bit...will make things easier later

Browse source
This commit is contained in:
Mitchell Livingston 2007-01-09 01:09:23 +00:00
parent 6b5a40ad91
commit fcf6161e85
3 changed files with 28 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
macosx/Controller.h
View file

@ -172,15 +172,13 @@
- (void) setQuickRatioGlobal: (id) sender;
#warning simplify?
- (void) checkWaitingForStopped: (NSNotification *) notification;
- (void) checkToStartWaiting: (Torrent *) finishedTorrent;
- (void) torrentStartSettingChange: (NSNotification *) notification;
- (void) globalStartSettingChange: (NSNotification *) notification;
- (void) torrentStoppedForRatio: (NSNotification *) notification;
- (void) attemptToStartAuto: (Torrent *) torrent;
- (void) attemptToStartMultipleAuto: (NSArray *) torrents;
- (void) updateTorrentsInQueue;
- (void) changeAutoImport;
- (void) checkAutoImportDirectory;

107
macosx/Controller.m
View file

@ -597,16 +597,12 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[torrent setDownloadFolder: folder];
[torrent update];
[self attemptToStartAuto: torrent];
[fTorrents addObject: torrent];
[torrent release];
}
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
[self updateTorrentsInQueue];
}
//called by the main open method to show sheet for choosing download location
@ -661,12 +657,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
{
[torrent setDownloadFolder: [[openPanel filenames] objectAtIndex: 0]];
[torrent update];
[self attemptToStartAuto: torrent];
[fTorrents addObject: torrent];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentsInQueue];
}
[self performSelectorOnMainThread: @selector(openFilesAskWithDict:) withObject: dictionary waitUntilDone: NO];
@ -791,11 +785,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
while ((torrent = [enumerator nextObject]))
[torrent setWaitToStart: YES];
[self attemptToStartMultipleAuto: torrents];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
[self updateTorrentsInQueue];
}
- (void) resumeSelectedTorrentsNoWait: (id) sender
@ -1156,8 +1146,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[fInfoController updateInfoStats];
[self applyFilter: nil];
[self checkToStartWaiting: torrent];
[self updateTorrentsInQueue];
if ([fDefaults boolForKey: @"PlayDownloadSound"])
{
@ -1577,74 +1566,21 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
- (void) checkWaitingForStopped: (NSNotification *) notification
{
[self checkToStartWaiting: [notification object]];
[self updateTorrentsInQueue];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
}
- (void) checkToStartWaiting: (Torrent *) finishedTorrent
{
//don't try to start a transfer if there should be none waiting
if (![fDefaults boolForKey: @"Queue"])
return;
int desiredActive = [fDefaults integerForKey: @"QueueDownloadNumber"];
NSEnumerator * enumerator = [fTorrents objectEnumerator];
Torrent * torrent, * torrentToStart = nil;
while ((torrent = [enumerator nextObject]))
{
//ignore the torrent just stopped
if (torrent == finishedTorrent)
continue;
if ([torrent isActive])
{
if (![torrent isSeeding] && ![torrent isError])
{
desiredActive--;
if (desiredActive <= 0)
return;
}
}
else
{
//use as next if it is waiting to start and either no previous or order value is lower
if ([torrent waitingToStart] && (!torrentToStart
|| [[torrentToStart orderValue] compare: [torrent orderValue]] == NSOrderedDescending))
torrentToStart = torrent;
}
}
//since it hasn't returned, the queue amount has not been met
if (torrentToStart)
{
[torrentToStart startTransfer];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
}
}
- (void) torrentStartSettingChange: (NSNotification *) notification
{
[self attemptToStartMultipleAuto: [notification object]];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
[self updateTorrentsInQueue];
}
- (void) globalStartSettingChange: (NSNotification *) notification
{
[self attemptToStartMultipleAuto: fTorrents];
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
[self updateTorrentsInQueue];
}
- (void) torrentStoppedForRatio: (NSNotification *) notification
@ -1666,15 +1602,15 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
- (void) attemptToStartAuto: (Torrent *) torrent
{
[self attemptToStartMultipleAuto: [NSArray arrayWithObject: torrent]];
[self updateTorrentsInQueue];
}
//will try to start, taking into consideration the start preference
- (void) attemptToStartMultipleAuto: (NSArray *) torrents
- (void) updateTorrentsInQueue
{
if (![fDefaults boolForKey: @"Queue"])
{
NSEnumerator * enumerator = [torrents objectEnumerator];
NSEnumerator * enumerator = [fTorrents objectEnumerator];
Torrent * torrent;
while ((torrent = [enumerator nextObject]))
if ([torrent waitingToStart])
@ -1697,18 +1633,12 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
}
//sort torrents by order value
NSArray * sortedTorrents;
if ([torrents count] > 1 && desiredActive > 0)
{
NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
@"orderValue" ascending: YES] autorelease];
NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
NSSortDescriptor * orderDescriptor = [[[NSSortDescriptor alloc] initWithKey:
@"orderValue" ascending: YES] autorelease];
NSArray * descriptors = [[NSArray alloc] initWithObjects: orderDescriptor, nil];
sortedTorrents = [torrents sortedArrayUsingDescriptors: descriptors];
[descriptors release];
}
else
sortedTorrents = torrents;
NSArray * sortedTorrents = [fTorrents sortedArrayUsingDescriptors: descriptors];
[descriptors release];
enumerator = [sortedTorrents objectEnumerator];
while ((torrent = [enumerator nextObject]))
@ -1720,7 +1650,8 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
else if (desiredActive > 0)
{
[torrent startTransfer];
desiredActive--;
if ([torrent isActive])
desiredActive--;
}
else
continue;
@ -1728,6 +1659,10 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[torrent update];
}
}
[self updateUI: nil];
[self applyFilter: nil];
[self updateTorrentHistory];
}
-(void) watcher: (id<UKFileWatcher>) watcher receivedNotification: (NSString *) notification forPath: (NSString *) path

5
macosx/Torrent.m
View file

@ -258,6 +258,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
fIncompleteFolder = nil;
}
fStat = tr_torrentStat(fHandle);
[[NSNotificationCenter defaultCenter] postNotificationName: @"TorrentFinishedDownloading" object: self];
}
@ -446,7 +447,10 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
fFinishedSeeding = NO;
if (![self isActive] && [self alertForVolumeAvailable] && [self alertForRemainingDiskSpace])
{
tr_torrentStart(fHandle);
[self update];
}
}
- (void) stopTransfer
@ -458,6 +462,7 @@ static uint32_t kRed = BE(0xFF6450FF), //255, 100, 80
BOOL wasSeeding = [self isSeeding];
tr_torrentStop(fHandle);
[self update];
if (!wasSeeding)
[[NSNotificationCenter defaultCenter] postNotificationName: @"StoppedDownloading" object: self];