forked from extern/nushell
# 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)
147 lines
4.3 KiB
Rust
147 lines
4.3 KiB
Rust
use std::path::Path;
|
|
|
|
use nu_engine::CallExt;
|
|
use nu_path::expand_to_real_path;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{EngineState, Stack};
|
|
use nu_protocol::{
|
|
engine::Command, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
|
|
use super::PathSubcommandArguments;
|
|
|
|
struct Arguments {
|
|
path: Spanned<String>,
|
|
columns: Option<Vec<String>>,
|
|
}
|
|
|
|
impl PathSubcommandArguments for Arguments {
|
|
fn get_columns(&self) -> Option<Vec<String>> {
|
|
self.columns.clone()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"path relative-to"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("path relative-to")
|
|
.input_output_types(vec![(Type::String, Type::String)])
|
|
.required(
|
|
"path",
|
|
SyntaxShape::String,
|
|
"Parent shared with the input path",
|
|
)
|
|
.named(
|
|
"columns",
|
|
SyntaxShape::Table,
|
|
"For a record or table input, convert strings at the given columns",
|
|
Some('c'),
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Express a path as relative to another path."
|
|
}
|
|
|
|
fn extra_usage(&self) -> &str {
|
|
r#"Can be used only when the input and the argument paths are either both
|
|
absolute or both relative. The argument path needs to be a parent of the input
|
|
path."#
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let args = Arguments {
|
|
path: call.req(engine_state, stack, 0)?,
|
|
columns: call.get_flag(engine_state, stack, "columns")?,
|
|
};
|
|
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty { dst_span: head });
|
|
}
|
|
input.map(
|
|
move |value| super::operate(&relative_to, &args, value, head),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Find a relative path from two absolute paths",
|
|
example: r"'C:\Users\viking' | path relative-to 'C:\Users'",
|
|
result: Some(Value::test_string(r"viking")),
|
|
},
|
|
Example {
|
|
description: "Find a relative path from two absolute paths in a column",
|
|
example: "ls ~ | path relative-to ~ -c [ name ]",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Find a relative path from two relative paths",
|
|
example: r"'eggs\bacon\sausage\spam' | path relative-to 'eggs\bacon\sausage'",
|
|
result: Some(Value::test_string(r"spam")),
|
|
},
|
|
]
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Find a relative path from two absolute paths",
|
|
example: r"'/home/viking' | path relative-to '/home'",
|
|
result: Some(Value::test_string(r"viking")),
|
|
},
|
|
Example {
|
|
description: "Find a relative path from two absolute paths in a column",
|
|
example: "ls ~ | path relative-to ~ -c [ name ]",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Find a relative path from two relative paths",
|
|
example: r"'eggs/bacon/sausage/spam' | path relative-to 'eggs/bacon/sausage'",
|
|
result: Some(Value::test_string(r"spam")),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn relative_to(path: &Path, span: Span, args: &Arguments) -> Value {
|
|
let lhs = expand_to_real_path(path);
|
|
let rhs = expand_to_real_path(&args.path.item);
|
|
match lhs.strip_prefix(&rhs) {
|
|
Ok(p) => Value::string(p.to_string_lossy(), span),
|
|
Err(e) => Value::Error {
|
|
error: ShellError::CantConvert(e.to_string(), "string".into(), span, None),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|