mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: resolve relative path when expanding path (#1428)

Browse source 
Co-authored-by: sxyazi <sxyazi@gmail.com>
This commit is contained in:
P_Lee 2024-08-08 15:13:55 +08:00 • committed by sxyazi
parent a9d2d9cd2b
commit 407ad266e9
No known key found for this signature in database
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
yazi-shared/src/fs/path.rs
View file

@ -1,9 +1,8 @@
use std::{borrow::Cow, env, ffi::OsString, path::{Component, Path, PathBuf, MAIN_SEPARATOR}}; use std::{borrow::Cow, env, ffi::OsString, path::{Component, Path, PathBuf}};
use super::maybe_exists; use super::maybe_exists;
use crate::fs::Url; use crate::fs::Url;
#[inline]
pub fn current_cwd() -> Option<PathBuf> { pub fn current_cwd() -> Option<PathBuf> {
env::var_os("PWD") env::var_os("PWD")
.map(PathBuf::from) .map(PathBuf::from)
@ -11,6 +10,32 @@ pub fn current_cwd() -> Option<PathBuf> {
.or_else(|| env::current_dir().ok()) .or_else(|| env::current_dir().ok())
} }
#[inline]
pub fn clean_path(path: impl AsRef<Path>) -> PathBuf { _clean_path(path.as_ref()) }
fn _clean_path(path: &Path) -> PathBuf {
let mut out = vec![];
for c in path.components() {
match c {
Component::CurDir => {}
Component::ParentDir => match out.last() {
Some(Component::RootDir) => {}
Some(Component::Normal(_)) => _ = out.pop(),
None
| Some(Component::CurDir)
| Some(Component::ParentDir)
| Some(Component::Prefix(_)) => out.push(c),
},
c => out.push(c),
}
}
if out.is_empty() { PathBuf::from(".") } else { out.iter().collect() }
}
#[inline]
pub fn expand_path(p: impl AsRef<Path>) -> PathBuf { _expand_path(p.as_ref()) }
fn _expand_path(p: &Path) -> PathBuf { fn _expand_path(p: &Path) -> PathBuf {
// ${HOME} or $HOME // ${HOME} or $HOME
#[cfg(unix)] #[cfg(unix)]
@ -37,22 +62,14 @@ fn _expand_path(p: &Path) -> PathBuf {
let p = Path::new(s.as_ref()); let p = Path::new(s.as_ref());
if let Ok(rest) = p.strip_prefix("~") { if let Ok(rest) = p.strip_prefix("~") {
return dirs::home_dir().unwrap_or_default().join(rest); clean_path(dirs::home_dir().unwrap_or_default().join(rest))
} else if p.is_absolute() {
clean_path(p)
} else if let Some(cwd) = current_cwd() {
clean_path(cwd.join(p))
} else {
clean_path(p)
} }
if p.is_absolute() {
return p.to_path_buf();
}
current_cwd().map_or_else(|| p.to_path_buf(), |c| c.join(p))
}
#[inline]
pub fn expand_path(p: impl AsRef<Path>) -> PathBuf { _expand_path(p.as_ref()) }
#[inline]
pub fn ends_with_slash(p: &Path) -> bool {
let b = p.as_os_str().as_encoded_bytes();
if let [.., last] = b { *last == MAIN_SEPARATOR as u8 } else { false }
} }
// FIXME: should return a `std::io::Result` to handle errors such as // FIXME: should return a `std::io::Result` to handle errors such as