2019-11-24 10:20:08 +01:00
|
|
|
use crate::commands::WholeStreamCommand;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use crate::context::CommandRegistry;
|
2019-11-24 10:20:08 +01:00
|
|
|
use crate::prelude::*;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 03:30:48 +01:00
|
|
|
use nu_errors::ShellError;
|
|
|
|
use nu_protocol::{ReturnSuccess, Signature, SyntaxShape, UntaggedValue, Value};
|
2019-11-21 15:33:14 +01:00
|
|
|
use nu_source::Tagged;
|
2019-12-09 19:52:01 +01:00
|
|
|
use nu_value_ext::ValueExt;
|
2019-11-24 10:20:08 +01:00
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
struct DefaultArgs {
|
|
|
|
column: Tagged<String>,
|
2019-11-21 15:33:14 +01:00
|
|
|
value: Value,
|
2019-11-24 10:20:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Default;
|
|
|
|
|
|
|
|
impl WholeStreamCommand for Default {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"default"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("default")
|
|
|
|
.required("column name", SyntaxShape::String, "the name of the column")
|
|
|
|
.required(
|
|
|
|
"column value",
|
|
|
|
SyntaxShape::Any,
|
|
|
|
"the value of the column to default",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Sets a default row's column if missing."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
2020-05-16 05:18:24 +02:00
|
|
|
default(args, registry)
|
2019-11-24 10:20:08 +01:00
|
|
|
}
|
2020-05-12 07:17:17 +02:00
|
|
|
|
|
|
|
fn examples(&self) -> &[Example] {
|
|
|
|
&[Example {
|
|
|
|
description: "Give a default 'target' to all file entries",
|
|
|
|
example: "ls -af | default target 'nothing'",
|
|
|
|
}]
|
|
|
|
}
|
2019-11-24 10:20:08 +01:00
|
|
|
}
|
|
|
|
|
2020-05-16 05:18:24 +02:00
|
|
|
fn default(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
|
|
|
let registry = registry.clone();
|
|
|
|
let stream = async_stream! {
|
|
|
|
let (DefaultArgs { column, value }, mut input) = args.process(®istry).await?;
|
|
|
|
while let Some(item) = input.next().await {
|
2019-11-24 10:20:08 +01:00
|
|
|
let should_add = match item {
|
2019-11-21 15:33:14 +01:00
|
|
|
Value {
|
|
|
|
value: UntaggedValue::Row(ref r),
|
2019-11-24 10:20:08 +01:00
|
|
|
..
|
|
|
|
} => r.get_data(&column.item).borrow().is_none(),
|
|
|
|
_ => false,
|
|
|
|
};
|
|
|
|
|
|
|
|
if should_add {
|
2019-11-21 15:33:14 +01:00
|
|
|
match item.insert_data_at_path(&column.item, value.clone()) {
|
2020-05-16 05:18:24 +02:00
|
|
|
Some(new_value) => yield ReturnSuccess::value(new_value),
|
|
|
|
None => yield ReturnSuccess::value(item),
|
2019-11-24 10:20:08 +01:00
|
|
|
}
|
|
|
|
} else {
|
2020-05-16 05:18:24 +02:00
|
|
|
yield ReturnSuccess::value(item);
|
2019-11-24 10:20:08 +01: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 04:46:48 +01:00
|
|
|
|
2020-05-16 05:18:24 +02:00
|
|
|
}
|
|
|
|
};
|
2019-11-24 10:20:08 +01:00
|
|
|
|
|
|
|
Ok(stream.to_output_stream())
|
|
|
|
}
|