Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-03 23:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[lo-fi] display fixes

Browse Source 
Fixes #513
Fixes #516
This commit is contained in:
Timothy Stack 2018-05-18 22:11:40 -07:00
parent ab2980f5dd
commit 36d5ff8b86
4 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hotkeys.cc
View File

@ -475,41 +475,6 @@ void handle_paging_key(int ch)
}
break;
case KEY_CTRL_L: {
vis_line_t top = tc->get_top();
vis_line_t bottom = tc->get_bottom();
char line_break[120];
nodelay(lnav_data.ld_window, 0);
endwin();
{
guard_termios tguard(STDOUT_FILENO);
struct termios new_termios = *tguard.get_termios();
new_termios.c_oflag |= ONLCR | OPOST;
tcsetattr(STDOUT_FILENO, TCSANOW, &new_termios);
snprintf(line_break, sizeof(line_break),
"\n---------------- Lines %'d-%'d, "
"press any key to exit lo-fi mode "
"----------------\n\n",
(int) top, (int) bottom);
log_perror(write(STDOUT_FILENO, line_break, strlen(line_break)));
vector<attr_line_t> rows(bottom - top);
tc->listview_value_for_rows(*tc, top, rows);
for (auto &al : rows) {
struct line_range lr = find_string_attr_range(
al.get_attrs(), &textview_curses::SA_ORIGINAL_LINE);
log_perror(write(STDOUT_FILENO, lr.substr(al.get_string()),
lr.sublen(al.get_string())));
log_perror(write(STDOUT_FILENO, "\n", 1));
}
}
cbreak();
getch();
refresh();
nodelay(lnav_data.ld_window, 1);
break;
}
case 'M':
if (lnav_data.ld_last_user_mark.find(tc) ==
lnav_data.ld_last_user_mark.end()) {

3
src/keymap-default.json
View File

@ -9,6 +9,9 @@
},
"keymap_def": {
"default": {
"x0c": [
":write-raw-to -"
],
"x45": [
":prev-mark error",
":eval :alt-msg ${keymap_def_alt_warning}"

63
src/lnav_commands.cc
View File

@ -541,13 +541,12 @@ static string com_save_to(exec_context &ec, string cmdline, vector<string> &args
if (args[0] == "write-csv-to" ||
args[0] == "write-json-to" ||
args[0] == "write-cols-to" ||
args[0] == "write-raw-to") {
args[0] == "write-cols-to") {
if (dls.dls_headers.empty()) {
return "error: no query result to write, use ';' to execute a query";
}
}
else {
else if (args[0] != "write-raw-to") {
if (bv.empty()) {
return "error: no lines marked to write, use 'm' to mark lines";
}
@ -569,9 +568,8 @@ static string com_save_to(exec_context &ec, string cmdline, vector<string> &args
setvbuf(stdout, NULL, _IONBF, 0);
to_term = true;
fprintf(outfile,
"\n---------------- %s output, press any key to exit "
"----------------\n\n",
args[0].c_str());
"\n---------------- Press any key to exit lo-fi display "
"----------------\n\n");
}
else {
outfile = lnav_data.ld_output_stack.top();
@ -672,23 +670,46 @@ static string com_save_to(exec_context &ec, string cmdline, vector<string> &args
}
}
else if (args[0] == "write-raw-to") {
std::vector<std::vector<const char *> >::iterator row_iter;
std::vector<const char *>::iterator iter;
if (tc == &lnav_data.ld_views[LNV_DB]) {
std::vector<std::vector<const char *> >::iterator row_iter;
std::vector<const char *>::iterator iter;
for (row_iter = dls.dls_rows.begin();
row_iter != dls.dls_rows.end();
++row_iter) {
if (ec.ec_dry_run &&
distance(dls.dls_rows.begin(), row_iter) > 10) {
break;
for (row_iter = dls.dls_rows.begin();
row_iter != dls.dls_rows.end();
++row_iter) {
if (ec.ec_dry_run &&
distance(dls.dls_rows.begin(), row_iter) > 10) {
break;
}
for (iter = row_iter->begin();
iter != row_iter->end();
++iter) {
fputs(*iter, outfile);
}
fprintf(outfile, "\n");
}
} else {
bool wrapped = tc->get_word_wrap();
vis_line_t orig_top = tc->get_top();
tc->set_word_wrap(to_term);
vis_line_t top = tc->get_top();
vis_line_t bottom = tc->get_bottom();
vector<attr_line_t> rows(bottom - top + 1);
tc->listview_value_for_rows(*tc, top, rows);
for (auto &al : rows) {
struct line_range lr = find_string_attr_range(
al.get_attrs(), &textview_curses::SA_ORIGINAL_LINE);
log_perror(write(STDOUT_FILENO, lr.substr(al.get_string()),
lr.sublen(al.get_string())));
log_perror(write(STDOUT_FILENO, "\n", 1));
}
for (iter = row_iter->begin();
iter != row_iter->end();
++iter) {
fputs(*iter, outfile);
}
fprintf(outfile, "\n");
tc->set_word_wrap(wrapped);
tc->set_top(orig_top);
}
}
else {
@ -3737,7 +3758,7 @@ readline_context::command_t STD_COMMANDS[] = {
com_save_to,
help_text(":write-raw-to")
.with_summary("Write SQL results to the given file without any formatting")
.with_summary("Write the displayed text or SQL results to the given file without any formatting")
.with_parameter(help_text("path", "The path to the file to write"))
.with_tags({"io", "scripting", "sql"})
.with_example({"/tmp/table.txt"})

11
test/test_cmds.sh
View File

@ -441,6 +441,17 @@ check_output "close not sticking" <<EOF
EOF
run_test ${lnav_test} -n \
-c ":goto 1" \
-c ":write-raw-to -" \
"${test_dir}/logfile_access_log.0"
check_output "write-raw-to not working" <<EOF
192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
EOF
run_test ${lnav_test} -n \
-c ";select * from access_log" \
-c ':write-json-to -' \