Changeset 9617

Timestamp:

Nov 28, 2009, 8:39:31 PM (12 years ago)

Author:

livings124

Message:

#2624 Message Log's level filter should act as an actual filter, and all messages should be stored

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• MessageWindowController.h (modified) (1 diff)
• MessageWindowController.m (modified) (16 diffs)

trunk/macosx/Controller.m

@@ -295 +295 @@
         tr_bencDictAddBool(&settings, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]);
         
-        tr_bencDictAddInt(&settings, TR_PREFS_KEY_MSGLEVEL, [fDefaults integerForKey: @"MessageLevel"]);
+        tr_bencDictAddInt(&settings, TR_PREFS_KEY_MSGLEVEL, TR_MSG_DBG);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, [fDefaults integerForKey: @"PeersTotal"]);
         tr_bencDictAddInt(&settings, TR_PREFS_KEY_PEER_LIMIT_TORRENT, [fDefaults integerForKey: @"PeersTorrent"]);

trunk/macosx/MessageWindowController.h

@@ -32 +32 @@
     IBOutlet NSButton * fSaveButton, * fClearButton;
     
-    NSMutableArray * fMessages;
+    NSMutableArray * fMessages, * fDisplayedMessages;
     
     NSDictionary * fAttributes;

trunk/macosx/MessageWindowController.m

@@ -32 +32 @@
 #define LEVEL_DEBUG 2
 
-#define UPDATE_SECONDS  0.6
+#define UPDATE_SECONDS  0.75
 
 @interface MessageWindowController (Private)
@@ -52 +52 @@
     [fTimer invalidate];
     [fMessages release];
+    [fDisplayedMessages release];
     
     [fAttributes release];
@@ -67 +68 @@
         name: @"NSTableViewColumnDidResizeNotification" object: fMessageTable];
     
-    [window setContentBorderThickness: [[fMessageTable enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
+    [window setContentBorderThickness: NSMinY([[fMessageTable enclosingScrollView] frame]) forEdge: NSMinYEdge];
     
     //initially sort peer table by date
@@ -108 +109 @@
     
     //select proper level in popup button
-    switch (tr_getMessageLevel())
+    switch ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"])
     {
         case TR_MSG_ERR:
@@ -118 +119 @@
         case TR_MSG_DBG:
             [fLevelButton selectItemAtIndex: LEVEL_DEBUG];
+            break;
     }
     
     fMessages = [[NSMutableArray alloc] init];
+    fDisplayedMessages = [[NSMutableArray alloc] init];
 }
 
@@ -148 +151 @@
     const BOOL shouldScroll = currentIndex == 0 || [scroller floatValue] == 1.0 || [scroller isHidden]
                                 || [scroller knobProportion] == 1.0;
+    
+    const NSInteger maxLevel = [[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"];
+    BOOL changed = NO;
     
     for (tr_msg_list * currentMessage = messages; currentMessage != NULL; currentMessage = currentMessage->next)
@@ -166 +172 @@
         
         [fMessages addObject: message];
+        
+        if (currentMessage->level <= maxLevel)
+        {
+            [fDisplayedMessages addObject: message];
+            changed = YES;
+        }
     }
     
     tr_freeMessageList(messages);
     
-    [fMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
-    
-    [fMessageTable reloadData];
-    if (shouldScroll)
-        [fMessageTable scrollRowToVisible: [fMessages count]-1];
+    if (changed)
+    {
+        [fDisplayedMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
+        
+        [fMessageTable reloadData];
+        if (shouldScroll)
+            [fMessageTable scrollRowToVisible: [fDisplayedMessages count]-1];
+    }
 }
 
 - (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView
 {
-    return [fMessages count];
+    return [fDisplayedMessages count];
 }
 
@@ -185 +200 @@
 {
     NSString * ident = [column identifier];
-    NSDictionary * message = [fMessages objectAtIndex: row];
+    NSDictionary * message = [fDisplayedMessages objectAtIndex: row];
 
     if ([ident isEqualToString: @"Date"])
@@ -219 +234 @@
         fAttributes = [[[[column dataCell] attributedStringValue] attributesAtIndex: 0 effectiveRange: NULL] retain];
     
-    const CGFloat count = floorf([[[fMessages objectAtIndex: row] objectForKey: @"Message"] sizeWithAttributes: fAttributes].width
+    const CGFloat count = floorf([[[fDisplayedMessages objectAtIndex: row] objectForKey: @"Message"] sizeWithAttributes: fAttributes].width
                                 / [column width]);
     return [tableView rowHeight] * (count + 1.0);
@@ -226 +241 @@
 - (void) tableView: (NSTableView *) tableView sortDescriptorsDidChange: (NSArray *) oldDescriptors
 {
-    [fMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
+    [fDisplayedMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
     [fMessageTable reloadData];
 }
@@ -233 +248 @@
                 tableColumn: (NSTableColumn *) column row: (NSInteger) row mouseLocation: (NSPoint) mouseLocation
 {
-    NSDictionary * message = [fMessages objectAtIndex: row];
+    NSDictionary * message = [fDisplayedMessages objectAtIndex: row];
     return [message objectForKey: @"File"];
 }
@@ -242 +257 @@
     NSMutableArray * messageStrings = [NSMutableArray arrayWithCapacity: [indexes count]];
     
-    for (NSDictionary * message in [fMessages objectsAtIndexes: indexes])
+    for (NSDictionary * message in [fDisplayedMessages objectsAtIndexes: indexes])
         [messageStrings addObject: [self stringForMessage: message]];
     
@@ -272 +287 @@
 - (void) changeLevel: (id) sender
 {
-    [self updateLog: nil];
-    
     NSInteger level;
     switch ([fLevelButton indexOfSelectedItem])
@@ -288 +301 @@
     }
     
-    tr_setMessageLevel(level);
+    if ([[NSUserDefaults standardUserDefaults] integerForKey: @"MessageLevel"] == level)
+        return;
+    
     [[NSUserDefaults standardUserDefaults] setInteger: level forKey: @"MessageLevel"];
+    
+    if (level == TR_MSG_DBG) //all messages at this level
+        [fDisplayedMessages setArray: fMessages];
+    else
+    {
+        [fDisplayedMessages removeAllObjects];
+        for (NSDictionary * message in fMessages)
+            if ([[message objectForKey: @"Level"] integerValue] <= level)
+                [fDisplayedMessages addObject: message];
+    }
+    
+    [fDisplayedMessages sortUsingDescriptors: [fMessageTable sortDescriptors]];
+    
+    [fMessageTable deselectAll: nil];
+    [fMessageTable reloadData];
 }
 
@@ -295 +325 @@
 {
     [fMessages removeAllObjects];
+    [fDisplayedMessages removeAllObjects];
     [fMessageTable reloadData];
 }
@@ -303 +334 @@
     NSSortDescriptor * descriptor = [[[NSSortDescriptor alloc] initWithKey: @"Index" ascending: YES] autorelease];
     NSArray * descriptors = [[NSArray alloc] initWithObjects: descriptor, nil];
-    NSArray * sortedMessages = [[fMessages sortedArrayUsingDescriptors: descriptors] retain];
+    NSArray * sortedMessages = [[fDisplayedMessages sortedArrayUsingDescriptors: descriptors] retain];
     [descriptors release];