resourceloader: Automatically set proxy for http request if specified

simonwuelker · Aug 12, 2024 · 5754951 · 5754951
1 parent 599d4e2
commit 5754951
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/crates/resourceloader/Cargo.toml b/crates/resourceloader/Cargo.toml
@@ -13,6 +13,7 @@ log = { workspace = true }
 sl-std = { workspace = true }
 http = { workspace = true }
 error-derive = { workspace = true }
+settings = { workspace = true }
 # smol = { workspace = true }
 # async-task = { workspace = true }
 # serialize = { workspace = true }

diff --git a/crates/resourceloader/src/resource.rs b/crates/resourceloader/src/resource.rs
@@ -1,5 +1,6 @@
 use error_derive::Error;
 use http::request::HTTPError;
+use settings::SETTINGS;
 use sl_std::{ascii, base64};
 use std::{fs, io};
 use url::URL;
@@ -93,7 +94,13 @@ impl Resource {
         let resource = match url.scheme().as_str() {
             "http" | "https" => {
                 // Fetch the file via http
-                let response = http::request::Request::get(url).send()?;
+                let mut request = http::request::Request::get(url);
+
+                if let Some(proxy) = dbg!(SETTINGS.proxy) {
+                    request.set_proxy(proxy);
+                }
+
+                let response = request.send()?;
 
                 Self::new_for_http_request(response.body, response.headers)
             },