2019-12-02 20:15:14 +01:00
|
|
|
use crate::prelude::*;
|
2021-01-10 03:50:49 +01:00
|
|
|
use nu_engine::deserializer::NumericRange;
|
|
|
|
use nu_engine::WholeStreamCommand;
|
2019-12-03 20:56:39 +01:00
|
|
|
use nu_errors::ShellError;
|
2020-09-19 22:41:49 +02:00
|
|
|
use nu_protocol::{RangeInclusion, ReturnSuccess, Signature, SyntaxShape};
|
2019-12-02 20:15:14 +01:00
|
|
|
use nu_source::Tagged;
|
|
|
|
|
|
|
|
#[derive(Deserialize)]
|
|
|
|
struct RangeArgs {
|
2019-12-04 22:14:52 +01:00
|
|
|
area: Tagged<NumericRange>,
|
2019-12-02 20:15:14 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Range;
|
|
|
|
|
2020-05-29 10:22:52 +02:00
|
|
|
#[async_trait]
|
2019-12-02 20:15:14 +01:00
|
|
|
impl WholeStreamCommand for Range {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"range"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("range").required(
|
|
|
|
"rows ",
|
2019-12-04 22:14:52 +01:00
|
|
|
SyntaxShape::Range,
|
2019-12-02 20:15:14 +01:00
|
|
|
"range of rows to return: Eg) 4..7 (=> from 4 to 7)",
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Return only the selected rows"
|
|
|
|
}
|
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
async fn run(&self, args: CommandArgs) -> Result<OutputStream, ShellError> {
|
|
|
|
range(args).await
|
2019-12-02 20:15:14 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-18 08:53:49 +01:00
|
|
|
async fn range(args: CommandArgs) -> Result<OutputStream, ShellError> {
|
|
|
|
let (RangeArgs { area }, input) = args.process().await?;
|
2020-06-13 06:03:39 +02:00
|
|
|
let range = area.item;
|
2020-09-19 22:41:49 +02:00
|
|
|
let (from, left_inclusive) = range.from;
|
|
|
|
let (to, right_inclusive) = range.to;
|
|
|
|
let from = from.map(|from| *from as usize).unwrap_or(0).saturating_add(
|
|
|
|
if left_inclusive == RangeInclusion::Inclusive {
|
|
|
|
0
|
|
|
|
} else {
|
|
|
|
1
|
|
|
|
},
|
|
|
|
);
|
|
|
|
let to = to
|
|
|
|
.map(|to| *to as usize)
|
|
|
|
.unwrap_or(usize::MAX)
|
|
|
|
.saturating_sub(if right_inclusive == RangeInclusion::Inclusive {
|
|
|
|
0
|
|
|
|
} else {
|
|
|
|
1
|
|
|
|
});
|
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-06-13 06:03:39 +02:00
|
|
|
Ok(input
|
|
|
|
.skip(from)
|
|
|
|
.take(to - from + 1)
|
|
|
|
.map(ReturnSuccess::value)
|
|
|
|
.to_output_stream())
|
2019-12-03 08:24:49 +01:00
|
|
|
}
|
2020-05-18 14:56:01 +02:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::Range;
|
2020-10-03 16:06:02 +02:00
|
|
|
use super::ShellError;
|
2020-05-18 14:56:01 +02:00
|
|
|
|
|
|
|
#[test]
|
2020-10-03 16:06:02 +02:00
|
|
|
fn examples_work_as_expected() -> Result<(), ShellError> {
|
2020-05-18 14:56:01 +02:00
|
|
|
use crate::examples::test as test_examples;
|
|
|
|
|
2020-10-03 16:06:02 +02:00
|
|
|
Ok(test_examples(Range {})?)
|
2020-05-18 14:56:01 +02:00
|
|
|
}
|
|
|
|
}
|