From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 93D811FF38E for ; Tue, 14 May 2024 12:34:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 16BB33AEF; Tue, 14 May 2024 12:34:50 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 14 May 2024 12:33:32 +0200 Message-Id: <20240514103421.289431-17-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240514103421.289431-1-c.ebner@proxmox.com> References: <20240514103421.289431-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v6 proxmox-backup 16/65] client: backup: factor out extension from backup target X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Instead of composing the backup target name and pushing it to the backup list, push the archive name and extension separately, only constructing it while iterating the list later. By this it remains possible to additionally prefix the extension, as required with the separate pxar metadata and payload indexes. Signed-off-by: Christian Ebner --- proxmox-backup-client/src/main.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 287005024..d8da36de4 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -785,7 +785,8 @@ async fn create_backup( upload_list.push(( BackupSpecificationType::PXAR, filename.to_owned(), - format!("{}.didx", target), + target.to_owned(), + "didx", 0, )); } @@ -803,7 +804,8 @@ async fn create_backup( upload_list.push(( BackupSpecificationType::IMAGE, filename.to_owned(), - format!("{}.fidx", target), + target.to_owned(), + "fidx", size, )); } @@ -814,7 +816,8 @@ async fn create_backup( upload_list.push(( BackupSpecificationType::CONFIG, filename.to_owned(), - format!("{}.blob", target), + target.to_owned(), + "blob", metadata.len(), )); } @@ -825,7 +828,8 @@ async fn create_backup( upload_list.push(( BackupSpecificationType::LOGFILE, filename.to_owned(), - format!("{}.blob", target), + target.to_owned(), + "blob", metadata.len(), )); } @@ -944,7 +948,8 @@ async fn create_backup( log::info!("{} {} '{}' to '{}' as {}", what, desc, file, repo, target); }; - for (backup_type, filename, target, size) in upload_list { + for (backup_type, filename, target_base, extension, size) in upload_list { + let target = format!("{target_base}.{extension}"); match (backup_type, dry_run) { // dry-run (BackupSpecificationType::CONFIG, true) => log_file("config file", &filename, &target), -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel