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 833511FF13B for ; Wed, 22 Apr 2026 13:16:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CC6C517FB7; Wed, 22 Apr 2026 13:14:31 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v1 30/54] plugin: simplify recently refactored logic in get_subdir_files helper Date: Wed, 22 Apr 2026 13:12:56 +0200 Message-ID: <20260422111322.257380-31-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260422111322.257380-1-m.carrara@proxmox.com> References: <20260422111322.257380-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776856347630 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.084 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 Message-ID-Hash: JVWEDYTGHKNYK2XYJZ3DTVQMWPBIBP3A X-Message-ID-Hash: JVWEDYTGHKNYK2XYJZ3DTVQMWPBIBP3A X-MailFrom: m.carrara@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Pull out the common pieces of the if-clauses that handle individual volume types. Do not strip the volume type subdirectory from the beginning of the current path anymore, because that is handled by the `parse_path_as_volid_parts()` parsing function, which left `$filename` unused. Signed-off-by: Max R. Carrara --- src/PVE/Storage/Plugin.pm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 376e2515..65e0869b 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1677,17 +1677,10 @@ my sub get_subdir_files { my $get_subdir_file_info = sub { my ($path, $st) = @_; - # Strip the vtype subdir from beginning of the current path - # so that we don't have to take it into account when parsing the file name - my $filename = $path; - if ($filename !~ s!^\Q$vtype_subdir\E!!) { - return; - } + my $parts = parse_path_as_volid_parts($storeid, $scfg, $path, $vtype); + return if !defined($parts); if ($vtype eq 'iso') { - my $parts = parse_path_as_volid_parts($storeid, $scfg, $path, $vtype); - return if !defined($parts); - return { volid => $parts->{volid}, format => 'iso', # always 'iso' even if we have a file ending in .img @@ -1695,9 +1688,6 @@ my sub get_subdir_files { } if ($vtype eq 'vztmpl') { - my $parts = parse_path_as_volid_parts($storeid, $scfg, $path, $vtype); - return if !defined($parts); - my ($ext, $ext_compression) = $parts->@{qw(ext ext-compression)}; my $format = $ext eq 'tar' ? $ext : ('t' . $ext_compression); @@ -1708,9 +1698,6 @@ my sub get_subdir_files { } if ($vtype eq 'backup') { - my $parts = parse_path_as_volid_parts($storeid, $scfg, $path, $vtype); - return if !defined($parts); - my $format = $parts->{ext}; my $volume_path = $parts->{path}; @@ -1748,9 +1735,6 @@ my sub get_subdir_files { } if ($vtype eq 'snippets') { - my $parts = parse_path_as_volid_parts($storeid, $scfg, $path, $vtype); - return if !defined($parts); - return { volid => $parts->{volid}, format => 'snippet', @@ -1758,9 +1742,6 @@ my sub get_subdir_files { } if ($vtype eq 'import') { - my $parts = parse_path_as_volid_parts($storeid, $scfg, $path, $vtype); - return if !defined($parts); - return { volid => $parts->{volid}, format => $parts->{ext}, -- 2.47.3