Skip to content

Commit

Permalink
Add (back) support for proxies (#68)
Browse files Browse the repository at this point in the history
Fixes #65
  • Loading branch information
aldanor authored and dbrgn committed Nov 22, 2018
1 parent ca0073f commit f3cabdd
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/cache.rs
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

0 comments on commit f3cabdd

Please sign in to comment.