diff --git a/src/validate.rs b/src/validate.rs index a544b57..55ae5c2 100644 --- a/src/validate.rs +++ b/src/validate.rs @@ -32,7 +32,6 @@ pub fn validate(verbosity: u8, config: util::config::Config) { print_unmached(in_to_out.1); print_invalid_pairs(invalid, in_suffix, out_suffix); - } /** @@ -110,7 +109,7 @@ fn map_files(in_files: Vec, out_files: Vec, config: &util::con cl.retain(|x| !r.contains(&x)); res.1.append(&mut cl); - println!("{:?}", res); + // println!("{:?}", res); return res; } @@ -124,7 +123,15 @@ fn map_files(in_files: Vec, out_files: Vec, config: &util::con * @return A vector of tuples with (input, output) PathBufs */ fn check_mappings(mappings: Vec<(PathBuf, PathBuf)>, in_suffix: &str, out_suffix: &str) -> Vec<(PathBuf, PathBuf)> { - return vec![(PathBuf::from("a"), PathBuf::from("b"))]; + let mut res: Vec<(PathBuf, PathBuf)> = vec![]; + + for tup in &mappings { + if !(tup.0.as_path().extension().unwrap() == in_suffix) || !(tup.1.as_path().extension().unwrap() == out_suffix) { + res.push(tup.clone()); + } + } + // println!("{:?}", res); + return res; } /** @@ -144,7 +151,7 @@ fn collect_invalid(files: &Vec, suf: &str) -> Vec { res.push(file.clone()); } } - + println!("{:?}", res); return res } /** @@ -320,7 +327,7 @@ mod tests { print_invalid_pairs(invalid.clone(), in_suffix, out_suffix); assert!(&invalid.contains(&(in_files[0].clone(), out_files[0].clone()))); assert!(&invalid.contains(&(in_files[1].clone(), out_files[1].clone()))); - assert!(&invalid.contains(&(in_files[2].clone(), out_files[2].clone()))); + assert!(!&invalid.contains(&(in_files[2].clone(), out_files[2].clone()))); assert!(!&invalid.contains(&(in_files[3].clone(), out_files[3].clone()))); assert!(!&invalid.contains(&(in_files[4].clone(), out_files[4].clone())));