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

Only comparing filename is enough

Browse source
This commit is contained in:
Shupeng Xue 2024-06-23 17:14:05 +10:00
parent 54de589309
commit 810f1d0483
No known key found for this signature in database
GPG key ID: A6C508165D76B601
3 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
yazi-core/src/manager/commands/bulk_rename.rs
View file

@ -6,7 +6,7 @@ use tokio::{fs::{self, OpenOptions}, io::{stdin, AsyncReadExt, AsyncWriteExt}};
use yazi_config::{OPEN, PREVIEW}; use yazi_config::{OPEN, PREVIEW};
use yazi_dds::Pubsub; use yazi_dds::Pubsub;
use yazi_proxy::{AppProxy, TasksProxy, HIDER, WATCHER}; use yazi_proxy::{AppProxy, TasksProxy, HIDER, WATCHER};
use yazi_shared::{fs::{are_paths_equal, max_common_root, maybe_exists, File, FilesOp, Url}, terminal_clear}; use yazi_shared::{fs::{are_names_equal, max_common_root, maybe_exists, File, FilesOp, Url}, terminal_clear};
use crate::manager::Manager; use crate::manager::Manager;
@ -84,7 +84,7 @@ impl Manager {
for (o, n) in todo { for (o, n) in todo {
let (old, new) = (root.join(&o), root.join(&n)); let (old, new) = (root.join(&o), root.join(&n));
if maybe_exists(&new).await && !are_paths_equal(&old, &new).await { if maybe_exists(&new).await && !are_names_equal(&old, &new) {
failed.push((o, n, anyhow!("Destination already exists"))); failed.push((o, n, anyhow!("Destination already exists")));
} else if let Err(e) = fs::rename(&old, &new).await { } else if let Err(e) = fs::rename(&old, &new).await {
failed.push((o, n, e.into())); failed.push((o, n, e.into()));

6
yazi-core/src/manager/commands/rename.rs
View file

@ -5,7 +5,7 @@ use tokio::fs;
use yazi_config::popup::InputCfg; use yazi_config::popup::InputCfg;
use yazi_dds::Pubsub; use yazi_dds::Pubsub;
use yazi_proxy::{InputProxy, TabProxy, WATCHER}; use yazi_proxy::{InputProxy, TabProxy, WATCHER};
use yazi_shared::{event::Cmd, fs::{are_paths_equal, maybe_exists, ok_or_not_found, symlink_realpath, File, FilesOp, Url}}; use yazi_shared::{event::Cmd, fs::{are_names_equal, maybe_exists, ok_or_not_found, symlink_realpath, File, FilesOp, Url}};
use crate::manager::Manager; use crate::manager::Manager;
@ -62,7 +62,7 @@ impl Manager {
} }
let new = hovered.parent().unwrap().join(name); let new = hovered.parent().unwrap().join(name);
if opt.force || !maybe_exists(&new).await || are_paths_equal(&hovered, &new).await { if opt.force || !maybe_exists(&new).await || are_names_equal(&hovered, &new) {
Self::rename_do(tab, hovered, Url::from(new)).await.ok(); Self::rename_do(tab, hovered, Url::from(new)).await.ok();
return; return;
} }
@ -81,7 +81,7 @@ impl Manager {
let Some(p_new) = new.parent_url() else { return Ok(()) }; let Some(p_new) = new.parent_url() else { return Ok(()) };
let _permit = WATCHER.acquire().await.unwrap(); let _permit = WATCHER.acquire().await.unwrap();
let are_different = !are_paths_equal(&old, &new).await; let are_different = !are_names_equal(&old, &new);
let overwritten = symlink_realpath(&new).await; let overwritten = symlink_realpath(&new).await;
fs::rename(&old, &new).await?; fs::rename(&old, &new).await?;

29
yazi-shared/src/fs/fns.rs
View file

@ -24,34 +24,19 @@ pub fn ok_or_not_found(result: io::Result<()>) -> io::Result<()> {
} }
#[inline] #[inline]
pub async fn are_paths_equal(old: impl AsRef<Path>, new: impl AsRef<Path>) -> bool { pub fn are_names_equal(old: impl AsRef<Path>, new: impl AsRef<Path>) -> bool {
if let (Some(old), Some(new)) = ( if let (Some(old), Some(new)) = (old.as_ref().file_name(), new.as_ref().file_name()) {
canonicalize_without_resolving_itself(old).await, let (old, new) = if cfg!(target_os = "macos") || cfg!(target_os = "windows") {
canonicalize_without_resolving_itself(new).await, (Cow::Owned(old.to_ascii_lowercase()), Cow::Owned(new.to_ascii_lowercase()))
) { } else {
(Cow::Borrowed(old), Cow::Borrowed(new))
};
old == new old == new
} else { } else {
false false
} }
} }
#[inline]
async fn canonicalize_without_resolving_itself(path: impl AsRef<Path>) -> Option<PathBuf> {
let meta = fs::symlink_metadata(&path).await.ok()?;
if meta.is_symlink() {
let (parent, link) = (path.as_ref().parent()?, path.as_ref().file_name()?);
let parent = fs::canonicalize(parent).await.ok()?;
let new_link = if cfg!(target_os = "macos") || cfg!(target_os = "windows") {
Cow::Owned(link.to_ascii_lowercase())
} else {
Cow::Borrowed(link)
};
Some(parent.join(new_link))
} else {
fs::canonicalize(path).await.ok()
}
}
pub async fn symlink_realpath(path: &Path) -> Result<PathBuf> { pub async fn symlink_realpath(path: &Path) -> Result<PathBuf> {
let p = fs::canonicalize(path).await?; let p = fs::canonicalize(path).await?;
if p == path { if p == path {