2019-12-07 03:46:05 +00:00
|
|
|
use futures::executor::block_on;
|
2019-09-03 06:04:46 +00:00
|
|
|
use mime::Mime;
|
Extract core stuff into own crates
This commit extracts five new crates:
- nu-source, which contains the core source-code handling logic in Nu,
including Text, Span, and also the pretty.rs-based debug logic
- nu-parser, which is the parser and expander logic
- nu-protocol, which is the bulk of the types and basic conveniences
used by plugins
- nu-errors, which contains ShellError, ParseError and error handling
conveniences
- nu-textview, which is the textview plugin extracted into a crate
One of the major consequences of this refactor is that it's no longer
possible to `impl X for Spanned<Y>` outside of the `nu-source` crate, so
a lot of types became more concrete (Value became a concrete type
instead of Spanned<Value>, for example).
This also turned a number of inherent methods in the main nu crate into
plain functions (impl Value {} became a bunch of functions in the
`value` namespace in `crate::data::value`).
2019-11-26 02:30:48 +00:00
|
|
|
use nu_errors::ShellError;
|
2019-12-27 13:30:14 +00:00
|
|
|
use nu_plugin::{serve_plugin, Plugin};
|
2019-12-07 03:46:05 +00:00
|
|
|
use nu_protocol::{
|
2019-12-27 13:30:14 +00:00
|
|
|
CallInfo, CommandAction, ReturnSuccess, ReturnValue, Signature, SyntaxShape, UntaggedValue,
|
|
|
|
Value,
|
2019-12-07 03:46:05 +00:00
|
|
|
};
|
|
|
|
use nu_source::{AnchorLocation, Span, Tag};
|
2019-09-03 06:04:46 +00:00
|
|
|
use std::path::PathBuf;
|
|
|
|
use std::str::FromStr;
|
|
|
|
use surf::mime;
|
2019-11-21 14:33:14 +00:00
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
struct Fetch {
|
|
|
|
path: Option<Value>,
|
|
|
|
has_raw: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Fetch {
|
|
|
|
fn new() -> Fetch {
|
|
|
|
Fetch {
|
|
|
|
path: None,
|
|
|
|
has_raw: false,
|
|
|
|
}
|
|
|
|
}
|
2019-09-03 06:04:46 +00:00
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
fn setup(&mut self, call_info: CallInfo) -> ReturnValue {
|
|
|
|
self.path = Some(
|
|
|
|
match call_info.args.nth(0).ok_or_else(|| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
"No file or directory specified",
|
|
|
|
"for command",
|
|
|
|
&call_info.name_tag,
|
|
|
|
)
|
|
|
|
})? {
|
|
|
|
file => file.clone(),
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
|
|
|
self.has_raw = call_info.args.has("raw");
|
|
|
|
|
|
|
|
ReturnSuccess::value(UntaggedValue::nothing().into_untagged_value())
|
2019-09-03 06:04:46 +00:00
|
|
|
}
|
2019-12-07 03:46:05 +00:00
|
|
|
}
|
2019-09-03 06:04:46 +00:00
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
impl Plugin for Fetch {
|
|
|
|
fn config(&mut self) -> Result<Signature, ShellError> {
|
|
|
|
Ok(Signature::build("fetch")
|
|
|
|
.desc("Load from a URL into a cell, convert to table if possible (avoid by appending '--raw')")
|
2019-10-28 05:15:35 +00:00
|
|
|
.required(
|
|
|
|
"path",
|
|
|
|
SyntaxShape::Path,
|
|
|
|
"the URL to fetch the contents from",
|
|
|
|
)
|
|
|
|
.switch("raw", "fetch contents as text rather than a table")
|
2019-12-07 03:46:05 +00:00
|
|
|
.filter())
|
2019-09-03 06:04:46 +00:00
|
|
|
}
|
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
fn begin_filter(&mut self, callinfo: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
|
2019-12-07 04:23:59 +00:00
|
|
|
self.setup(callinfo)?;
|
|
|
|
Ok(vec![])
|
2019-09-03 06:04:46 +00:00
|
|
|
}
|
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
fn filter(&mut self, value: Value) -> Result<Vec<ReturnValue>, ShellError> {
|
|
|
|
Ok(vec![block_on(fetch_helper(
|
2020-01-01 20:45:32 +00:00
|
|
|
&self.path.clone().ok_or_else(|| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
"internal error: path not set",
|
|
|
|
"path not set",
|
|
|
|
&value.tag,
|
|
|
|
)
|
|
|
|
})?,
|
2019-12-07 03:46:05 +00:00
|
|
|
self.has_raw,
|
|
|
|
value,
|
|
|
|
))])
|
2019-09-03 06:04:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
fn main() {
|
|
|
|
serve_plugin(&mut Fetch::new());
|
|
|
|
}
|
|
|
|
|
2019-12-07 04:23:59 +00:00
|
|
|
async fn fetch_helper(path: &Value, has_raw: bool, row: Value) -> ReturnValue {
|
2019-09-03 06:04:46 +00:00
|
|
|
let path_buf = path.as_path()?;
|
|
|
|
let path_str = path_buf.display().to_string();
|
2019-12-07 04:23:59 +00:00
|
|
|
|
|
|
|
//FIXME: this is a workaround because plugins don't yet support per-item iteration
|
|
|
|
let path_str = if path_str == "$it" {
|
|
|
|
let path_buf = row.as_path()?;
|
|
|
|
path_buf.display().to_string()
|
|
|
|
} else {
|
|
|
|
path_str
|
|
|
|
};
|
|
|
|
|
Overhaul the expansion system
The main thrust of this (very large) commit is an overhaul of the
expansion system.
The parsing pipeline is:
- Lightly parse the source file for atoms, basic delimiters and pipeline
structure into a token tree
- Expand the token tree into a HIR (high-level intermediate
representation) based upon the baseline syntax rules for expressions
and the syntactic shape of commands.
Somewhat non-traditionally, nu doesn't have an AST at all. It goes
directly from the token tree, which doesn't represent many important
distinctions (like the difference between `hello` and `5KB`) directly
into a high-level representation that doesn't have a direct
correspondence to the source code.
At a high level, nu commands work like macros, in the sense that the
syntactic shape of the invocation of a command depends on the
definition of a command.
However, commands do not have the ability to perform unrestricted
expansions of the token tree. Instead, they describe their arguments in
terms of syntactic shapes, and the expander expands the token tree into
HIR based upon that definition.
For example, the `where` command says that it takes a block as its first
required argument, and the description of the block syntactic shape
expands the syntax `cpu > 10` into HIR that represents
`{ $it.cpu > 10 }`.
This commit overhauls that system so that the syntactic shapes are
described in terms of a few new traits (`ExpandSyntax` and
`ExpandExpression` are the primary ones) that are more composable than
the previous system.
The first big win of this new system is the addition of the `ColumnPath`
shape, which looks like `cpu."max ghz"` or `package.version`.
Previously, while a variable path could look like `$it.cpu."max ghz"`,
the tail of a variable path could not be easily reused in other
contexts. Now, that tail is its own syntactic shape, and it can be used
as part of a command's signature.
This cleans up commands like `inc`, `add` and `edit` as well as
shorthand blocks, which can now look like `| where cpu."max ghz" > 10`
2019-09-17 22:26:27 +00:00
|
|
|
let path_span = path.tag.span;
|
2019-09-03 06:04:46 +00:00
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
let result = fetch(&path_str, path_span).await;
|
2019-09-03 06:04:46 +00:00
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
if let Err(e) = result {
|
|
|
|
return Err(e);
|
|
|
|
}
|
2020-01-01 20:45:32 +00:00
|
|
|
let (file_extension, contents, contents_tag) = result?;
|
2019-09-03 06:04:46 +00:00
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
let file_extension = if has_raw {
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
// If the extension could not be determined via mimetype, try to use the path
|
|
|
|
// extension. Some file types do not declare their mimetypes (such as bson files).
|
2019-12-31 07:36:08 +00:00
|
|
|
file_extension.or_else(|| path_str.split('.').last().map(String::from))
|
2019-09-03 06:04:46 +00:00
|
|
|
};
|
|
|
|
|
2019-12-07 03:46:05 +00:00
|
|
|
let tagged_contents = contents.retag(&contents_tag);
|
|
|
|
|
|
|
|
if let Some(extension) = file_extension {
|
2019-12-31 07:36:08 +00:00
|
|
|
Ok(ReturnSuccess::Action(CommandAction::AutoConvert(
|
2019-12-07 03:46:05 +00:00
|
|
|
tagged_contents,
|
|
|
|
extension,
|
2019-12-31 07:36:08 +00:00
|
|
|
)))
|
2019-12-07 03:46:05 +00:00
|
|
|
} else {
|
2019-12-31 07:36:08 +00:00
|
|
|
ReturnSuccess::value(tagged_contents)
|
2019-12-07 03:46:05 +00:00
|
|
|
}
|
2019-09-03 06:04:46 +00:00
|
|
|
}
|
|
|
|
|
2019-11-21 14:33:14 +00:00
|
|
|
pub async fn fetch(
|
|
|
|
location: &str,
|
|
|
|
span: Span,
|
|
|
|
) -> Result<(Option<String>, UntaggedValue, Tag), ShellError> {
|
2019-12-06 15:28:26 +00:00
|
|
|
if url::Url::parse(location).is_err() {
|
2019-09-03 06:04:46 +00:00
|
|
|
return Err(ShellError::labeled_error(
|
|
|
|
"Incomplete or incorrect url",
|
|
|
|
"expected a full url",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
));
|
|
|
|
}
|
|
|
|
|
|
|
|
let response = surf::get(location).await;
|
|
|
|
match response {
|
|
|
|
Ok(mut r) => match r.headers().get("content-type") {
|
|
|
|
Some(content_type) => {
|
2020-01-01 20:45:32 +00:00
|
|
|
let content_type = Mime::from_str(content_type).map_err(|_| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
format!("MIME type unknown: {}", content_type),
|
|
|
|
"given unknown MIME type",
|
|
|
|
span,
|
|
|
|
)
|
|
|
|
})?;
|
2019-09-03 06:04:46 +00:00
|
|
|
match (content_type.type_(), content_type.subtype()) {
|
|
|
|
(mime::APPLICATION, mime::XML) => Ok((
|
|
|
|
Some("xml".to_string()),
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::string(r.body_string().await.map_err(|_| {
|
2019-09-03 06:04:46 +00:00
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load text from remote url",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
)),
|
|
|
|
(mime::APPLICATION, mime::JSON) => Ok((
|
|
|
|
Some("json".to_string()),
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::string(r.body_string().await.map_err(|_| {
|
2019-09-03 06:04:46 +00:00
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load text from remote url",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
)),
|
|
|
|
(mime::APPLICATION, mime::OCTET_STREAM) => {
|
|
|
|
let buf: Vec<u8> = r.body_bytes().await.map_err(|_| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load binary file",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?;
|
|
|
|
Ok((
|
|
|
|
None,
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::binary(buf),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
))
|
|
|
|
}
|
|
|
|
(mime::IMAGE, mime::SVG) => Ok((
|
|
|
|
Some("svg".to_string()),
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::string(r.body_string().await.map_err(|_| {
|
2019-09-03 06:04:46 +00:00
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load svg from remote url",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
)),
|
|
|
|
(mime::IMAGE, image_ty) => {
|
|
|
|
let buf: Vec<u8> = r.body_bytes().await.map_err(|_| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load image file",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?;
|
|
|
|
Ok((
|
|
|
|
Some(image_ty.to_string()),
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::binary(buf),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
))
|
|
|
|
}
|
|
|
|
(mime::TEXT, mime::HTML) => Ok((
|
|
|
|
Some("html".to_string()),
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::string(r.body_string().await.map_err(|_| {
|
2019-09-03 06:04:46 +00:00
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load text from remote url",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
)),
|
|
|
|
(mime::TEXT, mime::PLAIN) => {
|
|
|
|
let path_extension = url::Url::parse(location)
|
2020-01-01 20:45:32 +00:00
|
|
|
.map_err(|_| {
|
|
|
|
ShellError::labeled_error(
|
|
|
|
format!("Cannot parse URL: {}", location),
|
|
|
|
"cannot parse",
|
|
|
|
span,
|
|
|
|
)
|
|
|
|
})?
|
2019-09-03 06:04:46 +00:00
|
|
|
.path_segments()
|
|
|
|
.and_then(|segments| segments.last())
|
|
|
|
.and_then(|name| if name.is_empty() { None } else { Some(name) })
|
|
|
|
.and_then(|name| {
|
|
|
|
PathBuf::from(name)
|
|
|
|
.extension()
|
|
|
|
.map(|name| name.to_string_lossy().to_string())
|
|
|
|
});
|
|
|
|
|
|
|
|
Ok((
|
|
|
|
path_extension,
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::string(r.body_string().await.map_err(|_| {
|
2019-09-03 06:04:46 +00:00
|
|
|
ShellError::labeled_error(
|
|
|
|
"Could not load text from remote url",
|
|
|
|
"could not load",
|
2019-09-18 06:37:04 +00:00
|
|
|
span,
|
2019-09-03 06:04:46 +00:00
|
|
|
)
|
|
|
|
})?),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
))
|
|
|
|
}
|
|
|
|
(ty, sub_ty) => Ok((
|
|
|
|
None,
|
2019-12-04 19:52:31 +00:00
|
|
|
UntaggedValue::string(format!(
|
|
|
|
"Not yet supported MIME type: {} {}",
|
|
|
|
ty, sub_ty
|
|
|
|
)),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => Ok((
|
|
|
|
None,
|
2019-12-06 15:28:26 +00:00
|
|
|
UntaggedValue::string("No content type found".to_owned()),
|
2019-09-18 06:37:04 +00:00
|
|
|
Tag {
|
|
|
|
span,
|
2019-10-13 04:12:43 +00:00
|
|
|
anchor: Some(AnchorLocation::Url(location.to_string())),
|
2019-09-18 06:37:04 +00:00
|
|
|
},
|
2019-09-03 06:04:46 +00:00
|
|
|
)),
|
|
|
|
},
|
2019-12-06 15:28:26 +00:00
|
|
|
Err(_) => Err(ShellError::labeled_error(
|
|
|
|
"URL could not be opened",
|
|
|
|
"url not found",
|
|
|
|
span,
|
|
|
|
)),
|
2019-09-03 06:04:46 +00:00
|
|
|
}
|
|
|
|
}
|