Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added as_html switch so a selector can be passed to a selector (#2739)

Browse Source
This commit is contained in:
Darren Schroeder 2020-11-09 13:37:32 -06:00 committed by GitHub
parent 8df748463d
commit 3924e9d50a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/nu_plugin_selector/src/nu/mod.rs
View File

@ -12,6 +12,7 @@ impl Plugin for Selector {
Ok(Signature::build("selector") Ok(Signature::build("selector")
.desc("execute selector query on html/web") .desc("execute selector query on html/web")
.required("query", SyntaxShape::String, "selector query") .required("query", SyntaxShape::String, "selector query")
.switch("as_html", "return the query output as html", Some('a'))
.filter()) .filter())
} }
@ -27,6 +28,7 @@ impl Plugin for Selector {
self.query = query.as_string()?; self.query = query.as_string()?;
self.tag = tag; self.tag = tag;
self.as_html = call_info.args.has("as_html");
Ok(vec![]) Ok(vec![])
} }
@ -36,10 +38,12 @@ impl Plugin for Selector {
Value { Value {
value: UntaggedValue::Primitive(Primitive::String(s)), value: UntaggedValue::Primitive(Primitive::String(s)),
.. ..
} => Ok(begin_selector_query(s, (*self.query).tagged(&self.tag))? } => Ok(
.into_iter() begin_selector_query(s, (*self.query).tagged(&self.tag), self.as_html)?
.map(ReturnSuccess::value) .into_iter()
.collect()), .map(ReturnSuccess::value)
.collect(),
),
Value { tag, .. } => Err(ShellError::labeled_error_with_secondary( Value { tag, .. } => Err(ShellError::labeled_error_with_secondary(
"Expected text from pipeline", "Expected text from pipeline",
"requires text input", "requires text input",

24
crates/nu_plugin_selector/src/selector.rs
View File

@ -6,6 +6,7 @@ use nu_source::{Tag, Tagged};
pub struct Selector { pub struct Selector {
pub query: String, pub query: String,
pub tag: Tag, pub tag: Tag,
pub as_html: bool,
} }
impl Selector { impl Selector {
@ -13,6 +14,7 @@ impl Selector {
Selector { Selector {
query: String::new(), query: String::new(),
tag: Tag::unknown(), tag: Tag::unknown(),
as_html: false,
} }
} }
} }
@ -23,14 +25,19 @@ impl Default for Selector {
} }
} }
pub fn begin_selector_query(raw: String, query: Tagged<&str>) -> Result<Vec<Value>, ShellError> { pub fn begin_selector_query(
execute_selector_query(raw, query.item.to_string(), query.tag()) input: String,
query: Tagged<&str>,
as_html: bool,
) -> Result<Vec<Value>, ShellError> {
execute_selector_query(input, query.item.to_string(), query.tag(), as_html)
} }
fn execute_selector_query( fn execute_selector_query(
input_string: String, input_string: String,
query_string: String, query_string: String,
tag: impl Into<Tag>, tag: impl Into<Tag>,
as_html: bool,
) -> Result<Vec<Value>, ShellError> { ) -> Result<Vec<Value>, ShellError> {
let _tag = tag.into(); let _tag = tag.into();
let mut ret = vec![]; let mut ret = vec![];
@ -48,10 +55,15 @@ fn execute_selector_query(
// ret.push(title_url.to_string_value_create_tag()); // ret.push(title_url.to_string_value_create_tag());
// }); // });
doc.nip(&query_string).iter().for_each(|athing| { if as_html {
ret.push(athing.text().to_string().to_string_value_create_tag()); doc.nip(&query_string).iter().for_each(|athing| {
}); ret.push(athing.html().to_string().to_string_value_create_tag());
});
} else {
doc.nip(&query_string).iter().for_each(|athing| {
ret.push(athing.text().to_string().to_string_value_create_tag());
});
}
Ok(ret) Ok(ret)
} }