forked from extern/nushell
Finish magic post and magic receive
This commit is contained in:
parent
1d77595576
commit
ad18c7f61a
@ -1,12 +1,13 @@
|
|||||||
|
use crate::commands::UnevaluatedCallInfo;
|
||||||
use crate::context::SpanSource;
|
use crate::context::SpanSource;
|
||||||
use crate::errors::ShellError;
|
use crate::errors::ShellError;
|
||||||
use crate::object::{Primitive, Value};
|
use crate::object::Value;
|
||||||
use crate::parser::hir::SyntaxType;
|
use crate::parser::hir::SyntaxType;
|
||||||
use crate::parser::registry::Signature;
|
use crate::parser::registry::Signature;
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
use base64::encode;
|
use base64::encode;
|
||||||
use mime::Mime;
|
use mime::Mime;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::PathBuf;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use surf::mime;
|
use surf::mime;
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@ -29,51 +30,106 @@ impl PerItemCommand for Post {
|
|||||||
fn run(
|
fn run(
|
||||||
&self,
|
&self,
|
||||||
call_info: &CallInfo,
|
call_info: &CallInfo,
|
||||||
_registry: &CommandRegistry,
|
registry: &CommandRegistry,
|
||||||
shell_manager: &ShellManager,
|
raw_args: &RawCommandArgs,
|
||||||
_input: Tagged<Value>,
|
_input: Tagged<Value>,
|
||||||
) -> Result<OutputStream, ShellError> {
|
) -> Result<OutputStream, ShellError> {
|
||||||
run(call_info, shell_manager)
|
run(call_info, registry, raw_args)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run(call_info: &CallInfo, shell_manager: &ShellManager) -> Result<OutputStream, ShellError> {
|
fn run(
|
||||||
let cwd = PathBuf::from(shell_manager.path());
|
call_info: &CallInfo,
|
||||||
let full_path = PathBuf::from(cwd);
|
registry: &CommandRegistry,
|
||||||
|
raw_args: &RawCommandArgs,
|
||||||
|
) -> Result<OutputStream, ShellError> {
|
||||||
|
let call_info = call_info.clone();
|
||||||
let path = match call_info
|
let path = match call_info
|
||||||
.args
|
.args
|
||||||
.nth(0)
|
.nth(0)
|
||||||
.ok_or_else(|| ShellError::string(&format!("No file or directory specified")))?
|
.ok_or_else(|| ShellError::string(&format!("No url specified")))?
|
||||||
{
|
{
|
||||||
file => file,
|
file => file.clone(),
|
||||||
};
|
};
|
||||||
let body = match call_info
|
let body = match call_info
|
||||||
.args
|
.args
|
||||||
.nth(1)
|
.nth(1)
|
||||||
.ok_or_else(|| ShellError::string(&format!("No body specified")))?
|
.ok_or_else(|| ShellError::string(&format!("No body specified")))?
|
||||||
{
|
{
|
||||||
file => file,
|
file => file.clone(),
|
||||||
};
|
};
|
||||||
let path_str = path.as_string()?;
|
let path_str = path.as_string()?;
|
||||||
let body_str = body.as_string()?;
|
//let body_str = body.as_string()?;
|
||||||
let path_span = path.span();
|
let path_span = path.span();
|
||||||
let name_span = call_info.name_span;
|
|
||||||
let has_raw = call_info.args.has("raw");
|
let has_raw = call_info.args.has("raw");
|
||||||
let user = call_info.args.get("user").map(|x| x.as_string().unwrap());
|
let user = call_info.args.get("user").map(|x| x.as_string().unwrap());
|
||||||
let password = call_info
|
let password = call_info
|
||||||
.args
|
.args
|
||||||
.get("password")
|
.get("password")
|
||||||
.map(|x| x.as_string().unwrap());
|
.map(|x| x.as_string().unwrap());
|
||||||
|
let registry = registry.clone();
|
||||||
|
let raw_args = raw_args.clone();
|
||||||
|
|
||||||
//r#"{"query": "query { viewer { name, } }"}"#.to_string()
|
|
||||||
let stream = async_stream_block! {
|
let stream = async_stream_block! {
|
||||||
let (file_extension, contents, contents_tag, span_source) =
|
let (file_extension, contents, contents_tag, span_source) =
|
||||||
post(&path_str, body_str, user, password, path_span).await.unwrap();
|
post(&path_str, &body, user, password, path_span, ®istry, &raw_args).await.unwrap();
|
||||||
|
|
||||||
//println!("{:?}", contents);
|
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).
|
||||||
|
file_extension.or(path_str.split('.').last().map(String::from))
|
||||||
|
};
|
||||||
|
|
||||||
yield ReturnSuccess::value(contents.tagged(contents_tag));
|
if let Some(uuid) = contents_tag.origin {
|
||||||
|
// If we have loaded something, track its source
|
||||||
|
yield ReturnSuccess::action(CommandAction::AddSpanSource(
|
||||||
|
uuid,
|
||||||
|
span_source,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let tagged_contents = contents.tagged(contents_tag);
|
||||||
|
|
||||||
|
if let Some(extension) = file_extension {
|
||||||
|
let command_name = format!("from-{}", extension);
|
||||||
|
if let Some(converter) = registry.get_command(&command_name) {
|
||||||
|
let new_args = RawCommandArgs {
|
||||||
|
host: raw_args.host,
|
||||||
|
shell_manager: raw_args.shell_manager,
|
||||||
|
call_info: UnevaluatedCallInfo {
|
||||||
|
args: crate::parser::hir::Call {
|
||||||
|
head: raw_args.call_info.args.head,
|
||||||
|
positional: None,
|
||||||
|
named: None
|
||||||
|
},
|
||||||
|
source: raw_args.call_info.source,
|
||||||
|
source_map: raw_args.call_info.source_map,
|
||||||
|
name_span: raw_args.call_info.name_span,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let mut result = converter.run(new_args.with_input(vec![tagged_contents]), ®istry);
|
||||||
|
let result_vec: Vec<Result<ReturnSuccess, ShellError>> = result.drain_vec().await;
|
||||||
|
for res in result_vec {
|
||||||
|
match res {
|
||||||
|
Ok(ReturnSuccess::Value(Tagged { item: Value::List(list), ..})) => {
|
||||||
|
for l in list {
|
||||||
|
yield Ok(ReturnSuccess::Value(l));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(ReturnSuccess::Value(Tagged { item, .. })) => {
|
||||||
|
yield Ok(ReturnSuccess::Value(Tagged { item: item, tag: contents_tag }));
|
||||||
|
}
|
||||||
|
x => yield x,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
yield ReturnSuccess::value(tagged_contents);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
yield ReturnSuccess::value(tagged_contents);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(stream.to_output_stream())
|
Ok(stream.to_output_stream())
|
||||||
@ -81,17 +137,89 @@ fn run(call_info: &CallInfo, shell_manager: &ShellManager) -> Result<OutputStrea
|
|||||||
|
|
||||||
pub async fn post(
|
pub async fn post(
|
||||||
location: &str,
|
location: &str,
|
||||||
body: String,
|
body: &Tagged<Value>,
|
||||||
user: Option<String>,
|
user: Option<String>,
|
||||||
password: Option<String>,
|
password: Option<String>,
|
||||||
span: Span,
|
span: Span,
|
||||||
|
registry: &CommandRegistry,
|
||||||
|
raw_args: &RawCommandArgs,
|
||||||
) -> Result<(Option<String>, Value, Tag, SpanSource), ShellError> {
|
) -> Result<(Option<String>, Value, Tag, SpanSource), ShellError> {
|
||||||
|
let registry = registry.clone();
|
||||||
|
let raw_args = raw_args.clone();
|
||||||
if location.starts_with("http:") || location.starts_with("https:") {
|
if location.starts_with("http:") || location.starts_with("https:") {
|
||||||
let login = encode(&format!("{}:{}", user.unwrap(), password.unwrap()));
|
let login = encode(&format!("{}:{}", user.unwrap(), password.unwrap()));
|
||||||
let response = surf::post(location)
|
let response = match body {
|
||||||
.body_string(body)
|
Tagged {
|
||||||
|
item: Value::Primitive(Primitive::String(body_str)),
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
surf::post(location)
|
||||||
|
.body_string(body_str.to_string())
|
||||||
.set_header("Authorization", format!("Basic {}", login))
|
.set_header("Authorization", format!("Basic {}", login))
|
||||||
.await;
|
.await
|
||||||
|
}
|
||||||
|
Tagged {
|
||||||
|
item: Value::Binary(b),
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
surf::post(location)
|
||||||
|
.body_bytes(b)
|
||||||
|
.set_header("Authorization", format!("Basic {}", login))
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
Tagged { item, tag } => {
|
||||||
|
if let Some(converter) = registry.get_command("to-json") {
|
||||||
|
let new_args = RawCommandArgs {
|
||||||
|
host: raw_args.host,
|
||||||
|
shell_manager: raw_args.shell_manager,
|
||||||
|
call_info: UnevaluatedCallInfo {
|
||||||
|
args: crate::parser::hir::Call {
|
||||||
|
head: raw_args.call_info.args.head,
|
||||||
|
positional: None,
|
||||||
|
named: None,
|
||||||
|
},
|
||||||
|
source: raw_args.call_info.source,
|
||||||
|
source_map: raw_args.call_info.source_map,
|
||||||
|
name_span: raw_args.call_info.name_span,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
let mut result = converter.run(
|
||||||
|
new_args.with_input(vec![item.clone().tagged(tag.clone())]),
|
||||||
|
®istry,
|
||||||
|
);
|
||||||
|
let result_vec: Vec<Result<ReturnSuccess, ShellError>> =
|
||||||
|
result.drain_vec().await;
|
||||||
|
let mut result_string = String::new();
|
||||||
|
for res in result_vec {
|
||||||
|
match res {
|
||||||
|
Ok(ReturnSuccess::Value(Tagged {
|
||||||
|
item: Value::Primitive(Primitive::String(s)),
|
||||||
|
..
|
||||||
|
})) => {
|
||||||
|
result_string.push_str(&s);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Save could not successfully save",
|
||||||
|
"unexpected data during save",
|
||||||
|
span,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
surf::post(location)
|
||||||
|
.body_string(result_string)
|
||||||
|
.set_header("Authorization", format!("Basic {}", login))
|
||||||
|
.await
|
||||||
|
} else {
|
||||||
|
return Err(ShellError::labeled_error(
|
||||||
|
"Could not automatically convert table",
|
||||||
|
"needs manual conversion",
|
||||||
|
tag.span,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
match response {
|
match response {
|
||||||
Ok(mut r) => match r.headers().get("content-type") {
|
Ok(mut r) => match r.headers().get("content-type") {
|
||||||
Some(content_type) => {
|
Some(content_type) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user