tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/client/http_client.rs - BackupClient: use async

Browse Source
This commit is contained in:
Dietmar Maurer 2019-09-04 14:52:19 +02:00
parent d4a085e564
commit 2a1e6d7dea
1 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
src/client/http_client.rs
View File

@ -575,36 +575,38 @@ impl BackupClient {
Arc::new(Self { h2, canceller })
}
pub fn get(
pub async fn get(
&self,
path: &str,
param: Option<Value>,
) -> impl Future<Output = Result<Value, Error>> {
self.h2.get(path, param)
) -> Result<Value, Error> {
self.h2.get(path, param).await
}
pub fn put(
pub async fn put(
&self,
path: &str,
param: Option<Value>,
) -> impl Future<Output = Result<Value, Error>> {
self.h2.put(path, param)
) -> Result<Value, Error> {
self.h2.put(path, param).await
}
pub fn post(
pub async fn post(
&self,
path: &str,
param: Option<Value>,
) -> impl Future<Output = Result<Value, Error>> {
self.h2.post(path, param)
) -> Result<Value, Error> {
self.h2.post(path, param).await
}
pub fn finish(self: Arc<Self>) -> impl Future<Output = Result<(), Error>> {
self.h2.clone()
.post("finish", None)
pub async fn finish(self: Arc<Self>) -> Result<(), Error> {
let h2 = self.h2.clone();
h2.post("finish", None)
.map_ok(move |_| {
self.canceller.cancel();
})
.await
}
pub fn force_close(self) {
@ -1090,88 +1092,88 @@ impl H2Client {
Self { h2 }
}
pub fn get(&self, path: &str, param: Option<Value>) -> impl Future<Output = Result<Value, Error>> {
pub async fn get(
&self,
path: &str,
param: Option<Value>
) -> Result<Value, Error> {
let req = Self::request_builder("localhost", "GET", path, param).unwrap();
self.request(req)
self.request(req).await
}
pub fn put(&self, path: &str, param: Option<Value>) -> impl Future<Output = Result<Value, Error>> {
pub async fn put(
&self,
path: &str,
param: Option<Value>
) -> Result<Value, Error> {
let req = Self::request_builder("localhost", "PUT", path, param).unwrap();
self.request(req)
self.request(req).await
}
pub fn post(&self, path: &str, param: Option<Value>) -> impl Future<Output = Result<Value, Error>> {
pub async fn post(
&self,
path: &str,
param: Option<Value>
) -> Result<Value, Error> {
let req = Self::request_builder("localhost", "POST", path, param).unwrap();
self.request(req)
self.request(req).await
}
pub async fn download<W: Write + Send>(
&self,
path: &str,
param: Option<Value>,
output: W,
mut output: W,
) -> Result<W, Error> {
let request = Self::request_builder("localhost", "GET", path, param).unwrap();
self.send_request(request, None)
.and_then(move |response| {
response
.map_err(Error::from)
.and_then(move |resp| {
let status = resp.status();
if !status.is_success() {
future::Either::Left(
H2Client::h2api_response(resp)
.map(|_| Err(format_err!("unknown error")))
)
} else {
let mut body = resp.into_body();
let release_capacity = body.release_capacity().clone();
let response_future = self.send_request(request, None).await?;
future::Either::Right(
body
.map_err(Error::from)
.try_fold(output, move |mut acc, chunk| {
let mut release_capacity = release_capacity.clone();
async move {
let _ = release_capacity.release_capacity(chunk.len());
acc.write_all(&chunk)?;
Ok::<_, Error>(acc)
}
})
)
}
})
})
.await
let resp = response_future.await?;
let status = resp.status();
if !status.is_success() {
H2Client::h2api_response(resp)
.map(|_| Err(format_err!("unknown error")))
.await?;
unreachable!();
}
let mut body = resp.into_body();
let mut release_capacity = body.release_capacity().clone();
while let Some(chunk) = body.try_next().await? {
let _ = release_capacity.release_capacity(chunk.len());
output.write_all(&chunk)?;
}
Ok(output)
}
pub fn upload(
pub async fn upload(
&self,
path: &str,
param: Option<Value>,
data: Vec<u8>,
) -> impl Future<Output = Result<Value, Error>> {
) -> Result<Value, Error> {
let request = Self::request_builder("localhost", "POST", path, param).unwrap();
self.h2.clone()
.ready()
.map_err(Error::from)
.and_then(move |mut send_request| {
let (response, stream) = send_request.send_request(request, false).unwrap();
PipeToSendStream::new(bytes::Bytes::from(data), stream)
.and_then(|_| {
response
.map_err(Error::from)
.and_then(Self::h2api_response)
})
let mut send_request = self.h2.clone().ready().await?;
let (response, stream) = send_request.send_request(request, false).unwrap();
PipeToSendStream::new(bytes::Bytes::from(data), stream)
.and_then(|_| {
response
.map_err(Error::from)
.and_then(Self::h2api_response)
})
.await
}
fn request(
async fn request(
&self,
request: Request<()>,
) -> impl Future<Output = Result<Value, Error>> {
) -> Result<Value, Error> {
self.send_request(request, None)
.and_then(move |response| {
@ -1179,6 +1181,7 @@ impl H2Client {
.map_err(Error::from)
.and_then(Self::h2api_response)
})
.await
}
fn send_request(