forked from extern/nushell
'last' gets last row if no amount desired given.
This commit is contained in:
parent
821ee5e726
commit
ec2e35ad81
@ -7,7 +7,7 @@ pub struct Last;
|
|||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
pub struct LastArgs {
|
pub struct LastArgs {
|
||||||
amount: Tagged<u64>,
|
rows: Option<Tagged<u64>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WholeStreamCommand for Last {
|
impl WholeStreamCommand for Last {
|
||||||
@ -16,7 +16,7 @@ impl WholeStreamCommand for Last {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("last").required("amount", SyntaxShape::Number)
|
Signature::build("last").optional("rows", SyntaxShape::Number)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
fn usage(&self) -> &str {
|
||||||
@ -32,13 +32,17 @@ impl WholeStreamCommand for Last {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn last(
|
fn last(LastArgs { rows }: LastArgs, context: RunnableContext) -> Result<OutputStream, ShellError> {
|
||||||
LastArgs { amount }: LastArgs,
|
|
||||||
context: RunnableContext,
|
|
||||||
) -> Result<OutputStream, ShellError> {
|
|
||||||
let stream = async_stream! {
|
let stream = async_stream! {
|
||||||
let v: Vec<_> = context.input.into_vec().await;
|
let v: Vec<_> = context.input.into_vec().await;
|
||||||
let count = (*amount as usize);
|
|
||||||
|
let rows_desired = if let Some(quantity) = rows {
|
||||||
|
*quantity
|
||||||
|
} else {
|
||||||
|
1
|
||||||
|
};
|
||||||
|
|
||||||
|
let count = (rows_desired as usize);
|
||||||
if count < v.len() {
|
if count < v.len() {
|
||||||
let k = v.len() - count;
|
let k = v.len() - count;
|
||||||
for x in v[k..].iter() {
|
for x in v[k..].iter() {
|
||||||
|
@ -70,6 +70,49 @@ fn first_gets_first_row_when_no_amount_given() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn last_gets_last_rows_by_amount() {
|
||||||
|
Playground::setup("last_test_1", |dirs, sandbox| {
|
||||||
|
sandbox.with_files(vec![
|
||||||
|
EmptyFile("los.txt"),
|
||||||
|
EmptyFile("tres.txt"),
|
||||||
|
EmptyFile("amigos.txt"),
|
||||||
|
EmptyFile("arepas.clu"),
|
||||||
|
]);
|
||||||
|
|
||||||
|
let actual = nu!(
|
||||||
|
cwd: dirs.test(), h::pipeline(
|
||||||
|
r#"
|
||||||
|
ls
|
||||||
|
| last 3
|
||||||
|
| count
|
||||||
|
| echo $it
|
||||||
|
"#
|
||||||
|
));
|
||||||
|
|
||||||
|
assert_eq!(actual, "3");
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn last_gets_last_row_when_no_amount_given() {
|
||||||
|
Playground::setup("last_test_2", |dirs, sandbox| {
|
||||||
|
sandbox.with_files(vec![EmptyFile("caballeros.txt"), EmptyFile("arepas.clu")]);
|
||||||
|
|
||||||
|
let actual = nu!(
|
||||||
|
cwd: dirs.test(), h::pipeline(
|
||||||
|
r#"
|
||||||
|
ls
|
||||||
|
| last
|
||||||
|
| count
|
||||||
|
| echo $it
|
||||||
|
"#
|
||||||
|
));
|
||||||
|
|
||||||
|
assert_eq!(actual, "1");
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn get() {
|
fn get() {
|
||||||
Playground::setup("get_test_1", |dirs, sandbox| {
|
Playground::setup("get_test_1", |dirs, sandbox| {
|
||||||
|
Loading…
Reference in New Issue
Block a user