public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Max R. Carrara" <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Wolfgang Bumiller <w.bumiller@proxmox.com>
Subject: [PATCH pve-storage v3 17/51] api: status: use get_subdir helper method to get content directory
Date: Tue, 17 Nov 2026 21:38:49 +0100	[thread overview]
Message-ID: <20261117203953.913035-18-m.carrara@proxmox.com> (raw)
In-Reply-To: <20261117203953.913035-1-m.carrara@proxmox.com>

Instead of calling the dedicated `get_$VTYPE_dir()` functions from
PVE::Storage, call `$plugin->get_subdir()` directly. Mark it with a
FIXME to replace it with `plugin_get_vtype_subdir()` from the common
module in the future.

There is IMO no reason to call a separate sub for each vtype here, and
it also doesn't split the declaration of `$path` from its assignment.

We may want to consider replacing `get_iso_dir()` and related subs
with a single subroutine instead as well at some point in the future.
When something calls `get_iso_dir()` for example, that call site
obviously already knows what vtype it is fetching the subdirectory
for.

Signed-off-by: Max R. Carrara <m.carrara@proxmox.com>
---
 src/PVE/API2/Storage/Status.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm
index a9f902f9..9fb16888 100644
--- a/src/PVE/API2/Storage/Status.pm
+++ b/src/PVE/API2/Storage/Status.pm
@@ -610,41 +610,41 @@ __PACKAGE__->register_method({
         my $size = -s $tmpfilename;
         die "temporary file '$tmpfilename' does not exist\n" if !defined($size);
 
         my $filename = PVE::Storage::normalize_content_filename($param->{filename});
 
-        my $path;
         my $is_ova = 0;
         my $image_format;
 
         if ($content eq 'iso') {
             if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) {
                 raise_param_exc({ filename => "wrong file extension" });
             }
-            $path = PVE::Storage::get_iso_dir($cfg, $storage);
         } elsif ($content eq 'vztmpl') {
             if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) {
                 raise_param_exc({ filename => "wrong file extension" });
             }
-            $path = PVE::Storage::get_vztmpl_dir($cfg, $storage);
         } elsif ($content eq 'import') {
             if ($filename !~
                 m!${PVE::Storage::SAFE_CHAR_CLASS_RE}+$PVE::Storage::UPLOAD_IMPORT_EXT_RE_1$!
             ) {
                 raise_param_exc({ filename => "invalid filename or wrong extension" });
             }
             my $format = $1;
 
             if ($format eq 'ova') {
                 $is_ova = 1;
             } else {
                 $image_format = $format;
             }
-
-            $path = PVE::Storage::get_import_dir($cfg, $storage);
         }
 
+        # FIXME: Call plugin_get_vtype_subdir() instead of
+        # $plugin->get_subdir() on the next APIAGE reset.
+        my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+        my $path = $plugin->get_subdir($scfg, $content);
+
         my $dest = "$path/$filename";
         my $dirname = dirname($dest);
 
         # best effort to match apl_download behaviour
         chmod 0644, $tmpfilename;
@@ -838,41 +838,41 @@ __PACKAGE__->register_method({
 
         assert_can_transfer_files($scfg, $storage, $content);
 
         my $filename = PVE::Storage::normalize_content_filename($param->{filename});
 
-        my $path;
         my $is_ova = 0;
         my $image_format;
 
         if ($content eq 'iso') {
             if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) {
                 raise_param_exc({ filename => "wrong file extension" });
             }
-            $path = PVE::Storage::get_iso_dir($cfg, $storage);
         } elsif ($content eq 'vztmpl') {
             if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) {
                 raise_param_exc({ filename => "wrong file extension" });
             }
-            $path = PVE::Storage::get_vztmpl_dir($cfg, $storage);
         } elsif ($content eq 'import') {
             if ($filename !~
                 m!${PVE::Storage::SAFE_CHAR_CLASS_RE}+$PVE::Storage::UPLOAD_IMPORT_EXT_RE_1$!
             ) {
                 raise_param_exc({ filename => "invalid filename or wrong extension" });
             }
             my $format = $1;
 
             if ($format eq 'ova') {
                 $is_ova = 1;
             } else {
                 $image_format = $format;
             }
-
-            $path = PVE::Storage::get_import_dir($cfg, $storage);
         }
 
