Software-Mac/spacedrive
Software-Mac/spacedrive
1
0
Fork 0
mirror of https://github.com/spacedriveapp/spacedrive synced 2024-07-08 07:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

super nice file AND directory copying (the new duplicate too)

Browse source
This commit is contained in:
brxken128 2023-01-17 22:40:42 +00:00
parent 8b9f05f168
commit 99440c4930
1 changed files with 38 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
core/src/object/fs/copy.rs
View file

@ -79,60 +79,57 @@ impl StatefulJob for FileCopierJob {
match info.obj_type {
ObjectType::File => {
let mut path = job_state.target_path.clone();
path.push(job_state.source_path.clone().file_name().unwrap());
if job_state.root_type == ObjectType::Directory {
if job_state.root_type == ObjectType::File {
path.push(job_state.source_path.clone().file_name().unwrap());
} else if job_state.root_type == ObjectType::Directory {
path.push(
info.obj_path
.strip_prefix(job_state.source_path.clone())
.unwrap(),
);
} else {
path.push(info.obj_path.clone().file_name().unwrap());
}
dbg!(info.obj_path.clone());
dbg!(path.clone());
std::fs::copy(info.obj_path.clone(), path.clone())?;
}
_ => todo!(), // ObjectType::Directory => {
// for entry in std::fs::read_dir(info.obj_path.clone())? {
// let entry = entry?;
// if entry.metadata()?.is_dir() {
// let obj_type = ObjectType::Directory;
// state.steps.push_back(FileCopierJobStep {
// fs_info: FsInfo {
// obj_id: None,
// obj_name: String::new(),
// obj_path: entry.path(),
// obj_type,
// },
// });
ObjectType::Directory => {
for entry in std::fs::read_dir(info.obj_path.clone())? {
let entry = entry?;
if entry.metadata()?.is_dir() {
state.steps.push_back(FileCopierJobStep {
source_fs_info: FsInfo {
obj_id: None,
obj_name: String::new(),
obj_path: entry.path(),
obj_type: ObjectType::Directory,
},
});
// let path_suffix = entry
// .path()
// .strip_prefix(job_state.root_path.clone())
// .unwrap()
// .to_path_buf();
let mut path = job_state.target_path.clone();
path.push(job_state.source_path.clone().file_name().unwrap());
path.push(
entry
.path()
.strip_prefix(job_state.source_path.clone())
.unwrap(),
);
// let mut path = job_state.root_prefix.clone();
// path.push(path_suffix);
// std::fs::create_dir_all(path)?;
// } else {
// let obj_type = ObjectType::File;
// state.steps.push_back(FileCopierJobStep {
// fs_info: FsInfo {
// obj_id: None,
// obj_name: entry.file_name().to_str().unwrap().to_string(),
// obj_path: entry.path(),
// obj_type,
// },
// });
// };
std::fs::create_dir_all(path)?;
} else {
state.steps.push_back(FileCopierJobStep {
source_fs_info: FsInfo {
obj_id: None,
obj_name: entry.file_name().to_str().unwrap().to_string(),
obj_path: entry.path(),
obj_type: ObjectType::File,
},
});
};
// ctx.progress(vec![JobReportUpdate::TaskCount(state.steps.len())]);
// }
// }
ctx.progress(vec![JobReportUpdate::TaskCount(state.steps.len())]);
}
}
};
ctx.progress(vec![JobReportUpdate::CompletedTaskCount(