2022-02-01 18:45:48 +00:00
|
|
|
use crate::web_tables::WebTable;
|
|
|
|
use nu_plugin::{EvaluatedCall, LabeledError};
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
use nu_protocol::{Record, Span, Value};
|
2022-02-01 18:45:48 +00:00
|
|
|
use scraper::{Html, Selector as ScraperSelector};
|
|
|
|
|
|
|
|
pub struct Selector {
|
|
|
|
pub query: String,
|
|
|
|
pub as_html: bool,
|
|
|
|
pub attribute: String,
|
|
|
|
pub as_table: Value,
|
|
|
|
pub inspect: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Selector {
|
|
|
|
pub fn new() -> Selector {
|
|
|
|
Selector {
|
|
|
|
query: String::new(),
|
|
|
|
as_html: false,
|
|
|
|
attribute: String::new(),
|
2022-12-24 13:41:57 +00:00
|
|
|
as_table: Value::string("".to_string(), Span::unknown()),
|
2022-02-01 18:45:48 +00:00
|
|
|
inspect: false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Default for Selector {
|
|
|
|
fn default() -> Self {
|
|
|
|
Self::new()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn parse_selector_params(call: &EvaluatedCall, input: &Value) -> Result<Value, LabeledError> {
|
|
|
|
let head = call.head;
|
|
|
|
let query: String = match call.get_flag("query")? {
|
|
|
|
Some(q2) => q2,
|
|
|
|
None => "".to_string(),
|
|
|
|
};
|
2022-02-17 14:55:17 +00:00
|
|
|
let as_html = call.has_flag("as-html");
|
2023-01-24 11:23:42 +00:00
|
|
|
let attribute = call.get_flag("attribute")?.unwrap_or_default();
|
|
|
|
let as_table: Value = call
|
|
|
|
.get_flag("as-table")?
|
|
|
|
.unwrap_or_else(|| Value::nothing(head));
|
2022-02-01 18:45:48 +00:00
|
|
|
|
|
|
|
let inspect = call.has_flag("inspect");
|
|
|
|
|
|
|
|
if !&query.is_empty() && ScraperSelector::parse(&query).is_err() {
|
|
|
|
return Err(LabeledError {
|
|
|
|
msg: "Cannot parse this query as a valid css selector".to_string(),
|
|
|
|
label: "Parse error".to_string(),
|
|
|
|
span: Some(head),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
let selector = Selector {
|
|
|
|
query,
|
|
|
|
as_html,
|
|
|
|
attribute,
|
|
|
|
as_table,
|
|
|
|
inspect,
|
|
|
|
};
|
|
|
|
|
|
|
|
match input {
|
|
|
|
Value::String { val, span } => Ok(begin_selector_query(val.to_string(), selector, *span)),
|
|
|
|
_ => Err(LabeledError {
|
|
|
|
label: "requires text input".to_string(),
|
|
|
|
msg: "Expected text from pipeline".to_string(),
|
2023-08-24 20:48:05 +00:00
|
|
|
span: Some(input.span()),
|
2022-02-01 18:45:48 +00:00
|
|
|
}),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn begin_selector_query(input_html: String, selector: Selector, span: Span) -> Value {
|
|
|
|
if let Value::List { .. } = selector.as_table {
|
|
|
|
return retrieve_tables(
|
|
|
|
input_html.as_str(),
|
|
|
|
&selector.as_table,
|
|
|
|
selector.inspect,
|
|
|
|
span,
|
|
|
|
);
|
2023-01-24 11:23:42 +00:00
|
|
|
} else if selector.attribute.is_empty() {
|
|
|
|
execute_selector_query(
|
|
|
|
input_html.as_str(),
|
|
|
|
selector.query.as_str(),
|
|
|
|
selector.as_html,
|
|
|
|
selector.inspect,
|
|
|
|
span,
|
|
|
|
)
|
2022-02-01 18:45:48 +00:00
|
|
|
} else {
|
2023-01-24 11:23:42 +00:00
|
|
|
execute_selector_query_with_attribute(
|
|
|
|
input_html.as_str(),
|
|
|
|
selector.query.as_str(),
|
|
|
|
selector.attribute.as_str(),
|
|
|
|
selector.inspect,
|
|
|
|
span,
|
|
|
|
)
|
2022-02-01 18:45:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn retrieve_tables(
|
|
|
|
input_string: &str,
|
|
|
|
columns: &Value,
|
|
|
|
inspect_mode: bool,
|
|
|
|
span: Span,
|
|
|
|
) -> Value {
|
|
|
|
let html = input_string;
|
|
|
|
let mut cols: Vec<String> = Vec::new();
|
|
|
|
if let Value::List { vals, .. } = &columns {
|
|
|
|
for x in vals {
|
|
|
|
// TODO Find a way to get the Config object here
|
|
|
|
if let Value::String { val, .. } = x {
|
|
|
|
cols.push(val.to_string())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if inspect_mode {
|
|
|
|
eprintln!("Passed in Column Headers = {:#?}", &cols,);
|
|
|
|
}
|
|
|
|
|
|
|
|
let tables = match WebTable::find_by_headers(html, &cols) {
|
|
|
|
Some(t) => {
|
|
|
|
if inspect_mode {
|
|
|
|
eprintln!("Table Found = {:#?}", &t);
|
|
|
|
}
|
|
|
|
t
|
|
|
|
}
|
|
|
|
None => vec![WebTable::empty()],
|
|
|
|
};
|
|
|
|
|
|
|
|
if tables.len() == 1 {
|
|
|
|
return retrieve_table(
|
2022-04-27 12:38:36 +00:00
|
|
|
tables.into_iter().next().expect("Error retrieving table"),
|
2022-02-01 18:45:48 +00:00
|
|
|
columns,
|
|
|
|
span,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
let vals = tables
|
|
|
|
.into_iter()
|
|
|
|
.map(move |table| retrieve_table(table, columns, span))
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
Value::List { vals, span }
|
|
|
|
}
|
|
|
|
|
|
|
|
fn retrieve_table(mut table: WebTable, columns: &Value, span: Span) -> Value {
|
|
|
|
let mut cols: Vec<String> = Vec::new();
|
|
|
|
if let Value::List { vals, .. } = &columns {
|
|
|
|
for x in vals {
|
|
|
|
// TODO Find a way to get the Config object here
|
|
|
|
if let Value::String { val, .. } = x {
|
|
|
|
cols.push(val.to_string())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if cols.is_empty() && !table.headers().is_empty() {
|
|
|
|
for col in table.headers().keys() {
|
|
|
|
cols.push(col.to_string());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut table_out = Vec::new();
|
|
|
|
// sometimes there are tables where the first column is the headers, kind of like
|
|
|
|
// a table has ben rotated ccw 90 degrees, in these cases all columns will be missing
|
|
|
|
// we keep track of this with this variable so we can deal with it later
|
|
|
|
let mut at_least_one_row_filled = false;
|
|
|
|
// if columns are still empty, let's just make a single column table with the data
|
|
|
|
if cols.is_empty() {
|
|
|
|
at_least_one_row_filled = true;
|
|
|
|
let table_with_no_empties: Vec<_> = table.iter().filter(|item| !item.is_empty()).collect();
|
|
|
|
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
let mut record = Record::new();
|
2022-02-01 18:45:48 +00:00
|
|
|
for row in &table_with_no_empties {
|
|
|
|
for (counter, cell) in row.iter().enumerate() {
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
record.push(format!("column{counter}"), Value::string(cell, span));
|
2022-02-01 18:45:48 +00:00
|
|
|
}
|
|
|
|
}
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
table_out.push(Value::record(record, span))
|
2022-02-01 18:45:48 +00:00
|
|
|
} else {
|
|
|
|
for row in &table {
|
|
|
|
let mut vals = vec![];
|
|
|
|
let record_cols = &cols;
|
|
|
|
for col in &cols {
|
|
|
|
let val = row
|
|
|
|
.get(col)
|
|
|
|
.unwrap_or(&format!("Missing column: '{}'", &col))
|
|
|
|
.to_string();
|
|
|
|
|
|
|
|
if !at_least_one_row_filled && val != format!("Missing column: '{}'", &col) {
|
|
|
|
at_least_one_row_filled = true;
|
|
|
|
}
|
|
|
|
vals.push(Value::string(val, span));
|
|
|
|
}
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
table_out.push(Value::record(
|
|
|
|
Record {
|
|
|
|
cols: record_cols.to_vec(),
|
|
|
|
vals,
|
|
|
|
},
|
2022-02-01 18:45:48 +00:00
|
|
|
span,
|
Create `Record` type (#10103)
# Description
This PR creates a new `Record` type to reduce duplicate code and
possibly bugs as well. (This is an edited version of #9648.)
- `Record` implements `FromIterator` and `IntoIterator` and so can be
iterated over or collected into. For example, this helps with
conversions to and from (hash)maps. (Also, no more
`cols.iter().zip(vals)`!)
- `Record` has a `push(col, val)` function to help insure that the
number of columns is equal to the number of values. I caught a few
potential bugs thanks to this (e.g. in the `ls` command).
- Finally, this PR also adds a `record!` macro that helps simplify
record creation. It is used like so:
```rust
record! {
"key1" => some_value,
"key2" => Value::string("text", span),
"key3" => Value::int(optional_int.unwrap_or(0), span),
"key4" => Value::bool(config.setting, span),
}
```
Since macros hinder formatting, etc., the right hand side values should
be relatively short and sweet like the examples above.
Where possible, prefer `record!` or `.collect()` on an iterator instead
of multiple `Record::push`s, since the first two automatically set the
record capacity and do less work overall.
# User-Facing Changes
Besides the changes in `nu-protocol` the only other breaking changes are
to `nu-table::{ExpandedTable::build_map, JustTable::kv_table}`.
2023-08-24 19:50:29 +00:00
|
|
|
))
|
2022-02-01 18:45:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if !at_least_one_row_filled {
|
|
|
|
let mut data2 = Vec::new();
|
|
|
|
for x in &table.data {
|
|
|
|
data2.push(x.join(", "));
|
|
|
|
}
|
|
|
|
table.data = vec![data2];
|
|
|
|
return retrieve_table(table, columns, span);
|
|
|
|
}
|
|
|
|
// table_out
|
|
|
|
|
|
|
|
Value::List {
|
|
|
|
vals: table_out,
|
|
|
|
span,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn execute_selector_query_with_attribute(
|
|
|
|
input_string: &str,
|
|
|
|
query_string: &str,
|
|
|
|
attribute: &str,
|
2022-04-27 12:38:36 +00:00
|
|
|
inspect: bool,
|
2022-02-01 18:45:48 +00:00
|
|
|
span: Span,
|
|
|
|
) -> Value {
|
|
|
|
let doc = Html::parse_fragment(input_string);
|
|
|
|
|
|
|
|
let vals: Vec<Value> = doc
|
2022-04-27 12:38:36 +00:00
|
|
|
.select(&css(query_string, inspect))
|
2022-02-01 18:45:48 +00:00
|
|
|
.map(|selection| {
|
|
|
|
Value::string(
|
|
|
|
selection.value().attr(attribute).unwrap_or("").to_string(),
|
|
|
|
span,
|
|
|
|
)
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
Value::List { vals, span }
|
|
|
|
}
|
|
|
|
|
|
|
|
fn execute_selector_query(
|
|
|
|
input_string: &str,
|
|
|
|
query_string: &str,
|
|
|
|
as_html: bool,
|
2022-04-27 12:38:36 +00:00
|
|
|
inspect: bool,
|
2022-02-01 18:45:48 +00:00
|
|
|
span: Span,
|
|
|
|
) -> Value {
|
|
|
|
let doc = Html::parse_fragment(input_string);
|
|
|
|
|
|
|
|
let vals: Vec<Value> = match as_html {
|
|
|
|
true => doc
|
2022-04-27 12:38:36 +00:00
|
|
|
.select(&css(query_string, inspect))
|
2022-02-01 18:45:48 +00:00
|
|
|
.map(|selection| Value::string(selection.html(), span))
|
|
|
|
.collect(),
|
|
|
|
false => doc
|
2022-04-27 12:38:36 +00:00
|
|
|
.select(&css(query_string, inspect))
|
2022-02-01 18:45:48 +00:00
|
|
|
.map(|selection| {
|
|
|
|
Value::string(
|
|
|
|
selection
|
|
|
|
.text()
|
2023-01-30 01:37:54 +00:00
|
|
|
.fold("".to_string(), |acc, x| format!("{acc}{x}")),
|
2022-02-01 18:45:48 +00:00
|
|
|
span,
|
|
|
|
)
|
|
|
|
})
|
|
|
|
.collect(),
|
|
|
|
};
|
|
|
|
|
|
|
|
Value::List { vals, span }
|
|
|
|
}
|
|
|
|
|
2022-04-27 12:38:36 +00:00
|
|
|
pub fn css(selector: &str, inspect: bool) -> ScraperSelector {
|
|
|
|
if inspect {
|
|
|
|
ScraperSelector::parse("html").expect("Error unwrapping the default scraperselector")
|
|
|
|
} else {
|
|
|
|
ScraperSelector::parse(selector).expect("Error unwrapping scraperselector::parse")
|
|
|
|
}
|
2022-02-01 18:45:48 +00:00
|
|
|
}
|
|
|
|
|
2022-02-23 16:43:36 +00:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
2022-02-01 18:45:48 +00:00
|
|
|
|
2022-02-23 16:43:36 +00:00
|
|
|
const SIMPLE_LIST: &str = r#"
|
|
|
|
<ul>
|
|
|
|
<li>Coffee</li>
|
|
|
|
<li>Tea</li>
|
|
|
|
<li>Milk</li>
|
|
|
|
</ul>
|
|
|
|
"#;
|
2022-02-01 18:45:48 +00:00
|
|
|
|
2022-02-23 16:43:36 +00:00
|
|
|
#[test]
|
|
|
|
fn test_first_child_is_not_empty() {
|
2022-04-27 12:38:36 +00:00
|
|
|
assert!(!execute_selector_query(
|
|
|
|
SIMPLE_LIST,
|
|
|
|
"li:first-child",
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
Span::test_data()
|
2022-02-23 16:43:36 +00:00
|
|
|
)
|
2022-04-27 12:38:36 +00:00
|
|
|
.is_empty())
|
2022-02-23 16:43:36 +00:00
|
|
|
}
|
2022-02-01 18:45:48 +00:00
|
|
|
|
2022-02-23 16:43:36 +00:00
|
|
|
#[test]
|
|
|
|
fn test_first_child() {
|
2022-04-27 12:38:36 +00:00
|
|
|
let item = execute_selector_query(
|
|
|
|
SIMPLE_LIST,
|
|
|
|
"li:first-child",
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
Span::test_data(),
|
|
|
|
);
|
2022-02-23 16:43:36 +00:00
|
|
|
let config = nu_protocol::Config::default();
|
|
|
|
let out = item.into_string("\n", &config);
|
|
|
|
assert_eq!("[Coffee]".to_string(), out)
|
|
|
|
}
|
|
|
|
}
|