pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

logger: fix display of multiline messages in backlog (closes #1926)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-06-05 01:07:16 +02:00
parent 4e705afdf6
commit 48b35bdc63
5 changed files with 241 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.adoc
+1
View File
@@ -105,6 +105,7 @@ Bug fixes::
* irc: add missing tags "irc_cap" and "log3" in cap messages (client capability)
* irc: fix split of CTCP message with no arguments
* irc: remove extra space in CTCP ACTION message sent without arguments
* logger: fix display of multiline messages in backlog (issue #1926)
* lua: fix crash with print when the value to print is not a string (issue #1904, issue #1905)
* relay: fix connection with IRC clients sending "CAP REQ :" (without capability) and not sending "CAP END" (issue #1040)
* ruby: fix crash on quit when a child process is still running (issue #1889, issue #1915)
src/plugins/logger/logger-backlog.c
+133 -9
View File
@@ -124,6 +124,114 @@ logger_backlog_display_line (struct t_gui_buffer *buffer, const char *line)
}
}
/*
* Compares two messages in arraylist.
*/
int
logger_backlog_msg_cmp_cb (void *data,
struct t_arraylist *arraylist,
void *pointer1,
void *pointer2)
{
/* make C compiler happy */
(void) data;
(void) arraylist;
return weechat_strcmp ((const char *)pointer1, (const char *)pointer2);
}
/*
* Frees a message in arraylist.
*/
void
logger_backlog_msg_free_cb (void *data, struct t_arraylist *arraylist,
void *pointer)
{
/* make C compiler happy */
(void) data;
(void) arraylist;
free (pointer);
}
/*
* Groups lines by messages: each line with a timestamp is considered the first
* line of a message, and subsequent lines without timestamp are the rest of
* the message.
*
* Note: result must be freed after use.
*/
struct t_arraylist *
logger_backlog_group_messages (struct t_arraylist *lines)
{
int i, size, time_found;
char **message, **old_message, *str_date, *error;
const char *ptr_line, *pos_message;
struct tm tm_line;
struct t_arraylist *messages;
if (!lines)
return NULL;
size = weechat_arraylist_size (lines);
messages = weechat_arraylist_new (size, 0, 1,
&logger_backlog_msg_cmp_cb, NULL,
&logger_backlog_msg_free_cb, NULL);
if (!messages)
return NULL;
message = weechat_string_dyn_alloc (256);
old_message = weechat_string_dyn_alloc (256);
for (i = size - 1; i >= 0; i--)
{
ptr_line = (const char *)weechat_arraylist_get (lines, i);
weechat_string_dyn_copy (old_message, *message);
weechat_string_dyn_copy (message, ptr_line);
if ((*old_message)[0])
{
weechat_string_dyn_concat (message, "\n", -1);
weechat_string_dyn_concat (message, *old_message, -1);
}
time_found = 0;
pos_message = strchr (ptr_line, '\t');
if (pos_message)
{
str_date = weechat_strndup (ptr_line, pos_message - ptr_line);
if (str_date)
{
memset (&tm_line, 0, sizeof (struct tm));
error = strptime (
str_date,
weechat_config_string (logger_config_file_time_format),
&tm_line);
if (error && !error[0] && (tm_line.tm_year > 0))
time_found = 1;
free (str_date);
}
}
if (time_found)
{
weechat_arraylist_insert (messages, 0, strdup (*message));
weechat_string_dyn_copy (message, NULL);
}
}
if ((*message)[0])
weechat_arraylist_insert (messages, 0, strdup (*message));
weechat_string_dyn_free (message, 1);
weechat_string_dyn_free (old_message, 1);
return messages;
}
/*
* Displays backlog for a buffer by reading end of log file.
*/
@@ -132,36 +240,52 @@ void
logger_backlog_file (struct t_gui_buffer *buffer, const char *filename,
int lines)
{
struct t_arraylist *last_lines;
int i, num_lines;
struct t_arraylist *last_lines, *messages;
int i, num_msgs, old_input_multiline;
num_lines = 0;
num_msgs = 0;
last_lines = logger_tail_file (filename, lines);
if (!last_lines)
return;
messages = logger_backlog_group_messages (last_lines);
if (!messages)
{
weechat_arraylist_free (last_lines);
return;
}
weechat_arraylist_free (last_lines);
/* disable any print hook during display of backlog */
weechat_buffer_set (buffer, "print_hooks_enabled", "0");
num_lines = weechat_arraylist_size (last_lines);
for (i = 0; i < num_lines; i++)
/* temporary enable multiline support so we can display multiline msgs */
old_input_multiline = weechat_buffer_get_integer (buffer, "input_multiline");
weechat_buffer_set (buffer, "input_multiline", "1");
num_msgs = weechat_arraylist_size (messages);
for (i = 0; i < num_msgs; i++)
{
logger_backlog_display_line (
buffer,
(const char *)weechat_arraylist_get (last_lines, i));
(const char *)weechat_arraylist_get (messages, i));
}
weechat_arraylist_free (last_lines);
weechat_arraylist_free (messages);
if (num_lines > 0)
if (num_msgs > 0)
{
weechat_printf_date_tags (buffer, 0,
"no_highlight,notify_none,logger_backlog_end",
_("%s===\t%s========== End of backlog (%d lines) =========="),
weechat_color (weechat_config_string (logger_config_color_backlog_end)),
weechat_color (weechat_config_string (logger_config_color_backlog_end)),
num_lines);
num_msgs);
weechat_buffer_set (buffer, "unread", "");
}
weechat_buffer_set (buffer, "input_multiline",
(old_input_multiline) ? "1" : "0");
weechat_buffer_set (buffer, "print_hooks_enabled", "1");
}
src/plugins/logger/logger-tail.c
+2 -2
View File
@@ -60,7 +60,7 @@ logger_tail_last_eol (const char *string_start, const char *string_ptr)
}
/*
* Compares two lines.
* Compares two lines in arraylist.
*/
int
@@ -77,7 +77,7 @@ logger_tail_lines_cmp_cb (void *data,
}
/*
* Frees a line.
* Frees a line in arraylist.
*/
void
tests/unit/plugins/logger/test-logger-backlog.cpp
+103
View File
@@ -26,6 +26,7 @@
extern "C"
{
#include <stdio.h>
#include "src/core/wee-arraylist.h"
#include "src/core/wee-config.h"
#include "src/gui/gui-buffer.h"
#include "src/gui/gui-color.h"
@@ -34,6 +35,7 @@ extern "C"
extern void logger_backlog_display_line (struct t_gui_buffer *buffer,
const char *line);
extern struct t_arraylist *logger_backlog_group_messages (struct t_arraylist *lines);
}
TEST_GROUP(LoggerBacklog)
@@ -145,6 +147,107 @@ TEST(LoggerBacklog, DisplayLine)
STRCMP_EQUAL(string, ptr_data->message);
}
/*
* Compares two messages in arraylist.
*/
int
test_logger_backlog_msg_cmp_cb (void *data,
struct t_arraylist *arraylist,
void *pointer1,
void *pointer2)
{
/* make C compiler happy */
(void) data;
(void) arraylist;
return strcmp ((const char *)pointer1, (const char *)pointer2);
}
/*
* Frees a message in arraylist.
*/
void
test_logger_backlog_msg_free_cb (void *data, struct t_arraylist *arraylist,
void *pointer)
{
/* make C compiler happy */
(void) data;
(void) arraylist;
free (pointer);
}
/*
* Tests functions:
* logger_backlog_msg_cmp_cb
* logger_backlog_msg_free_cb
* logger_backlog_group_messages
*/
TEST(LoggerBacklog, GroupMessages)
{
struct t_arraylist *lines, *messages;
const char *test_lines_1[] = {
"2023-06-04 21:15:34\t\tMessage 1",
"2023-06-04 21:15:40\t\tMessage 2",
NULL,
};
const char *test_lines_2[] = {
"end of line",
"2023-06-04 21:15:34\t\tFirst line",
"of multiline message",
"end of message",
"2023-06-04 21:15:40\t\tMessage on one line",
NULL,
};
int i;
POINTERS_EQUAL(NULL, logger_backlog_group_messages (NULL));
lines = arraylist_new (3, 0, 1,
&test_logger_backlog_msg_cmp_cb, NULL,
&test_logger_backlog_msg_free_cb, NULL);
for (i = 0; test_lines_1[i]; i++)
{
arraylist_add (lines, strdup (test_lines_1[i]));
}
messages = logger_backlog_group_messages (lines);
CHECK(messages);
LONGS_EQUAL(2, arraylist_size (messages));
STRCMP_EQUAL("2023-06-04 21:15:34\t\tMessage 1",
(const char *)arraylist_get (messages, 0));
STRCMP_EQUAL("2023-06-04 21:15:40\t\tMessage 2",
(const char *)arraylist_get (messages, 1));
arraylist_free (messages);
arraylist_clear (lines);
for (i = 0; test_lines_2[i]; i++)
{
arraylist_add (lines, strdup (test_lines_2[i]));
}
messages = logger_backlog_group_messages (lines);
CHECK(messages);
LONGS_EQUAL(3, arraylist_size (messages));
STRCMP_EQUAL("end of line",
(const char *)arraylist_get (messages, 0));
STRCMP_EQUAL("2023-06-04 21:15:34\t\tFirst line\n"
"of multiline message\n"
"end of message",
(const char *)arraylist_get (messages, 1));
STRCMP_EQUAL("2023-06-04 21:15:40\t\tMessage on one line",
(const char *)arraylist_get (messages, 2));
arraylist_free (messages);
arraylist_free (lines);
}
/*
* Tests functions:
* logger_backlog_file
tests/unit/plugins/logger/test-logger-tail.cpp
+2 -1
View File
@@ -71,8 +71,9 @@ TEST(LoggerTail, LoggerTailLastEol)
/*
* Tests functions:
* logger_tail_lines_cmp_cb
* logger_tail_lines_free_cb
* logger_tail_file
* logger_tail_free
*/
TEST(LoggerTail, LoggerTailFile)