Changeset 13870

Timestamp:

Jan 26, 2013, 7:17:58 PM (8 years ago)

Author:

livings124

Message:

update Mac code for logging changes in r13868

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (5 diffs)
• macosx/Controller.m (modified) (1 diff)
• macosx/MessageWindowController.m (modified) (5 diffs)
• macosx/Torrent.m (modified) (4 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -270 +270 @@
                 A2AB883E16A399A6008FAD50 /* VDKQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AB883C16A399A6008FAD50 /* VDKQueue.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 */; };
                 A2B3FB4C0E59023000FF78FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@@ -975 +977 @@
                 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>"; };
+                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>"; };
                 A2B5BB7A0D9C7C2300FCB650 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = macosx/es.lproj/AddWindow.xib; sourceTree = "<group>"; };
@@ -1729 +1733 @@
                                 A2EA522F1686AC0D00180493 /* quark.c */,
                                 A2EA52301686AC0D00180493 /* quark.h */,
+                                A2AF23C616B44FA0003BC59E /* log.c */,
+                                A2AF23C716B44FA0003BC59E /* log.h */,
                                 A2A4EA0B0DE106E8000CE197 /* ConvertUTF.h */,
                                 A2A4EA0A0DE106E8000CE197 /* ConvertUTF.c */,
@@ -2070 +2076 @@
                                 A25BFD6E167BED3B0039D1AA /* variant.h in Headers */,
                                 A2EA52321686AC0D00180493 /* quark.h in Headers */,
+                                A2AF23C916B44FA0003BC59E /* log.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -2677 +2684 @@
                                 A25BFD6D167BED3B0039D1AA /* variant.c in Sources */,
                                 A2EA52311686AC0D00180493 /* quark.c in Sources */,
+                                A2AF23C816B44FA0003BC59E /* log.c in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/macosx/Controller.m

@@ -280 +280 @@
         tr_variantDictAddBool(&settings, TR_KEY_incomplete_dir_enabled, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]);
         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_per_torrent, [fDefaults integerForKey: @"PeersTorrent"]);

trunk/macosx/MessageWindowController.m

@@ -28 +28 @@
 #import "NSMutableArrayAdditions.h"
 #import "NSStringAdditions.h"
+#import <log.h>
 #import <transmission.h>
-#import <utils.h>
 
 #define LEVEL_ERROR 0
@@ -115 +115 @@
     switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
     {
-        case TR_MSG_ERR:
+        case TR_LOG_ERROR:
             [fLevelButton selectItemAtIndex: LEVEL_ERROR];
             break;
-        case TR_MSG_INF:
+        case TR_LOG_INFO:
             [fLevelButton selectItemAtIndex: LEVEL_INFO];
             break;
-        case TR_MSG_DBG:
+        case TR_LOG_DEBUG:
             [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
             break;
         default: //safety
-            [[NSUserDefaults standardUserDefaults] setInteger: TR_MSG_ERR forKey: @"MessageLevel"];
+            [[NSUserDefaults standardUserDefaults] setInteger: TR_LOG_ERROR forKey: @"MessageLevel"];
             [fLevelButton selectItemAtIndex: LEVEL_ERROR];
     }
@@ -271 +271 @@
         switch (level)
         {
-            case TR_MSG_ERR:
+            case TR_LOG_ERROR:
                 return [NSImage imageNamed: @"RedDot"];
-            case TR_MSG_INF:
+            case TR_LOG_INFO:
                 return [NSImage imageNamed: @"YellowDot"];
-            case TR_MSG_DBG:
+            case TR_LOG_DEBUG:
                 return [NSImage imageNamed: @"PurpleDot"];
             default:
@@ -343 +343 @@
     {
         case LEVEL_ERROR:
-            level = TR_MSG_ERR;
+            level = TR_LOG_ERROR;
             break;
         case LEVEL_INFO:
-            level = TR_MSG_INF;
+            level = TR_LOG_INFO;
             break;
         case LEVEL_DEBUG:
-            level = TR_MSG_DBG;
+            level = TR_LOG_DEBUG;
             break;
         default:
@@ -536 +536 @@
     switch (level)
     {
-        case TR_MSG_ERR:
+        case TR_LOG_ERROR:
             levelString = NSLocalizedString(@"Error", "Message window -> level");
             break;
-        case TR_MSG_INF:
+        case TR_LOG_INFO:
             levelString = NSLocalizedString(@"Info", "Message window -> level");
             break;
-        case TR_MSG_DBG:
+        case TR_LOG_DEBUG:
             levelString = NSLocalizedString(@"Debug", "Message window -> level");
             break;

trunk/macosx/Torrent.m

@@ -29 +29 @@
 #import "TrackerNode.h"
 
+#import "log.h"
 #import "transmission.h" // required by utils.h
 #import "utils.h" // tr_new()
@@ -99 +100 @@
         NSString * oldPath = [NSString stringWithUTF8String: oldPathCharString];
         NSString * path = [oldPath stringByDeletingLastPathComponent];
-        NSString * oldName = [oldPath lastPathComponent];
         NSString * newName = [NSString stringWithUTF8String: newNameCharString];
         
         if (error == 0)
         {
+            NSString * oldName = [oldPath lastPathComponent];
             void (^__block updateNodeAndChildrenForRename)(FileListNode *) = ^(FileListNode * node) {
                 [node updateFromOldName: oldName toNewName: newName inPath: path];
@@ -379 +380 @@
     if (fResumeOnWake)
     {
-        tr_ninf( fInfo->name, "restarting because of wakeUp" );
+        tr_logAddNamedInfo( fInfo->name, "restarting because of wakeUp" );
         tr_torrentStart(fHandle);
     }
@@ -855 +856 @@
 - (void) renameFileNode: (FileListNode *) node withName: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler
 {
-    NSParameterAssert(node != nil);
     NSParameterAssert([node torrent] == self);
     NSParameterAssert(newName != nil);