Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add (back) support for proxies #68

Merged
merged 2 commits into from
Nov 22, 2018
Merged

Add (back) support for proxies #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6455ccc
Add (back) support for proxies
aldanor Nov 22, 2018
75aa42b
Don't bail when instantiating Proxy fails
aldanor Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::path::PathBuf;
#[cfg(unix)]
use std::os::unix::fs::MetadataExt;

use reqwest;
use reqwest::{Client, Proxy};
use flate2::read::GzDecoder;
use tar::Archive;
use time;
Expand Down Expand Up @@ -61,7 +61,19 @@ impl Cache {

/// Download the archive
fn download(&self) -> Result<Vec<u8>, TealdeerError> {
let mut resp = reqwest::get(&self.url)?;
let mut builder = Client::builder();
if let Ok(ref host) = env::var("HTTP_PROXY") {
if let Ok(proxy) = Proxy::http(host) {
builder = builder.proxy(proxy);
}
}
if let Ok(ref host) = env::var("HTTPS_PROXY") {
if let Ok(proxy) = Proxy::https(host) {
builder = builder.proxy(proxy);
}
}
let client = builder.build().unwrap_or_else(|_| Client::new());
let mut resp = client.get(&self.url).send()?;
let mut buf: Vec<u8> = vec![];
let bytes_downloaded = resp.copy_to(&mut buf)?;
debug!("{} bytes downloaded", bytes_downloaded);
Expand Down