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 BD7151FF15E for ; Mon, 27 Oct 2025 14:26:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 424E06025; Mon, 27 Oct 2025 14:26:55 +0100 (CET) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Mon, 27 Oct 2025 14:24:46 +0100 Message-ID: <20251027132450.101103-5-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251027132450.101103-1-f.schauer@proxmox.com> References: <20251027132450.101103-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1761571571285 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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: [pbs-devel] [PATCH proxmox-backup v5 4/5] pxar: Adopt FileType enum when adding a zip entry 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" Use a FileType enum instead of a boolean to specify whether a ZipEntry is a directory or a regular file. Signed-off-by: Filip Schauer --- pbs-client/src/pxar/extract.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs index c4d0085c..f8775aaf 100644 --- a/pbs-client/src/pxar/extract.rs +++ b/pbs-client/src/pxar/extract.rs @@ -26,7 +26,7 @@ use proxmox_log::{debug, error, info}; use proxmox_sys::c_result; use proxmox_sys::fs::{create_path, CreateOptions}; -use proxmox_compression::zip::{ZipEncoder, ZipEntry}; +use proxmox_compression::zip::{FileType, ZipEncoder, ZipEntry}; use crate::pxar::dir_stack::PxarDirStack; use crate::pxar::metadata; @@ -1034,7 +1034,7 @@ where path, metadata.stat.mtime.secs, metadata.stat.mode as u16, - false, + FileType::Directory, ); zip.add_entry::>(entry, None).await?; } @@ -1053,7 +1053,7 @@ where path, metadata.stat.mtime.secs, metadata.stat.mode as u16, - true, + FileType::Regular, ); let contents = decoder.contents().await?; zip.add_entry(entry, contents) @@ -1072,7 +1072,7 @@ where path, metadata.stat.mtime.secs, metadata.stat.mode as u16, - true, + FileType::Regular, ); let contents = decoder.contents().await?; zip.add_entry(entry, contents) @@ -1085,7 +1085,7 @@ where path, metadata.stat.mtime.secs, metadata.stat.mode as u16, - false, + FileType::Directory, ); zip.add_entry::>(entry, None).await?; } -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel