diff --git a/src/apply.rs b/src/apply.rs index 4b50bf8..3fa42d1 100644 --- a/src/apply.rs +++ b/src/apply.rs @@ -3,7 +3,7 @@ use log::info; use std::path::Path; use tokio::fs; -use crate::{File, base64_decode}; +use crate::File; pub async fn files(files: &[File], root: &str, dry_run: bool) -> Result<()> { for f in files { diff --git a/src/dls.rs b/src/dls.rs index 70f49d7..1a660ae 100644 --- a/src/dls.rs +++ b/src/dls.rs @@ -23,6 +23,18 @@ impl Client { } } + pub fn new_with_http_client( + base_url: String, + token: String, + http_client: reqwest::Client, + ) -> Self { + Self { + base_url, + token, + http_client, + } + } + pub fn with_proxy(self, proxy: String) -> reqwest::Result { let proxy = reqwest::Proxy::all(proxy)?; Ok(Self { @@ -154,7 +166,7 @@ impl<'t> Host<'t> { pub async fn asset( &self, asset_name: &str, - ) -> Result>> { + ) -> Result> + use<>> { let req = self.dls.get(format!("hosts/{}/{asset_name}", self.name))?; let resp = do_req(req, &self.dls.token).await?; Ok(resp.bytes_stream()) diff --git a/src/lib.rs b/src/lib.rs index e314765..867896d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -171,7 +171,7 @@ impl FileKind { } impl FilePart { - pub fn content(&self) -> Result, base64::DecodeError> { + pub fn content(&self) -> Result, base64::DecodeError> { use FilePart::*; Ok(match self { Content(content) => Cow::Borrowed(content.as_bytes()),