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

proxmox-backup-debug api: fewer cloning

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2022-03-09 09:55:37 +01:00
parent c6140c62ab
commit 787c6550d4
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/proxmox_backup_debug/api.rs
View File

@ -149,19 +149,23 @@ fn merge_parameters(
param: Option<Value>,
schema: ParameterSchema,
) -> Result<Value, Error> {
let mut param_list: Vec<(String, String)> = vec![];
let mut param_list: Vec<(String, String)> = uri_param
.iter()
.map(|(k, v)| (k.clone(), v.clone()))
.collect();
for (k, v) in uri_param {
param_list.push((k.clone(), v.clone()));
if let Some(Value::Object(map)) = param {
param_list.extend(map.into_iter().map(|(k, v)| {
(
k,
match v {
Value::String(s) => s,
_ => unreachable!(), // we're in the CLI
},
)
}));
}
let param = param.unwrap_or(json!({}));
if let Some(map) = param.as_object() {
for (k, v) in map {
param_list.push((k.clone(), v.as_str().unwrap().to_string()));
}
}
let params = schema.parse_parameter_strings(&param_list, true)?;