changed from path().starts_with(PATH/imag-) to path.filename().starts_with(imag-) for simplicity. Also filtered out the command name for displaying

This commit is contained in:
mario 2016-07-04 16:23:45 +02:00
parent 323c545db9
commit 04fff6070d

View file

@ -68,17 +68,18 @@ fn get_commands() -> Vec<String> {
.into_iter() .into_iter()
.filter(|path| { .filter(|path| {
match path { match path {
&Ok(ref path) => path.path().starts_with(format!("{}/imag-", elem)), &Ok(ref p) => p.file_name()
.to_str()
.map_or(false, |filename| filename.starts_with("imag-")),
&Err(_) => false, &Err(_) => false,
} }
}) })
.filter_map(|x| x.ok()) .filter_map(|x| x.ok())
.map(|path| { .filter_map(|path| {
path.path() path.file_name()
.to_str() .to_str()
.map(String::from) .map(String::from)
}) })
.filter_map(|x| x)
.collect() .collect()
}) })
}) })