From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 185747A09C for ; Thu, 28 Oct 2021 15:02:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0F17420D6C for ; Thu, 28 Oct 2021 15:01:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B0AD020D5F for ; Thu, 28 Oct 2021 15:01:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 88C3145FDD for ; Thu, 28 Oct 2021 15:01:35 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 28 Oct 2021 15:00:50 +0200 Message-Id: <20211028130058.1308810-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211028130058.1308810-1-f.gruenbichler@proxmox.com> References: <20211028130058.1308810-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.336 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 v3 proxmox-backup 03/11] BackupGroup: add filter helper 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: , X-List-Received-Date: Thu, 28 Oct 2021 13:02:07 -0000 to have a single implementation of "group is matched by group filter". Signed-off-by: Fabian Grünbichler --- Notes: v2->v3: rename `filter` fn to `matches` there might be a better place for this if we want to support more complex filters in the future (like, exists in local datastore, or has > X snapshots, ..) pbs-datastore/src/backup_info.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index b94b9779..9f56e924 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -1,5 +1,6 @@ use std::os::unix::io::RawFd; use std::path::{Path, PathBuf}; +use std::str::FromStr; use anyhow::{bail, format_err, Error}; @@ -10,6 +11,7 @@ use pbs_api_types::{ GROUP_PATH_REGEX, SNAPSHOT_PATH_REGEX, BACKUP_FILE_REGEX, + GroupFilter, }; use super::manifest::MANIFEST_BLOB_NAME; @@ -155,6 +157,17 @@ impl BackupGroup { Ok(last) } + + pub fn matches(&self, filter: &GroupFilter) -> bool { + match filter { + GroupFilter::Group(backup_group) => match BackupGroup::from_str(&backup_group) { + Ok(group) => &group == self, + Err(_) => false, // shouldn't happen if value is schema-checked + }, + GroupFilter::BackupType(backup_type) => self.backup_type() == backup_type, + GroupFilter::Regex(regex) => regex.is_match(&self.to_string()), + } + } } impl std::fmt::Display for BackupGroup { -- 2.30.2