utils-system/darakian.ddh
1
0
Fork 0
mirror of https://github.com/darakian/ddh.git synced 2026-09-10 07:06:21 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaner canonicalize

Browse source
This commit is contained in:
Jon Moroney 2020-07-19 12:20:11 -07:00
parent d30346c713
commit 8a1d5f8e8e
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/lib.rs
View file

@ -53,14 +53,14 @@ pub fn deduplicate_dirs<P: AsRef<Path> + Sync>(search_dirs: Vec<P>) -> (Vec<File
(complete_files, errors)
}
fn traverse_and_spawn(current_path: &Path, sender: Sender<ChannelPackage>) -> (){
let can_path = current_path.canonicalize().expect("Error canonicalizing path");
let current_path = can_path.as_path();
fn traverse_and_spawn(current_path: impl AsRef<Path>, sender: Sender<ChannelPackage>) -> (){
let current_path = fs::canonicalize(current_path)
.expect("Error canonicalizing path");
println!("Processing {:?}.\n Metadata {:?}",
current_path,
current_path.metadata().expect("Error unwrapping metadata")
);
let current_path_metadata = match fs::symlink_metadata(current_path) {
let current_path_metadata = match fs::symlink_metadata(&current_path) {
Err(e) =>{
sender.send(
ChannelPackage::Fail(current_path.to_path_buf(), e)
@ -89,7 +89,7 @@ fn traverse_and_spawn(current_path: &Path, sender: Sender<ChannelPackage>) -> ()
}
if current_path_metadata.file_type().is_dir(){
match fs::read_dir(current_path) {
match fs::read_dir(&current_path) {
Ok(read_dir_results) => {
let good_entries: Vec<_> = read_dir_results
.filter(|x| x.is_ok())
@ -104,7 +104,7 @@ fn traverse_and_spawn(current_path: &Path, sender: Sender<ChannelPackage>) -> ()
traverse_and_spawn(&x.path(), sender.clone()));
dirs.into_par_iter()
.for_each_with(sender, |sender, x| {
traverse_and_spawn(x.path().as_path(), sender.clone());
traverse_and_spawn(x.path(), sender.clone());
})
},
Err(e) => {