extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 00:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check capture group count (#1814)

Browse Source
This commit is contained in:
John Erickson 2020-05-17 11:52:17 -07:00 committed by GitHub
parent af6aff8ca3
commit d1b1438ce5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
crates/nu_plugin_parse/src/nu/mod.rs
View File

@ -26,6 +26,7 @@ impl Plugin for Parse {
value: UntaggedValue::Primitive(Primitive::String(s)),
tag,
} => {
self.pattern_tag = tag.clone();
let parse_pattern = parse(&s);
let parse_regex = build_regex(&parse_pattern);
self.column_names = column_names(&parse_pattern);
@ -54,12 +55,44 @@ impl Plugin for Parse {
match &input.as_string() {
Ok(s) => {
let mut output = vec![];
for cap in self.regex.captures_iter(&s) {
for caps in self.regex.captures_iter(&s) {
let group_count = caps.len() - 1;
if self.column_names.len() != group_count {
return Err(ShellError::labeled_error(
format!(
"There are {} column(s) specified in the pattern, but could only match the first {}: [{}]",
self.column_names.len(),
group_count,
caps.iter()
.skip(1)
.map(|m| {
if let Some(m) = m {
let m = m.as_str();
let mut m = m.replace(",","\\,");
if m.len() > 20 {
m.truncate(17);
format!("{}...", m)
} else {
m
}
} else {
"<none>".to_string()
}
})
.collect::<Vec<String>>()
.join(", ")
),
"could not match all columns in pattern",
&self.pattern_tag,
));
}
let mut dict = TaggedDictBuilder::new(&input.tag);
for (idx, column_name) in self.column_names.iter().enumerate() {
dict.insert_untagged(
column_name,
UntaggedValue::string(cap[idx + 1].to_string()),
UntaggedValue::string(caps[idx + 1].to_string()),
);
}
output.push(Ok(ReturnSuccess::Value(dict.into_value())));

2
crates/nu_plugin_parse/src/parse.rs
View File

@ -4,6 +4,7 @@ use regex::Regex;
pub struct Parse {
pub regex: Regex,
pub name: Tag,
pub pattern_tag: Tag,
pub column_names: Vec<String>,
}
@ -13,6 +14,7 @@ impl Parse {
Ok(Parse {
regex: Regex::new("")?,
name: Tag::unknown(),
pattern_tag: Tag::unknown(),
column_names: vec![],
})
}