mirror of
https://github.com/nushell/nushell.git
synced 2025-05-06 07:52:57 +00:00
# Description This PR is trying to allow you to have `[blah]` in your path and yet still have `ls` work. This is done by trying to separate the path from the pattern to be searched for. It may still need more work. I've tested it with: - mkdir "[test]" - cd "[test]" - ls Related to #9307 Hopefully fixes #9232 # 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 -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` 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. -->
117 lines
3.6 KiB
Rust
117 lines
3.6 KiB
Rust
use std::{
|
|
fs,
|
|
path::{Component, Path, PathBuf},
|
|
};
|
|
|
|
use nu_glob::MatchOptions;
|
|
use nu_path::{canonicalize_with, expand_path_with};
|
|
use nu_protocol::{ShellError, Span, Spanned};
|
|
|
|
/// This function is like `nu_glob::glob` from the `glob` crate, except it is relative to a given cwd.
|
|
///
|
|
/// It returns a tuple of two values: the first is an optional prefix that the expanded filenames share.
|
|
/// This prefix can be removed from the front of each value to give an approximation of the relative path
|
|
/// to the user
|
|
///
|
|
/// The second of the two values is an iterator over the matching filepaths.
|
|
#[allow(clippy::type_complexity)]
|
|
pub fn glob_from(
|
|
pattern: &Spanned<String>,
|
|
cwd: &Path,
|
|
span: Span,
|
|
options: Option<MatchOptions>,
|
|
) -> Result<
|
|
(
|
|
Option<PathBuf>,
|
|
Box<dyn Iterator<Item = Result<PathBuf, ShellError>> + Send>,
|
|
),
|
|
ShellError,
|
|
> {
|
|
let path = PathBuf::from(&pattern.item);
|
|
let path = expand_path_with(path, cwd);
|
|
let is_symlink = match fs::symlink_metadata(&path) {
|
|
Ok(attr) => attr.file_type().is_symlink(),
|
|
Err(_) => false,
|
|
};
|
|
|
|
// Check for brackets first
|
|
let (prefix, pattern) = if path.to_string_lossy().contains('[') {
|
|
// Path is a glob pattern => do not check for existence
|
|
// Select the longest prefix until the first '*'
|
|
let mut p = PathBuf::new();
|
|
let components = path.components();
|
|
let mut counter = 0;
|
|
|
|
// Get the path up to the pattern which we'll call the prefix
|
|
for c in components {
|
|
if let Component::Normal(os) = c {
|
|
if os.to_string_lossy().contains('*') {
|
|
break;
|
|
}
|
|
}
|
|
p.push(c);
|
|
counter += 1;
|
|
}
|
|
|
|
// Let's separate the pattern from the path and we'll call this the pattern
|
|
let mut just_pattern = PathBuf::new();
|
|
for c in counter..path.components().count() {
|
|
if let Some(comp) = path.components().nth(c) {
|
|
just_pattern.push(comp);
|
|
}
|
|
}
|
|
|
|
(Some(p), just_pattern)
|
|
} else if path.to_string_lossy().contains('*') {
|
|
// Path is a glob pattern => do not check for existence
|
|
// Select the longest prefix until the first '*'
|
|
let mut p = PathBuf::new();
|
|
for c in path.components() {
|
|
if let Component::Normal(os) = c {
|
|
if os.to_string_lossy().contains('*') {
|
|
break;
|
|
}
|
|
}
|
|
p.push(c);
|
|
}
|
|
|
|
(Some(p), path)
|
|
} else if is_symlink {
|
|
(path.parent().map(|parent| parent.to_path_buf()), path)
|
|
} else {
|
|
let path = if let Ok(p) = canonicalize_with(path, cwd) {
|
|
p
|
|
} else {
|
|
return Err(ShellError::DirectoryNotFound(pattern.span, None));
|
|
};
|
|
(path.parent().map(|parent| parent.to_path_buf()), path)
|
|
};
|
|
|
|
let pattern = pattern.to_string_lossy().to_string();
|
|
let glob_options = options.unwrap_or_else(MatchOptions::new);
|
|
|
|
let glob = nu_glob::glob_with(&pattern, glob_options).map_err(|err| {
|
|
nu_protocol::ShellError::GenericError(
|
|
"Error extracting glob pattern".into(),
|
|
err.to_string(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
})?;
|
|
|
|
Ok((
|
|
prefix,
|
|
Box::new(glob.map(move |x| match x {
|
|
Ok(v) => Ok(v),
|
|
Err(err) => Err(nu_protocol::ShellError::GenericError(
|
|
"Error extracting glob pattern".into(),
|
|
err.to_string(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
)),
|
|
})),
|
|
))
|
|
}
|