mirror of
https://github.com/nushell/nushell
synced 2025-01-14 22:24:54 +00:00
b6ce907928
So it's my take on the comments in #14060
The change could be seen in this test.
Looks like it works :) but I haven't done a lot of testing.
0b1af77415/crates/nu-command/tests/commands/table.rs (L3032-L3062)
```nushell
$env.config.table.footer_inheritance = true;
$env.config.footer_mode = 7;
[[a b]; ['kv' {0: [[field]; [0] [1] [2] [3] [4] [5]]} ], ['data' 0], ['data' 0] ] | table --expand --width=80
```
```text
╭───┬──────┬───────────────────────╮
│ # │ a │ b │
├───┼──────┼───────────────────────┤
│ 0 │ kv │ ╭───┬───────────────╮ │
│ │ │ │ │ ╭───┬───────╮ │ │
│ │ │ │ 0 │ │ # │ field │ │ │
│ │ │ │ │ ├───┼───────┤ │ │
│ │ │ │ │ │ 0 │ 0 │ │ │
│ │ │ │ │ │ 1 │ 1 │ │ │
│ │ │ │ │ │ 2 │ 2 │ │ │
│ │ │ │ │ │ 3 │ 3 │ │ │
│ │ │ │ │ │ 4 │ 4 │ │ │
│ │ │ │ │ │ 5 │ 5 │ │ │
│ │ │ │ │ ╰───┴───────╯ │ │
│ │ │ ╰───┴───────────────╯ │
│ 1 │ data │ 0 │
│ 2 │ data │ 0 │
├───┼──────┼───────────────────────┤
│ # │ a │ b │
╰───┴──────┴───────────────────────╯
```
Maybe it will also solve the issue you @fdncred encountered.
close #14060
cc: @NotTheDr01ds
222 lines
7.5 KiB
Rust
222 lines
7.5 KiB
Rust
use crate::{
|
|
clean_charset, colorize_space_str, string_wrap, NuTableConfig, TableOutput, TableTheme,
|
|
};
|
|
use nu_color_config::{Alignment, StyleComputer, TextStyle};
|
|
use nu_protocol::{Config, FooterMode, ShellError, Span, TableMode, TrimStrategy, Value};
|
|
use terminal_size::{terminal_size, Height, Width};
|
|
|
|
pub type NuText = (String, TextStyle);
|
|
pub type TableResult = Result<Option<TableOutput>, ShellError>;
|
|
pub type StringResult = Result<Option<String>, ShellError>;
|
|
|
|
pub const INDEX_COLUMN_NAME: &str = "index";
|
|
|
|
pub fn create_nu_table_config(
|
|
config: &Config,
|
|
comp: &StyleComputer,
|
|
out: &TableOutput,
|
|
expand: bool,
|
|
mode: TableMode,
|
|
) -> NuTableConfig {
|
|
let mut count_rows = out.table.count_rows();
|
|
if config.table.footer_inheritance {
|
|
count_rows = out.count_rows;
|
|
}
|
|
|
|
let with_footer = with_footer(config, out.with_header, count_rows);
|
|
|
|
NuTableConfig {
|
|
theme: load_theme(mode),
|
|
with_footer,
|
|
with_index: out.with_index,
|
|
with_header: out.with_header,
|
|
split_color: Some(lookup_separator_color(comp)),
|
|
trim: config.table.trim.clone(),
|
|
header_on_border: config.table.header_on_separator,
|
|
expand,
|
|
}
|
|
}
|
|
|
|
pub fn nu_value_to_string_colored(val: &Value, cfg: &Config, style: &StyleComputer) -> String {
|
|
let (mut text, value_style) = nu_value_to_string(val, cfg, style);
|
|
if let Some(color) = value_style.color_style {
|
|
text = color.paint(text).to_string();
|
|
}
|
|
|
|
if matches!(val, Value::String { .. }) {
|
|
text = clean_charset(&text);
|
|
colorize_space_str(&mut text, style);
|
|
}
|
|
|
|
text
|
|
}
|
|
|
|
pub fn nu_value_to_string(val: &Value, cfg: &Config, style: &StyleComputer) -> NuText {
|
|
let float_precision = cfg.float_precision as usize;
|
|
let text = val.to_abbreviated_string(cfg);
|
|
make_styled_string(style, text, Some(val), float_precision)
|
|
}
|
|
|
|
pub fn nu_value_to_string_clean(val: &Value, cfg: &Config, style_comp: &StyleComputer) -> NuText {
|
|
let (text, style) = nu_value_to_string(val, cfg, style_comp);
|
|
let mut text = clean_charset(&text);
|
|
colorize_space_str(&mut text, style_comp);
|
|
|
|
(text, style)
|
|
}
|
|
|
|
pub fn error_sign(style_computer: &StyleComputer) -> (String, TextStyle) {
|
|
make_styled_string(style_computer, String::from("❎"), None, 0)
|
|
}
|
|
|
|
pub fn wrap_text(text: &str, width: usize, config: &Config) -> String {
|
|
let keep_words = config.table.trim == TrimStrategy::wrap(true);
|
|
string_wrap(text, width, keep_words)
|
|
}
|
|
|
|
pub fn get_header_style(style_computer: &StyleComputer) -> TextStyle {
|
|
TextStyle::with_style(
|
|
Alignment::Center,
|
|
style_computer.compute("header", &Value::string("", Span::unknown())),
|
|
)
|
|
}
|
|
|
|
pub fn get_index_style(style_computer: &StyleComputer) -> TextStyle {
|
|
TextStyle::with_style(
|
|
Alignment::Right,
|
|
style_computer.compute("row_index", &Value::string("", Span::unknown())),
|
|
)
|
|
}
|
|
|
|
pub fn get_leading_trailing_space_style(style_computer: &StyleComputer) -> TextStyle {
|
|
TextStyle::with_style(
|
|
Alignment::Right,
|
|
style_computer.compute(
|
|
"leading_trailing_space_bg",
|
|
&Value::string("", Span::unknown()),
|
|
),
|
|
)
|
|
}
|
|
|
|
pub fn get_value_style(value: &Value, config: &Config, style_computer: &StyleComputer) -> NuText {
|
|
match value {
|
|
// Float precision is required here.
|
|
Value::Float { val, .. } => (
|
|
format!("{:.prec$}", val, prec = config.float_precision as usize),
|
|
style_computer.style_primitive(value),
|
|
),
|
|
_ => (
|
|
value.to_abbreviated_string(config),
|
|
style_computer.style_primitive(value),
|
|
),
|
|
}
|
|
}
|
|
|
|
pub fn get_empty_style(style_computer: &StyleComputer) -> NuText {
|
|
(
|
|
String::from("❎"),
|
|
TextStyle::with_style(
|
|
Alignment::Right,
|
|
style_computer.compute("empty", &Value::nothing(Span::unknown())),
|
|
),
|
|
)
|
|
}
|
|
|
|
fn make_styled_string(
|
|
style_computer: &StyleComputer,
|
|
text: String,
|
|
value: Option<&Value>, // None represents table holes.
|
|
float_precision: usize,
|
|
) -> NuText {
|
|
match value {
|
|
Some(value) => {
|
|
match value {
|
|
Value::Float { .. } => {
|
|
// set dynamic precision from config
|
|
let precise_number = match convert_with_precision(&text, float_precision) {
|
|
Ok(num) => num,
|
|
Err(e) => e.to_string(),
|
|
};
|
|
(precise_number, style_computer.style_primitive(value))
|
|
}
|
|
_ => (text, style_computer.style_primitive(value)),
|
|
}
|
|
}
|
|
None => {
|
|
// Though holes are not the same as null, the closure for "empty" is passed a null anyway.
|
|
(
|
|
text,
|
|
TextStyle::with_style(
|
|
Alignment::Center,
|
|
style_computer.compute("empty", &Value::nothing(Span::unknown())),
|
|
),
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
fn convert_with_precision(val: &str, precision: usize) -> Result<String, ShellError> {
|
|
// vall will always be a f64 so convert it with precision formatting
|
|
let val_float = match val.trim().parse::<f64>() {
|
|
Ok(f) => f,
|
|
Err(e) => {
|
|
return Err(ShellError::GenericError {
|
|
error: format!("error converting string [{}] to f64", &val),
|
|
msg: "".into(),
|
|
span: None,
|
|
help: Some(e.to_string()),
|
|
inner: vec![],
|
|
});
|
|
}
|
|
};
|
|
Ok(format!("{val_float:.precision$}"))
|
|
}
|
|
|
|
pub fn load_theme(mode: TableMode) -> TableTheme {
|
|
match mode {
|
|
TableMode::Basic => TableTheme::basic(),
|
|
TableMode::Thin => TableTheme::thin(),
|
|
TableMode::Light => TableTheme::light(),
|
|
TableMode::Compact => TableTheme::compact(),
|
|
TableMode::WithLove => TableTheme::with_love(),
|
|
TableMode::CompactDouble => TableTheme::compact_double(),
|
|
TableMode::Rounded => TableTheme::rounded(),
|
|
TableMode::Reinforced => TableTheme::reinforced(),
|
|
TableMode::Heavy => TableTheme::heavy(),
|
|
TableMode::None => TableTheme::none(),
|
|
TableMode::Psql => TableTheme::psql(),
|
|
TableMode::Markdown => TableTheme::markdown(),
|
|
TableMode::Dots => TableTheme::dots(),
|
|
TableMode::Restructured => TableTheme::restructured(),
|
|
TableMode::AsciiRounded => TableTheme::ascii_rounded(),
|
|
TableMode::BasicCompact => TableTheme::basic_compact(),
|
|
}
|
|
}
|
|
|
|
fn lookup_separator_color(style_computer: &StyleComputer) -> nu_ansi_term::Style {
|
|
style_computer.compute("separator", &Value::nothing(Span::unknown()))
|
|
}
|
|
|
|
fn with_footer(config: &Config, with_header: bool, count_records: usize) -> bool {
|
|
with_header && need_footer(config, count_records as u64)
|
|
}
|
|
|
|
fn need_footer(config: &Config, count_records: u64) -> bool {
|
|
match config.footer_mode {
|
|
// Only show the footer if there are more than RowCount rows
|
|
FooterMode::RowCount(limit) => count_records > limit,
|
|
// Always show the footer
|
|
FooterMode::Always => true,
|
|
// Never show the footer
|
|
FooterMode::Never => false,
|
|
// Calculate the screen height and row count, if screen height is larger than row count, don't show footer
|
|
FooterMode::Auto => {
|
|
let (_width, height) = match terminal_size() {
|
|
Some((w, h)) => (Width(w.0).0 as u64, Height(h.0).0 as u64),
|
|
None => (Width(0).0 as u64, Height(0).0 as u64),
|
|
};
|
|
|
|
height <= count_records
|
|
}
|
|
}
|
|
}
|