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

pbs-client: extract: add top-level dir in tar.zst 

when download a folder, include that folder as first entry (except '/')

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-04-19 12:28:28 +02:00 committed by Wolfgang Bumiller
parent 7098f5d885
commit 07a683d266
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pbs-client/src/pxar/extract.rs
View File

@ -557,6 +557,22 @@ where
let mut hardlinks: HashMap<PathBuf, PathBuf> = HashMap::new(); let mut hardlinks: HashMap<PathBuf, PathBuf> = HashMap::new();
if let Ok(dir) = file.enter_directory().await { if let Ok(dir) = file.enter_directory().await {
let entry = dir.lookup_self().await?;
let path = entry.path().strip_prefix(prefix)?;
if path != Path::new("/") {
let metadata = entry.metadata();
let mut header = tar::Header::new_gnu();
header.set_entry_type(tar::EntryType::Directory);
add_metadata_to_header(&mut header, metadata);
header.set_size(0);
header.set_cksum();
tarencoder
.add_entry(&mut header, path, tokio::io::empty())
.await
.map_err(|err| format_err!("could not send dir entry: {}", err))?;
}
let mut decoder = dir.decode_full().await?; let mut decoder = dir.decode_full().await?;
decoder.enable_goodbye_entries(false); decoder.enable_goodbye_entries(false);
while let Some(entry) = decoder.next().await { while let Some(entry) = decoder.next().await {