From c142ccc4dc6dc8b44cd00be65758117c25f19786 Mon Sep 17 00:00:00 2001 From: Ayrton Chilibeck Date: Sun, 14 Jan 2024 11:58:14 -0700 Subject: [PATCH] Fixecd printing implementation for invalid suffix --- src/validate.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/validate.rs b/src/validate.rs index 9cb7356..dcddc5d 100644 --- a/src/validate.rs +++ b/src/validate.rs @@ -19,11 +19,11 @@ pub fn validate(verbosity: u8, config: util::config::Config) { // print the delinquints if invalid_suffix_in.len() > 0 { - print_invalid_suffixes(invalid_suffix_in, String::from(in_suffix)); + print_invalid_suffixes(invalid_suffix_in, in_suffix); } if invalid_suffix_out.len() > 0 { - print_invalid_suffixes(invalid_suffix_out, String::from(out_suffix)); + print_invalid_suffixes(invalid_suffix_out, out_suffix); } // make sure each has a match @@ -89,7 +89,7 @@ fn compare_list(from: &Vec, against: &Vec) -> Vec { return res; } -fn print_invalid_suffixes(files: Vec, exp: String) { +fn print_invalid_suffixes(files: Vec, exp: &str) { println!("Invalid suffixes detected 😱:" ); println!("Current => Suggested"); for mut file in files { @@ -98,7 +98,11 @@ fn print_invalid_suffixes(files: Vec, exp: String) { _ => panic!("Failed to load the file"), }; - println!("{} => {}", initial, file.clone().set_extension(&exp).to_string()); + println!("{} => {}.{}", + initial.to_string(), + file.file_stem().expect("failed to extract") + .to_str().expect("failed to transform"), + exp); } } @@ -122,6 +126,7 @@ mod tests { let invalid = collect_invalid(&files, suffix); println!("{:?}", invalid); + print_invalid_suffixes(invalid.clone(), suffix); assert!(invalid.contains(&invalid_path1)); assert!(invalid.contains(&invalid_path2));