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

Updated Doc, error on bad input

Browse Source
This commit is contained in:
Flare576 2019-11-01 17:25:08 -05:00
parent cd058db046
commit 763bbe1c01
2 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/commands/str.md
View File

@ -26,13 +26,6 @@ Consumes either a single value or a table and converts the provided data to a st
0 │ X │ filesystem │ /home/tux/stuff/expr/stuff
1 │ │ filesystem │ /
━━━┷━━━┷━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
> shells | str # --to-int
━━━┯━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
# │ │ name │ path
───┼───┼────────────┼────────────────────────────────
0 │ X │ filesystem │ /home/TUX/stuff/expr/stuff
1 │ │ filesystem │ /
━━━┷━━━┷━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
> shells | str # --substring "21, 99"
━━━┯━━━┯━━━━━━━━━━━━┯━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
# │ │ name │ path
@ -47,4 +40,11 @@ Consumes either a single value or a table and converts the provided data to a st
0 │ X │ filesystem │ TUX/stuff/expr/stuff
1 │ │ filesystem │
━━━┷━━━┷━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
> echo "1, 2, 3" | split-row "," | str --to-int | sum
━━━━━━━━━
<value>
─────────
6
━━━━━━━━━
```

54
src/plugins/str.rs
View File

@ -9,7 +9,7 @@ enum Action {
Downcase,
Upcase,
ToInteger,
Substring(String),
Substring(usize, usize),
}
pub type ColumnPath = Vec<Tagged<String>>;
@ -35,23 +35,14 @@ impl Str {
let applied = match self.action.as_ref() {
Some(Action::Downcase) => Value::string(input.to_ascii_lowercase()),
Some(Action::Upcase) => Value::string(input.to_ascii_uppercase()),
Some(Action::Substring(s)) => {
// Index operator isn't perfect: https://users.rust-lang.org/t/how-to-get-a-substring-of-a-string/1351
let no_spaces: String = s.chars().filter(|c| !c.is_whitespace()).collect();
let v: Vec<&str> = no_spaces.split(',').collect();
let start: usize = match v[0] {
"" => 0,
_ => v[0].parse().unwrap(),
};
let end: usize = match v[1] {
"" => input.len(),
_ => cmp::min(v[1].parse().unwrap(), input.len()),
};
Some(Action::Substring(s, e)) => {
let end: usize = cmp::min(*e, input.len());
let start: usize = *s;
if start > input.len() - 1 {
Value::string("")
} else if start > end {
Value::string(input)
} else {
// Index operator isn't perfect:
// https://users.rust-lang.org/t/how-to-get-a-substring-of-a-string/1351
Value::string(&input[start..end])
}
}
@ -103,9 +94,20 @@ impl Str {
}
}
fn for_substring(&mut self, start_end: String) {
if self.permit() {
self.action = Some(Action::Substring(start_end));
fn for_substring(&mut self, s: String) {
let v: Vec<&str> = s.split(',').collect();
let start: usize = match v[0] {
"" => 0,
_ => v[0].trim().parse().unwrap(),
};
let end: usize = match v[1] {
"" => usize::max_value().clone(),
_ => v[1].trim().parse().unwrap(),
};
if start > end {
self.log_error("End must be greater than or equal to Start");
} else if self.permit() {
self.action = Some(Action::Substring(start, end));
} else {
self.log_error("can only apply one");
}
@ -688,7 +690,7 @@ mod tests {
}
#[test]
fn str_plugin_applies_substring_returns_string_if_start_exceeds_end() {
fn str_plugin_applies_substring_returns_error_if_start_exceeds_end() {
let mut plugin = Str::new();
assert!(plugin
@ -697,17 +699,7 @@ mod tests {
.with_named_parameter("substring", "3,1")
.create()
)
.is_ok());
let subject = unstructured_sample_record("0123456789");
let output = plugin.filter(subject).unwrap();
match output[0].as_ref().unwrap() {
ReturnSuccess::Value(Tagged {
item: Value::Primitive(Primitive::String(s)),
..
}) => assert_eq!(*s, String::from("0123456789")),
_ => {}
}
.is_err());
assert_eq!(plugin.error, Some("End must be greater than or equal to Start".to_string()));
}
}