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

fmt

Browse Source
This commit is contained in:
merelymyself 2022-05-29 17:17:18 +08:00
parent 878b1e1603
commit 6d951751cf
1 changed files with 168 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/nu-command/src/network/fetch.rs
View File

@ -16,7 +16,7 @@ use std::collections::HashMap;
use std::io::BufReader; use std::io::BufReader;
use reqwest::StatusCode; use reqwest::StatusCode;
use std::path::{PathBuf, Path}; use std::path::{Path, PathBuf};
use std::str::FromStr; use std::str::FromStr;
use std::time::Duration; use std::time::Duration;
@ -108,12 +108,14 @@ impl Command for SubCommand {
let output = call.has_flag("output"); let output = call.has_flag("output");
if !output { if !output {
run_fetch(engine_state, stack, call, input) run_fetch(engine_state, stack, call, input)
} } else {
else {
match run_fetch(engine_state, stack, call, input) { match run_fetch(engine_state, stack, call, input) {
Err(err) => Err(err), Err(err) => Err(err),
Ok(value) => { Ok(value) => {
let path:Value = call.get_flag(engine_state, stack, "output").expect("there should be a value").expect("value should be unwrappable"); let path: Value = call
.get_flag(engine_state, stack, "output")
.expect("there should be a value")
.expect("value should be unwrappable");
let bin = call.has_flag("bin"); let bin = call.has_flag("bin");
let append = call.has_flag("append"); let append = call.has_flag("append");
let span = call.head; let span = call.head;
@ -131,7 +133,8 @@ impl Command for SubCommand {
let mut file = match file { let mut file = match file {
Ok(file) => file, Ok(file) => file,
Err(err) => { Err(err) => {
let arg_span = call.get_named_arg("output").expect("arg should exist").span; let arg_span =
call.get_named_arg("output").expect("arg should exist").span;
return Ok(PipelineData::Value( return Ok(PipelineData::Value(
Value::Error { Value::Error {
error: ShellError::GenericError( error: ShellError::GenericError(
@ -155,7 +158,8 @@ impl Command for SubCommand {
}; };
if let Some(ext) = ext { if let Some(ext) = ext {
let output = match engine_state.find_decl(format!("to {}", ext).as_bytes(), &[]) { let output =
match engine_state.find_decl(format!("to {}", ext).as_bytes(), &[]) {
Some(converter_id) => { Some(converter_id) => {
let output = engine_state.get_decl(converter_id).run( let output = engine_state.get_decl(converter_id).run(
engine_state, engine_state,
@ -211,7 +215,9 @@ impl Command for SubCommand {
} }
} else { } else {
match value { match value {
PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::new(span)), PipelineData::ExternalStream { stdout: None, .. } => {
Ok(PipelineData::new(span))
}
PipelineData::ExternalStream { PipelineData::ExternalStream {
stdout: Some(mut stream), stdout: Some(mut stream),
.. ..
@ -283,7 +289,7 @@ impl Command for SubCommand {
}, },
} }
} }
}, }
} }
} }
} }