gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Transition to ureq http client (#5777)

Browse Source 
* Transition to ureq http client

* Remove unwrap
This commit is contained in:
Tyera Eulberg
2019-09-04 12:11:44 -07:00
committed by GitHub
parent 355640b5db
commit b19d9a50d3
16 changed files with 236 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/Cargo.toml
View File

@ -26,7 +26,6 @@ indicatif = "0.11.0"
lazy_static = "1.4.0"
log = "0.4.8"
nix = "0.15.0"
reqwest = "0.9.20"
semver = "0.9.0"
serde = "1.0.99"
serde_derive = "1.0.99"
@ -39,6 +38,7 @@ solana-sdk = { path = "../sdk", version = "0.19.0-pre0" }
tar = "0.4.26"
tempdir = "0.3.7"
url = "2.1.0"
ureq = "0.11.0"
[target."cfg(windows)".dependencies]
winapi = "0.3.8"

10
install/src/command.rs
View File

@ -73,17 +73,15 @@ fn download_to_temp_archive(
let temp_dir = TempDir::new(clap::crate_name!())?;
let temp_file = temp_dir.path().join("release.tar.bz2");
let client = reqwest::Client::new();
let client = ureq::agent();
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message(&format!("{}Downloading...", TRUCK));
let response = client.get(url.as_str()).send()?;
let response = client.get(url.as_str()).call();
let download_size = {
response
.headers()
.get(reqwest::header::CONTENT_LENGTH)
.and_then(|content_length| content_length.to_str().ok())
.header("Content-Length")
.and_then(|content_length| content_length.parse().ok())
.unwrap_or(0)
};
@ -116,7 +114,7 @@ fn download_to_temp_archive(
let mut source = DownloadProgress {
progress_bar,
response,
response: response.into_reader(),
};
let mut file = File::create(&temp_file)?;