]> git.proxmox.com Git - proxmox-backup.git/commitdiff
projects / proxmox-backup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c65bc99)
extract create_download_response API helper
authorStefan Reiter <s.reiter@proxmox.com>
Wed, 24 Jun 2020 13:27:40 +0000 (15:27 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 25 Jun 2020 09:57:37 +0000 (11:57 +0200)
and put it into a new "api2::helpers" module.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
src/api2.rs patch | blob | blame | history
src/api2/helpers.rs [new file with mode: 0644] patch | blob
src/api2/reader.rs patch | blob | blame | history

diff --git a/src/api2.rs b/src/api2.rs
index 1e5bc4a9a37fa55bcc13d4c43b899a9338ceed03..178f3f4570f1c6b33e3aa14c6fb4dc05ab6068e4 100644 (file)
--- a/src/api2.rs
+++ b/src/api2.rs
@@ -9,6 +9,7 @@ pub mod status;
 pub mod types;
 pub mod version;
 pub mod pull;
+mod helpers;
 
 use proxmox::api::router::SubdirMap;
 use proxmox::api::Router;
diff --git a/src/api2/helpers.rs b/src/api2/helpers.rs
new file mode 100644 (file)
index 0000000..9dd4ecb
--- /dev/null
+++ b/src/api2/helpers.rs
@@ -0,0 +1,23 @@
+use std::path::PathBuf;
+use anyhow::Error;
+use futures::*;
+use hyper::{Body, Response, StatusCode, header};
+use proxmox::http_err;
+
+pub async fn create_download_response(path: PathBuf) -> Result<Response<Body>, Error> {
+    let file = tokio::fs::File::open(path.clone())
+        .map_err(move |err| http_err!(BAD_REQUEST, format!("open file {:?} failed: {}", path.clone(), err)))
+        .await?;
+
+    let payload = tokio_util::codec::FramedRead::new(file, tokio_util::codec::BytesCodec::new())
+        .map_ok(|bytes| hyper::body::Bytes::from(bytes.freeze()));
+
+    let body = Body::wrap_stream(payload);
+
+    // fixme: set other headers ?
+    Ok(Response::builder()
+        .status(StatusCode::OK)
+        .header(header::CONTENT_TYPE, "application/octet-stream")
+        .body(body)
+        .unwrap())
+}
diff --git a/src/api2/reader.rs b/src/api2/reader.rs
index a6aed505bba3ceb1f92545e97c3e3b87ed724ab6..4c14c97ca56de3bf56927305f56113a84f028a0d 100644 (file)
--- a/src/api2/reader.rs
+++ b/src/api2/reader.rs
@@ -17,6 +17,7 @@ use crate::server::{WorkerTask, H2Service};
 use crate::tools;
 use crate::config::acl::PRIV_DATASTORE_READ;
 use crate::config::cached_user_info::CachedUserInfo;
+use crate::api2::helpers;
 
 mod environment;
 use environment::*;
@@ -187,26 +188,9 @@ fn download_file(
         path.push(env.backup_dir.relative_path());
         path.push(&file_name);
 
-        let path2 = path.clone();
-        let path3 = path.clone();
-
-        let file = tokio::fs::File::open(path)
-            .map_err(move |err| http_err!(BAD_REQUEST, format!("open file {:?} failed: {}", path2, err)))
-            .await?;
-
-        env.log(format!("download {:?}", path3));
-
-        let payload = tokio_util::codec::FramedRead::new(file, tokio_util::codec::BytesCodec::new())
-            .map_ok(|bytes| hyper::body::Bytes::from(bytes.freeze()));
-
-        let body = Body::wrap_stream(payload);
+        env.log(format!("download {:?}", path.clone()));
 
-        // fixme: set other headers ?
-        Ok(Response::builder()
-           .status(StatusCode::OK)
-           .header(header::CONTENT_TYPE, "application/octet-stream")
-           .body(body)
-           .unwrap())
+        helpers::create_download_response(path).await
     }.boxed()
 }
 
Proxmox Backup Server and Client