extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-18 10:49:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make trash support optional (#1572)

Browse Source
This commit is contained in:
Jonathan Turner
2020-04-11 18:53:53 +12:00
committed by GitHub
parent 8ac9d781fd
commit 8e7e8c17e1
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/nu-cli/Cargo.toml
View File

@@ -79,11 +79,11 @@ term = "0.5.2"
termcolor = "1.1.0"
textwrap = {version = "0.11.0", features = ["term_size"]}
toml = "0.5.6"
trash = "1.0.0"
typetag = "0.1.4"
umask = "0.1"
unicode-xid = "0.2.0"
trash = { version = "1.0.0", optional = true }
clipboard = { version = "0.5", optional = true }
starship = { version = "0.39.0", optional = true }
@@ -101,3 +101,4 @@ nu-build = { version = "0.12.0", path = "../nu-build" }
stable = []
starship-prompt = ["starship"]
clipboard-cli = ["clipboard"]
trash-support = ["trash"]

1
crates/nu-cli/src/commands/rm.rs
View File

@@ -12,6 +12,7 @@ pub struct Remove;
pub struct RemoveArgs {
pub rest: Vec<Tagged<PathBuf>>,
pub recursive: Tagged<bool>,
#[allow(unused)]
pub trash: Tagged<bool>,
}

36
crates/nu-cli/src/shell/filesystem_shell.rs
View File

@@ -946,7 +946,7 @@ impl Shell for FilesystemShell {
RemoveArgs {
rest: targets,
recursive,
trash,
trash: _trash,
}: RemoveArgs,
name: Tag,
path: &str,
@@ -1024,16 +1024,30 @@ impl Shell for FilesystemShell {
if let Ok(metadata) = f.symlink_metadata() {
if metadata.is_file() || metadata.file_type().is_symlink() || recursive.item || is_empty() {
let result = if trash.item {
trash::remove(f)
.map_err(|e| f.to_string_lossy())
} else if metadata.is_file() {
std::fs::remove_file(f)
.map_err(|e| f.to_string_lossy())
} else {
std::fs::remove_dir_all(f)
.map_err(|e| f.to_string_lossy())
};
let result;
#[cfg(feature = "trash-support")]
{
result = if _trash.item {
trash::remove(f)
.map_err(|e| f.to_string_lossy())
} else if metadata.is_file() {
std::fs::remove_file(f)
.map_err(|e| f.to_string_lossy())
} else {
std::fs::remove_dir_all(f)
.map_err(|e| f.to_string_lossy())
};
}
#[cfg(not(feature = "trash-support"))]
{
result = if metadata.is_file() {
std::fs::remove_file(f)
.map_err(|e| f.to_string_lossy())
} else {
std::fs::remove_dir_all(f)
.map_err(|e| f.to_string_lossy())
};
}
if let Err(e) = result {
let msg = format!("Could not delete {:}", e);