Add nth command

This commit is contained in:
Jonathan Turner 2019-08-12 17:13:58 +12:00
parent 6cf3dc92fc
commit 14e47f3d2c
4 changed files with 34 additions and 2 deletions

View File

@ -158,6 +158,7 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
command("size", Box::new(size::size)), command("size", Box::new(size::size)),
command("from-yaml", Box::new(from_yaml::from_yaml)), command("from-yaml", Box::new(from_yaml::from_yaml)),
command("enter", Box::new(enter::enter)), command("enter", Box::new(enter::enter)),
command("nth", Box::new(nth::nth)),
command("n", Box::new(next::next)), command("n", Box::new(next::next)),
command("p", Box::new(prev::prev)), command("p", Box::new(prev::prev)),
command("lines", Box::new(lines::lines)), command("lines", Box::new(lines::lines)),

View File

@ -24,6 +24,7 @@ crate mod lines;
crate mod ls; crate mod ls;
crate mod mkdir; crate mod mkdir;
crate mod next; crate mod next;
crate mod nth;
crate mod open; crate mod open;
crate mod pick; crate mod pick;
crate mod plugin; crate mod plugin;

View File

@ -2,8 +2,6 @@ use crate::errors::ShellError;
use crate::parser::CommandRegistry; use crate::parser::CommandRegistry;
use crate::prelude::*; use crate::prelude::*;
// TODO: "Amount remaining" wrapper
pub fn first(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> { pub fn first(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
let args = args.evaluate_once(registry)?; let args = args.evaluate_once(registry)?;

32
src/commands/nth.rs Normal file
View File

@ -0,0 +1,32 @@
use crate::errors::ShellError;
use crate::parser::CommandRegistry;
use crate::prelude::*;
pub fn nth(args: CommandArgs, registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
let args = args.evaluate_once(registry)?;
if args.len() == 0 {
return Err(ShellError::labeled_error(
"Nth requires an amount",
"needs amount",
args.name_span(),
));
}
let amount = args.expect_nth(0)?.as_i64();
let amount = match amount {
Ok(o) => o,
Err(_) => {
return Err(ShellError::labeled_error(
"Value is not a number",
"expected integer",
args.expect_nth(0)?.span(),
))
}
};
Ok(OutputStream::from_input(
args.input.values.skip(amount as u64).take(1),
))
}