+        # FIXME: Call plugin_get_vtype_subdir() instead of
+        # $plugin->get_subdir() on the next APIAGE reset.
+        my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+        my $path = $plugin->get_subdir($scfg, $content);
+
         PVE::Storage::activate_storage($cfg, $storage);
         File::Path::make_path($path);
 
         my $dccfg = PVE::Cluster::cfs_read_file('datacenter.cfg');
         my $opts = {
-- 
2.47.3





  parent reply	other threads:[~2026-11-17 20:42 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 20:38 [PATCH manager/storage v3 00/51] Fix #2884: Implement Subdirectory Scanning for Dir-Based Storage Types Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 01/51] test: plugin tests: run tests with at most 4 jobs Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 02/51] plugin, common: remove superfluous use of =pod command paragraph Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 03/51] common: use Exporter module for PVE::Storage::Common Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 04/51] plugin: make get_subdir_files a proper subroutine and update style Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 05/51] plugin api: replace subdir helper methods with standalone functions Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 06/51] common: prevent autovivification in plugin_get_vtype_subdir helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 07/51] plugin: break up if-elsif chain into separate if-blocks Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 08/51] plugin: adapt get_subdir_files helper of list_volumes API method Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 09/51] plugin: update code style of list_volumes plugin " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 10/51] plugin: use closure for obtaining raw volume data in list_volumes Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 11/51] plugin: use closure for inner loop logic " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 12/51] storage: update code style in function path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 13/51] storage: break up if-elsif chain in path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 14/51] storage: heave vtype file path parsing logic inside loop into helper Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 15/51] storage: clean up code that was moved into helper in path_to_volume_id Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 16/51] api: status: move content type assert for up-/downloads into helper Max R. Carrara
2026-11-17 20:38 ` Max R. Carrara [this message]
2026-11-17 20:38 ` [PATCH pve-storage v3 18/51] api: status: move up-/download file path parsing code " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 19/51] api: status: simplify file content assertion logic for up-/download Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 20/51] test: guest import: add tests for PVE::GuestImport Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 21/51] tree-wide: introduce parsing module and replace usages of ISO_EXT_RE_0 Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 22/51] common: test: set up parser testing code, add tests for 'iso' vtype Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 23/51] tree-wide: replace usages of VZTMPL_EXT_RE_1 with parsing functions Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 24/51] tree-wide: replace usages of BACKUP_EXT_RE_2 " Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 25/51] tree-wide: replace usages of inline regexes for snippets with parsers Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 26/51] tree-wide: partially replace usages of regexes for 'import' vtype Max R. Carrara
2026-11-17 20:38 ` [PATCH pve-storage v3 27/51] tree-wide: replace remaining " Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 28/51] tree-wide: simplify recently refactored parsing logic Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 29/51] test: list volumes: reorganize and modernize test running code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 30/51] test: list volumes: fix broken test checking for vmlist modifications Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 31/51] test: list volumes: introduce new format for test cases Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 32/51] test: list volumes: remove legacy code and migrate cases to new format Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 33/51] plugin: do not return volumes of undeclared content types anymore Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 34/51] plugin: correct comment in get_subdir_files helper Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 35/51] test: parse volname: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 36/51] test: parse volname: adapt tests regarding 'import' volume type Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 37/51] test: parse volname: move VM disk test creation into separate block Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 38/51] test: parse volname: move backup file test creation into sep. block Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 39/51] test: parse volname: parameterize test case creation for some vtypes Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 40/51] test: volume id: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 41/51] test: volume id: rename 'volname' test case parameter to 'file' Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 42/51] test: filesystem path: modernize code Max R. Carrara
2026-11-17 20:39 ` [PATCH pve-storage v3 43/51] plugin: list content directories without globbing Max R. Carrara
2026-11-18  9:12 ` [PATCH pve-storage v3 44/51] fix #2884: implement nested subdir scanning and support 'iso' vtype Max R. Carrara
2026-11-18  9:14 ` [PATCH pve-storage v3 45/51] fix #2884: support nested subdir scanning for 'vztmpl' volume type Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 46/51] fix #2884: support nested subdir scanning for 'snippets' vtype Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 47/51] test: add more tests for 'import' vtype & guard against nested subdirs Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 48/51] test: add tests guarding against subdir scanning for vtypes Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 49/51] storage: resolve images in content dir overrides ending with a slash Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-storage v3 50/51] bump the storage plugin API version Max R. Carrara
2026-11-18  9:14   ` [PATCH pve-manager v3 51/51] fix #2884: ui: storage: add field for 'max-scan-depth' property Max R. Carrara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261117203953.913035-18-m.carrara@proxmox.com \
    --to=m.carrara@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=w.bumiller@proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal