# Description The `ShellError` enum at the moment is kind of messy. Many variants are basic tuple structs where you always have to reference the implementation with its macro invocation to know which field serves which purpose. Furthermore we have both variants that are kind of redundant or either overly broad to be useful for the user to match on or overly specific with few uses. So I set out to start fixing the lacking documentation and naming to make it feasible to critically review the individual usages and fix those. Furthermore we can decide to join or split up variants that don't seem to be fit for purpose. Feel free to add review comments if you spot inconsistent use of `ShellError` variants. - Name fields on `ShellError::OperatorOverflow` - Name fields on `ShellError::PipelineMismatch` - Add doc to `ShellError::OnlySupportsThisInputType` - Name `ShellError::OnlySupportsThisInputType` - Name field on `ShellError::PipelineEmpty` - Comment about issues with `TypeMismatch*` - Fix a few `exp_input_type`s - Name fields on `ShellError::InvalidRange` # User-Facing Changes (None now, end goal more explicit and consistent error messages) # Tests + Formatting (No additional tests needed so far)
142 lines
3.7 KiB
Rust
142 lines
3.7 KiB
Rust
use crate::input_handler::{operate, CmdArgument};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::{Call, CellPath};
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Span;
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
|
};
|
|
use std::marker::PhantomData;
|
|
|
|
pub trait HashDigest: digest::Digest + Clone {
|
|
fn name() -> &'static str;
|
|
fn examples() -> Vec<Example<'static>>;
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct GenericDigest<D: HashDigest> {
|
|
name: String,
|
|
usage: String,
|
|
phantom: PhantomData<D>,
|
|
}
|
|
|
|
impl<D: HashDigest> Default for GenericDigest<D> {
|
|
fn default() -> Self {
|
|
Self {
|
|
name: format!("hash {}", D::name()),
|
|
usage: format!("Hash a value using the {} hash algorithm", D::name()),
|
|
phantom: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(super) struct Arguments {
|
|
pub(super) cell_paths: Option<Vec<CellPath>>,
|
|
pub(super) binary: bool,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
impl<D> Command for GenericDigest<D>
|
|
where
|
|
D: HashDigest + Send + Sync + 'static,
|
|
digest::Output<D>: core::fmt::LowerHex,
|
|
{
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.category(Category::Hash)
|
|
.input_output_types(vec![
|
|
(Type::String, Type::String),
|
|
(Type::String, Type::Binary),
|
|
])
|
|
.switch(
|
|
"binary",
|
|
"Output binary instead of hexadecimal representation",
|
|
Some('b'),
|
|
)
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
format!("optionally {} hash data by cell path", D::name()),
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
&self.usage
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example<'static>> {
|
|
D::examples()
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let binary = call.has_flag("binary");
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let args = Arguments { binary, cell_paths };
|
|
operate(
|
|
action::<D>,
|
|
args,
|
|
input,
|
|
call.head,
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
}
|
|
|
|
pub(super) fn action<D>(input: &Value, args: &Arguments, _span: Span) -> Value
|
|
where
|
|
D: HashDigest,
|
|
digest::Output<D>: core::fmt::LowerHex,
|
|
{
|
|
let (bytes, span) = match input {
|
|
Value::String { val, span } => (val.as_bytes(), *span),
|
|
Value::Binary { val, span } => (val.as_slice(), *span),
|
|
// Propagate existing errors
|
|
Value::Error { .. } => return input.clone(),
|
|
other => {
|
|
let span = match input.span() {
|
|
Ok(span) => span,
|
|
Err(error) => return Value::Error { error },
|
|
};
|
|
|
|
return Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "string or binary".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: span,
|
|
src_span: other.expect_span(),
|
|
},
|
|
};
|
|
}
|
|
};
|
|
|
|
let digest = D::digest(bytes);
|
|
|
|
if args.binary {
|
|
Value::Binary {
|
|
val: digest.to_vec(),
|
|
span,
|
|
}
|
|
} else {
|
|
Value::String {
|
|
val: format!("{digest:x}"),
|
|
span,
|
|
}
|
|
}
|
|
}
|