mirror of
https://github.com/nushell/nushell.git
synced 2024-11-26 02:13:47 +01:00
match is now in the find command (#4727)
This commit is contained in:
parent
b714e034aa
commit
fbb2e7136c
@ -1,18 +0,0 @@
|
||||
[package]
|
||||
authors = ["The Nu Project Contributors"]
|
||||
description = "A regex match plugin for Nushell"
|
||||
edition = "2018"
|
||||
license = "MIT"
|
||||
name = "nu_plugin_match"
|
||||
version = "0.59.1"
|
||||
|
||||
[lib]
|
||||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
nu-errors = { path="../nu-errors", version = "0.59.1" }
|
||||
nu-plugin = { path="../nu-plugin", version = "0.59.1" }
|
||||
nu-protocol = { path="../nu-protocol", version = "0.59.1" }
|
||||
regex = "1.4.3"
|
||||
|
||||
[build-dependencies]
|
@ -1,4 +0,0 @@
|
||||
mod match_;
|
||||
mod nu;
|
||||
|
||||
pub use match_::Match;
|
@ -1,7 +0,0 @@
|
||||
use nu_plugin::serve_plugin;
|
||||
use nu_plugin_match::Match;
|
||||
|
||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
serve_plugin(&mut Match::new()?);
|
||||
Ok(())
|
||||
}
|
@ -1,18 +0,0 @@
|
||||
use regex::Regex;
|
||||
|
||||
pub struct Match {
|
||||
pub column: String,
|
||||
pub regex: Regex,
|
||||
pub invert: bool,
|
||||
}
|
||||
|
||||
impl Match {
|
||||
#[allow(clippy::trivial_regex)]
|
||||
pub fn new() -> Result<Self, Box<dyn std::error::Error>> {
|
||||
Ok(Match {
|
||||
column: String::new(),
|
||||
regex: Regex::new("")?,
|
||||
invert: false,
|
||||
})
|
||||
}
|
||||
}
|
@ -1,124 +0,0 @@
|
||||
use nu_errors::ShellError;
|
||||
use nu_plugin::Plugin;
|
||||
use nu_protocol::{
|
||||
CallInfo, Primitive, ReturnSuccess, ReturnValue, Signature, SyntaxShape, UntaggedValue, Value,
|
||||
};
|
||||
|
||||
use crate::Match;
|
||||
use regex::Regex;
|
||||
|
||||
impl Plugin for Match {
|
||||
fn config(&mut self) -> Result<Signature, ShellError> {
|
||||
Ok(Signature::build("match")
|
||||
.desc("Filter rows by Regex pattern.")
|
||||
.required("member", SyntaxShape::String, "the column name to match")
|
||||
.required("regex", SyntaxShape::String, "the regex to match with")
|
||||
.switch("insensitive", "case-insensitive search", Some('i'))
|
||||
.switch(
|
||||
"multiline",
|
||||
"multi-line mode: ^ and $ match begin/end of line",
|
||||
Some('m'),
|
||||
)
|
||||
.switch(
|
||||
"dotall",
|
||||
"dotall mode: allow a dot . to match newline character \\n",
|
||||
Some('s'),
|
||||
)
|
||||
.switch("invert", "invert the match", Some('v'))
|
||||
.filter())
|
||||
}
|
||||
|
||||
fn begin_filter(&mut self, call_info: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
|
||||
let insensitive = call_info.args.has("insensitive");
|
||||
let multiline = call_info.args.has("multiline");
|
||||
let dotall = call_info.args.has("dotall");
|
||||
self.invert = call_info.args.has("invert");
|
||||
if let Some(args) = call_info.args.positional {
|
||||
match &args[0] {
|
||||
Value {
|
||||
value: UntaggedValue::Primitive(Primitive::String(s)),
|
||||
..
|
||||
} => {
|
||||
self.column = s.clone();
|
||||
}
|
||||
Value { tag, .. } => {
|
||||
return Err(ShellError::labeled_error(
|
||||
"Unrecognized type in params",
|
||||
"value",
|
||||
tag,
|
||||
));
|
||||
}
|
||||
}
|
||||
let flags = match (insensitive, multiline, dotall) {
|
||||
(false, false, false) => "",
|
||||
(true, false, false) => "(?i)",
|
||||
(false, true, false) => "(?m)",
|
||||
(false, false, true) => "(?s)",
|
||||
(true, true, false) => "(?im)",
|
||||
(true, false, true) => "(?is)",
|
||||
(false, true, true) => "(?ms)",
|
||||
(true, true, true) => "(?ims)",
|
||||
}
|
||||
.to_owned();
|
||||
match &args[1] {
|
||||
Value {
|
||||
value: UntaggedValue::Primitive(Primitive::String(s)),
|
||||
tag,
|
||||
} => {
|
||||
self.regex = Regex::new(&(flags + s)).map_err(|_| {
|
||||
ShellError::labeled_error(
|
||||
"Internal error while creating regex",
|
||||
"internal error created by pattern",
|
||||
tag,
|
||||
)
|
||||
})?;
|
||||
}
|
||||
Value { tag, .. } => {
|
||||
return Err(ShellError::labeled_error(
|
||||
"Unrecognized type in params",
|
||||
"unexpected value",
|
||||
tag,
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(vec![])
|
||||
}
|
||||
|
||||
fn filter(&mut self, input: Value) -> Result<Vec<ReturnValue>, ShellError> {
|
||||
let flag: bool;
|
||||
match &input {
|
||||
Value {
|
||||
value: UntaggedValue::Row(dict),
|
||||
tag,
|
||||
} => {
|
||||
if let Some(val) = dict.entries.get(&self.column) {
|
||||
if let Ok(s) = val.as_string() {
|
||||
flag = self.regex.is_match(&s);
|
||||
} else {
|
||||
return Err(ShellError::labeled_error(
|
||||
"expected string",
|
||||
"value",
|
||||
val.tag(),
|
||||
));
|
||||
}
|
||||
} else {
|
||||
return Err(ShellError::labeled_error(
|
||||
format!("column not in row! {:?} {:?}", &self.column, dict),
|
||||
"row",
|
||||
tag,
|
||||
));
|
||||
}
|
||||
}
|
||||
Value { tag, .. } => {
|
||||
return Err(ShellError::labeled_error("Expected row", "value", tag));
|
||||
}
|
||||
}
|
||||
if flag ^ self.invert {
|
||||
Ok(vec![Ok(ReturnSuccess::Value(input))])
|
||||
} else {
|
||||
Ok(vec![])
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user