mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 13:16:53 +00:00
Code Issues Releases Wiki Activity

Don't auto-import torrents after they have been auto-imported. Useful for removing a transfer without it instantly being re-added.

Browse source
This commit is contained in:
Mitchell Livingston 2006-10-16 02:35:42 +00:00
parent 85383a66e4
commit f09f6568b0
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
macosx/Controller.h
View file

@ -92,6 +92,8 @@
BOOL fUpdateInProgress;
Badger * fBadger;
NSArray * fAutoImportedNames;
}
- (void) openFiles: (NSArray *) filenames;
@ -175,6 +177,7 @@
- (void) attemptToStartAuto: (Torrent *) torrent;
- (void) attemptToStartMultipleAuto: (NSArray *) torrents;
- (void) changeAutoImport;
- (void) checkAutoImportDirectory;
- (void) sleepCallBack: (natural_t) messageType argument: (void *) messageArgument;

30
macosx/Controller.m
View file

@ -113,6 +113,9 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[fSortType release];
[fFilterType release];
if (fAutoImportedNames)
[fAutoImportedNames release];
tr_close(fLib);
[super dealloc];
}
@ -320,7 +323,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[nc addObserver: self selector: @selector(autoSpeedLimitChange:)
name: @"AutoSpeedLimitChange" object: nil];
[nc addObserver: self selector: @selector(checkAutoImportDirectory)
[nc addObserver: self selector: @selector(changeAutoImport)
name: @"AutoImportSettingChange" object: nil];
[nc addObserver: self selector: @selector(setWindowSizeToFit)
@ -1558,6 +1561,18 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[self checkAutoImportDirectory];
}
- (void) changeAutoImport
{
if (fAutoImportedNames)
{
[fAutoImportedNames release];
fAutoImportedNames = nil;
}
if ([fDefaults boolForKey: @"AutoImport"])
[self checkAutoImportDirectory];
}
- (void) checkAutoImportDirectory
{
if (![fDefaults boolForKey: @"AutoImport"])
@ -1569,10 +1584,18 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
if (!(importedNames = [[NSFileManager defaultManager] directoryContentsAtPath: path]))
return;
NSEnumerator * enumerator = [importedNames objectEnumerator];
//only import those that have not been imported yet
NSMutableArray * newNames = [importedNames mutableCopy];
[newNames removeObjectsInArray: fAutoImportedNames];
if (fAutoImportedNames)
[fAutoImportedNames release];
fAutoImportedNames = [importedNames retain];
NSEnumerator * enumerator = [newNames objectEnumerator];
NSString * file;
unsigned oldCount;
while ((file = [enumerator nextObject]))
{
if ([[file pathExtension] caseInsensitiveCompare: @"torrent"] == NSOrderedSame)
{
oldCount = [fTorrents count];
@ -1583,6 +1606,9 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
[GrowlApplicationBridge notifyWithTitle: @"Torrent File Auto Added" description: file
notificationName: GROWL_AUTO_ADD iconData: nil priority: 0 isSticky: NO clickContext: nil];
}
}
[newNames release];
}
- (int) numberOfRowsInTableView: (NSTableView *) t