2019-08-19 07:16:39 +02:00
|
|
|
use crate::commands::WholeStreamCommand;
|
2019-06-18 02:39:57 +02: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;
|
2020-03-06 17:06:39 +01:00
|
|
|
use nu_protocol::{Primitive, ReturnSuccess, Signature, UntaggedValue, Value};
|
2019-06-22 05:43:37 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
pub struct Lines;
|
|
|
|
|
|
|
|
impl WholeStreamCommand for Lines {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"lines"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("lines")
|
|
|
|
}
|
2019-08-30 00:52:32 +02:00
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Split single string into rows, one per line."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
args: CommandArgs,
|
|
|
|
registry: &CommandRegistry,
|
|
|
|
) -> Result<OutputStream, ShellError> {
|
|
|
|
lines(args, registry)
|
|
|
|
}
|
2020-05-12 17:54:29 +02:00
|
|
|
|
|
|
|
fn examples(&self) -> &[Example] {
|
|
|
|
&[Example {
|
|
|
|
description: "Split output from an external command into lines",
|
|
|
|
example: "^ls -l | lines",
|
|
|
|
}]
|
|
|
|
}
|
2019-08-19 07:16:39 +02:00
|
|
|
}
|
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
fn ends_with_line_ending(st: &str) -> bool {
|
|
|
|
let mut temp = st.to_string();
|
|
|
|
let last = temp.pop();
|
|
|
|
if let Some(c) = last {
|
|
|
|
c == '\n'
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
2019-06-18 02:39:57 +02:00
|
|
|
|
2019-08-19 07:16:39 +02:00
|
|
|
fn lines(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
|
2019-07-24 00:22:11 +02:00
|
|
|
let args = args.evaluate_once(registry)?;
|
2019-09-14 18:30:24 +02:00
|
|
|
let tag = args.name_tag();
|
2019-11-21 15:33:14 +01:00
|
|
|
let name_span = tag.span;
|
2020-03-06 17:06:39 +01:00
|
|
|
let mut input = args.input;
|
2019-07-24 00:22:11 +02:00
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
let mut leftover = vec![];
|
|
|
|
let mut leftover_string = String::new();
|
|
|
|
let stream = async_stream! {
|
|
|
|
loop {
|
Move external closer to internal (#1611)
* Refactor InputStream and affected commands.
First, making `values` private and leaning on the `Stream` implementation makes
consumes of `InputStream` less likely to have to change in the future, if we
change what an `InputStream` is internally.
Second, we're dropping `Option<InputStream>` as the input to pipelines,
internals, and externals. Instead, `InputStream.is_empty` can be used to check
for "emptiness". Empty streams are typically only ever used as the first input
to a pipeline.
* Add run_external internal command.
We want to push external commands closer to internal commands, eventually
eliminating the concept of "external" completely. This means we can consolidate
a couple of things:
- Variable evaluation (for example, `$it`, `$nu`, alias vars)
- Behaviour of whole stream vs per-item external execution
It should also make it easier for us to start introducing argument signatures
for external commands,
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
* Update run_external.rs
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
2020-04-20 05:30:44 +02:00
|
|
|
match input.next().await {
|
2020-03-06 17:06:39 +01:00
|
|
|
Some(Value { value: UntaggedValue::Primitive(Primitive::String(st)), ..}) => {
|
|
|
|
let mut st = leftover_string.clone() + &st;
|
|
|
|
leftover.clear();
|
2019-06-22 05:43:37 +02:00
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
|
2019-06-18 02:39:57 +02:00
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
if !ends_with_line_ending(&st) {
|
|
|
|
if let Some(last) = lines.pop() {
|
|
|
|
leftover_string = last;
|
|
|
|
} else {
|
|
|
|
leftover_string.clear();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
leftover_string.clear();
|
|
|
|
}
|
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-03-06 17:06:39 +01:00
|
|
|
let success_lines: Vec<_> = lines.iter().map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value())).collect();
|
|
|
|
yield futures::stream::iter(success_lines)
|
|
|
|
}
|
|
|
|
Some(Value { value: UntaggedValue::Primitive(Primitive::Line(st)), ..}) => {
|
|
|
|
let mut st = leftover_string.clone() + &st;
|
|
|
|
leftover.clear();
|
2019-11-21 15:33:14 +01:00
|
|
|
|
2020-03-06 17:06:39 +01:00
|
|
|
let mut lines: Vec<String> = st.lines().map(|x| x.to_string()).collect();
|
|
|
|
if !ends_with_line_ending(&st) {
|
|
|
|
if let Some(last) = lines.pop() {
|
|
|
|
leftover_string = last;
|
|
|
|
} else {
|
|
|
|
leftover_string.clear();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
leftover_string.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
let success_lines: Vec<_> = lines.iter().map(|x| ReturnSuccess::value(UntaggedValue::line(x).into_untagged_value())).collect();
|
|
|
|
yield futures::stream::iter(success_lines)
|
|
|
|
}
|
|
|
|
Some( Value { tag: value_span, ..}) => {
|
|
|
|
yield futures::stream::iter(vec![Err(ShellError::labeled_error_with_secondary(
|
|
|
|
"Expected a string from pipeline",
|
|
|
|
"requires string input",
|
|
|
|
name_span,
|
|
|
|
"value originates from here",
|
|
|
|
value_span,
|
|
|
|
))]);
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
if !leftover.is_empty() {
|
|
|
|
let mut st = leftover_string.clone();
|
|
|
|
if let Ok(extra) = String::from_utf8(leftover) {
|
|
|
|
st.push_str(&extra);
|
|
|
|
}
|
|
|
|
yield futures::stream::iter(vec![ReturnSuccess::value(UntaggedValue::string(st).into_untagged_value())])
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2019-06-18 02:39:57 +02:00
|
|
|
}
|
2020-03-06 17:06:39 +01:00
|
|
|
}
|
|
|
|
if !leftover_string.is_empty() {
|
|
|
|
yield futures::stream::iter(vec![ReturnSuccess::value(UntaggedValue::string(leftover_string).into_untagged_value())]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
.flatten();
|
2019-06-18 02:39:57 +02:00
|
|
|
|
2019-07-03 22:31:15 +02:00
|
|
|
Ok(stream.to_output_stream())
|
2019-06-18 02:39:57 +02:00
|
|
|
}
|