From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.schauer@proxmox.com>
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 2D578BA7CC
for <pbs-devel@lists.proxmox.com>; Thu, 14 Dec 2023 15:49:03 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id CAD4A18A8C
for <pbs-devel@lists.proxmox.com>; Thu, 14 Dec 2023 15:49:02 +0100 (CET)
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
for <pbs-devel@lists.proxmox.com>; Thu, 14 Dec 2023 15:49:01 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A4F9E47637
for <pbs-devel@lists.proxmox.com>; Thu, 14 Dec 2023 15:49:01 +0100 (CET)
From: Filip Schauer <f.schauer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 14 Dec 2023 15:48:23 +0100
Message-Id: <20231214144824.100616-5-f.schauer@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231214144824.100616-1-f.schauer@proxmox.com>
References: <20231214144824.100616-1-f.schauer@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.155 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 v3 backup 1/2] pxar: Adopt FileType enum when
creating a ZipEntry
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>
X-List-Received-Date: Thu, 14 Dec 2023 14:49:03 -0000
Use a FileType enum instead of a boolean to specify whether a ZipEntry
refers to a directory or a regular file.
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
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 f78e06c2..d8bbd3e1 100644
--- a/pbs-client/src/pxar/extract.rs
+++ b/pbs-client/src/pxar/extract.rs
@@ -24,7 +24,7 @@ use proxmox_io::{sparse_copy, sparse_copy_async};
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;
@@ -997,7 +997,7 @@ where
path,
metadata.stat.mtime.secs,
metadata.stat.mode as u16,
- false,
+ FileType::Directory,
);
zip.add_entry::<FileContents<T>>(entry, None).await?;
}
@@ -1016,7 +1016,7 @@ where
path,
metadata.stat.mtime.secs,
metadata.stat.mode as u16,
- true,
+ FileType::Regular,
);
zip.add_entry(entry, decoder.contents())
.await
@@ -1034,7 +1034,7 @@ where
path,
metadata.stat.mtime.secs,
metadata.stat.mode as u16,
- true,
+ FileType::Regular,
);
zip.add_entry(entry, decoder.contents())
.await
@@ -1046,7 +1046,7 @@ where
path,
metadata.stat.mtime.secs,
metadata.stat.mode as u16,
- false,
+ FileType::Directory,
);
zip.add_entry::<FileContents<T>>(entry, None).await?;
}
--
2.39.2