From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 90E7F7189E for ; Thu, 12 May 2022 17:27:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8EE0A2988E for ; Thu, 12 May 2022 17:27:21 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id F179E29883 for ; Thu, 12 May 2022 17:27:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CFE3A434AC for ; Thu, 12 May 2022 17:27:20 +0200 (CEST) Message-ID: <59dbe363-e716-d241-1270-c7ecca384514@proxmox.com> Date: Thu, 12 May 2022 17:27:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:101.0) Gecko/20100101 Thunderbird/101.0 Content-Language: en-GB To: Proxmox Backup Server development discussion , Stefan Sterz References: <20220505135252.466838-1-s.sterz@proxmox.com> <20220505135252.466838-5-s.sterz@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220505135252.466838-5-s.sterz@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.384 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.727 Looks like a legit reply (A) 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [catalog.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v1 1/2] fix #4001: datastore/catalog: add number of files to directory 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: , X-List-Received-Date: Thu, 12 May 2022 15:27:21 -0000 Am 5/5/22 um 15:52 schrieb Stefan Sterz: > when listing the content of a catalog, add the number of files > contained in the directory as its size. also removes redundant code, > the size of a file is already set when creating the archive entry. > did you mean to write "the mtime of a file ..." as, we obviously need to set the size differently to get the number of children, but you dropped setting the mtime, which is OK as ArchiveEntry::new does that already, or did I overlooked something? > Signed-off-by: Stefan Sterz > --- > this requires patch two from the widget toolkit part of this patch to > be applied already. otherwise the formatting and sorting of the folder > "size" will be wrong. ok so no hard depends. > > pbs-datastore/src/catalog.rs | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/pbs-datastore/src/catalog.rs b/pbs-datastore/src/catalog.rs > index c07b71a6..6cb8aeb4 100644 > --- a/pbs-datastore/src/catalog.rs > +++ b/pbs-datastore/src/catalog.rs > @@ -706,10 +706,11 @@ impl CatalogReader { > components.push(b'/'); > components.extend(&direntry.name); > let mut entry = ArchiveEntry::new(&components, Some(&direntry.attr)); > - if let DirEntryAttribute::File { size, mtime } = direntry.attr { > - entry.size = size.into(); > - entry.mtime = mtime.into(); > + > + if let DirEntryAttribute::Directory { start: _ } = direntry.attr { > + entry.size = Some(u64::try_from(self.read_dir(&direntry)?.len())?); > } > + > res.push(entry); > } > > @@ -911,7 +912,8 @@ pub struct ArchiveEntry { > pub entry_type: String, > /// Is this entry a leaf node, or does it have children (i.e. a directory)? > pub leaf: bool, > - /// The file size, if entry_type is 'f' (file) > + /// The file size, if entry_type is 'f' (file) or the amount of files in a > + /// directory if entry_type is 'd' (directory) > #[serde(skip_serializing_if = "Option::is_none")] > pub size: Option, > /// The file "last modified" time stamp, if entry_type is 'f' (file)