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 964EA1FF389
	for <inbox@lore.proxmox.com>; Wed,  5 Jun 2024 12:54:54 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id F33DE31DBE;
	Wed,  5 Jun 2024 12:55:07 +0200 (CEST)
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed,  5 Jun 2024 12:53:33 +0200
Message-Id: <20240605105416.278748-16-c.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240605105416.278748-1-c.ebner@proxmox.com>
References: <20240605105416.278748-1-c.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.028 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: [pbs-devel] [PATCH v9 proxmox-backup 15/58] file restore: cover
 split metadata and payload archives
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-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>

Attach the payload data archive as input stream to the decoder
and accessor instances for split archives.
Allows to restore contents from split archives via the
`proxmox-file-restore extract` command, by passing the metadata
archive name.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
changes since version 8:
- use get_pxar_archive_names helper function

 proxmox-file-restore/src/main.rs | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs
index c9a545677..e6a21afa2 100644
--- a/proxmox-file-restore/src/main.rs
+++ b/proxmox-file-restore/src/main.rs
@@ -470,9 +470,26 @@ async fn extract(
 
     match path {
         ExtractPath::Pxar(archive_name, path) => {
-            let (reader, archive_size) =
-                get_remote_pxar_reader(&archive_name, client, &manifest, crypt_config).await?;
-            let decoder = Accessor::new(pxar::PxarVariant::Unified(reader), archive_size).await?;
+            let (archive_name, payload_archive_name) =
+                pbs_client::tools::get_pxar_archive_names(&archive_name, &manifest)?;
+            let (reader, archive_size) = get_remote_pxar_reader(
+                &archive_name,
+                client.clone(),
+                &manifest,
+                crypt_config.clone(),
+            )
+            .await?;
+
+            let reader = if let Some(payload_archive_name) = payload_archive_name {
+                let (payload_reader, payload_size) =
+                    get_remote_pxar_reader(&payload_archive_name, client, &manifest, crypt_config)
+                        .await?;
+                pxar::PxarVariant::Split(reader, (payload_reader, payload_size))
+            } else {
+                pxar::PxarVariant::Unified(reader)
+            };
+            let decoder = Accessor::new(reader, archive_size).await?;
+
             extract_to_target(decoder, &path, target, format, zstd).await?;
         }
         ExtractPath::VM(file, path) => {
-- 
2.39.2



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