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

src/client/http_client.rs: code cleanup

Browse Source
This commit is contained in:
Dietmar Maurer 2019-05-22 13:24:33 +02:00
parent 6ab34afa88
commit d2c48afc6e
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/client/http_client.rs
View File

@ -330,6 +330,30 @@ impl HttpClient {
Box::new(login_future) Box::new(login_future)
} }
fn api_response(response: Response<Body>) -> impl Future<Item=Value, Error=Error> {
let status = response.status();
response
.into_body()
.concat2()
.map_err(Error::from)
.and_then(move |data| {
let text = String::from_utf8(data.to_vec()).unwrap();
if status.is_success() {
if text.len() > 0 {
let value: Value = serde_json::from_str(&text)?;
Ok(value)
} else {
Ok(Value::Null)
}
} else {
bail!("HTTP Error {}: {}", status, text);
}
})
}
fn api_request( fn api_request(
client: Client<hyper_tls::HttpsConnector<hyper::client::HttpConnector>>, client: Client<hyper_tls::HttpsConnector<hyper::client::HttpConnector>>,
req: Request<Body> req: Request<Body>
@ -337,29 +361,7 @@ impl HttpClient {
client.request(req) client.request(req)
.map_err(Error::from) .map_err(Error::from)
.and_then(|resp| { .and_then(Self::api_response)
let status = resp.status();
resp
.into_body()
.concat2()
.map_err(Error::from)
.and_then(move |data| {
let text = String::from_utf8(data.to_vec()).unwrap();
if status.is_success() {
if text.len() > 0 {
let value: Value = serde_json::from_str(&text)?;
Ok(value)
} else {
Ok(Value::Null)
}
} else {
bail!("HTTP Error {}: {}", status, text);
}
})
})
} }
pub fn request_builder(server: &str, method: &str, path: &str, data: Option<Value>) -> Result<Request<Body>, Error> { pub fn request_builder(server: &str, method: &str, path: &str, data: Option<Value>) -> Result<Request<Body>, Error> {
@ -550,7 +552,7 @@ impl BackupClient {
//upload_pxar(h2, known_chunks, &dir_path, wid).unwrap() //upload_pxar(h2, known_chunks, &dir_path, wid).unwrap()
Self::upload_stream(h2_3, wid, stream, known_chunks.clone()) Self::upload_stream(h2_3, wid, stream, known_chunks.clone())
.and_then(move |size| { .and_then(move |_size| {
Self::h2post(h2_4, "dynamic_close", Some(json!({ "wid": wid }))) Self::h2post(h2_4, "dynamic_close", Some(json!({ "wid": wid })))
}) })
.map(|_| ()) .map(|_| ())