holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for downloading unsupported mime types (#1441)

Browse Source
This commit is contained in:
Ryan Blecher 2020-02-29 19:14:36 -05:00 committed by GitHub
parent 8d38743e27
commit 2a8cb24309
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/nu_plugin_fetch/src/fetch.rs
View File

@ -53,7 +53,7 @@ pub async fn fetch_helper(path: &Value, has_raw: bool, row: Value) -> ReturnValu
let path_span = path.tag.span;
let result = fetch(&path_str, path_span).await;
let result = fetch(&path_str, path_span, has_raw).await;
if let Err(e) = result {
return Err(e);
@ -83,6 +83,7 @@ pub async fn fetch_helper(path: &Value, has_raw: bool, row: Value) -> ReturnValu
pub async fn fetch(
location: &str,
span: Span,
has_raw: bool,
) -> Result<(Option<String>, UntaggedValue, Tag), ShellError> {
if url::Url::parse(location).is_err() {
return Err(ShellError::labeled_error(
@ -227,6 +228,30 @@ pub async fn fetch(
},
))
}
(_ty, _sub_ty) if has_raw => {
let raw_bytes = r.body_bytes().await?;
// For unsupported MIME types, we do not know if the data is UTF-8,
// so we get the raw body bytes and try to convert to UTF-8 if possible.
match std::str::from_utf8(&raw_bytes) {
Ok(response_str) => Ok((
None,
UntaggedValue::string(response_str),
Tag {
span,
anchor: Some(AnchorLocation::Url(location.to_string())),
},
)),
Err(_) => Ok((
None,
UntaggedValue::binary(raw_bytes),
Tag {
span,
anchor: Some(AnchorLocation::Url(location.to_string())),
},
)),
}
}
(ty, sub_ty) => Ok((
None,
UntaggedValue::string(format!(