mirror of
https://github.com/nushell/nushell.git
synced 2025-03-26 07:19:55 +01:00
close #8074 I attempted to refactor the "input" command. The reason for this is that the current implementation of the "input" command lacks consistency for different options. For instance, some parts use `std::io::stdin` while others use `crossterm::event::read`. In this pull request, I have made changes to use crossterm consistently: - Detection of the -u option is now done using `crossterm`'s `KeyCode::Char`. - The current input is displayed when using `crossterm` for input (it won't be displayed when -s is present). - Ctrl-C triggers SIGINT. # User-Facing Changes Users can interrupt "input" with ctrl-c.
204 lines
6.7 KiB
Rust
204 lines
6.7 KiB
Rust
use crossterm::{
|
|
cursor,
|
|
event::{Event, KeyCode, KeyEventKind, KeyModifiers},
|
|
execute,
|
|
style::Print,
|
|
terminal::{self, ClearType},
|
|
};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Spanned, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
use std::io::Write;
|
|
use std::time::Duration;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Input;
|
|
|
|
impl Command for Input {
|
|
fn name(&self) -> &str {
|
|
"input"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Get input from the user."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["prompt", "interactive"]
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("input")
|
|
.input_output_types(vec![
|
|
(Type::Nothing, Type::String),
|
|
(Type::Nothing, Type::Binary),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.optional("prompt", SyntaxShape::String, "prompt to show the user")
|
|
.named(
|
|
"bytes-until",
|
|
SyntaxShape::String,
|
|
"read bytes (not text) until a stop byte",
|
|
Some('u'),
|
|
)
|
|
.named(
|
|
"numchar",
|
|
SyntaxShape::Int,
|
|
"number of characters to read; suppresses output",
|
|
Some('n'),
|
|
)
|
|
.switch("suppress-output", "don't print keystroke values", Some('s'))
|
|
.category(Category::Platform)
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let prompt: Option<String> = call.opt(engine_state, stack, 0)?;
|
|
let bytes_until: Option<String> = call.get_flag(engine_state, stack, "bytes-until")?;
|
|
let suppress_output = call.has_flag("suppress-output");
|
|
let numchar: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "numchar")?;
|
|
let numchar: Spanned<i64> = numchar.unwrap_or(Spanned {
|
|
item: i64::MAX,
|
|
span: call.head,
|
|
});
|
|
|
|
if numchar.item < 1 {
|
|
return Err(ShellError::UnsupportedInput(
|
|
"Number of characters to read has to be positive".to_string(),
|
|
"value originated from here".to_string(),
|
|
call.head,
|
|
numchar.span,
|
|
));
|
|
}
|
|
|
|
let byte_until = if let Some(bytes_until) = bytes_until {
|
|
if let Some(c) = bytes_until.bytes().next() {
|
|
Some(c)
|
|
} else {
|
|
let _ = crossterm::terminal::disable_raw_mode();
|
|
return Err(ShellError::IOError(
|
|
"input can't stop on this byte".to_string(),
|
|
));
|
|
}
|
|
} else {
|
|
None
|
|
};
|
|
|
|
if let Some(prompt) = &prompt {
|
|
print!("{prompt}");
|
|
let _ = std::io::stdout().flush();
|
|
}
|
|
|
|
let mut buf = String::new();
|
|
|
|
crossterm::terminal::enable_raw_mode()?;
|
|
// clear terminal events
|
|
while crossterm::event::poll(Duration::from_secs(0))? {
|
|
// If there's an event, read it to remove it from the queue
|
|
let _ = crossterm::event::read()?;
|
|
}
|
|
|
|
loop {
|
|
if i64::try_from(buf.len()).unwrap_or(0) >= numchar.item {
|
|
break;
|
|
}
|
|
match crossterm::event::read() {
|
|
Ok(Event::Key(k)) => match k.kind {
|
|
KeyEventKind::Press | KeyEventKind::Repeat => {
|
|
match k.code {
|
|
// TODO: maintain keycode parity with existing command
|
|
KeyCode::Char(c) => {
|
|
if k.modifiers == KeyModifiers::ALT
|
|
|| k.modifiers == KeyModifiers::CONTROL
|
|
{
|
|
if k.modifiers == KeyModifiers::CONTROL && c == 'c' {
|
|
crossterm::terminal::disable_raw_mode()?;
|
|
return Err(ShellError::IOError("SIGINT".to_string()));
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if let Some(byte_until) = byte_until {
|
|
if c == byte_until as char {
|
|
break;
|
|
}
|
|
}
|
|
buf.push(c);
|
|
}
|
|
KeyCode::Backspace => {
|
|
let _ = buf.pop();
|
|
}
|
|
KeyCode::Enter => {
|
|
break;
|
|
}
|
|
_ => continue,
|
|
}
|
|
}
|
|
_ => continue,
|
|
},
|
|
Ok(_) => continue,
|
|
Err(event_error) => {
|
|
crossterm::terminal::disable_raw_mode()?;
|
|
return Err(event_error.into());
|
|
}
|
|
}
|
|
if !suppress_output {
|
|
// clear the current line and print the current buffer
|
|
execute!(
|
|
std::io::stdout(),
|
|
terminal::Clear(ClearType::CurrentLine),
|
|
cursor::MoveToColumn(0),
|
|
)?;
|
|
if let Some(prompt) = &prompt {
|
|
execute!(std::io::stdout(), Print(prompt.to_string()))?;
|
|
}
|
|
execute!(std::io::stdout(), Print(buf.to_string()))?;
|
|
}
|
|
}
|
|
crossterm::terminal::disable_raw_mode()?;
|
|
if !suppress_output {
|
|
std::io::stdout().write_all(b"\n")?;
|
|
}
|
|
Ok(Value::String {
|
|
val: buf,
|
|
span: call.head,
|
|
}
|
|
.into_pipeline_data())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Get input from the user, and assign to a variable",
|
|
example: "let user_input = (input)",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Get two characters from the user, and assign to a variable",
|
|
example: "let user_input = (input --numchar 2)",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::Input;
|
|
|
|
#[test]
|
|
fn examples_work_as_expected() {
|
|
use crate::test_examples;
|
|
test_examples(Input {})
|
|
}
|
|
}
|