* [pbs-devel] [PATCH backup] client: allocate two fewer strings
@ 2025-03-10 10:43 Maximiliano Sandoval
2025-03-17 15:10 ` [pbs-devel] applied: " Fabian Grünbichler
0 siblings, 1 reply; 2+ messages in thread
From: Maximiliano Sandoval @ 2025-03-10 10:43 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
A small improvement I noticed while browsing the project.
proxmox-backup-client/src/main.rs | 38 ++++++++++++++-----------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
index 7fa57b2f..5a4dc76f 100644
--- a/proxmox-backup-client/src/main.rs
+++ b/proxmox-backup-client/src/main.rs
@@ -827,40 +827,36 @@ async fn create_backup(
let mut target_set = HashSet::new();
for backupspec in backupspec_list {
- let spec = parse_backup_specification(backupspec.as_str().unwrap())?;
- let filename = &spec.config_string;
- let target = &spec.archive_name;
+ let pbs_client::BackupSpecification {
+ archive_name: target,
+ 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);
}
- target_set.insert(target.to_string());
+ target_set.insert(target.clone());
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))?;
let file_type = metadata.file_type();
- match spec.spec_type {
+ match spec_type {
BackupSpecificationType::PXAR => {
if !file_type.is_dir() {
bail!("got unexpected file type (expected directory)");
}
- upload_list.push((
- BackupSpecificationType::PXAR,
- filename.to_owned(),
- target.to_owned(),
- "didx",
- 0,
- ));
+ upload_list.push((BackupSpecificationType::PXAR, filename, target, "didx", 0));
}
BackupSpecificationType::IMAGE => {
if !(file_type.is_file() || file_type.is_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 {
bail!("got zero-sized file '{}'", filename);
@@ -868,8 +864,8 @@ async fn create_backup(
upload_list.push((
BackupSpecificationType::IMAGE,
- filename.to_owned(),
- target.to_owned(),
+ filename,
+ target,
"fidx",
size,
));
@@ -880,8 +876,8 @@ async fn create_backup(
}
upload_list.push((
BackupSpecificationType::CONFIG,
- filename.to_owned(),
- target.to_owned(),
+ filename,
+ target,
"blob",
metadata.len(),
));
@@ -892,8 +888,8 @@ async fn create_backup(
}
upload_list.push((
BackupSpecificationType::LOGFILE,
- filename.to_owned(),
- target.to_owned(),
+ filename,
+ target,
"blob",
metadata.len(),
));
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] applied: [PATCH backup] client: allocate two fewer strings
2025-03-10 10:43 [pbs-devel] [PATCH backup] client: allocate two fewer strings Maximiliano Sandoval
@ 2025-03-17 15:10 ` Fabian Grünbichler
0 siblings, 0 replies; 2+ messages in thread
From: Fabian Grünbichler @ 2025-03-17 15:10 UTC (permalink / raw)
To: Proxmox Backup Server development discussion
thanks!
On March 10, 2025 11:43 am, Maximiliano Sandoval wrote:
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
>
> A small improvement I noticed while browsing the project.
>
> proxmox-backup-client/src/main.rs | 38 ++++++++++++++-----------------
> 1 file changed, 17 insertions(+), 21 deletions(-)
>
> diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
> index 7fa57b2f..5a4dc76f 100644
> --- a/proxmox-backup-client/src/main.rs
> +++ b/proxmox-backup-client/src/main.rs
> @@ -827,40 +827,36 @@ async fn create_backup(
> let mut target_set = HashSet::new();
>
> for backupspec in backupspec_list {
> - let spec = parse_backup_specification(backupspec.as_str().unwrap())?;
> - let filename = &spec.config_string;
> - let target = &spec.archive_name;
> + let pbs_client::BackupSpecification {
> + archive_name: target,
> + 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);
> }
> - target_set.insert(target.to_string());
> + target_set.insert(target.clone());
>
> 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))?;
> let file_type = metadata.file_type();
>
> - match spec.spec_type {
> + match spec_type {
> BackupSpecificationType::PXAR => {
> if !file_type.is_dir() {
> bail!("got unexpected file type (expected directory)");
> }
> - upload_list.push((
> - BackupSpecificationType::PXAR,
> - filename.to_owned(),
> - target.to_owned(),
> - "didx",
> - 0,
> - ));
> + upload_list.push((BackupSpecificationType::PXAR, filename, target, "didx", 0));
> }
> BackupSpecificationType::IMAGE => {
> if !(file_type.is_file() || file_type.is_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 {
> bail!("got zero-sized file '{}'", filename);
> @@ -868,8 +864,8 @@ async fn create_backup(
>
> upload_list.push((
> BackupSpecificationType::IMAGE,
> - filename.to_owned(),
> - target.to_owned(),
> + filename,
> + target,
> "fidx",
> size,
> ));
> @@ -880,8 +876,8 @@ async fn create_backup(
> }
> upload_list.push((
> BackupSpecificationType::CONFIG,
> - filename.to_owned(),
> - target.to_owned(),
> + filename,
> + target,
> "blob",
> metadata.len(),
> ));
> @@ -892,8 +888,8 @@ async fn create_backup(
> }
> upload_list.push((
> BackupSpecificationType::LOGFILE,
> - filename.to_owned(),
> - target.to_owned(),
> + filename,
> + target,
> "blob",
> metadata.len(),
> ));
> --
> 2.39.5
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-17 15:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-10 10:43 [pbs-devel] [PATCH backup] client: allocate two fewer strings Maximiliano Sandoval
2025-03-17 15:10 ` [pbs-devel] applied: " Fabian Grünbichler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal