forked from extern/nushell
Add post command
This commit is contained in:
parent
39e06bbc80
commit
9e167713b3
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -1549,6 +1549,7 @@ version = "0.2.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"ansi_term 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"ansi_term 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
"base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
"battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bson 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bson 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"byte-unit 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"byte-unit 3.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -26,6 +26,7 @@ dunce = "1.0.0"
|
|||||||
indexmap = { version = "1.0.2", features = ["serde-1"] }
|
indexmap = { version = "1.0.2", features = ["serde-1"] }
|
||||||
chrono-humanize = "0.0.11"
|
chrono-humanize = "0.0.11"
|
||||||
byte-unit = "3.0.1"
|
byte-unit = "3.0.1"
|
||||||
|
base64 = "0.10.1"
|
||||||
ordered-float = {version = "1.0.2", features = ["serde"]}
|
ordered-float = {version = "1.0.2", features = ["serde"]}
|
||||||
futures-preview = { version = "=0.3.0-alpha.18", features = ["compat", "io-compat"] }
|
futures-preview = { version = "=0.3.0-alpha.18", features = ["compat", "io-compat"] }
|
||||||
futures-async-stream = "=0.1.0-alpha.5"
|
futures-async-stream = "=0.1.0-alpha.5"
|
||||||
|
@ -17,7 +17,7 @@ use crate::prelude::*;
|
|||||||
use log::{debug, trace};
|
use log::{debug, trace};
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use rustyline::error::ReadlineError;
|
use rustyline::error::ReadlineError;
|
||||||
use rustyline::{self, ColorMode, Config, Editor, config::Configurer, config::EditMode};
|
use rustyline::{self, config::Configurer, config::EditMode, ColorMode, Config, Editor};
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use std::io::{BufRead, BufReader, Write};
|
use std::io::{BufRead, BufReader, Write};
|
||||||
@ -200,6 +200,7 @@ pub async fn cli() -> Result<(), Box<dyn Error>> {
|
|||||||
whole_stream_command(Get),
|
whole_stream_command(Get),
|
||||||
per_item_command(Remove),
|
per_item_command(Remove),
|
||||||
per_item_command(Open),
|
per_item_command(Open),
|
||||||
|
per_item_command(Post),
|
||||||
per_item_command(Where),
|
per_item_command(Where),
|
||||||
whole_stream_command(Config),
|
whole_stream_command(Config),
|
||||||
whole_stream_command(SkipWhile),
|
whole_stream_command(SkipWhile),
|
||||||
|
@ -34,6 +34,7 @@ pub(crate) mod nth;
|
|||||||
pub(crate) mod open;
|
pub(crate) mod open;
|
||||||
pub(crate) mod pick;
|
pub(crate) mod pick;
|
||||||
pub(crate) mod plugin;
|
pub(crate) mod plugin;
|
||||||
|
pub(crate) mod post;
|
||||||
pub(crate) mod prev;
|
pub(crate) mod prev;
|
||||||
pub(crate) mod ps;
|
pub(crate) mod ps;
|
||||||
pub(crate) mod reject;
|
pub(crate) mod reject;
|
||||||
@ -93,6 +94,7 @@ pub(crate) use next::Next;
|
|||||||
pub(crate) use nth::Nth;
|
pub(crate) use nth::Nth;
|
||||||
pub(crate) use open::Open;
|
pub(crate) use open::Open;
|
||||||
pub(crate) use pick::Pick;
|
pub(crate) use pick::Pick;
|
||||||
|
pub(crate) use post::Post;
|
||||||
pub(crate) use prev::Previous;
|
pub(crate) use prev::Previous;
|
||||||
pub(crate) use ps::PS;
|
pub(crate) use ps::PS;
|
||||||
pub(crate) use reject::Reject;
|
pub(crate) use reject::Reject;
|
||||||
|
248
src/commands/post.rs
Normal file
248
src/commands/post.rs
Normal file
@ -0,0 +1,248 @@
|
|||||||
|
use crate::context::SpanSource;
|
||||||
|
use crate::errors::ShellError;
|
||||||
|
use crate::object::{Primitive, Value};
|
||||||
|
use crate::parser::hir::SyntaxType;
|
||||||
|
use crate::parser::registry::Signature;
|
||||||
|
use crate::prelude::*;
|
||||||
|
use base64::encode;
|
||||||
|
use mime::Mime;
|
||||||
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::str::FromStr;
|
||||||
|
use surf::mime;
|
||||||
|
use uuid::Uuid;
|
||||||
|
pub struct Post;
|
||||||
|
|
||||||
|
impl PerItemCommand for Post {
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"post"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signature(&self) -> Signature {
|
||||||
|
Signature::build(self.name())
|
||||||
|
.required("path", SyntaxType::Any)
|
||||||
|
.required("body", SyntaxType::Any)
|
||||||
|
.named("user", SyntaxType::Any)
|
||||||
|
.named("password", SyntaxType::Any)
|
||||||
|
.switch("raw")
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(
|
||||||
|
&self,
|
||||||
|
call_info: &CallInfo,
|
||||||
|
_registry: &CommandRegistry,
|
||||||
|
shell_manager: &ShellManager,
|
||||||
|
_input: Tagged<Value>,
|
||||||
|
) -> Result<OutputStream, ShellError> {
|
||||||
|
run(call_info, shell_manager)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(call_info: &CallInfo, shell_manager: &ShellManager) -> Result<OutputStream, ShellError> {
|
||||||
|
let cwd = PathBuf::from(shell_manager.path());
|
||||||
|
let full_path = PathBuf::from(cwd);
|
||||||
|
|
||||||
|
let path = match call_info
|
||||||
|
.args
|
||||||
|
.nth(0)
|
||||||
|
.ok_or_else(|| ShellError::string(&format!("No file or directory specified")))?
|
||||||
|
{
|
||||||
|
file => file,
|
||||||
|
};
|
||||||
|
let body = match call_info
|
||||||
|
.args
|
||||||
|
.nth(1)
|
||||||
|
.ok_or_else(|| ShellError::string(&format!("No body specified")))?
|
||||||
|
{
|
||||||
|
file => file,
|
||||||
|
};
|
||||||
|
let path_str = path.as_string()?;
|
||||||
|
let body_str = body.as_string()?;
|
||||||
|
let path_span = path.span();
|
||||||
|
let name_span = call_info.name_span;
|
||||||
|
let has_raw = call_info.args.has("raw");
|
||||||
|
let user = call_info.args.get("user").map(|x| x.as_string().unwrap());
|
||||||
|
let password = call_info
|
||||||
|
.args
|
||||||
|
.get("password")
|
||||||
|
.map(|x| x.as_string().unwrap());
|
||||||
|
|
||||||
|
//r#"{"query": "query { viewer { name, } }"}"#.to_string()
|
||||||
|
let stream = async_stream_block! {
|
||||||
|
let (file_extension, contents, contents_tag, span_source) =
|
||||||
|
post(&path_str, body_str, user, password, path_span).await.unwrap();
|
||||||
|
|
||||||
|
//println!("{:?}", contents);
|
||||||
|
|
||||||
|
yield ReturnSuccess::value(contents.tagged(contents_tag));
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(stream.to_output_stream())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn post(
|
||||||
|
location: &str,
|
||||||
|
body: String,
|
||||||
|
user: Option<String>,
|
||||||
|
password: Option<String>,
|
||||||
|
span: Span,
|
||||||
|
) -> Result<(Option<String>, Value, Tag, SpanSource), ShellError> {
|
||||||
|
if location.starts_with("http:") || location.starts_with("https:") {
|
||||||
|
let login = encode(&format!("{}:{}", user.unwrap(), password.unwrap()));
|
||||||
|
let response = surf::post(location)
|
||||||
|
.body_string(body)
|
||||||
|
.set_header("Authorization", format!("Basic {}", login))
|
||||||
|
.await;
|
||||||
|
match response {
|
||||||
|
Ok(mut r) => match r.headers().get("content-type") {
|
||||||
|
Some(content_type) => {
|
||||||
|
let content_type = Mime::from_str(content_type).unwrap();
|
||||||
|
match (content_type.type_(), content_type.subtype()) {
|
||||||
|
(mime::APPLICATION, mime::XML) => Ok((
|
||||||
|
Some("xml".to_string()),
|
||||||
|
Value::string(r.body_string().await.map_err(|_| {
|
||||||
|
ShellError::labeled_error(
|
||||||
|
"Could not load text from remote url",
|
||||||
|
"could not load",
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
)),
|
||||||
|
(mime::APPLICATION, mime::JSON) => Ok((
|
||||||
|
Some("json".to_string()),
|
||||||
|
Value::string(r.body_string().await.map_err(|_| {
|
||||||
|
ShellError::labeled_error(
|
||||||
|
"Could not load text from remote url",
|
||||||
|
"could not load",
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
)),
|
||||||
|
(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",
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
Ok((
|
||||||
|
None,
|
||||||
|
Value::Binary(buf),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
(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",
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
Ok((
|
||||||
|
Some(image_ty.to_string()),
|
||||||
|
Value::Binary(buf),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
(mime::TEXT, mime::HTML) => Ok((
|
||||||
|
Some("html".to_string()),
|
||||||
|
Value::string(r.body_string().await.map_err(|_| {
|
||||||
|
ShellError::labeled_error(
|
||||||
|
"Could not load text from remote url",
|
||||||
|
"could not load",
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
)),
|
||||||
|
(mime::TEXT, mime::PLAIN) => {
|
||||||
|
let path_extension = url::Url::parse(location)
|
||||||
|
.unwrap()
|
||||||
|
.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,
|
||||||
|
Value::string(r.body_string().await.map_err(|_| {
|
||||||
|
ShellError::labeled_error(
|
||||||
|
"Could not load text from remote url",
|
||||||
|
"could not load",
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
(ty, sub_ty) => Ok((
|
||||||
|
None,
|
||||||
|
Value::string(format!(
|
||||||
|
"Not yet supported MIME type: {} {}",
|
||||||
|
ty, sub_ty
|
||||||
|
)),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => Ok((
|
||||||
|
None,
|
||||||
|
Value::string(format!("No content type found")),
|
||||||
|
Tag {
|
||||||
|
span,
|
||||||
|
origin: Some(Uuid::new_v4()),
|
||||||
|
},
|
||||||
|
SpanSource::Url(location.to_string()),
|
||||||
|
)),
|
||||||
|
},
|
||||||
|
Err(_) => {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"URL could not be opened",
|
||||||
|
"url not found",
|
||||||
|
span,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Err(ShellError::labeled_error(
|
||||||
|
"Expected a url",
|
||||||
|
"needs a url",
|
||||||
|
span,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user