proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-08 03:06:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

client: allocate two fewer strings

Browse Source 
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2025-03-10 11:43:18 +01:00 committed by Fabian Grünbichler
parent bb408fd151
commit f74978572b
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
proxmox-backup-client/src/main.rs
View File

@ -827,40 +827,36 @@ async fn create_backup(
let mut target_set = HashSet::new(); let mut target_set = HashSet::new();
for backupspec in backupspec_list { for backupspec in backupspec_list {
let spec = parse_backup_specification(backupspec.as_str().unwrap())?; let pbs_client::BackupSpecification {
let filename = &spec.config_string; archive_name: target,
let target = &spec.archive_name; config_string: filename,
spec_type,
} = parse_backup_specification(backupspec.as_str().unwrap())?;
if target_set.contains(target) { if target_set.contains(&target) {
bail!("got target twice: '{}'", target); bail!("got target twice: '{}'", target);
} }
target_set.insert(target.to_string()); target_set.insert(target.clone());
use std::os::unix::fs::FileTypeExt; use std::os::unix::fs::FileTypeExt;
let metadata = std::fs::metadata(filename) let metadata = std::fs::metadata(&filename)
.map_err(|err| format_err!("unable to access '{}' - {}", filename, err))?; .map_err(|err| format_err!("unable to access '{}' - {}", filename, err))?;
let file_type = metadata.file_type(); let file_type = metadata.file_type();
match spec.spec_type { match spec_type {
BackupSpecificationType::PXAR => { BackupSpecificationType::PXAR => {
if !file_type.is_dir() { if !file_type.is_dir() {
bail!("got unexpected file type (expected directory)"); bail!("got unexpected file type (expected directory)");
} }
upload_list.push(( upload_list.push((BackupSpecificationType::PXAR, filename, target, "didx", 0));
BackupSpecificationType::PXAR,
filename.to_owned(),
target.to_owned(),
"didx",
0,
));
} }
BackupSpecificationType::IMAGE => { BackupSpecificationType::IMAGE => {
if !(file_type.is_file() || file_type.is_block_device()) { if !(file_type.is_file() || file_type.is_block_device()) {
bail!("got unexpected file type (expected file or block device)"); bail!("got unexpected file type (expected file or block device)");
} }
let size = image_size(&PathBuf::from(filename))?; let size = image_size(&PathBuf::from(&filename))?;
if size == 0 { if size == 0 {
bail!("got zero-sized file '{}'", filename); bail!("got zero-sized file '{}'", filename);
@ -868,8 +864,8 @@ async fn create_backup(
upload_list.push(( upload_list.push((
BackupSpecificationType::IMAGE, BackupSpecificationType::IMAGE,
filename.to_owned(), filename,
target.to_owned(), target,
"fidx", "fidx",
size, size,
)); ));
@ -880,8 +876,8 @@ async fn create_backup(
} }
upload_list.push(( upload_list.push((
BackupSpecificationType::CONFIG, BackupSpecificationType::CONFIG,
filename.to_owned(), filename,
target.to_owned(), target,
"blob", "blob",
metadata.len(), metadata.len(),
)); ));
@ -892,8 +888,8 @@ async fn create_backup(
} }
upload_list.push(( upload_list.push((
BackupSpecificationType::LOGFILE, BackupSpecificationType::LOGFILE,
filename.to_owned(), filename,
target.to_owned(), target,
"blob", "blob",
metadata.len(), metadata.len(),
)); ));