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 12E25DA7C for ; Tue, 19 Apr 2022 12:29:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0277D26CE6 for ; Tue, 19 Apr 2022 12:28:30 +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 8624026CDD for ; Tue, 19 Apr 2022 12:28:29 +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 5A1B6421D6 for ; Tue, 19 Apr 2022 12:28:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 19 Apr 2022 12:28:28 +0200 Message-Id: <20220419102828.2847367-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220419102828.2847367-1-d.csapak@proxmox.com> References: <20220419102828.2847367-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.137 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup 2/2] pbs-client: extract: add top-level dir in tar.zst 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: Tue, 19 Apr 2022 10:29:00 -0000 when download a folder, include that folder as first entry (except '/') Signed-off-by: Dominik Csapak --- pbs-client/src/pxar/extract.rs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs index 90ce88bd..f18fc7d4 100644 --- a/pbs-client/src/pxar/extract.rs +++ b/pbs-client/src/pxar/extract.rs @@ -557,6 +557,22 @@ where let mut hardlinks: HashMap = HashMap::new(); if let Ok(dir) = file.enter_directory().await { + let entry = dir.lookup_self().await?; + let path = entry.path().strip_prefix(prefix)?; + + if path != Path::new("/") { + let metadata = entry.metadata(); + let mut header = tar::Header::new_gnu(); + header.set_entry_type(tar::EntryType::Directory); + add_metadata_to_header(&mut header, metadata); + header.set_size(0); + header.set_cksum(); + tarencoder + .add_entry(&mut header, path, tokio::io::empty()) + .await + .map_err(|err| format_err!("could not send dir entry: {}", err))?; + } + let mut decoder = dir.decode_full().await?; decoder.enable_goodbye_entries(false); while let Some(entry) = decoder.next().await { -- 2.30.2