Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

#5223 Use VDKQueue for watching for torrent files

Browse Source
This commit is contained in:
Mitchell Livingston
2013-01-19 05:03:00 +00:00
parent 818308376b
commit bc574a559a
18 changed files with 727 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
macosx/Controller.m
View File

@@ -60,7 +60,7 @@
#import "utils.h"
#import "variant.h"
#import "UKKQueue.h"
#import "VDKQueue.h"
#import <Sparkle/Sparkle.h>
#define TOOLBAR_CREATE @"Toolbar Create"
@@ -160,6 +160,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
#warning remove ivars in header when 64-bit only (or it compiles in 32-bit mode)
@synthesize prefsController = fPrefsController;
@synthesize messageWindowController = fMessageController;
@synthesize fileWatcherQueue = fFileWatcherQueue;
+ (void) initialize
{
@@ -371,6 +372,10 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
fInfoController = [[InfoWindowController alloc] init];
//needs to be done before init-ing the prefs controller
fFileWatcherQueue = [[[VDKQueue alloc] init] autorelease];
[fFileWatcherQueue setDelegate: self];
fPrefsController = [[PrefsController alloc] initWithHandle: fLib];
fQuitting = NO;
@@ -385,8 +390,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[GrowlApplicationBridge setGrowlDelegate: self];
[[UKKQueue sharedFileWatcher] setDelegate: self];
[[SUUpdater sharedUpdater] setDelegate: self];
fQuitRequested = NO;
@@ -777,6 +780,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[fConfigDirectory release];
[fFileWatcherQueue release];
//complete cleanup
tr_sessionClose(fLib);
}
@@ -2929,27 +2934,26 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
fSoundPlaying = NO;
}
- (void) watcher: (id<UKFileWatcher>) watcher receivedNotification: (NSString *) notification forPath: (NSString *) path
-(void) VDKQueue: (VDKQueue *) queue receivedNotification: (NSString*) notification forPath: (NSString*) fpath
{
if ([notification isEqualToString: UKFileWatcherWriteNotification])
NSParameterAssert([notification isEqualToString:VDKQueueWriteNotification]);NSLog(@"%@",notification);
if (![fDefaults boolForKey: @"AutoImport"] || ![fDefaults stringForKey: @"AutoImportDirectory"])
return;
if (fAutoImportTimer)
{
if (![fDefaults boolForKey: @"AutoImport"] || ![fDefaults stringForKey: @"AutoImportDirectory"])
return;
if (fAutoImportTimer)
{
if ([fAutoImportTimer isValid])
[fAutoImportTimer invalidate];
[fAutoImportTimer release];
fAutoImportTimer = nil;
}
//check again in 10 seconds in case torrent file wasn't complete
fAutoImportTimer = [[NSTimer scheduledTimerWithTimeInterval: 10.0 target: self
selector: @selector(checkAutoImportDirectory) userInfo: nil repeats: NO] retain];
[self checkAutoImportDirectory];
if ([fAutoImportTimer isValid])
[fAutoImportTimer invalidate];
[fAutoImportTimer release];
fAutoImportTimer = nil;
}
//check again in 10 seconds in case torrent file wasn't complete
fAutoImportTimer = [[NSTimer scheduledTimerWithTimeInterval: 10.0 target: self
selector: @selector(checkAutoImportDirectory) userInfo: nil repeats: NO] retain];
[self checkAutoImportDirectory];
}
- (void) changeAutoImport