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

when migrating old blacklists, use URLs instead of string paths and don't hardcode the Application Support folder location

Browse Source
This commit is contained in:
Mitchell Livingston
2012-05-28 17:43:51 +00:00
parent 84a7f149a6
commit ff6af7b86a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
macosx/PrefsController.m
View File

@@ -103,10 +103,9 @@ tr_session * fHandle;
[fDefaults setObject: blocklistDate forKey: @"BlocklistNewLastUpdate"]; [fDefaults setObject: blocklistDate forKey: @"BlocklistNewLastUpdate"];
[fDefaults removeObjectForKey: @"BlocklistLastUpdate"]; [fDefaults removeObjectForKey: @"BlocklistLastUpdate"];
NSString * blocklistDir = [NSHomeDirectory() stringByAppendingPathComponent: NSURL * blocklistDir = [[[[NSFileManager defaultManager] URLsForDirectory: NSApplicationDirectory inDomains: NSUserDomainMask] objectAtIndex: 0] URLByAppendingPathComponent: @"Transmission/blocklists/"];
@"/Library/Application Support/Transmission/blocklists/"]; [[NSFileManager defaultManager] moveItemAtURL: [blocklistDir URLByAppendingPathComponent: @"level1.bin"]
[[NSFileManager defaultManager] moveItemAtPath: [blocklistDir stringByAppendingPathComponent: @"level1.bin"] toURL: [blocklistDir URLByAppendingPathComponent: [NSString stringWithUTF8String: DEFAULT_BLOCKLIST_FILENAME]]
toPath: [blocklistDir stringByAppendingPathComponent: [NSString stringWithUTF8String: DEFAULT_BLOCKLIST_FILENAME]]
error: nil]; error: nil];
} }
@@ -444,8 +443,7 @@ tr_session * fHandle;
{ {
NSMutableArray * sounds = [NSMutableArray array]; NSMutableArray * sounds = [NSMutableArray array];
NSArray * directories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory, NSArray * directories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory, NSUserDomainMask | NSLocalDomainMask | NSSystemDomainMask, YES);
NSUserDomainMask | NSLocalDomainMask | NSSystemDomainMask, YES);
for (NSString * directory in directories) for (NSString * directory in directories)
{ {