mirror of
https://github.com/nushell/nushell.git
synced 2025-04-02 20:27:11 +02:00
# Description This doesn't really do much that the user could see, but it helps get us ready to do the steps of the refactor to split the span off of Value, so that values can be spanless. This allows us to have top-level values that can hold both a Value and a Span, without requiring that all values have them. We expect to see significant memory reduction by removing so many unnecessary spans from values. For example, a table of 100,000 rows and 5 columns would have a savings of ~8megs in just spans that are almost always duplicated. # User-Facing Changes Nothing yet # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
194 lines
6.1 KiB
Rust
194 lines
6.1 KiB
Rust
use nu_cmd_base::input_handler::{operate, CmdArgument};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::ast::CellPath;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Category;
|
|
use nu_protocol::{Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value};
|
|
|
|
struct Arguments {
|
|
added_data: Vec<u8>,
|
|
index: Option<usize>,
|
|
end: bool,
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct BytesAdd;
|
|
|
|
impl Command for BytesAdd {
|
|
fn name(&self) -> &str {
|
|
"bytes add"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("bytes add")
|
|
.input_output_types(vec![
|
|
(Type::Binary, Type::Binary),
|
|
(
|
|
Type::List(Box::new(Type::Binary)),
|
|
Type::List(Box::new(Type::Binary)),
|
|
),
|
|
(Type::Table(vec![]), Type::Table(vec![])),
|
|
(Type::Record(vec![]), Type::Record(vec![])),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.required("data", SyntaxShape::Binary, "the binary to add")
|
|
.named(
|
|
"index",
|
|
SyntaxShape::Int,
|
|
"index to insert binary data",
|
|
Some('i'),
|
|
)
|
|
.switch("end", "add to the end of binary", Some('e'))
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"for a data structure input, add bytes to the data at the given cell paths",
|
|
)
|
|
.category(Category::Bytes)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Add specified bytes to the input."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["append", "truncate", "padding"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let added_data: Vec<u8> = call.req(engine_state, stack, 0)?;
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let index: Option<usize> = call.get_flag(engine_state, stack, "index")?;
|
|
let end = call.has_flag("end");
|
|
|
|
let arg = Arguments {
|
|
added_data,
|
|
index,
|
|
end,
|
|
cell_paths,
|
|
};
|
|
operate(add, arg, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Add bytes `0x[AA]` to `0x[1F FF AA AA]`",
|
|
example: "0x[1F FF AA AA] | bytes add 0x[AA]",
|
|
result: Some(Value::Binary {
|
|
val: vec![0xAA, 0x1F, 0xFF, 0xAA, 0xAA],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Add bytes `0x[AA BB]` to `0x[1F FF AA AA]` at index 1",
|
|
example: "0x[1F FF AA AA] | bytes add 0x[AA BB] -i 1",
|
|
result: Some(Value::Binary {
|
|
val: vec![0x1F, 0xAA, 0xBB, 0xFF, 0xAA, 0xAA],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Add bytes `0x[11]` to `0x[FF AA AA]` at the end",
|
|
example: "0x[FF AA AA] | bytes add 0x[11] -e",
|
|
result: Some(Value::Binary {
|
|
val: vec![0xFF, 0xAA, 0xAA, 0x11],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Add bytes `0x[11 22 33]` to `0x[FF AA AA]` at the end, at index 1(the index is start from end)",
|
|
example: "0x[FF AA BB] | bytes add 0x[11 22 33] -e -i 1",
|
|
result: Some(Value::Binary {
|
|
val: vec![0xFF, 0xAA, 0x11, 0x22, 0x33, 0xBB],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn add(val: &Value, args: &Arguments, span: Span) -> Value {
|
|
match val {
|
|
Value::Binary {
|
|
val,
|
|
span: val_span,
|
|
} => add_impl(val, args, *val_span),
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => val.clone(),
|
|
other => Value::Error {
|
|
error: Box::new(ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "binary".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: span,
|
|
src_span: other.span(),
|
|
}),
|
|
span,
|
|
},
|
|
}
|
|
}
|
|
|
|
fn add_impl(input: &[u8], args: &Arguments, span: Span) -> Value {
|
|
match args.index {
|
|
None => {
|
|
if args.end {
|
|
let mut added_data = args.added_data.clone();
|
|
let mut result = input.to_vec();
|
|
result.append(&mut added_data);
|
|
Value::Binary { val: result, span }
|
|
} else {
|
|
let mut result = args.added_data.clone();
|
|
let mut input = input.to_vec();
|
|
result.append(&mut input);
|
|
Value::Binary { val: result, span }
|
|
}
|
|
}
|
|
Some(mut indx) => {
|
|
let inserted_index = if args.end {
|
|
input.len().saturating_sub(indx)
|
|
} else {
|
|
if indx > input.len() {
|
|
indx = input.len()
|
|
}
|
|
indx
|
|
};
|
|
let mut result = vec![];
|
|
let mut prev_data = input[..inserted_index].to_vec();
|
|
result.append(&mut prev_data);
|
|
let mut added_data = args.added_data.clone();
|
|
result.append(&mut added_data);
|
|
let mut after_data = input[inserted_index..].to_vec();
|
|
result.append(&mut after_data);
|
|
Value::Binary { val: result, span }
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(BytesAdd {})
|
|
}
|
|
}
|