extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-30 16:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add quiet and feedback to mv command (#5073)

Browse Source 
* Add quiet and feedback to mv command

* replaced filter and map with filter_map
This commit is contained in:
Elijah Koreman 2022-04-04 13:30:51 -05:00 committed by GitHub
parent 4654f03d31
commit 1e4b33b9c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/nu-command/src/filesystem/mv.rs
View File

@ -6,7 +6,8 @@ use nu_engine::CallExt;
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{ use nu_protocol::{
Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Category, Example, IntoInterruptiblePipelineData, PipelineData, ShellError, Signature, Span,
Spanned, SyntaxShape, Value,
}; };
const GLOB_PARAMS: nu_glob::MatchOptions = nu_glob::MatchOptions { const GLOB_PARAMS: nu_glob::MatchOptions = nu_glob::MatchOptions {
@ -40,6 +41,7 @@ impl Command for Mv {
SyntaxShape::Filepath, SyntaxShape::Filepath,
"the location to move files/directories to", "the location to move files/directories to",
) )
.switch("quiet", "suppress output showing files moved", Some('q'))
// .switch("interactive", "ask user to confirm action", Some('i')) // .switch("interactive", "ask user to confirm action", Some('i'))
// .switch("force", "suppress error when no file", Some('f')) // .switch("force", "suppress error when no file", Some('f'))
.category(Category::FileSystem) .category(Category::FileSystem)
@ -55,9 +57,12 @@ impl Command for Mv {
// TODO: handle invalid directory or insufficient permissions when moving // TODO: handle invalid directory or insufficient permissions when moving
let spanned_source: Spanned<String> = call.req(engine_state, stack, 0)?; let spanned_source: Spanned<String> = call.req(engine_state, stack, 0)?;
let spanned_destination: Spanned<String> = call.req(engine_state, stack, 1)?; let spanned_destination: Spanned<String> = call.req(engine_state, stack, 1)?;
let quiet = call.has_flag("quiet");
// let interactive = call.has_flag("interactive"); // let interactive = call.has_flag("interactive");
// let force = call.has_flag("force"); // let force = call.has_flag("force");
let ctrlc = engine_state.ctrlc.clone();
let path = current_dir(engine_state, stack)?; let path = current_dir(engine_state, stack)?;
let source = path.join(spanned_source.item.as_str()); let source = path.join(spanned_source.item.as_str());
let destination = path.join(spanned_destination.item.as_str()); let destination = path.join(spanned_destination.item.as_str());
@ -116,20 +121,35 @@ impl Command for Mv {
.collect(); .collect();
} }
for entry in sources.into_iter().flatten() { let span = call.head;
move_file( Ok(sources
.into_iter()
.flatten()
.filter_map(move |entry| {
let result = move_file(
Spanned { Spanned {
item: entry, item: entry.clone(),
span: spanned_source.span, span: spanned_source.span,
}, },
Spanned { Spanned {
item: destination.clone(), item: destination.clone(),
span: spanned_destination.span, span: spanned_destination.span,
}, },
)? );
if let Err(error) = result {
Some(Value::Error { error })
} else if quiet {
None
} else {
let val = format!(
"moved {:} to {:}",
entry.to_string_lossy(),
destination.to_string_lossy()
);
Some(Value::String { val, span })
} }
})
Ok(PipelineData::new(call.head)) .into_pipeline_data(ctrlc))
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {