# Description As part of the refactor to split spans off of Value, this moves to using helper functions to create values, and using `.span()` instead of matching span out of Value directly. Hoping to get a few more helping hands to finish this, as there are a lot of commands to update :) # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # 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` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `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. --> --------- Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com> Co-authored-by: WindSoilder <windsoilder@outlook.com>
216 lines
7.2 KiB
Rust
216 lines
7.2 KiB
Rust
use nu_cmd_base::input_handler::{operate, CmdArgument};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
ast::{Call, CellPath},
|
|
engine::{Command, EngineState, Stack},
|
|
Category, Example, PipelineData, Record, ShellError, Signature, Span, Spanned, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
|
|
struct Arguments {
|
|
pattern: Vec<u8>,
|
|
end: bool,
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
all: bool,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct BytesRemove;
|
|
|
|
impl Command for BytesRemove {
|
|
fn name(&self) -> &str {
|
|
"bytes remove"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("bytes remove")
|
|
.input_output_types(vec![
|
|
(Type::Binary, Type::Binary),
|
|
(Type::Table(vec![]), Type::Table(vec![])),
|
|
(Type::Record(vec![]), Type::Record(vec![])),
|
|
])
|
|
.required("pattern", SyntaxShape::Binary, "the pattern to find")
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"for a data structure input, remove bytes from data at the given cell paths",
|
|
)
|
|
.switch("end", "remove from end of binary", Some('e'))
|
|
.switch("all", "remove occurrences of finding binary", Some('a'))
|
|
.category(Category::Bytes)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Remove bytes."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["search", "shift", "switch"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let pattern_to_remove = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
|
|
if pattern_to_remove.item.is_empty() {
|
|
return Err(ShellError::TypeMismatch {
|
|
err_message: "the pattern to remove cannot be empty".to_string(),
|
|
span: pattern_to_remove.span,
|
|
});
|
|
}
|
|
|
|
let pattern_to_remove: Vec<u8> = pattern_to_remove.item;
|
|
let arg = Arguments {
|
|
pattern: pattern_to_remove,
|
|
end: call.has_flag("end"),
|
|
cell_paths,
|
|
all: call.has_flag("all"),
|
|
};
|
|
|
|
operate(remove, arg, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Remove contents",
|
|
example: "0x[10 AA FF AA FF] | bytes remove 0x[10 AA]",
|
|
result: Some(Value::binary (
|
|
vec![0xFF, 0xAA, 0xFF],
|
|
Span::test_data(),
|
|
)),
|
|
},
|
|
Example {
|
|
description: "Remove all occurrences of find binary in record field",
|
|
example: "{ data: 0x[10 AA 10 BB 10] } | bytes remove -a 0x[10] data",
|
|
result: Some(Value::test_record(Record {
|
|
cols: vec!["data".to_string()],
|
|
vals: vec![Value::test_binary(vec![0xAA, 0xBB])]
|
|
})),
|
|
},
|
|
Example {
|
|
description: "Remove occurrences of find binary from end",
|
|
example: "0x[10 AA 10 BB CC AA 10] | bytes remove -e 0x[10]",
|
|
result: Some(Value::binary (
|
|
vec![0x10, 0xAA, 0x10, 0xBB, 0xCC, 0xAA],
|
|
Span::test_data(),
|
|
)),
|
|
},
|
|
Example {
|
|
description: "Remove all occurrences of find binary in table",
|
|
example: "[[ColA ColB ColC]; [0x[11 12 13] 0x[14 15 16] 0x[17 18 19]]] | bytes remove 0x[11] ColA ColC",
|
|
result: Some(Value::list (
|
|
vec![Value::test_record(Record {
|
|
cols: vec!["ColA".to_string(), "ColB".to_string(), "ColC".to_string()],
|
|
vals: vec![
|
|
Value::binary (
|
|
vec![0x12, 0x13],
|
|
Span::test_data(),
|
|
),
|
|
Value::binary (
|
|
vec![0x14, 0x15, 0x16],
|
|
Span::test_data(),
|
|
),
|
|
Value::binary (
|
|
vec![0x17, 0x18, 0x19],
|
|
Span::test_data(),
|
|
),
|
|
]
|
|
})],
|
|
Span::test_data(),
|
|
)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn remove(val: &Value, args: &Arguments, span: Span) -> Value {
|
|
let val_span = val.span();
|
|
match val {
|
|
Value::Binary { val, .. } => remove_impl(val, args, val_span),
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => val.clone(),
|
|
other => Value::error(
|
|
ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "binary".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: span,
|
|
src_span: other.span(),
|
|
},
|
|
span,
|
|
),
|
|
}
|
|
}
|
|
|
|
fn remove_impl(input: &[u8], arg: &Arguments, span: Span) -> Value {
|
|
let mut result = vec![];
|
|
let remove_all = arg.all;
|
|
let input_len = input.len();
|
|
let pattern_len = arg.pattern.len();
|
|
|
|
// Note:
|
|
// remove_all from start and end will generate the same result.
|
|
// so we'll put `remove_all` relative logic into else clause.
|
|
if arg.end && !remove_all {
|
|
let (mut left, mut right) = (
|
|
input.len() as isize - arg.pattern.len() as isize,
|
|
input.len() as isize,
|
|
);
|
|
while left >= 0 && input[left as usize..right as usize] != arg.pattern {
|
|
result.push(input[right as usize - 1]);
|
|
left -= 1;
|
|
right -= 1;
|
|
}
|
|
// append the remaining thing to result, this can be happening when
|
|
// we have something to remove and remove_all is False.
|
|
let mut remain = input[..left as usize].iter().copied().rev().collect();
|
|
result.append(&mut remain);
|
|
result = result.into_iter().rev().collect();
|
|
Value::binary(result, span)
|
|
} else {
|
|
let (mut left, mut right) = (0, arg.pattern.len());
|
|
while right <= input_len {
|
|
if input[left..right] == arg.pattern {
|
|
left += pattern_len;
|
|
right += pattern_len;
|
|
if !remove_all {
|
|
break;
|
|
}
|
|
} else {
|
|
result.push(input[left]);
|
|
left += 1;
|
|
right += 1;
|
|
}
|
|
}
|
|
// append the remaining thing to result, this can happened when
|
|
// we have something to remove and remove_all is False.
|
|
let mut remain = input[left..].to_vec();
|
|
result.append(&mut remain);
|
|
Value::binary(result, span)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(BytesRemove {})
|
|
}
|
|
}
|