mirror of
https://github.com/nushell/nushell.git
synced 2025-06-08 02:57:06 +02:00
8f634f4140
Came from [this discussion](https://discord.com/channels/601130461678272522/1348791953784836147/1349699872059691038) on discord with @fdncred # Description Small refactoring where I rename commands from "SubCommand" to its proper name. Motivations: better clarity (although subjective), better searchable, consistency. The only commands I didn't touch were "split list" and "ansi gradient" because of name clashes. # User-Facing Changes None # Tests + Formatting cargo fmt and clippy OK # After Submitting nothing required
72 lines
1.9 KiB
Rust
72 lines
1.9 KiB
Rust
mod basename;
|
|
mod dirname;
|
|
mod exists;
|
|
mod expand;
|
|
mod join;
|
|
mod parse;
|
|
pub mod path_;
|
|
mod relative_to;
|
|
mod self_;
|
|
mod split;
|
|
mod r#type;
|
|
|
|
pub use basename::PathBasename;
|
|
pub use dirname::PathDirname;
|
|
pub use exists::PathExists;
|
|
pub use expand::PathExpand;
|
|
pub use join::PathJoin;
|
|
pub use parse::PathParse;
|
|
pub use path_::Path;
|
|
pub use r#type::PathType;
|
|
pub use relative_to::PathRelativeTo;
|
|
pub use self_::PathSelf;
|
|
pub use split::PathSplit;
|
|
|
|
use nu_protocol::{ShellError, Span, Value};
|
|
use std::path::Path as StdPath;
|
|
|
|
#[cfg(windows)]
|
|
const ALLOWED_COLUMNS: [&str; 4] = ["prefix", "parent", "stem", "extension"];
|
|
#[cfg(not(windows))]
|
|
const ALLOWED_COLUMNS: [&str; 3] = ["parent", "stem", "extension"];
|
|
|
|
trait PathSubcommandArguments {}
|
|
|
|
fn operate<F, A>(cmd: &F, args: &A, v: Value, name: Span) -> Value
|
|
where
|
|
F: Fn(&StdPath, Span, &A) -> Value + Send + Sync + 'static,
|
|
A: PathSubcommandArguments + Send + Sync + 'static,
|
|
{
|
|
let span = v.span();
|
|
match v {
|
|
Value::String { val, .. } => cmd(StdPath::new(&val), span, args),
|
|
_ => handle_invalid_values(v, name),
|
|
}
|
|
}
|
|
|
|
fn handle_invalid_values(rest: Value, name: Span) -> Value {
|
|
Value::error(err_from_value(&rest, name), name)
|
|
}
|
|
|
|
fn err_from_value(rest: &Value, name: Span) -> ShellError {
|
|
match rest {
|
|
Value::Error { error, .. } => *error.clone(),
|
|
_ => {
|
|
if rest.is_nothing() {
|
|
ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "string, record or list".into(),
|
|
wrong_type: "nothing".into(),
|
|
dst_span: name,
|
|
src_span: rest.span(),
|
|
}
|
|
} else {
|
|
ShellError::PipelineMismatch {
|
|
exp_input_type: "string, row or list".into(),
|
|
dst_span: name,
|
|
src_span: rest.span(),
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|