-i flag finished, lacking tests

This commit is contained in:
Gabriel B Gutierrez
2021-10-14 14:54:51 -03:00
parent 9ea7cdfc33
commit 8c2ae1eed1
8 changed files with 145 additions and 15 deletions

View File

@ -1,6 +1,7 @@
use std::env::current_dir;
use std::path::PathBuf;
use super::interactive_helper::get_confirmation;
use nu_engine::CallExt;
use nu_path::canonicalize_with;
use nu_protocol::ast::Call;
@ -29,6 +30,7 @@ impl Command for Cp {
"copy recursively through subdirectories",
Some('r'),
)
.switch("force", "suppress error when no file", Some('f'))
.switch("interactive", "ask user to confirm action", Some('i'))
}
@ -41,19 +43,13 @@ impl Command for Cp {
let source: String = call.req(context, 0)?;
let destination: String = call.req(context, 1)?;
let interactive = call.has_flag("interactive");
if interactive {
println!(
"Are you shure that you want to move {} to {}?",
source, destination
);
}
let force = call.has_flag("force");
let path: PathBuf = current_dir().unwrap();
let source = path.join(source.as_str());
let destination = path.join(destination.as_str());
let sources =
let mut sources =
glob::glob(&source.to_string_lossy()).map_or_else(|_| Vec::new(), Iterator::collect);
if sources.is_empty() {
return Err(ShellError::FileNotFound(call.positional[0].span));
@ -77,6 +73,35 @@ impl Command for Cp {
));
}
if interactive && !force {
let mut remove_index: Vec<usize> = vec![];
for (index, file) in sources.iter().enumerate() {
let prompt = format!(
"Are you shure that you want to copy {} to {}?",
file.as_ref()
.unwrap()
.file_name()
.unwrap()
.to_str()
.unwrap(),
destination.file_name().unwrap().to_str().unwrap()
);
let input = get_confirmation(prompt)?;
if !input {
remove_index.push(index);
}
}
for index in remove_index {
sources.remove(index);
}
if sources.len() == 0 {
return Err(ShellError::NoFileToBeCopied());
}
}
for entry in sources.into_iter().flatten() {
let mut sources = FileStructure::new();
sources.walk_decorate(&entry)?;

View File

@ -0,0 +1,26 @@
use dialoguer::Input;
use std::error::Error;
pub fn get_confirmation(prompt: String) -> Result<bool, Box<dyn Error>> {
let input = Input::new()
.with_prompt(prompt)
.validate_with(|c_input: &String| -> Result<(), String> {
if c_input.len() == 1
&& (c_input == "y" || c_input == "Y" || c_input == "n" || c_input == "N")
{
Ok(())
} else if c_input.len() > 1 {
Err("Enter only one letter (Y/N)".to_string())
} else {
Err("Input not valid".to_string())
}
})
.default("Y/N".into())
.interact_text()?;
if input == "y" || input == "Y" {
Ok(true)
} else {
Ok(false)
}
}

View File

@ -1,5 +1,6 @@
mod cd;
mod cp;
mod interactive_helper;
mod ls;
mod mkdir;
mod mv;

View File

@ -1,6 +1,7 @@
use std::env::current_dir;
use std::path::{Path, PathBuf};
use super::interactive_helper::get_confirmation;
use nu_engine::CallExt;
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EvaluationContext};
@ -59,8 +60,9 @@ impl Command for Mv {
}
if interactive && !force {
for file in &sources {
println!(
let mut remove_index: Vec<usize> = vec![];
for (index, file) in sources.iter().enumerate() {
let prompt = format!(
"Are you shure that you want to move {} to {}?",
file.as_ref()
.unwrap()
@ -70,6 +72,19 @@ impl Command for Mv {
.unwrap(),
destination.file_name().unwrap().to_str().unwrap()
);
let input = get_confirmation(prompt)?;
if !input {
remove_index.push(index);
}
}
for index in remove_index {
sources.remove(index);
}
if sources.len() == 0 {
return Err(ShellError::NoFileToBeMoved());
}
}

View File

@ -3,6 +3,8 @@ use std::env::current_dir;
use std::os::unix::prelude::FileTypeExt;
use std::path::PathBuf;
use super::interactive_helper::get_confirmation;
use nu_engine::CallExt;
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EvaluationContext};
@ -19,7 +21,6 @@ struct RmArgs {
trash: bool,
permanent: bool,
force: bool,
interactive: bool,
}
impl Command for Rm {
@ -126,11 +127,26 @@ fn rm(context: &EvaluationContext, call: &Call) -> Result<Value, ShellError> {
let force = call.has_flag("force");
if interactive && !force {
for file in &targets {
println!(
"Are you shure that you want to delete {}?",
let mut remove_index: Vec<usize> = vec![];
for (index, file) in targets.iter().enumerate() {
let prompt: String = format!(
"Are you sure that you what to delete {}?",
file.1.file_name().unwrap().to_str().unwrap()
);
let input = get_confirmation(prompt)?;
if !input {
remove_index.push(index);
}
}
for index in remove_index {
targets.remove(index);
}
if targets.len() == 0 {
return Err(ShellError::NoFileToBeRemoved());
}
}
@ -140,7 +156,6 @@ fn rm(context: &EvaluationContext, call: &Call) -> Result<Value, ShellError> {
trash,
permanent,
force,
interactive,
};
let response = rm_helper(call, args);