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

fix: prevent pasting a directory into itself

Browse source
This commit is contained in:
rolv 2024-04-17 18:26:13 +01:00 • committed by sxyazi
parent ff14b9a265
commit ae13c29488
No known key found for this signature in database
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
yazi-scheduler/src/file/file.rs
View file

@ -3,7 +3,7 @@ use std::{borrow::Cow, collections::VecDeque, fs::Metadata, path::{Path, PathBuf
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use futures::{future::BoxFuture, FutureExt}; use futures::{future::BoxFuture, FutureExt};
use tokio::{fs, io::{self, ErrorKind::{AlreadyExists, NotFound}}, sync::mpsc}; use tokio::{fs, io::{self, ErrorKind::{AlreadyExists, NotFound}}, sync::mpsc};
use tracing::warn; use tracing::{debug, warn};
use yazi_config::TASKS; use yazi_config::TASKS;
use yazi_shared::fs::{accessible, calculate_size, copy_with_progress, path_relative_to, Url}; use yazi_shared::fs::{accessible, calculate_size, copy_with_progress, path_relative_to, Url};
@ -134,6 +134,21 @@ impl File {
} }
pub async fn paste(&self, mut task: FileOpPaste) -> Result<()> { pub async fn paste(&self, mut task: FileOpPaste) -> Result<()> {
// Prevent pasting of a directory into itself
if task.from.is_dir() {
let mut parent = task.to.parent_url();
while let Some(p) = parent {
if task.from == p {
debug!(
"file_paste: cannot paste directory into itself, skipping {:?} -> {:?}",
task.from, task.to
);
return self.succ(task.id);
}
parent = p.parent_url();
}
}
if task.cut { if task.cut {
match fs::rename(&task.from, &task.to).await { match fs::rename(&task.from, &task.to).await {
Ok(_) => return self.succ(task.id), Ok(_) => return self.succ(task.id),