mirror of
https://github.com/nushell/nushell.git
synced 2025-05-08 20:14:26 +02:00
f7d647ac3c
# Description
This is a follow up to
https://github.com/nushell/nushell/pull/11621#issuecomment-1937484322
Also Fixes: #11838
## About the code change
It applys the same logic when we pass variables to external commands:
0487e9ffcb/crates/nu-command/src/system/run_external.rs (L162-L170)
That is: if user input dynamic things(like variables, sub-expression, or
string interpolation), it returns a quoted `NuPath`, then user input
won't be globbed
# User-Facing Changes
Given two input files: `a*c.txt`, `abc.txt`
* `let f = "a*c.txt"; rm $f` will remove one file: `a*c.txt`.
~* `let f = "a*c.txt"; rm --glob $f` will remove `a*c.txt` and
`abc.txt`~
* `let f: glob = "a*c.txt"; rm $f` will remove `a*c.txt` and `abc.txt`
## Rules about globbing with *variable*
Given two files: `a*c.txt`, `abc.txt`
| Cmd Type | example | Result |
| ----- | ------------------ | ------ |
| builtin | let f = "a*c.txt"; rm $f | remove `a*c.txt` |
| builtin | let f: glob = "a*c.txt"; rm $f | remove `a*c.txt` and
`abc.txt`
| builtin | let f = "a*c.txt"; rm ($f \| into glob) | remove `a*c.txt`
and `abc.txt`
| custom | def crm [f: glob] { rm $f }; let f = "a*c.txt"; crm $f |
remove `a*c.txt` and `abc.txt`
| custom | def crm [f: glob] { rm ($f \| into string) }; let f =
"a*c.txt"; crm $f | remove `a*c.txt`
| custom | def crm [f: string] { rm $f }; let f = "a*c.txt"; crm $f |
remove `a*c.txt`
| custom | def crm [f: string] { rm $f }; let f = "a*c.txt"; crm ($f \|
into glob) | remove `a*c.txt` and `abc.txt`
In general, if a variable is annotated with `glob` type, nushell will
expand glob pattern. Or else, we need to use `into | glob` to expand
glob pattern
# Tests + Formatting
Done
# After Submitting
I think `str glob-escape` command will be no-longer required. We can
remove it.
34 lines
923 B
Rust
34 lines
923 B
Rust
use serde::Deserialize;
|
|
use std::fmt::Display;
|
|
|
|
#[derive(Debug, Clone, Deserialize)]
|
|
pub enum NuGlob {
|
|
/// A quoted path(except backtick), in this case, nushell shouldn't auto-expand path.
|
|
NoExpand(String),
|
|
/// An unquoted path, in this case, nushell should auto-expand path.
|
|
NeedExpand(String),
|
|
}
|
|
|
|
impl NuGlob {
|
|
pub fn strip_ansi_string_unlikely(self) -> Self {
|
|
match self {
|
|
NuGlob::NoExpand(s) => NuGlob::NoExpand(nu_utils::strip_ansi_string_unlikely(s)),
|
|
NuGlob::NeedExpand(s) => NuGlob::NeedExpand(nu_utils::strip_ansi_string_unlikely(s)),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl AsRef<str> for NuGlob {
|
|
fn as_ref(&self) -> &str {
|
|
match self {
|
|
NuGlob::NoExpand(s) | NuGlob::NeedExpand(s) => s,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Display for NuGlob {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
write!(f, "{}", self.as_ref())
|
|
}
|
|
}
|