holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix input --until-bytes: now stops at any of given bytes (#10235)

Browse Source 
- this PR should close #10197

# Description
`input --bytes-until` takes a string but used to only terminate on the
first byte of that string. Now it checks for each byte in the string.

# User-Facing Changes
all of the above. No change in documentation needed. New behavior
arguably fits better.

# Tests + Formatting
don't know how to test input
This commit is contained in:
J-Kappes 2023-09-15 11:55:37 +00:00 committed by GitHub
parent 3a04bd9154
commit 5ee74b6ab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/nu-command/src/platform/input/input_.rs
View File

@ -5,6 +5,7 @@ use crossterm::{
style::Print, style::Print,
terminal::{self, ClearType}, terminal::{self, ClearType},
}; };
use itertools::Itertools;
use nu_engine::CallExt; use nu_engine::CallExt;
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
@ -40,9 +41,9 @@ impl Command for Input {
.allow_variants_without_examples(true) .allow_variants_without_examples(true)
.optional("prompt", SyntaxShape::String, "prompt to show the user") .optional("prompt", SyntaxShape::String, "prompt to show the user")
.named( .named(
"bytes-until", "bytes-until-any",
SyntaxShape::String, SyntaxShape::String,
"read bytes (not text) until a stop byte", "read bytes (not text) until any of the given stop bytes is seen",
Some('u'), Some('u'),
) )
.named( .named(
@ -63,7 +64,7 @@ impl Command for Input {
_input: PipelineData, _input: PipelineData,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let prompt: Option<String> = call.opt(engine_state, stack, 0)?; let prompt: Option<String> = call.opt(engine_state, stack, 0)?;
let bytes_until: Option<String> = call.get_flag(engine_state, stack, "bytes-until")?; let bytes_until: Option<String> = call.get_flag(engine_state, stack, "bytes-until-any")?;
let suppress_output = call.has_flag("suppress-output"); let suppress_output = call.has_flag("suppress-output");
let numchar: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "numchar")?; let numchar: Option<Spanned<i64>> = call.get_flag(engine_state, stack, "numchar")?;
let numchar: Spanned<i64> = numchar.unwrap_or(Spanned { let numchar: Spanned<i64> = numchar.unwrap_or(Spanned {
@ -80,19 +81,6 @@ impl Command for Input {
)); ));
} }
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 { if let Some(prompt) = &prompt {
print!("{prompt}"); print!("{prompt}");
let _ = std::io::stdout().flush(); let _ = std::io::stdout().flush();
@ -127,8 +115,8 @@ impl Command for Input {
continue; continue;
} }
if let Some(byte_until) = byte_until { if let Some(bytes_until) = bytes_until.as_ref() {
if c == byte_until as char { if bytes_until.bytes().contains(&(c as u8)) {
break; break;
} }
} }