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-09-25 01:11:57 +08:00
parent 4129537916
commit 8c412260d2
No known key found for this signature in database
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/tasks/workers/file.rs
View file

@ -131,7 +131,8 @@ impl File {
Cow::Borrowed(task.from.as_path())
};
let src = if task.relative { path_relative_to(&src, &task.to) } else { src };
let src =
if task.relative { path_relative_to(&src, task.to.parent().unwrap()) } else { src };
match fs::remove_file(&task.to).await {
Err(e) if e.kind() != NotFound => Err(e)?,

31
shared/src/fns.rs
View file

@ -73,8 +73,7 @@ pub async fn unique_path(mut p: Url) -> Url {
// * Unix: The relative format to `root` of `path`.
// * Windows: The relative format to `root` of `path`; or `path` itself when
// `path` and `root` are both under different disk drives.
pub fn path_relative_to<P: AsRef<Path>>(path: &Path, root: P) -> Cow<'_, Path> {
let root = root.as_ref();
pub fn path_relative_to<'a>(path: &'a Path, root: &Path) -> Cow<'a, Path> {
assert!(path.is_absolute());
assert!(root.is_absolute());
let mut p_comps = path.components();
@ -131,14 +130,28 @@ mod tests {
#[cfg(unix)]
#[test]
fn test_path_relative_to() {
assert_path_relate_to_root("/a/b", "/a/b/c", "../");
assert_path_relate_to_root("/a/b/c", "/a/b", "c");
assert_path_relate_to_root("/a/b/c", "/a/b/d", "../c");
assert_path_relate_to_root("/a", "/a/b/c", "../../");
assert_path_relate_to_root("/a/a/b", "/a/b/b", "../../b/b");
fn assert(path: &str, root: &str, res: &str) {
assert_eq!(path_relative_to(Path::new(path), Path::new(root)), Cow::Borrowed(Path::new(res)));
}
assert("/a/b", "/a/b/c", "../");
assert("/a/b/c", "/a/b", "c");
assert("/a/b/c", "/a/b/d", "../c");
assert("/a", "/a/b/c", "../../");
assert("/a/a/b", "/a/b/b", "../../a/b");
}
fn assert_path_relate_to_root(path: &str, root: &str, res: &str) {
assert_eq!(path_relative_to(Path::new(path), Path::new(root)), Cow::Borrowed(Path::new(res)));
#[cfg(windows)]
#[test]
fn test_path_relative_to() {
fn assert(path: &str, root: &str, res: &str) {
assert_eq!(path_relative_to(Path::new(path), Path::new(root)), Cow::Borrowed(Path::new(res)));
}
assert("C:\\a\\b", "C:\\a\\b\\c", "..\\");
assert("C:\\a\\b\\c", "C:\\a\\b", "c");
assert("C:\\a\\b\\c", "C:\\a\\b\\d", "..\\c");
assert("C:\\a", "C:\\a\\b\\c", "..\\..\\");
assert("C:\\a\\a\\b", "C:\\a\\b\\b", "..\\..\\a\\b");
}
}