proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-04-28 18:12:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pxar: bin: add optional payload input for archive restore

Browse Source 
Allows to pass the optional payload input to restore for cases where the
regular file payloads are stored in the split archive.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2024-03-25 11:59:46 +01:00 committed by Fabian Grünbichler
parent 082c801ebb
commit 0b789a96dd
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pxar-bin/src/main.rs
View File

@ -25,9 +25,15 @@ fn extract_archive_from_reader<R: std::io::Read>(
target: &str, target: &str,
feature_flags: Flags, feature_flags: Flags,
options: PxarExtractOptions, options: PxarExtractOptions,
payload_reader: Option<&mut R>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let reader = if let Some(payload_reader) = payload_reader {
pxar::PxarVariant::Split(reader, payload_reader)
} else {
pxar::PxarVariant::Unified(reader)
};
pbs_client::pxar::extract_archive( pbs_client::pxar::extract_archive(
pxar::decoder::Decoder::from_std(pxar::PxarVariant::Unified(reader))?, pxar::decoder::Decoder::from_std(reader)?,
Path::new(target), Path::new(target),
feature_flags, feature_flags,
|path| { |path| {
@ -120,6 +126,10 @@ fn extract_archive_from_reader<R: std::io::Read>(
optional: true, optional: true,
default: false, default: false,
}, },
"payload-input": {
description: "'ppxar' payload input data file to restore split archive.",
optional: true,
},
}, },
}, },
)] )]
@ -142,6 +152,7 @@ fn extract_archive(
no_fifos: bool, no_fifos: bool,
no_sockets: bool, no_sockets: bool,
strict: bool, strict: bool,
payload_input: Option<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let mut feature_flags = Flags::DEFAULT; let mut feature_flags = Flags::DEFAULT;
if no_xattrs { if no_xattrs {
@ -220,12 +231,24 @@ fn extract_archive(
if archive == "-" { if archive == "-" {
let stdin = std::io::stdin(); let stdin = std::io::stdin();
let mut reader = stdin.lock(); let mut reader = stdin.lock();
extract_archive_from_reader(&mut reader, target, feature_flags, options)?; extract_archive_from_reader(&mut reader, target, feature_flags, options, None)?;
} else { } else {
log::debug!("PXAR extract: {}", archive); log::debug!("PXAR extract: {}", archive);
let file = std::fs::File::open(archive)?; let file = std::fs::File::open(archive)?;
let mut reader = std::io::BufReader::new(file); let mut reader = std::io::BufReader::new(file);
extract_archive_from_reader(&mut reader, target, feature_flags, options)?; let mut payload_reader = if let Some(payload_input) = payload_input {
let file = std::fs::File::open(payload_input)?;
Some(std::io::BufReader::new(file))
} else {
None
};
extract_archive_from_reader(
&mut reader,
target,
feature_flags,
options,
payload_reader.as_mut(),
)?;
} }
if !was_ok.load(Ordering::Acquire) { if !was_ok.load(Ordering::Acquire) {
@ -465,7 +488,8 @@ fn main() {
.arg_param(&["archive", "target"]) .arg_param(&["archive", "target"])
.completion_cb("archive", complete_file_name) .completion_cb("archive", complete_file_name)
.completion_cb("target", complete_file_name) .completion_cb("target", complete_file_name)
.completion_cb("files-from", complete_file_name), .completion_cb("files-from", complete_file_name)
.completion_cb("payload-input", complete_file_name),
) )
.insert( .insert(
"mount", "mount",