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

feat: make trash optional (#178)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2023-09-19 08:54:31 +08:00 • committed by GitHub
parent db4d5edeb4
commit 6d2f69b612
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/Cargo.toml
View file

@ -26,9 +26,11 @@ syntect = "^5"
tokio = { version = "^1", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs", "process", "io-std", "io-util" ] } tokio = { version = "^1", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs", "process", "io-std", "io-util" ] }
tokio-stream = "^0" tokio-stream = "^0"
tracing = "^0" tracing = "^0"
trash = "^3"
unicode-width = "^0" unicode-width = "^0"
yazi-prebuild = "^0" yazi-prebuild = "^0"
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
clipboard-win = "^4" clipboard-win = "^4"
[target.'cfg(not(target_os = "netbsd"))'.dependencies]
trash = "^3"

2
core/src/tasks/workers/file.rs
View file

@ -159,7 +159,7 @@ impl File {
ctx.set_delete_method(DeleteMethod::NsFileManager); ctx.set_delete_method(DeleteMethod::NsFileManager);
ctx.delete(&task.target)?; ctx.delete(&task.target)?;
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "netbsd"))]
{ {
trash::delete(&task.target)?; trash::delete(&task.target)?;
} }

2
shared/src/fs.rs
View file

@ -101,6 +101,8 @@ pub fn file_mode(mode: u32) -> String {
let m = mode as u16; let m = mode as u16;
#[cfg(target_os = "freebsd")] #[cfg(target_os = "freebsd")]
let m = mode as u16; let m = mode as u16;
#[cfg(target_os = "netbsd")]
let m = mode;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let m = mode; let m = mode;