matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Make tag-checking error message more explicit about what is wrong

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-11-11 19:24:51 +01:00
parent 164880dbf9
commit 61ade452de
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/entry/libimagentrytag/src/tag.rs
View file

@ -26,21 +26,27 @@ pub type TagSlice<'a> = &'a str;
/// validator which can be used by clap to validate that a string is a valid tag /// validator which can be used by clap to validate that a string is a valid tag
pub fn is_tag(s: String) -> Result<(), String> { pub fn is_tag(s: String) -> Result<(), String> {
is_tag_str(&s).map_err(|_| format!("The string '{}' is not a valid tag", s)) check_tag_string(&s)
} }
pub fn is_tag_str(s: &str) -> Result<(), Error> { pub fn is_tag_str(s: &str) -> Result<(), Error> {
use filters::filter::Filter; check_tag_string(s).map_err(|s| format_err!("{}", s))
}
fn check_tag_string(s: &str) -> Result<(), String> {
trace!("Checking whether '{}' is a valid tag", s); trace!("Checking whether '{}' is a valid tag", s);
let is_lower = |s: &&str| s.chars().all(|c| c.is_lowercase()); let is_lower = |s: &&str| s.chars().all(|c| c.is_lowercase());
let no_whitespace = |s: &&str| s.chars().all(|c| !c.is_whitespace()); let no_whitespace = |s: &&str| s.chars().all(|c| !c.is_whitespace());
let is_alphanum = |s: &&str| s.chars().all(|c| c.is_alphanumeric()); let is_alphanum = |s: &&str| s.chars().all(|c| c.is_alphanumeric());
if is_lower.and(no_whitespace).and(is_alphanum).filter(&s) { match (is_lower(&s), no_whitespace(&s), is_alphanum(&s)) {
Ok(()) (true, true, true) => Ok(()),
} else { (false, false, false) => Err(format!("The string '{}' is not valid, because it is not all-lowercase, has whitespace and is not alphanumeric", s)),
Err(format_err!("The string '{}' is not a valid tag", s)) (false, false, _ ) => Err(format!("The string '{}' is not valid, because it is not all-lowercase and has whitespace", s)),
(false, _, _ ) => Err(format!("The string '{}' is not valid, because it is not all-lowercase", s)),
(_, false, _ ) => Err(format!("The string '{}' is not valid, because it has whitespace", s)),
(_, _, false) => Err(format!("The string '{}' is not valid, because it is not alphanumeric", s)),
} }
} }