From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 6E6651FF16B for ; Tue, 29 Jul 2025 11:30:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 52520C4D2; Tue, 29 Jul 2025 11:32:01 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 11:31:35 +0200 Message-ID: <20250729093139.316600-2-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729093139.316600-1-c.ebner@proxmox.com> References: <20250729093139.316600-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753781508810 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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 proxmox-backup v2 1/5] api: admin: refactor generation of backup dir for snapshot listing 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 recreating the `pbs_api_types::BackupDir` from information via the backup group, use the `BackupDir` as stored in `BackupInfo`. As a side effect this allows to drop the backup group as parameter to the closure generating the snapshot list items from the backup info objects. No functional changes intended. Signed-off-by: Christian Ebner --- src/api2/admin/datastore.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 8f1d0e07b..d73e6d64f 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -64,8 +64,8 @@ use pbs_datastore::index::IndexFile; use pbs_datastore::manifest::BackupManifest; use pbs_datastore::prune::compute_prune_info; use pbs_datastore::{ - check_backup_owner, ensure_datastore_is_mounted, task_tracking, BackupDir, BackupGroup, - DataStore, DatastoreBackend, LocalChunkReader, StoreProgress, + check_backup_owner, ensure_datastore_is_mounted, task_tracking, BackupDir, DataStore, + DatastoreBackend, LocalChunkReader, StoreProgress, }; use pbs_tools::json::required_string_param; use proxmox_rest_server::{formatter, worker_is_active, WorkerTask}; @@ -516,11 +516,8 @@ unsafe fn list_snapshots_blocking( (None, None) => datastore.list_backup_groups(ns.clone())?, }; - let info_to_snapshot_list_item = |group: &BackupGroup, owner, info: BackupInfo| { - let backup = pbs_api_types::BackupDir { - group: group.into(), - time: info.backup_dir.backup_time(), - }; + let info_to_snapshot_list_item = |owner, info: BackupInfo| { + let backup = info.backup_dir.dir().to_owned(); let protected = info.protected; match get_all_snapshot_files(&info) { @@ -609,7 +606,7 @@ unsafe fn list_snapshots_blocking( snapshots.extend( group_backups .into_iter() - .map(|info| info_to_snapshot_list_item(group, Some(owner.clone()), info)), + .map(|info| info_to_snapshot_list_item(Some(owner.clone()), info)), ); Ok(snapshots) -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel