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

refactor: consolidate branches

Browse source
This commit is contained in:
Juan José Lledó Frasquet 2026-01-12 13:41:00 +01:00
parent 29a610d389
commit b0bb9f19d8
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
yazi-actor/src/mgr/rename.rs
View file

@ -67,19 +67,19 @@ impl Actor for Rename {
return; return;
}; };
if opt.force || !maybe_exists(&new).await || provider::must_identical(&old, &new).await { if !opt.force
&& maybe_exists(&new).await
&& !provider::must_identical(&old, &new).await
&& !ConfirmProxy::show(ConfirmCfg::overwrite(&new)).await
{
return;
}
if conversion_to_dir_requested && target_is_empty { if conversion_to_dir_requested && target_is_empty {
Self::replace_file_with_dir(old, new).await.ok(); Self::replace_file_with_dir(old, new).await.ok();
} else { } else {
Self::r#do(tab, old, new).await.ok(); Self::r#do(tab, old, new).await.ok();
} }
} else if ConfirmProxy::show(ConfirmCfg::overwrite(&new)).await {
if conversion_to_dir_requested && target_is_empty {
Self::replace_file_with_dir(old, new).await.ok();
} else {
Self::r#do(tab, old, new).await.ok();
}
}
}); });
succ!(); succ!();
} }