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 EA3F6701CB for ; Thu, 1 Apr 2021 17:45:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E409387A5 for ; Thu, 1 Apr 2021 17:45:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 7845D8755 for ; Thu, 1 Apr 2021 17:45:13 +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 411E442F7C for ; Thu, 1 Apr 2021 17:45:13 +0200 (CEST) From: Stefan Reiter To: pbs-devel@lists.proxmox.com Date: Thu, 1 Apr 2021 17:45:05 +0200 Message-Id: <20210401154505.10358-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.012 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox-file-restore.rs] Subject: [pbs-devel] [PATCH proxmox-backup] file-restore: don't list non-pxar/-img *idx archives 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, 01 Apr 2021 15:45:44 -0000 These can't be entered or restored anyway, and cause issues with catalog files for example. Also a clippy fix. Signed-off-by: Stefan Reiter --- Applies on top of my single file restore series. Just some minor fixups, sent so I don't forget about them later ;) src/bin/proxmox-file-restore.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/bin/proxmox-file-restore.rs b/src/bin/proxmox-file-restore.rs index c9ef3912..36fdd391 100644 --- a/src/bin/proxmox-file-restore.rs +++ b/src/bin/proxmox-file-restore.rs @@ -56,7 +56,7 @@ fn parse_path(path: String, base64: bool) -> Result { return Ok(ExtractPath::ListArchives); } - while bytes.len() > 0 && bytes[0] == b'/' { + while !bytes.is_empty() && bytes[0] == b'/' { bytes.remove(0); } @@ -170,10 +170,8 @@ async fn list( ExtractPath::ListArchives => { let mut entries = vec![]; for file in manifest.files() { - match file.filename.rsplitn(2, '.').next().unwrap() { - "didx" => {} - "fidx" => {} - _ => continue, // ignore all non fidx/didx + if !file.filename.ends_with(".pxar.didx") && !file.filename.ends_with(".img.fidx") { + continue; } let path = format!("/{}", file.filename); let attr = DirEntryAttribute::Directory { start: 0 }; -- 2.20.1