github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 19:45:29 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Moving cli input .canonicalize to help testing

Browse Source 
We are moving canonicalize_files step
    from parse_args_from
    to parse_args

This helps testing our CLI without panicking when files don't exist
This commit is contained in:
João M. Bezerra 2021-05-28 03:07:25 -03:00
parent cd43f215ea
commit f51a5c8727
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/cli.rs
View File

@ -26,9 +26,21 @@ pub enum Command {
} }
/// Calls parse_args_and_flags_from using std::env::args_os ( argv ) /// Calls parse_args_and_flags_from using std::env::args_os ( argv )
///
/// This function is also responsible for treating and checking the cli input
/// Like calling canonicale, checking if it exists.
pub fn parse_args() -> crate::Result<ParsedArgs> { pub fn parse_args() -> crate::Result<ParsedArgs> {
let args = env::args_os().skip(1).collect(); let args = env::args_os().skip(1).collect();
parse_args_from(args) let mut parsed_args = parse_args_from(args)?;
// If has a list of files, canonicalize them, reporting error if they do now exist
match &mut parsed_args.command {
Command::Compress { files, .. } | Command::Decompress { files, .. } => {
*files = canonicalize_files(&files)?;
},
_ => {},
}
Ok(parsed_args)
} }
#[derive(Debug)] #[derive(Debug)]
@ -70,7 +82,7 @@ where
} }
} }
fn canonicalize_files<'a, P>(files: Vec<P>) -> crate::Result<Vec<PathBuf>> fn canonicalize_files<'a, P>(files: &[P]) -> crate::Result<Vec<PathBuf>>
where where
P: AsRef<Path> + 'a, P: AsRef<Path> + 'a,
{ {
@ -87,7 +99,6 @@ pub fn parse_args_from(mut args: Vec<OsString>) -> crate::Result<ParsedArgs> {
} }
let subcommands = &["c", "compress"]; let subcommands = &["c", "compress"];
let mut flags_info = vec![flag!('y', "yes"), flag!('n', "no")]; let mut flags_info = vec![flag!('y', "yes"), flag!('n', "no")];
let parsed_args = match oof::pop_subcommand(&mut args, subcommands) { let parsed_args = match oof::pop_subcommand(&mut args, subcommands) {
@ -103,8 +114,6 @@ pub fn parse_args_from(mut args: Vec<OsString>) -> crate::Result<ParsedArgs> {
// Safety: we checked that args.len() >= 2 // Safety: we checked that args.len() >= 2
let compressed_output_path = files.pop().unwrap(); let compressed_output_path = files.pop().unwrap();
let files = canonicalize_files(files)?;
let command = Command::Compress { files, compressed_output_path }; let command = Command::Compress { files, compressed_output_path };
ParsedArgs { command, flags } ParsedArgs { command, flags }
}, },
@ -121,9 +130,8 @@ pub fn parse_args_from(mut args: Vec<OsString>) -> crate::Result<ParsedArgs> {
} }
// Parse flags // Parse flags
let (args, mut flags) = oof::filter_flags(args, &flags_info)?; let (files, mut flags) = oof::filter_flags(args, &flags_info)?;
let files = files.into_iter().map(PathBuf::from).collect();
let files = args.into_iter().map(canonicalize).collect::<Result<Vec<_>, _>>()?;
let output_folder = flags.take_arg("output").map(PathBuf::from); let output_folder = flags.take_arg("output").map(PathBuf::from);