Mirrors/rip
2
0
Fork 0
mirror of https://github.com/nivekuil/rip synced 2024-11-23 12:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove redundant directory level

Browse source
This commit is contained in:
Kevin Liu 2016-09-03 03:07:17 -07:00
parent 544336bf79
commit f17278a121
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -54,6 +54,9 @@ fn send_to_graveyard(source: &str, graveyard: &Path) -> std::io::Result<()> {
}
};
let parent: &Path = dest.parent().expect("Trying to delete / ?");
fs::create_dir_all(parent).expect("Failed to create grave path");
// Try a simple rename, which will only work within the same mount point.
// Trying to rename across filesystems will throw errno 18.
if let Ok(_) = fs::rename(&fullpath, &dest) {
@ -62,21 +65,18 @@ fn send_to_graveyard(source: &str, graveyard: &Path) -> std::io::Result<()> {
// If that didn't work, then copy and rm.
if fullpath.is_dir() {
fs::create_dir_all(&dest).expect("Failed to create grave path");
for entry in WalkDir::new(source) {
let entry = entry.expect("Failed to open file in source dir");
let path = entry.path();
if path.is_dir() {
println!("{}", dest.join(path).display());
fs::create_dir(dest.join(path)).expect("Copy dir failed");
println!("{}", parent.join(path).display());
fs::create_dir(parent.join(path)).expect("Copy dir failed");
} else {
fs::copy(path, dest.join(path)).expect("Copy file failed");
fs::copy(path, parent.join(path)).expect("Copy file failed");
}
}
fs::remove_dir_all(&fullpath).expect("Failed to remove source dir");
} else {
let parent: &Path = dest.parent().expect("Trying to delete / ?");
fs::create_dir_all(parent).expect("Failed to create grave path");
try!(fs::copy(&fullpath, &dest));
try!(fs::remove_file(source));
}