[pbs-devel] [PATCH proxmox-backup 1/5] api: admin: refactor generation of backup dir for snapshot listing
Christian Ebner
c.ebner at proxmox.com
Fri May 16 13:54:25 CEST 2025
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 <c.ebner at proxmox.com>
---
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 392494488..55cb3a0b3 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -62,8 +62,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, LocalChunkReader, StoreProgress,
+ check_backup_owner, ensure_datastore_is_mounted, task_tracking, BackupDir, DataStore,
+ LocalChunkReader, StoreProgress,
};
use pbs_tools::json::required_string_param;
use proxmox_rest_server::{formatter, WorkerTask};
@@ -529,11 +529,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) {
@@ -622,7 +619,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.39.5
More information about the pbs-devel
mailing list