From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 90F721FF0AB for ; Wed, 23 Sep 2026 17:07:44 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id D0FFD216DD; Wed, 23 Sep 2026 17:07:00 +0200 (CEST) From: "Max R. Carrara" To: pve-devel@lists.proxmox.com Subject: [PATCH pve-storage v2 11/50] plugin: use closure for obtaining raw volume data in list_volumes Date: Wed, 23 Sep 2026 17:05:25 +0200 Message-ID: <20260923150606.531239-12-m.carrara@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260923150606.531239-1-m.carrara@proxmox.com> References: <20260923150606.531239-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: 1790175989808 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.462 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: QLW2PTSKY4HOKTQYWMRPS4IKMCBHIHFP X-Message-ID-Hash: QLW2PTSKY4HOKTQYWMRPS4IKMCBHIHFP 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: To make the code in the `list_volumes()` API method a little more readable and maintainable, break up the if-elsif chain that obtains the raw volume data into a closure. The overall logic is kept the same. Also rename `$data` to `$raw_volumes` to make it a little clearer what is actually being iterated over, since "data" does not really say much. Be a little more specific and use an un-definedness check on `$raw_volumes` to continue with the iteration, instead of a plain negation. Signed-off-by: Max R. Carrara --- src/PVE/Storage/Plugin.pm | 51 ++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 5ed5a919..99bc573d 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1813,28 +1813,45 @@ sub list_volumes { my $res = []; my $vmlist = PVE::Cluster::get_vmlist(); - for my $type ($content_types->@*) { - my $data; + + my $get_raw_volumes_for_type = sub { + my ($type) = @_; if ($type eq 'images' || $type eq 'rootdir') { - $data = $class->list_images($storeid, $scfg, $vmid); - } elsif ($scfg->{path}) { - if ($type eq 'iso' && !defined($vmid)) { - $data = get_subdir_files($storeid, $scfg, 'iso', undef); - } elsif ($type eq 'vztmpl' && !defined($vmid)) { - $data = get_subdir_files($storeid, $scfg, 'vztmpl', undef); - } elsif ($type eq 'backup') { - $data = get_subdir_files($storeid, $scfg, 'backup', $vmid); - } elsif ($type eq 'snippets') { - $data = get_subdir_files($storeid, $scfg, 'snippets', undef); - } elsif ($type eq 'import') { - $data = get_subdir_files($storeid, $scfg, 'import', undef); - } + return $class->list_images($storeid, $scfg, $vmid); } - next if !$data; + return if !$scfg->{path}; - for my $item ($data->@*) { + if ($type eq 'iso' && !defined($vmid)) { + return get_subdir_files($storeid, $scfg, 'iso', undef); + } + + if ($type eq 'vztmpl' && !defined($vmid)) { + return get_subdir_files($storeid, $scfg, 'vztmpl', undef); + } + + if ($type eq 'backup') { + return get_subdir_files($storeid, $scfg, 'backup', $vmid); + } + + if ($type eq 'snippets') { + return get_subdir_files($storeid, $scfg, 'snippets', undef); + } + + if ($type eq 'import') { + return get_subdir_files($storeid, $scfg, 'import', undef); + } + + return; + }; + + for my $type ($content_types->@*) { + my $raw_volumes = $get_raw_volumes_for_type->($type); + + next if !defined($raw_volumes); + + for my $item ($raw_volumes->@*) { if ($type eq 'images' || $type eq 'rootdir') { my $vminfo = $vmlist->{ids}->{ $item->{vmid} }; my $vmtype; -- 2.47.3