mirror of
https://github.com/nushell/nushell.git
synced 2025-05-24 08:31:17 +00:00
0c67d742f0
This pr fix clippy warnings in latest clippy version(1.72.0): Unfortunally it's not easy to handle for [try fold](https://rust-lang.github.io/rust-clippy/master/index.html#/manual_try_fold) warning in `start command` Refer to known issue: > This lint doesn’t take into account whether a function does something on the failure case, i.e., whether short-circuiting will affect behavior. Refactoring to try_fold is not desirable in those cases. That's the case for our code, which does something on the failure case. So this pr is making a little refactor on `try_commands`.
111 lines
3.4 KiB
Rust
111 lines
3.4 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};
|
|
|
|
const GLOB_CHARS: &[char] = &['*', '?', '['];
|
|
|
|
/// 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 (prefix, pattern) = if pattern.item.contains(GLOB_CHARS) {
|
|
// Pattern contains glob, split it
|
|
let mut p = PathBuf::new();
|
|
let path = PathBuf::from(&pattern.item);
|
|
let components = path.components();
|
|
let mut counter = 0;
|
|
|
|
for c in components {
|
|
if let Component::Normal(os) = c {
|
|
if os.to_string_lossy().contains(GLOB_CHARS) {
|
|
break;
|
|
}
|
|
}
|
|
p.push(c);
|
|
counter += 1;
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|
|
|
|
// Now expand `p` to get full prefix
|
|
let path = expand_path_with(p, cwd);
|
|
let escaped_prefix = PathBuf::from(nu_glob::Pattern::escape(&path.to_string_lossy()));
|
|
|
|
(Some(path), escaped_prefix.join(just_pattern))
|
|
} else {
|
|
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,
|
|
};
|
|
|
|
if is_symlink {
|
|
(path.parent().map(|parent| parent.to_path_buf()), path)
|
|
} else {
|
|
let path = if let Ok(p) = canonicalize_with(path.clone(), cwd) {
|
|
p
|
|
} else {
|
|
return Err(ShellError::DirectoryNotFound(
|
|
pattern.span,
|
|
path.to_string_lossy().to_string(),
|
|
));
|
|
};
|
|
(path.parent().map(|parent| parent.to_path_buf()), path)
|
|
}
|
|
};
|
|
|
|
let pattern = pattern.to_string_lossy().to_string();
|
|
let glob_options = options.unwrap_or_default();
|
|
|
|
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(),
|
|
)),
|
|
})),
|
|
))
|
|
}
|