mirror of
https://github.com/nushell/nushell.git
synced 2025-02-13 09:00:07 +01:00
77e73cef66
# Description Fixes #6706. I took a look at this issue and it seems that the issue is because the path is canonicalized and thus derives to the target. I've tested it locally by checking if the path is a symlink and acting accordingly to not canonicalize it and it seems fine. In current release if the target is deleted but the symlink remains and one `ls`'s it, it throws a `directory not found` error. But with the fix it still shows the symlink (with red background, indicating missing target). The change I've applied only triggers when `ls` is done on a symlink, on all other counts it should basically do the same as before. # 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` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass ## List existing symlink and target Current ``` ls a_symlink ╭───┬────────┬──────┬──────┬──────────────╮ │ # │ name │ type │ size │ modified │ ├───┼────────┼──────┼──────┼──────────────┤ │ 0 │ a_file │ file │ 0 B │ 20 hours ago │ ╰───┴────────┴──────┴──────┴──────────────╯ ``` With fix ``` ls a_symlink ╭───┬───────────┬─────────┬──────┬──────────────╮ │ # │ name │ type │ size │ modified │ ├───┼───────────┼─────────┼──────┼──────────────┤ │ 0 │ a_symlink │ symlink │ 6 B │ 20 hours ago │ ╰───┴───────────┴─────────┴──────┴──────────────╯ ``` ## List existing symlink with missing target Current ``` ls symfile_x Error: nu:🐚:directory_not_found (link) × Directory not found ╭─[entry #13:1:1] 1 │ ls symfile_x · ────┬──── · ╰── directory not found ╰──── ``` With fix ``` ls symfile_x ╭───┬───────────┬─────────┬──────┬─────────────╮ │ # │ name │ type │ size │ modified │ ├───┼───────────┼─────────┼──────┼─────────────┤ │ 0 │ symfile_x │ symlink │ 6 B │ 2 hours ago │ ╰───┴───────────┴─────────┴──────┴─────────────╯ ```
88 lines
2.7 KiB
Rust
88 lines
2.7 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,
|
|
};
|
|
|
|
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();
|
|
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(),
|
|
)),
|
|
})),
|
|
))
|
|
}
|