2019-12-09 01:57:53 +00:00
|
|
|
use crate::commands::PerItemCommand;
|
|
|
|
use crate::context::CommandRegistry;
|
2019-05-24 19:35:22 +00:00
|
|
|
use crate::prelude::*;
|
2019-12-09 01:57:53 +00:00
|
|
|
use nu_errors::ShellError;
|
2020-03-10 06:55:03 +00:00
|
|
|
use nu_protocol::{
|
|
|
|
CallInfo, ColumnPath, ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value,
|
|
|
|
};
|
|
|
|
use nu_source::Tagged;
|
|
|
|
use nu_value_ext::{as_column_path, get_data_by_column_path};
|
2019-12-09 01:57:53 +00:00
|
|
|
use std::borrow::Borrow;
|
|
|
|
|
|
|
|
pub struct Format;
|
|
|
|
|
|
|
|
impl PerItemCommand for Format {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"format"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("format").required(
|
|
|
|
"pattern",
|
|
|
|
SyntaxShape::Any,
|
|
|
|
"the pattern to output. Eg) \"{foo}: {bar}\"",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Format columns into a string using a simple pattern."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
call_info: &CallInfo,
|
|
|
|
_registry: &CommandRegistry,
|
|
|
|
_raw_args: &RawCommandArgs,
|
|
|
|
value: Value,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
//let value_tag = value.tag();
|
2020-01-02 05:24:41 +00:00
|
|
|
let pattern = call_info.args.expect_nth(0)?;
|
|
|
|
let pattern_tag = pattern.tag.clone();
|
|
|
|
let pattern = pattern.as_string()?;
|
2019-12-09 01:57:53 +00:00
|
|
|
|
2020-04-07 07:51:17 +00:00
|
|
|
let format_pattern = format(&pattern);
|
|
|
|
let commands = format_pattern;
|
2019-12-09 01:57:53 +00:00
|
|
|
|
2020-03-10 06:55:03 +00:00
|
|
|
let output = match value {
|
|
|
|
value
|
|
|
|
@
|
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Row(_),
|
|
|
|
..
|
|
|
|
} => {
|
|
|
|
let mut output = String::new();
|
|
|
|
|
|
|
|
for command in &commands {
|
|
|
|
match command {
|
|
|
|
FormatCommand::Text(s) => {
|
2020-04-07 07:51:17 +00:00
|
|
|
output.push_str(&s);
|
2020-03-10 06:55:03 +00:00
|
|
|
}
|
|
|
|
FormatCommand::Column(c) => {
|
|
|
|
let key = to_column_path(&c, &pattern_tag)?;
|
|
|
|
|
|
|
|
let fetcher = get_data_by_column_path(
|
|
|
|
&value,
|
|
|
|
&key,
|
|
|
|
Box::new(move |(_, _, error)| error),
|
|
|
|
);
|
|
|
|
|
|
|
|
if let Ok(c) = fetcher {
|
|
|
|
output
|
|
|
|
.push_str(&value::format_leaf(c.borrow()).plain_string(100_000))
|
|
|
|
}
|
|
|
|
// That column doesn't match, so don't emit anything
|
2019-12-09 01:57:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-10 06:55:03 +00:00
|
|
|
output
|
|
|
|
}
|
|
|
|
_ => String::new(),
|
2019-12-09 01:57:53 +00:00
|
|
|
};
|
|
|
|
|
Futures v0.3 upgrade (#1344)
* Upgrade futures, async-stream, and futures_codec
These were the last three dependencies on futures-preview. `nu` itself
is now fully dependent on `futures@0.3`, as opposed to `futures-preview`
alpha.
Because the update to `futures` from `0.3.0-alpha.19` to `0.3.0` removed
the `Stream` implementation of `VecDeque` ([changelog][changelog]), most
commands that convert a `VecDeque` to an `OutputStream` broke and had to
be fixed.
The current solution is to now convert `VecDeque`s to a `Stream` via
`futures::stream::iter`. However, it may be useful for `futures` to
create an `IntoStream` trait, implemented on the `std::collections` (or
really any `IntoIterator`). If something like this happends, it may be
worthwhile to update the trait implementations on `OutputStream` and
refactor these commands again.
While upgrading `futures_codec`, we remove a custom implementation of
`LinesCodec`, as one has been added to the library. There's also a small
refactor to make the stream output more idiomatic.
[changelog]: https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md#030---2019-11-5
* Upgrade sys & ps plugin dependencies
They were previously dependent on `futures-preview`, and `nu_plugin_ps`
was dependent on an old version of `futures-timer`.
* Remove dependency on futures-timer from nu
* Update Cargo.lock
* Fix formatting
* Revert fmt regressions
CI is still on 1.40.0, but the latest rustfmt v1.41.0 has changes to the
`val @ pattern` syntax, causing the linting job to fail.
* Fix clippy warnings
2020-02-06 03:46:48 +00:00
|
|
|
Ok(futures::stream::iter(vec![ReturnSuccess::value(
|
2019-12-09 01:57:53 +00:00
|
|
|
UntaggedValue::string(output).into_untagged_value(),
|
|
|
|
)])
|
|
|
|
.to_output_stream())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug)]
|
|
|
|
enum FormatCommand {
|
|
|
|
Text(String),
|
|
|
|
Column(String),
|
|
|
|
}
|
|
|
|
|
2020-04-07 07:51:17 +00:00
|
|
|
fn format(input: &str) -> Vec<FormatCommand> {
|
2019-12-09 01:57:53 +00:00
|
|
|
let mut output = vec![];
|
|
|
|
|
2020-04-07 07:51:17 +00:00
|
|
|
let mut loop_input = input.chars();
|
2019-12-09 01:57:53 +00:00
|
|
|
loop {
|
2020-04-07 07:51:17 +00:00
|
|
|
let mut before = String::new();
|
|
|
|
|
|
|
|
while let Some(c) = loop_input.next() {
|
|
|
|
if c == '{' {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
before.push(c);
|
|
|
|
}
|
|
|
|
|
2019-12-09 01:57:53 +00:00
|
|
|
if !before.is_empty() {
|
|
|
|
output.push(FormatCommand::Text(before.to_string()));
|
|
|
|
}
|
2020-04-07 07:51:17 +00:00
|
|
|
// Look for column as we're now at one
|
|
|
|
let mut column = String::new();
|
2019-12-09 01:57:53 +00:00
|
|
|
|
2020-04-07 07:51:17 +00:00
|
|
|
while let Some(c) = loop_input.next() {
|
|
|
|
if c == '}' {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
column.push(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
if !column.is_empty() {
|
2019-12-09 01:57:53 +00:00
|
|
|
output.push(FormatCommand::Column(column.to_string()));
|
|
|
|
}
|
2020-04-07 07:51:17 +00:00
|
|
|
|
|
|
|
if before.is_empty() && column.is_empty() {
|
2019-12-09 01:57:53 +00:00
|
|
|
break;
|
2019-05-24 19:35:22 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-09 01:57:53 +00:00
|
|
|
|
2020-04-07 07:51:17 +00:00
|
|
|
output
|
2019-05-24 19:35:22 +00:00
|
|
|
}
|
2020-03-10 06:55:03 +00:00
|
|
|
|
|
|
|
fn to_column_path(
|
|
|
|
path_members: &str,
|
|
|
|
tag: impl Into<Tag>,
|
|
|
|
) -> Result<Tagged<ColumnPath>, ShellError> {
|
|
|
|
let tag = tag.into();
|
|
|
|
|
|
|
|
as_column_path(
|
|
|
|
&UntaggedValue::Table(
|
|
|
|
path_members
|
|
|
|
.split('.')
|
|
|
|
.map(|x| {
|
|
|
|
let member = match x.parse::<u64>() {
|
|
|
|
Ok(v) => UntaggedValue::int(v),
|
|
|
|
Err(_) => UntaggedValue::string(x),
|
|
|
|
};
|
|
|
|
|
|
|
|
member.into_value(&tag)
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
)
|
|
|
|
.into_value(&tag),
|
|
|
|
)
|
|
|
|
}
|