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 [IPv6:2a01:7e0:0:424::9])
	by lore.proxmox.com (Postfix) with ESMTPS id DF9071FF3A0
	for <inbox@lore.proxmox.com>; Thu, 13 Jun 2024 14:28:01 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 669E530887;
	Thu, 13 Jun 2024 14:28:39 +0200 (CEST)
Date: Thu, 13 Jun 2024 14:28:34 +0200
From: Gabriel Goller <g.goller@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
Message-ID: <20240613122834.a6fyqwzryjg72fkl@luna.proxmox.com>
References: <20240613105605.283550-1-c.ebner@proxmox.com>
 <20240613105605.283550-5-c.ebner@proxmox.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20240613105605.283550-5-c.ebner@proxmox.com>
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.059 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
 T_SCC_BODY_TEXT_LINE    -0.01 -
Subject: Re: [pbs-devel] [PATCH v3 proxmox-backup 4/4] fix #2996: client:
 allow optional match patterns for restore
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-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>

On 13.06.2024 12:56, Christian Ebner wrote:
>diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
>index f1c7fbf93..9cc6f889a 100644
>--- a/proxmox-backup-client/src/main.rs
>+++ b/proxmox-backup-client/src/main.rs
>@@ -1389,6 +1389,10 @@ We do not extract '.pxar' archives when writing to standard output.
>
> "###
>             },
>+            pattern: {
>+                type: PathPatterns,
>+                optional: true,
>+            },
>             rate: {
>                 schema: TRAFFIC_CONTROL_RATE_SCHEMA,
>                 optional: true,
>@@ -1514,6 +1518,21 @@ async fn restore(
>     let target = json::required_string_param(&param, "target")?;
>     let target = if target == "-" { None } else { Some(target) };
>
>+    let mut match_list = Vec::new();
>+    if let Some(pattern) = param["pattern"].as_array() {
>+        if target.is_none() {
>+            bail!("matches not allowed when restoring to stdout");

s/matches/patterns

>+        }
>+
>+        for p in pattern {
>+            if let Some(pattern) = p.as_str() {
>+                let match_entry =
>+                    MatchEntry::parse_pattern(pattern, PatternFlag::PATH_NAME, MatchType::Include)?;
>+                match_list.push(match_entry);
>+            }
>+        }
>+    };
>+
>     let crypto = crypto_parameters(&param)?;
>
>     let crypt_config = match crypto.enc_key {

Otherwise the pattern-restore part seems to work nicely! Consider:

Tested-by: Gabriel Goller <g.goller@proxmox.com>



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel