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

src/bin/pxar.rs: Make pxar extract target optional 

In order to improve usablity, the target on archive extraction will be the
current working directory by default.
A different target can be provided via the optional --target <PATH> parameter.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-07-16 15:45:17 +02:00 committed by Dietmar Maurer
parent 34a816cc7b
commit bdf0d82ced
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/pxar.rs
View File

@ -77,7 +77,7 @@ fn extract_archive(
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let archive = tools::required_string_param(&param, "archive")?; let archive = tools::required_string_param(&param, "archive")?;
let target = tools::required_string_param(&param, "target")?; let target = param["target"].as_str().unwrap_or(".");
let verbose = param["verbose"].as_bool().unwrap_or(false); let verbose = param["verbose"].as_bool().unwrap_or(false);
let no_xattrs = param["no-xattrs"].as_bool().unwrap_or(false); let no_xattrs = param["no-xattrs"].as_bool().unwrap_or(false);
let no_fcaps = param["no-fcaps"].as_bool().unwrap_or(false); let no_fcaps = param["no-fcaps"].as_bool().unwrap_or(false);
@ -177,13 +177,13 @@ fn main() {
extract_archive, extract_archive,
ObjectSchema::new("Extract an archive.") ObjectSchema::new("Extract an archive.")
.required("archive", StringSchema::new("Archive name.")) .required("archive", StringSchema::new("Archive name."))
.required("target", StringSchema::new("Target directory.")) .optional("target", StringSchema::new("Target directory."))
.optional("verbose", BooleanSchema::new("Verbose output.").default(false)) .optional("verbose", BooleanSchema::new("Verbose output.").default(false))
.optional("no-xattrs", BooleanSchema::new("Ignore extended file attributes.").default(false)) .optional("no-xattrs", BooleanSchema::new("Ignore extended file attributes.").default(false))
.optional("no-fcaps", BooleanSchema::new("Ignore file capabilities.").default(false)) .optional("no-fcaps", BooleanSchema::new("Ignore file capabilities.").default(false))
.optional("no-acls", BooleanSchema::new("Ignore access control list entries.").default(false)) .optional("no-acls", BooleanSchema::new("Ignore access control list entries.").default(false))
)) ))
.arg_param(vec!["archive", "target"]) .arg_param(vec!["archive"])
.completion_cb("archive", tools::complete_file_name) .completion_cb("archive", tools::complete_file_name)
.completion_cb("target", tools::complete_file_name) .completion_cb("target", tools::complete_file_name)
.into() .into()

1
tests/pxar.rs
View File

@ -27,6 +27,7 @@ fn pxar_create_and_extract() {
Command::new(exec_path) Command::new(exec_path)
.arg("extract") .arg("extract")
.arg("./tests/archive.pxar") .arg("./tests/archive.pxar")
.arg("--target")
.arg(dest_dir) .arg(dest_dir)
.status() .status()
.unwrap_or_else(|err| { .unwrap_or_else(|err| {