extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 14:36:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Path migration 1 (#13309)

Browse Source 
# Description
Part 1 of replacing `std::path` types with `nu_path` types added in
#13115.
This commit is contained in:
Ian Manske
2024-07-09 09:25:23 +00:00
committed by GitHub
parent 399a7c8836
commit e98b2ceb8c
11 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
crates/nu-protocol/src/engine/engine_state.rs
View File

@ -12,6 +12,7 @@ use crate::{
};
use fancy_regex::Regex;
use lru::LruCache;
use nu_path::AbsolutePathBuf;
use std::{
collections::HashMap,
num::NonZeroUsize,
@ -922,58 +923,44 @@ impl EngineState {
///
/// If `stack` is supplied, also considers modifications to the working
/// directory on the stack that have yet to be merged into the engine state.
pub fn cwd(&self, stack: Option<&Stack>) -> Result<PathBuf, ShellError> {
pub fn cwd(&self, stack: Option<&Stack>) -> Result<AbsolutePathBuf, ShellError> {
// Helper function to create a simple generic error.
fn error(msg: &str, cwd: impl AsRef<Path>) -> Result<PathBuf, ShellError> {
Err(ShellError::GenericError {
fn error(msg: &str, cwd: impl AsRef<nu_path::Path>) -> ShellError {
ShellError::GenericError {
error: msg.into(),
msg: format!("$env.PWD = {}", cwd.as_ref().display()),
span: None,
help: Some("Use `cd` to reset $env.PWD into a good state".into()),
inner: vec![],
})
}
// Helper function to check if a path is a root path.
fn is_root(path: &Path) -> bool {
path.parent().is_none()
}
// Helper function to check if a path has trailing slashes.
fn has_trailing_slash(path: &Path) -> bool {
nu_path::components(path).last()
== Some(std::path::Component::Normal(std::ffi::OsStr::new("")))
}
}
// Retrieve $env.PWD from the stack or the engine state.
let pwd = if let Some(stack) = stack {
stack.get_env_var(self, "PWD")
} else {
self.get_env_var("PWD").map(ToOwned::to_owned)
self.get_env_var("PWD").cloned()
};
if let Some(pwd) = pwd {
if let Value::String { val, .. } = pwd {
let path = PathBuf::from(val);
let pwd = pwd.ok_or_else(|| error("$env.PWD not found", ""))?;
// Technically, a root path counts as "having trailing slashes", but
// for the purpose of PWD, a root path is acceptable.
if !is_root(&path) && has_trailing_slash(&path) {
error("$env.PWD contains trailing slashes", path)
} else if !path.is_absolute() {
error("$env.PWD is not an absolute path", path)
} else if !path.exists() {
error("$env.PWD points to a non-existent directory", path)
} else if !path.is_dir() {
error("$env.PWD points to a non-directory", path)
} else {
Ok(path)
}
if let Value::String { val, .. } = pwd {
let path = AbsolutePathBuf::try_from(val)
.map_err(|path| error("$env.PWD is not an absolute path", path))?;
// Technically, a root path counts as "having trailing slashes", but
// for the purpose of PWD, a root path is acceptable.
if path.parent().is_some() && nu_path::has_trailing_slash(path.as_ref()) {
Err(error("$env.PWD contains trailing slashes", &path))
} else if !path.exists() {
Err(error("$env.PWD points to a non-existent directory", &path))
} else if !path.is_dir() {
Err(error("$env.PWD points to a non-directory", &path))
} else {
error("$env.PWD is not a string", format!("{pwd:?}"))
Ok(path)
}
} else {
error("$env.PWD not found", "")
Err(error("$env.PWD is not a string", format!("{pwd:?}")))
}
}