Transition to ureq http client (#5777)
* Transition to ureq http client * Remove unwrap
This commit is contained in:
@@ -66,17 +66,19 @@ fn download_tar_bz2(
|
||||
let progress_bar = new_spinner_progress_bar();
|
||||
progress_bar.set_message(&format!("{}Downloading {}...", TRUCK, url));
|
||||
|
||||
let client = reqwest::Client::new();
|
||||
let response = client
|
||||
.get(url.as_str())
|
||||
.send()
|
||||
.and_then(|response| response.error_for_status())
|
||||
.map_err(|err| format!("Unable to get: {:?}", err))?;
|
||||
let client = ureq::agent();
|
||||
let response = client.get(url.as_str()).call();
|
||||
if response.error() {
|
||||
let error = if let Some(err) = response.synthetic_error().as_ref() {
|
||||
format!("Unable to get: {:?}", err)
|
||||
} else {
|
||||
"Unable to get: unspecified error".to_string()
|
||||
};
|
||||
Err(error)?
|
||||
}
|
||||
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)
|
||||
};
|
||||
@@ -109,7 +111,7 @@ fn download_tar_bz2(
|
||||
|
||||
let mut source = DownloadProgress {
|
||||
progress_bar,
|
||||
response,
|
||||
response: response.into_reader(),
|
||||
};
|
||||
|
||||
let mut file = File::create(&temp_archive_path)
|
||||
|
Reference in New Issue
Block a user