From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A2E8B1FF399 for ; Wed, 5 Jun 2024 12:55:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C2863203D; Wed, 5 Jun 2024 12:55:30 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:53:58 +0200 Message-Id: <20240605105416.278748-41-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 40/58] pxar: bin: ignore version and prelude entries in listing 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" Do not list the pxar format version and the prelude entries in the output of pxar list, these are not regular entries. Do include them however when dumping with the debug environmet variable set. Since the prelude is arbitrary in size, only show the content size. Signed-off-by: Christian Ebner --- changes since version 8: - prefix subject with `pxar: bin` instead of `pxar` only - do show enties when debug environment variable is set pxar-bin/Cargo.toml | 1 + pxar-bin/src/main.rs | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml index d91c03d3e..bb010ff78 100644 --- a/pxar-bin/Cargo.toml +++ b/pxar-bin/Cargo.toml @@ -20,6 +20,7 @@ pathpatterns.workspace = true pxar.workspace = true proxmox-async.workspace = true +proxmox-human-byte.workspace = true proxmox-router = { workspace = true, features = ["cli", "server"] } proxmox-schema = { workspace = true, features = [ "api-macro" ] } proxmox-sys.workspace = true diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 52bb1ca97..7ea5b114a 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -18,6 +18,7 @@ use pbs_client::pxar::{ }; use pxar::EntryKind; +use proxmox_human_byte::HumanByte; use proxmox_router::cli::*; use proxmox_schema::api; @@ -490,6 +491,14 @@ fn dump_archive(archive: String, payload_input: Option) -> Result<(), Er if log::log_enabled!(log::Level::Debug) { match entry.kind() { + EntryKind::Version(version) => { + log::debug!("pxar format version '{version:?}'"); + continue; + } + EntryKind::Prelude(prelude) => { + log::debug!("prelude of size {}", HumanByte::from(prelude.data.len())); + continue; + } EntryKind::File { payload_offset: Some(offset), size, @@ -508,7 +517,10 @@ fn dump_archive(archive: String, payload_input: Option) -> Result<(), Er log::debug!("{}", format_single_line_entry(&entry)); } else { - log::info!("{:?}", entry.path()); + match entry.kind() { + EntryKind::Version(_) | EntryKind::Prelude(_) => continue, + _ => log::info!("{:?}", entry.path()), + } } } Ok(()) -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel