From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id AFA9B1FF389 for ; Wed, 5 Jun 2024 12:54:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E7AD31A71; Wed, 5 Jun 2024 12:55:01 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:54:12 +0200 Message-Id: <20240605105416.278748-55-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.027 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 54/58] www: content: lookup via metadata archive instead of catalog 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" In case of pxar archives with split metadata and payload data, the metadata archive has to be used to lookup entries for navigation before performing a single file restore. Decide based on the archive filename extension whether to use the `catalog` or the `pxar-lookup` api endpoint. Signed-off-by: Christian Ebner --- changes since version 8: - not present in previous version www/datastore/Content.js | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/www/datastore/Content.js b/www/datastore/Content.js index 6dd1ab319..f3ff3998c 100644 --- a/www/datastore/Content.js +++ b/www/datastore/Content.js @@ -789,15 +789,28 @@ Ext.define('PBS.DataStoreContent', { if (view.namespace && view.namespace !== '') { extraParams.ns = view.namespace; } - Ext.create('Proxmox.window.FileBrowser', { - title: `${type}/${id}/${timetext}`, - listURL: `/api2/json/admin/datastore/${view.datastore}/catalog`, - downloadURL: `/api2/json/admin/datastore/${view.datastore}/pxar-file-download`, - extraParams, - enableTar: true, - downloadPrefix: `${type}-${id}-`, - archive: rec.data.filename, - }).show(); + + if (rec.data.filename.endsWith(".mpxar.didx")) { + extraParams['archive-name'] = btoa(rec.data.filename); + Ext.create('Proxmox.window.FileBrowser', { + title: `${type}/${id}/${timetext}`, + listURL: `/api2/json/admin/datastore/${view.datastore}/pxar-lookup`, + downloadURL: `/api2/json/admin/datastore/${view.datastore}/pxar-file-download`, + extraParams, + enableTar: true, + downloadPrefix: `${type}-${id}-`, + archive: rec.data.filename, + }).show(); + } else { + Ext.create('Proxmox.window.FileBrowser', { + title: `${type}/${id}/${timetext}`, + listURL: `/api2/json/admin/datastore/${view.datastore}/catalog`, + downloadURL: `/api2/json/admin/datastore/${view.datastore}/pxar-file-download`, + extraParams, + enableTar: true, + downloadPrefix: `${type}-${id}-`, + }).show(); + } }, filter: function(item, value) { -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel