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

async just dropped

Browse source
This commit is contained in:
brxken128 2023-01-18 15:30:58 +00:00
parent 4d79239957
commit 83cc7ace2d
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,18 +57,14 @@ impl StatefulJob for FileCopierJob {
// if no suffix has been selected, just use the file name
// if a suffix is provided and it's a directory, use the directory name + suffix
// if a suffix is provided and it's a file, use the (file name + suffix).extension
let target_file_name = state.init.target_file_name_suffix.clone().map_or_else(
|| {
// if there's no provided suffix, just use source name
osstr_to_string(source_fs_info.obj_path.clone().file_name())
},
let file_name = osstr_to_string(source_fs_info.obj_path.clone().file_name())?;
let target_file_name = state.init.target_file_name_suffix.as_ref().map_or(
Ok::<_, JobError>(file_name.clone()),
|s| match source_fs_info.obj_type {
ObjectType::Directory => {
Ok(osstr_to_string(source_fs_info.obj_path.clone().file_name())? + &s)
}
ObjectType::File => Ok(osstr_to_string(
source_fs_info.obj_path.clone().file_stem(),
)? + &s + &source_fs_info
ObjectType::Directory => Ok(file_name.clone() + s),
ObjectType::File => Ok(osstr_to_string(source_fs_info.obj_path.file_stem())?
+ s + &source_fs_info
.obj_path
.extension()
.map_or(Ok::<_, JobError>("".to_string()), |x| {
@ -118,7 +114,7 @@ impl StatefulJob for FileCopierJob {
);
}
std::fs::copy(info.obj_path.clone(), path.clone())?;
tokio::fs::copy(&info.obj_path, &path).await?;
}
ObjectType::Directory => {
// if this is the very first path, create the target dir
@ -126,12 +122,12 @@ impl StatefulJob for FileCopierJob {
if job_state.root_type == ObjectType::Directory
&& job_state.source_path == info.obj_path
{
std::fs::create_dir_all(&job_state.target_path)?;
tokio::fs::create_dir_all(&job_state.target_path).await?;
}
for entry in std::fs::read_dir(info.obj_path.clone())? {
let entry = entry?;
if entry.metadata()?.is_dir() {
let mut dir = tokio::fs::read_dir(&info.obj_path).await?;
while let Some(entry) = dir.next_entry().await? {
if entry.metadata().await?.is_dir() {
state.steps.push_back(FileCopierJobStep {
source_fs_info: FsInfo {
obj_id: None,
@ -149,7 +145,7 @@ impl StatefulJob for FileCopierJob {
.map_err(|_| JobError::Path)?,
);
std::fs::create_dir_all(path)?;
tokio::fs::create_dir_all(path).await?;
} else {
state.steps.push_back(FileCopierJobStep {
source_fs_info: FsInfo {

2
core/src/object/fs/cut.rs
View file

@ -78,7 +78,7 @@ impl StatefulJob for FileCutterJob {
dbg!(source_info.obj_path.clone());
dbg!(full_output.clone());
std::fs::rename(source_info.obj_path.clone(), full_output.clone())?;
tokio::fs::rename(source_info.obj_path.clone(), full_output.clone()).await?;
ctx.progress(vec![JobReportUpdate::CompletedTaskCount(
state.step_number + 1,