api: admin/datastore: add tar support for pxar_file_download
by using the newly added 'create_tar' and the 'ZstdEncoder' Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
parent
23af572d3f
commit
984ddb2ff2
@ -105,6 +105,7 @@ proxmox-uuid = "1"
|
||||
proxmox-serde = "0.1"
|
||||
proxmox-shared-memory = "0.2"
|
||||
proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
|
||||
proxmox-compression = "0.1"
|
||||
|
||||
|
||||
proxmox-acme-rs = "0.4"
|
||||
|
@ -12,6 +12,7 @@ use hyper::{header, Body, Response, StatusCode};
|
||||
use serde_json::{json, Value};
|
||||
use tokio_stream::wrappers::ReceiverStream;
|
||||
|
||||
use proxmox_compression::zstd::ZstdEncoder;
|
||||
use proxmox_sys::sortable;
|
||||
use proxmox_sys::fs::{
|
||||
file_read_firstline, file_read_optional_string, replace_file, CreateOptions,
|
||||
@ -40,7 +41,7 @@ use pbs_api_types::{ Authid, BackupContent, Counts, CryptMode,
|
||||
PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_VERIFY,
|
||||
|
||||
};
|
||||
use pbs_client::pxar::create_zip;
|
||||
use pbs_client::pxar::{create_tar, create_zip};
|
||||
use pbs_datastore::{
|
||||
check_backup_owner, DataStore, BackupDir, BackupGroup, StoreProgress, LocalChunkReader,
|
||||
CATALOG_NAME, task_tracking
|
||||
@ -1433,6 +1434,7 @@ pub const API_METHOD_PXAR_FILE_DOWNLOAD: ApiMethod = ApiMethod::new(
|
||||
("backup-id", false, &BACKUP_ID_SCHEMA),
|
||||
("backup-time", false, &BACKUP_TIME_SCHEMA),
|
||||
("filepath", false, &StringSchema::new("Base64 encoded path").schema()),
|
||||
("tar", true, &BooleanSchema::new("Download as .tar.zst").schema()),
|
||||
]),
|
||||
)
|
||||
).access(None, &Permission::Privilege(
|
||||
@ -1461,6 +1463,8 @@ pub fn pxar_file_download(
|
||||
let backup_id = required_string_param(¶m, "backup-id")?;
|
||||
let backup_time = required_integer_param(¶m, "backup-time")?;
|
||||
|
||||
let tar = param["tar"].as_bool().unwrap_or(false);
|
||||
|
||||
let backup_dir = BackupDir::new(backup_type, backup_id, backup_time)?;
|
||||
|
||||
check_priv_or_backup_owner(&datastore, backup_dir.group(), &auth_id, PRIV_DATASTORE_READ)?;
|
||||
@ -1520,8 +1524,18 @@ pub fn pxar_file_download(
|
||||
}),
|
||||
),
|
||||
EntryKind::Directory => {
|
||||
let (sender, receiver) = tokio::sync::mpsc::channel(100);
|
||||
let (sender, receiver) = tokio::sync::mpsc::channel::<Result<_, Error>>(100);
|
||||
let channelwriter = AsyncChannelWriter::new(sender, 1024 * 1024);
|
||||
if tar {
|
||||
proxmox_rest_server::spawn_internal_task(
|
||||
create_tar(channelwriter, decoder, path.clone(), false)
|
||||
);
|
||||
let zstdstream = ZstdEncoder::new(ReceiverStream::new(receiver))?;
|
||||
Body::wrap_stream(zstdstream.map_err(move |err| {
|
||||
eprintln!("error during streaming of tar.zst '{:?}' - {}", path, err);
|
||||
err
|
||||
}))
|
||||
} else {
|
||||
proxmox_rest_server::spawn_internal_task(
|
||||
create_zip(channelwriter, decoder, path.clone(), false)
|
||||
);
|
||||
@ -1530,6 +1544,7 @@ pub fn pxar_file_download(
|
||||
err
|
||||
}))
|
||||
}
|
||||
}
|
||||
other => bail!("cannot download file of type {:?}", other),
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user