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

..

Browse source
This commit is contained in:
sxyazi 2023-10-11 00:15:38 +08:00
parent e182edbf96
commit cd1787c1cf
No known key found for this signature in database
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
shared/src/fns.rs
View file

@ -5,19 +5,21 @@ use tokio::fs;
use crate::Url; use crate::Url;
pub fn expand_path(p: impl AsRef<Path>) -> PathBuf { pub fn expand_path(p: impl AsRef<Path>) -> PathBuf {
let p = p.as_ref().to_string_lossy(); // ${HOME} or $HOME
#[cfg(unix)] #[cfg(unix)]
let re = regex::Regex::new(r"\$([a-zA-Z0-9_]+)").unwrap(); let re = regex::Regex::new(r"\$(?:\{([^}]+)\}|([a-zA-Z\d_]+))").unwrap();
// %USERPROFILE%
#[cfg(windows)] #[cfg(windows)]
let re = regex::Regex::new(r"%([^%]+)%").unwrap(); let re = regex::Regex::new(r"%([^%]+)%").unwrap();
let expanded = re.replace_all(&p, |caps: &regex::Captures| { let s = p.as_ref().to_string_lossy();
env::var(caps.get(1).unwrap().as_str()) let s = re.replace_all(&s, |caps: &regex::Captures| {
.unwrap_or_else(|_| caps.get(0).unwrap().as_str().to_string()) let name = caps.get(2).or_else(|| caps.get(1)).unwrap();
env::var(name.as_str()).unwrap_or_else(|_| caps.get(0).unwrap().as_str().to_owned())
}); });
let p = Path::new(expanded.as_ref()); let p = Path::new(s.as_ref());
if let Ok(p) = p.strip_prefix("~") { if let Ok(p) = p.strip_prefix("~") {
#[cfg(unix)] #[cfg(unix)]
if let Some(home) = env::var_os("HOME") { if let Some(home) = env::var_os("HOME") {