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

..

Browse source
This commit is contained in:
sxyazi 2024-07-10 11:57:38 +08:00
parent 2e98fa2dba
commit a32680a639
No known key found for this signature in database
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@ impl File {
} }
Ok(n) => self.prog.send(TaskProg::Adv(task.id, 0, n))?, Ok(n) => self.prog.send(TaskProg::Adv(task.id, 0, n))?,
Err(e) if e.kind() == NotFound => { Err(e) if e.kind() == NotFound => {
warn!("Paste task partially done: {:?}", task); warn!("Paste task partially done: {task:?}");
break; break;
} }
// Operation not permitted (os error 1) // Operation not permitted (os error 1)
@ -64,7 +64,7 @@ impl File {
match fs::read_link(&task.from).await { match fs::read_link(&task.from).await {
Ok(p) => Cow::Owned(p), Ok(p) => Cow::Owned(p),
Err(e) if e.kind() == NotFound => { Err(e) if e.kind() == NotFound => {
self.log(task.id, format!("Link task partially done: {:?}", task))?; warn!("Link task partially done: {task:?}");
return Ok(self.prog.send(TaskProg::Adv(task.id, 1, meta.len()))?); return Ok(self.prog.send(TaskProg::Adv(task.id, 1, meta.len()))?);
} }
Err(e) => Err(e)?, Err(e) => Err(e)?,
@ -102,19 +102,20 @@ impl File {
let meta = task.meta.as_ref().unwrap(); let meta = task.meta.as_ref().unwrap();
let src = if !task.follow { let src = if !task.follow {
Cow::Borrowed(task.from.as_path()) Cow::Borrowed(task.from.as_path())
} else if let Ok(p) = fs::canonicalize(&task.from).await {
Cow::Owned(p)
} else { } else {
match fs::canonicalize(&task.from).await { Cow::Borrowed(task.from.as_path())
Ok(p) => Cow::Owned(p),
Err(e) if e.kind() == NotFound => {
self.log(task.id, format!("Hardlink task partially done: {:?}", task))?;
return Ok(self.prog.send(TaskProg::Adv(task.id, 1, meta.len()))?);
}
Err(_) => Cow::Borrowed(task.from.as_path()),
}
}; };
ok_or_not_found(fs::remove_file(&task.to).await)?; ok_or_not_found(fs::remove_file(&task.to).await)?;
fs::hard_link(src, &task.to).await?; match fs::hard_link(src, &task.to).await {
Err(e) if e.kind() == NotFound => {
warn!("Hardlink task partially done: {task:?}");
}
v => v?,
}
self.prog.send(TaskProg::Adv(task.id, 1, meta.len()))?; self.prog.send(TaskProg::Adv(task.id, 1, meta.len()))?;
} }
FileOp::Delete(task) => { FileOp::Delete(task) => {