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 8D263915BD for ; Thu, 4 Apr 2024 11:02:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 751A234C92 for ; Thu, 4 Apr 2024 11:02:43 +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 for ; Thu, 4 Apr 2024 11:02:42 +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 993CB424F8 for ; Thu, 4 Apr 2024 11:02:42 +0200 (CEST) Date: Thu, 04 Apr 2024 11:02:36 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240328123707.336951-1-c.ebner@proxmox.com> <20240328123707.336951-26-c.ebner@proxmox.com> In-Reply-To: <20240328123707.336951-26-c.ebner@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1712221319.umn8fwdu5i.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Subject: Re: [pbs-devel] [PATCH v3 proxmox-backup 25/58] restore: cover meta extension for pxar 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, 04 Apr 2024 09:02:43 -0000 On March 28, 2024 1:36 pm, Christian Ebner wrote: > Signed-off-by: Christian Ebner > --- > changes since version 2: > - use mpxar and ppxar file extensions > - merged with file restore patch into one >=20 > pbs-client/src/tools/mod.rs | 5 ++++- > proxmox-file-restore/src/main.rs | 16 +++++++++++++--- > 2 files changed, 17 insertions(+), 4 deletions(-) >=20 > diff --git a/pbs-client/src/tools/mod.rs b/pbs-client/src/tools/mod.rs > index 08986fc5e..f8d3102d1 100644 > --- a/pbs-client/src/tools/mod.rs > +++ b/pbs-client/src/tools/mod.rs > @@ -337,7 +337,10 @@ pub fn complete_pxar_archive_name(arg: &str, param: = &HashMap) -> > complete_server_file_name(arg, param) > .iter() > .filter_map(|name| { > - if name.ends_with(".pxar.didx") || name.ends_with(".pxar.met= a.didx") { > + if name.ends_with(".pxar.didx") > + || name.ends_with(".mpxar.didx") > + || name.ends_with(".ppxar.didx") > + { hit reply to soon on the previous patch - this hunk here should be folded into that one ;) > Some(pbs_tools::format::strip_server_file_extension(name= ).to_owned()) > } else { > None > diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/= main.rs > index dbab69942..685ce34d9 100644 > --- a/proxmox-file-restore/src/main.rs > +++ b/proxmox-file-restore/src/main.rs > @@ -75,7 +75,10 @@ fn parse_path(path: String, base64: bool) -> Result { > (file, path) > }; > =20 > - if file.ends_with(".pxar.didx") { > + if file.ends_with(".pxar.didx") > + || file.ends_with(".mpxar.didx") > + || file.ends_with(".ppxar.didx") > + { > Ok(ExtractPath::Pxar(file, path)) > } else if file.ends_with(".img.fidx") { > Ok(ExtractPath::VM(file, path)) > @@ -123,11 +126,18 @@ async fn list_files( > ExtractPath::ListArchives =3D> { > let mut entries =3D vec![]; > for file in manifest.files() { > - if !file.filename.ends_with(".pxar.didx") && !file.filen= ame.ends_with(".img.fidx") { > + if !file.filename.ends_with(".pxar.didx") > + && !file.filename.ends_with(".img.fidx") > + && !file.filename.ends_with(".mpxar.didx") > + && !file.filename.ends_with(".ppxar.didx") > + { > continue; > } > let path =3D format!("/{}", file.filename); > - let attr =3D if file.filename.ends_with(".pxar.didx") { > + let attr =3D if file.filename.ends_with(".pxar.didx") > + || file.filename.ends_with(".mpxar.didx") > + || file.filename.ends_with(".ppxar.didx") > + { > // a pxar file is a file archive, so it's root is al= so a directory root > Some(&DirEntryAttribute::Directory { start: 0 }) > } else { > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20