mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-22 06:00:41 +00:00
Code Issues Releases Wiki Activity

#4839 Use configuration directory retrieved from libtransmission

Browse source
This commit is contained in:
Mitchell Livingston 2012-03-18 14:33:50 +00:00
parent 87b6288c73
commit 496290d263
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
macosx/Controller.h
View file

@ -61,6 +61,8 @@ typedef enum
NSUserDefaults * fDefaults;
NSString * fConfigDirectory;
IBOutlet NSWindow * fWindow;
DragOverlayWindow * fOverlayWindow;
IBOutlet TorrentTableView * fTableView;

12
macosx/Controller.m
View file

@ -324,6 +324,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
fLib = tr_sessionInit("macosx", configDir, YES, &settings);
tr_bencFree(&settings);
fConfigDirectory = [[NSString alloc] initWithUTF8String: configDir];
[NSApp setDelegate: self];
//register for magnet URLs (has to be in init)
@ -444,8 +446,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
NSLog(@"Could not IORegisterForSystemPower");
//load previous transfers
NSURL * historyURL = [[[[[NSFileManager defaultManager] URLsForDirectory: NSApplicationSupportDirectory inDomains: NSUserDomainMask] objectAtIndex: 0] URLByAppendingPathComponent: @"Transmission"] URLByAppendingPathComponent: TRANSFER_PLIST];
NSArray * history = [NSArray arrayWithContentsOfURL: historyURL];
NSString * historyFile = [fConfigDirectory stringByAppendingPathComponent: TRANSFER_PLIST];
NSArray * history = [NSArray arrayWithContentsOfFile: historyFile];
if (!history)
{
//old version saved transfer info in prefs file
@ -724,6 +726,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
[fPreviewPanel release];
[fConfigDirectory release];
//complete cleanup
tr_sessionClose(fLib);
}
@ -1903,8 +1907,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
for (Torrent * torrent in fTorrents)
[history addObject: [torrent history]];
NSURL * historyURL = [[[[[NSFileManager defaultManager] URLsForDirectory: NSApplicationSupportDirectory inDomains: NSUserDomainMask] objectAtIndex: 0] URLByAppendingPathComponent: @"Transmission"] URLByAppendingPathComponent: TRANSFER_PLIST];
[history writeToURL: historyURL atomically: YES];
NSString * historyFile = [fConfigDirectory stringByAppendingPathComponent: TRANSFER_PLIST];
[history writeToFile: historyFile atomically: YES];
}
- (void) setSort: (id) sender