extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 08:45:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve open URL. Format and remove warning in tests

Browse Source
This commit is contained in:
Jonathan Turner
2019-07-18 06:56:15 +12:00
parent 73b978ad51
commit 00b3106f05
2 changed files with 71 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/commands/open.rs
View File

@ -67,41 +67,53 @@ pub fn fetch(
if location.starts_with("http:") || location.starts_with("https:") {
let response = reqwest::get(location);
match response {
Ok(mut r) => match r.text() {
Ok(s) => {
let path_extension = r
.url()
.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())
});
let extension = match r.headers().get("content-type") {
Some(content_type) => {
let content_type =
Mime::from_str(content_type.to_str().unwrap()).unwrap();
match (content_type.type_(), content_type.subtype()) {
(mime::APPLICATION, mime::XML) => Some("xml".to_string()),
(mime::APPLICATION, mime::JSON) => Some("json".to_string()),
_ => path_extension,
}
Ok(mut r) => match r.headers().get("content-type") {
Some(content_type) => {
let content_type = Mime::from_str(content_type.to_str().unwrap()).unwrap();
match (content_type.type_(), content_type.subtype()) {
(mime::APPLICATION, mime::XML) => Ok((
Some("xml".to_string()),
Value::string(r.text().unwrap()),
span,
)),
(mime::APPLICATION, mime::JSON) => Ok((
Some("json".to_string()),
Value::string(r.text().unwrap()),
span,
)),
(mime::IMAGE, image_ty) => {
let mut buf: Vec<u8> = vec![];
r.copy_to(&mut buf).map_err(|_| {
ShellError::labeled_error(
"Could not load image file",
"could not load",
span,
)
})?;
Ok((Some(image_ty.to_string()), Value::Binary(buf), span))
}
None => path_extension,
};
(mime::TEXT, mime::PLAIN) => {
let path_extension = r
.url()
.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((extension, Value::string(s), span))
}
Err(_) => {
return Err(ShellError::labeled_error(
"Web page contents corrupt",
"received garbled data",
span,
));
Ok((path_extension, Value::string(r.text().unwrap()), span))
}
(ty, sub_ty) => Ok((
None,
Value::string(format!("Not yet support MIME type: {} {}", ty, sub_ty)),
span,
)),
}
}
None => Ok((None, Value::string(format!("No content type found")), span)),
},
Err(_) => {
return Err(ShellError::labeled_error(