holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pivot options (#1888)

Browse Source
This commit is contained in:
Darren Schroeder
2020-05-25 17:40:25 -05:00
committed by GitHub
parent cb6ccc3c5a
commit f0fc9e1038
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/nu-cli/src/commands/autoview.rs
View File

@ -80,13 +80,24 @@ pub fn autoview(context: RunnableContext) -> Result<OutputStream, ShellError> {
let binary = context.get_command("binaryview");
let text = context.get_command("textview");
let table = context.get_command("table");
let no_auto_pivot = match config::config(Tag::unknown())?.get("no_auto_pivot") {
Some(val) => val.is_true(),
_ => false,
};
let pivot_to_fit = match config::config(Tag::unknown())?.get("pivot_to_fit") {
Some(val) => val.is_true(),
_ => false,
#[derive(PartialEq)]
enum AutoPivotMode {
Auto,
Always,
Never,
}
let pivot_mode = crate::data::config::config(Tag::unknown());
let pivot_mode = if let Some(v) = pivot_mode?.get("pivot_mode") {
match v.as_string() {
Ok(m) if m.to_lowercase() == "auto" => AutoPivotMode::Auto,
Ok(m) if m.to_lowercase() == "always" => AutoPivotMode::Always,
Ok(m) if m.to_lowercase() == "never" => AutoPivotMode::Never,
_ => AutoPivotMode::Always,
}
} else {
AutoPivotMode::Always
};
Ok(OutputStream::new(async_stream! {
@ -234,8 +245,9 @@ pub fn autoview(context: RunnableContext) -> Result<OutputStream, ShellError> {
yield Err(e);
}
Value { value: UntaggedValue::Row(row), ..} if !no_auto_pivot
|| (pivot_to_fit && // Or if the row character count + number of headers * 2 (for padding) > terminal width
Value { value: UntaggedValue::Row(row), ..}
if pivot_mode == AutoPivotMode::Always ||
(pivot_mode == AutoPivotMode::Auto &&
(row.entries.iter().map(|(k,v)| v.convert_to_string())
.collect::<Vec<_>>().iter()
.fold(0, |acc, len| acc + len.len())