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

#4923 "Open when created" might not be respected

Browse Source
This commit is contained in:
Mitchell Livingston
2012-05-28 19:43:53 +00:00
parent ff6af7b86a
commit 5bcc41da4e
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/CreatorWindowController.h
View File

@@ -43,7 +43,7 @@
NSMutableArray * fTrackers; NSMutableArray * fTrackers;
NSTimer * fTimer; NSTimer * fTimer;
BOOL fStarted; BOOL fStarted, fOpenWhenCreated;
NSUserDefaults * fDefaults; NSUserDefaults * fDefaults;
} }

29
macosx/CreatorWindowController.m
View File

@@ -36,6 +36,7 @@
+ (NSURL *) chooseFile; + (NSURL *) chooseFile;
- (void) updateLocationField;
- (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo; - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo;
- (void) createReal; - (void) createReal;
- (void) checkProgress; - (void) checkProgress;
@@ -183,9 +184,7 @@
NSString * location = [fDefaults stringForKey: @"CreatorLocation"]; NSString * location = [fDefaults stringForKey: @"CreatorLocation"];
fLocation = [[NSURL alloc] initFileURLWithPath: [[location stringByExpandingTildeInPath] stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]]; fLocation = [[NSURL alloc] initFileURLWithPath: [[location stringByExpandingTildeInPath] stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]];
} }
NSString * pathString = [fLocation path]; [self updateLocationField];
[fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: pathString];
//set previously saved values //set previously saved values
if ([fDefaults objectForKey: @"CreatorPrivate"]) if ([fDefaults objectForKey: @"CreatorPrivate"])
@@ -234,12 +233,9 @@
- (void) window: (NSWindow *) window didDecodeRestorableState: (NSCoder *) coder - (void) window: (NSWindow *) window didDecodeRestorableState: (NSCoder *) coder
{ {
#warning done in 3 places - make a separate method
[fLocation release]; [fLocation release];
fLocation = [[coder decodeObjectForKey: @"TRCreatorLocation"] retain]; fLocation = [[coder decodeObjectForKey: @"TRCreatorLocation"] retain];
NSString * pathString = [fLocation path]; [self updateLocationField];
[fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: pathString];
[fTrackers release]; [fTrackers release];
fTrackers = [[coder decodeObjectForKey: @"TRCreatorTrackers"] retain]; fTrackers = [[coder decodeObjectForKey: @"TRCreatorTrackers"] retain];
@@ -269,10 +265,7 @@
{ {
[fLocation release]; [fLocation release];
fLocation = [[panel URL] retain]; fLocation = [[panel URL] retain];
[self updateLocationField];
NSString * pathString = [fLocation path];
[fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: pathString];
} }
}]; }];
} }
@@ -453,6 +446,13 @@
@implementation CreatorWindowController (Private) @implementation CreatorWindowController (Private)
- (void) updateLocationField
{
NSString * pathString = [fLocation path];
[fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]];
[fLocationField setToolTip: pathString];
}
+ (NSURL *) chooseFile + (NSURL *) chooseFile
{ {
NSOpenPanel * panel = [NSOpenPanel openPanel]; NSOpenPanel * panel = [NSOpenPanel openPanel];
@@ -539,11 +539,11 @@
[fDefaults setObject: fTrackers forKey: @"CreatorTrackers"]; [fDefaults setObject: fTrackers forKey: @"CreatorTrackers"];
[fDefaults setBool: [fPrivateCheck state] == NSOnState forKey: @"CreatorPrivate"]; [fDefaults setBool: [fPrivateCheck state] == NSOnState forKey: @"CreatorPrivate"];
[fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"]; [fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"];
fOpenWhenCreated = [fOpenCheck state] == NSOnState; //need this since the check box might not exist, and value in prefs might have changed from another creator window
[fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"]; [fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"];
[[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil]; [[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil];
tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], [fPrivateCheck state] == NSOnState);
[fPrivateCheck state] == NSOnState);
tr_free(trackerInfo); tr_free(trackerInfo);
fTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1 target: self selector: @selector(checkProgress) fTimer = [NSTimer scheduledTimerWithTimeInterval: 0.1 target: self selector: @selector(checkProgress)
@@ -561,8 +561,7 @@
switch (fInfo->result) switch (fInfo->result)
{ {
case TR_MAKEMETA_OK: case TR_MAKEMETA_OK:
#warning this isn't safe - what if another window changes it after hitting the create button on this window? if (fOpenWhenCreated)
if ([fDefaults boolForKey: @"CreatorOpen"])
{ {
NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: [fLocation path], @"File", NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: [fLocation path], @"File",
[[fPath URLByDeletingLastPathComponent] path], @"Path", nil]; [[fPath URLByDeletingLastPathComponent] path], @"Path", nil];