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

refactor: use backslash_to_slash function

Browse source
This commit is contained in:
alan910127 2024-11-03 00:55:45 +08:00
parent 7d8b798a78
commit cb217e5e7f
1 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
yazi-core/src/tab/commands/copy.rs
View file

@ -84,47 +84,20 @@ impl From<&Cmd> for PathSeparator {
} }
} }
#[cfg(not(target_os = "windows"))] #[cfg(unix)]
fn path_to_os_str(path: &Path, _separator: PathSeparator) -> Cow<'_, OsStr> { fn path_to_os_str(path: &Path, _separator: PathSeparator) -> Cow<'_, OsStr> {
return Cow::Borrowed(path.as_os_str()); Cow::Borrowed(path.as_os_str())
} }
#[cfg(target_os = "windows")] #[cfg(windows)]
fn path_to_os_str(path: &Path, separator: PathSeparator) -> Cow<'_, OsStr> { fn path_to_os_str(path: &Path, separator: PathSeparator) -> Cow<'_, OsStr> {
if let PathSeparator::Auto = separator { match separator {
return Cow::Borrowed(path.as_os_str()); PathSeparator::Auto => Cow::Borrowed(path.as_os_str()),
}; PathSeparator::Unix => match yazi_shared::fs::path::backslash_to_slash(path) {
Cow::Borrowed(path) => Cow::Borrowed(path.as_os_str()),
use std::path::Component; Cow::Owned(path) => Cow::Owned(OsString::from(path)),
},
let mut s = String::with_capacity(path.as_os_str().len());
for component in path.components() {
match component {
Component::RootDir => {}
Component::CurDir => s.push('.'),
Component::ParentDir => s.push_str(".."),
Component::Normal(path) => s.push_str(&path.to_string_lossy()),
Component::Prefix(prefix) => {
// "C:\foo" => [Prefix("C:"), RootDir, Normal(foo)]
s.push_str(&prefix.as_os_str().to_string_lossy());
// If we push a "/" below, we will met a RootDir and push a "/"
// again resulting in "C://". So we need to skip that.
continue;
}
};
s.push('/');
} }
use std::os::windows::ffi::OsStrExt as _;
use std::path::MAIN_SEPARATOR;
let path_ends_with_main_sep =
path.as_os_str().encode_wide().last() == Some(MAIN_SEPARATOR as u16);
if !path_ends_with_main_sep && s != "/" && s.ends_with('/') {
s.pop();
}
return Cow::Owned(OsString::from(s));
} }
#[cfg(test)] #[cfg(test)]