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

update Mac code for logging changes in r13868

Browse Source
This commit is contained in:
Mitchell Livingston
2013-01-26 19:17:58 +00:00
parent 6123bb5359
commit 94a329b38a
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Transmission.xcodeproj/project.pbxproj
View File

@@ -269,6 +269,8 @@
A2AB76EA15D8130B009EFC95 /* libcurl.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A2290D2D1442B23200B95A09 /* libcurl.4.dylib */; }; A2AB76EA15D8130B009EFC95 /* libcurl.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A2290D2D1442B23200B95A09 /* libcurl.4.dylib */; };
A2AB883E16A399A6008FAD50 /* VDKQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AB883C16A399A6008FAD50 /* VDKQueue.m */; }; A2AB883E16A399A6008FAD50 /* VDKQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AB883C16A399A6008FAD50 /* VDKQueue.m */; };
A2AF1C390A3D0F6200F1575D /* FileOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */; }; A2AF1C390A3D0F6200F1575D /* FileOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */; };
A2AF23C816B44FA0003BC59E /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = A2AF23C616B44FA0003BC59E /* log.c */; };
A2AF23C916B44FA0003BC59E /* log.h in Headers */ = {isa = PBXBuildFile; fileRef = A2AF23C716B44FA0003BC59E /* log.h */; };
A2B3FB460E5901E700FF78FB /* cli.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B3FB450E5901E700FF78FB /* cli.c */; }; A2B3FB460E5901E700FF78FB /* cli.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B3FB450E5901E700FF78FB /* cli.c */; };
A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
A2B3FB530E59027100FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; A2B3FB530E59027100FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -974,6 +976,8 @@
A2AC81D60D987E2D00A2878C /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/AddWindow.xib; sourceTree = "<group>"; }; A2AC81D60D987E2D00A2878C /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/AddWindow.xib; sourceTree = "<group>"; };
A2AF1C360A3D0F6200F1575D /* FileOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileOutlineView.h; path = macosx/FileOutlineView.h; sourceTree = "<group>"; }; A2AF1C360A3D0F6200F1575D /* FileOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileOutlineView.h; path = macosx/FileOutlineView.h; sourceTree = "<group>"; };
A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileOutlineView.m; path = macosx/FileOutlineView.m; sourceTree = "<group>"; }; A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = FileOutlineView.m; path = macosx/FileOutlineView.m; sourceTree = "<group>"; };
A2AF23C616B44FA0003BC59E /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = log.c; path = libtransmission/log.c; sourceTree = "<group>"; };
A2AF23C716B44FA0003BC59E /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = libtransmission/log.h; sourceTree = "<group>"; };
A2B3FB450E5901E700FF78FB /* cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cli.c; path = cli/cli.c; sourceTree = "<group>"; }; A2B3FB450E5901E700FF78FB /* cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cli.c; path = cli/cli.c; sourceTree = "<group>"; };
A2B5BB7A0D9C7C2300FCB650 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = macosx/es.lproj/AddWindow.xib; sourceTree = "<group>"; }; A2B5BB7A0D9C7C2300FCB650 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = macosx/es.lproj/AddWindow.xib; sourceTree = "<group>"; };
A2B6141B1395ADE9000E0975 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; A2B6141B1395ADE9000E0975 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
@@ -1728,6 +1732,8 @@
A25BFD68167BED3B0039D1AA /* variant.h */, A25BFD68167BED3B0039D1AA /* variant.h */,
A2EA522F1686AC0D00180493 /* quark.c */, A2EA522F1686AC0D00180493 /* quark.c */,
A2EA52301686AC0D00180493 /* quark.h */, A2EA52301686AC0D00180493 /* quark.h */,
A2AF23C616B44FA0003BC59E /* log.c */,
A2AF23C716B44FA0003BC59E /* log.h */,
A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */, A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */,
A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */, A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */,
4DB74F070E8CD75100AEB1A8 /* wildmat.c */, 4DB74F070E8CD75100AEB1A8 /* wildmat.c */,
@@ -2069,6 +2075,7 @@
A25BFD6A167BED3B0039D1AA /* variant-common.h in Headers */, A25BFD6A167BED3B0039D1AA /* variant-common.h in Headers */,
A25BFD6E167BED3B0039D1AA /* variant.h in Headers */, A25BFD6E167BED3B0039D1AA /* variant.h in Headers */,
A2EA52321686AC0D00180493 /* quark.h in Headers */, A2EA52321686AC0D00180493 /* quark.h in Headers */,
A2AF23C916B44FA0003BC59E /* log.h in Headers */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -2676,6 +2683,7 @@
A25BFD6B167BED3B0039D1AA /* variant-json.c in Sources */, A25BFD6B167BED3B0039D1AA /* variant-json.c in Sources */,
A25BFD6D167BED3B0039D1AA /* variant.c in Sources */, A25BFD6D167BED3B0039D1AA /* variant.c in Sources */,
A2EA52311686AC0D00180493 /* quark.c in Sources */, A2EA52311686AC0D00180493 /* quark.c in Sources */,
A2AF23C816B44FA0003BC59E /* log.c in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

2
macosx/Controller.m
View File

@@ -279,7 +279,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
stringByExpandingTildeInPath] UTF8String]); stringByExpandingTildeInPath] UTF8String]);
tr_variantDictAddBool(&settings, TR_KEY_incomplete_dir_enabled, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]); tr_variantDictAddBool(&settings, TR_KEY_incomplete_dir_enabled, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]);
tr_variantDictAddBool(&settings, TR_KEY_lpd_enabled, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]); tr_variantDictAddBool(&settings, TR_KEY_lpd_enabled, [fDefaults boolForKey: @"LocalPeerDiscoveryGlobal"]);
tr_variantDictAddInt(&settings, TR_KEY_message_level, TR_MSG_DBG); tr_variantDictAddInt(&settings, TR_KEY_message_level, TR_LOG_DEBUG);
tr_variantDictAddInt(&settings, TR_KEY_peer_limit_global, [fDefaults integerForKey: @"PeersTotal"]); tr_variantDictAddInt(&settings, TR_KEY_peer_limit_global, [fDefaults integerForKey: @"PeersTotal"]);
tr_variantDictAddInt(&settings, TR_KEY_peer_limit_per_torrent, [fDefaults integerForKey: @"PeersTorrent"]); tr_variantDictAddInt(&settings, TR_KEY_peer_limit_per_torrent, [fDefaults integerForKey: @"PeersTorrent"]);

28
macosx/MessageWindowController.m
View File

@@ -27,8 +27,8 @@
#import "NSApplicationAdditions.h" #import "NSApplicationAdditions.h"
#import "NSMutableArrayAdditions.h" #import "NSMutableArrayAdditions.h"
#import "NSStringAdditions.h" #import "NSStringAdditions.h"
#import <log.h>
#import <transmission.h> #import <transmission.h>
#import <utils.h>
#define LEVEL_ERROR 0 #define LEVEL_ERROR 0
#define LEVEL_INFO 1 #define LEVEL_INFO 1
@@ -114,17 +114,17 @@
//select proper level in popup button //select proper level in popup button
switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"]) switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
{ {
case TR_MSG_ERR: case TR_LOG_ERROR:
[fLevelButton selectItemAtIndex: LEVEL_ERROR]; [fLevelButton selectItemAtIndex: LEVEL_ERROR];
break; break;
case TR_MSG_INF: case TR_LOG_INFO:
[fLevelButton selectItemAtIndex: LEVEL_INFO]; [fLevelButton selectItemAtIndex: LEVEL_INFO];
break; break;
case TR_MSG_DBG: case TR_LOG_DEBUG:
[fLevelButton selectItemAtIndex: LEVEL_DEBUG]; [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
break; break;
default: //safety default: //safety
[[NSUserDefaults standardUserDefaults] setInteger: TR_MSG_ERR forKey: @"MessageLevel"]; [[NSUserDefaults standardUserDefaults] setInteger: TR_LOG_ERROR forKey: @"MessageLevel"];
[fLevelButton selectItemAtIndex: LEVEL_ERROR]; [fLevelButton selectItemAtIndex: LEVEL_ERROR];
} }
@@ -270,11 +270,11 @@
const NSInteger level = [[message objectForKey: @"Level"] integerValue]; const NSInteger level = [[message objectForKey: @"Level"] integerValue];
switch (level) switch (level)
{ {
case TR_MSG_ERR: case TR_LOG_ERROR:
return [NSImage imageNamed: @"RedDot"]; return [NSImage imageNamed: @"RedDot"];
case TR_MSG_INF: case TR_LOG_INFO:
return [NSImage imageNamed: @"YellowDot"]; return [NSImage imageNamed: @"YellowDot"];
case TR_MSG_DBG: case TR_LOG_DEBUG:
return [NSImage imageNamed: @"PurpleDot"]; return [NSImage imageNamed: @"PurpleDot"];
default: default:
NSAssert1(NO, @"Unknown message log level: %ld", level); NSAssert1(NO, @"Unknown message log level: %ld", level);
@@ -342,13 +342,13 @@
switch ([fLevelButton indexOfSelectedItem]) switch ([fLevelButton indexOfSelectedItem])
{ {
case LEVEL_ERROR: case LEVEL_ERROR:
level = TR_MSG_ERR; level = TR_LOG_ERROR;
break; break;
case LEVEL_INFO: case LEVEL_INFO:
level = TR_MSG_INF; level = TR_LOG_INFO;
break; break;
case LEVEL_DEBUG: case LEVEL_DEBUG:
level = TR_MSG_DBG; level = TR_LOG_DEBUG;
break; break;
default: default:
NSAssert1(NO, @"Unknown message log level: %ld", [fLevelButton indexOfSelectedItem]); NSAssert1(NO, @"Unknown message log level: %ld", [fLevelButton indexOfSelectedItem]);
@@ -535,13 +535,13 @@
const NSInteger level = [[message objectForKey: @"Level"] integerValue]; const NSInteger level = [[message objectForKey: @"Level"] integerValue];
switch (level) switch (level)
{ {
case TR_MSG_ERR: case TR_LOG_ERROR:
levelString = NSLocalizedString(@"Error", "Message window -> level"); levelString = NSLocalizedString(@"Error", "Message window -> level");
break; break;
case TR_MSG_INF: case TR_LOG_INFO:
levelString = NSLocalizedString(@"Info", "Message window -> level"); levelString = NSLocalizedString(@"Info", "Message window -> level");
break; break;
case TR_MSG_DBG: case TR_LOG_DEBUG:
levelString = NSLocalizedString(@"Debug", "Message window -> level"); levelString = NSLocalizedString(@"Debug", "Message window -> level");
break; break;
default: default:

6
macosx/Torrent.m
View File

@@ -28,6 +28,7 @@
#import "NSStringAdditions.h" #import "NSStringAdditions.h"
#import "TrackerNode.h" #import "TrackerNode.h"
#import "log.h"
#import "transmission.h" // required by utils.h #import "transmission.h" // required by utils.h
#import "utils.h" // tr_new() #import "utils.h" // tr_new()
@@ -98,11 +99,11 @@ void renameCallback(tr_torrent * torrent, const char * oldPathCharString, const
NSString * oldPath = [NSString stringWithUTF8String: oldPathCharString]; NSString * oldPath = [NSString stringWithUTF8String: oldPathCharString];
NSString * path = [oldPath stringByDeletingLastPathComponent]; NSString * path = [oldPath stringByDeletingLastPathComponent];
NSString * oldName = [oldPath lastPathComponent];
NSString * newName = [NSString stringWithUTF8String: newNameCharString]; NSString * newName = [NSString stringWithUTF8String: newNameCharString];
if (error == 0) if (error == 0)
{ {
NSString * oldName = [oldPath lastPathComponent];
void (^__block updateNodeAndChildrenForRename)(FileListNode *) = ^(FileListNode * node) { void (^__block updateNodeAndChildrenForRename)(FileListNode *) = ^(FileListNode * node) {
[node updateFromOldName: oldName toNewName: newName inPath: path]; [node updateFromOldName: oldName toNewName: newName inPath: path];
@@ -378,7 +379,7 @@ int trashDataFile(const char * filename)
{ {
if (fResumeOnWake) if (fResumeOnWake)
{ {
tr_ninf( fInfo->name, "restarting because of wakeUp" ); tr_logAddNamedInfo( fInfo->name, "restarting because of wakeUp" );
tr_torrentStart(fHandle); tr_torrentStart(fHandle);
} }
} }
@@ -854,7 +855,6 @@ int trashDataFile(const char * filename)
- (void) renameFileNode: (FileListNode *) node withName: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler - (void) renameFileNode: (FileListNode *) node withName: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler
{ {
NSParameterAssert(node != nil);
NSParameterAssert([node torrent] == self); NSParameterAssert([node torrent] == self);
NSParameterAssert(newName != nil); NSParameterAssert(newName != nil);
NSParameterAssert(![newName isEqualToString: @""]); NSParameterAssert(![newName isEqualToString: @""]);