From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 14E201FF164
for <inbox@lore.proxmox.com>; Fri, 9 May 2025 14:27:05 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 541063CEB3;
Fri, 9 May 2025 14:27:23 +0200 (CEST)
Date: Fri, 09 May 2025 14:27:17 +0200
From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
References: <20250508130555.494782-1-c.ebner@proxmox.com>
<20250508130555.494782-17-c.ebner@proxmox.com>
In-Reply-To: <20250508130555.494782-17-c.ebner@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid)
Message-Id: <1746792915.yfm4snbghn.astroid@yuna.none>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.046 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: Re: [pbs-devel] [RFC v2 proxmox-backup 16/21] api: datastore: add
flag to list trashed snapshots only
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
On May 8, 2025 3:05 pm, Christian Ebner wrote:
> Allows to conditionally show either active or trashed backup
> snapshots, the latter being used when displaying the contents of the
> trash for given datastore.
and what if I want to list both/all?
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> src/api2/admin/datastore.rs | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
> index 84c0bf5b4..cbd24c729 100644
> --- a/src/api2/admin/datastore.rs
> +++ b/src/api2/admin/datastore.rs
> @@ -473,6 +473,12 @@ pub async fn delete_snapshot(
> optional: true,
> schema: BACKUP_ID_SCHEMA,
> },
> + "trashed": {
> + type: bool,
> + optional: true,
> + default: false,
> + description: "List trashed snapshots only."
> + },
> },
> },
> returns: pbs_api_types::ADMIN_DATASTORE_LIST_SNAPSHOTS_RETURN_TYPE,
> @@ -488,6 +494,7 @@ pub async fn list_snapshots(
> ns: Option<BackupNamespace>,
> backup_type: Option<BackupType>,
> backup_id: Option<String>,
> + trashed: bool,
> _param: Value,
> _info: &ApiMethod,
> rpcenv: &mut dyn RpcEnvironment,
> @@ -495,7 +502,7 @@ pub async fn list_snapshots(
> let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
>
> tokio::task::spawn_blocking(move || unsafe {
> - list_snapshots_blocking(store, ns, backup_type, backup_id, auth_id)
> + list_snapshots_blocking(store, ns, backup_type, backup_id, auth_id, trashed)
> })
> .await
> .map_err(|err| format_err!("failed to await blocking task: {err}"))?
> @@ -508,6 +515,7 @@ unsafe fn list_snapshots_blocking(
> backup_type: Option<BackupType>,
> backup_id: Option<String>,
> auth_id: Authid,
> + trashed: bool,
> ) -> Result<Vec<SnapshotListItem>, Error> {
> let ns = ns.unwrap_or_default();
>
> @@ -631,7 +639,12 @@ unsafe fn list_snapshots_blocking(
> return Ok(snapshots);
> }
>
> - let group_backups = group.list_backups(ListBackupFilter::Active)?;
> + let filter = if trashed {
> + ListBackupFilter::Trashed
> + } else {
> + ListBackupFilter::Active
> + };
> + let group_backups = group.list_backups(filter)?;
>
> snapshots.extend(
> group_backups
> --
> 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