yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: {upload, download}_url: factor out common parameter hash accesses

Browse Source 
Minor cleanup to reduce the amount of `$param->{...}` to variables in
the upload and download url API handler.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
This commit is contained in:
Daniel Kral
2025-02-11 17:07:55 +01:00
committed by Fiona Ebner
parent bdabd1296b
commit 70955c2d34
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/PVE/API2/Storage/Status.pm
View File

@ -438,8 +438,8 @@ __PACKAGE__->register_method ({
my $cfg = PVE::Storage::config(); my $cfg = PVE::Storage::config();
my $node = $param->{node}; my ($node, $storage) = $param->@{qw(node storage)};
my $scfg = PVE::Storage::storage_check_enabled($cfg, $param->{storage}, $node); my $scfg = PVE::Storage::storage_check_enabled($cfg, $storage, $node);
die "can't upload to storage type '$scfg->{type}'\n" die "can't upload to storage type '$scfg->{type}'\n"
if !defined($scfg->{path}); if !defined($scfg->{path});
@ -461,24 +461,24 @@ __PACKAGE__->register_method ({
if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) { if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) {
raise_param_exc({ filename => "wrong file extension" }); raise_param_exc({ filename => "wrong file extension" });
} }
$path = PVE::Storage::get_iso_dir($cfg, $param->{storage}); $path = PVE::Storage::get_iso_dir($cfg, $storage);
} elsif ($content eq 'vztmpl') { } elsif ($content eq 'vztmpl') {
if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) { if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) {
raise_param_exc({ filename => "wrong file extension" }); raise_param_exc({ filename => "wrong file extension" });
} }
$path = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage}); $path = PVE::Storage::get_vztmpl_dir($cfg, $storage);
} elsif ($content eq 'import') { } elsif ($content eq 'import') {
if ($filename !~ m!${PVE::Storage::SAFE_CHAR_CLASS_RE}+$PVE::Storage::UPLOAD_IMPORT_EXT_RE_1$!) { 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" }); raise_param_exc({ filename => "invalid filename or wrong extension" });
} }
$isOva = 1; $isOva = 1;
$path = PVE::Storage::get_import_dir($cfg, $param->{storage}); $path = PVE::Storage::get_import_dir($cfg, $storage);
} else { } else {
raise_param_exc({ content => "upload content type '$content' not allowed" }); raise_param_exc({ content => "upload content type '$content' not allowed" });
} }
die "storage '$param->{storage}' does not support '$content' content\n" die "storage '$storage' does not support '$content' content\n"
if !$scfg->{content}->{$content}; if !$scfg->{content}->{$content};
my $dest = "$path/$filename"; my $dest = "$path/$filename";
@ -498,9 +498,9 @@ __PACKAGE__->register_method ({
my @remcmd = ('/usr/bin/ssh', $ssh_options->@*, $remip, '--'); my @remcmd = ('/usr/bin/ssh', $ssh_options->@*, $remip, '--');
eval { # activate remote storage eval { # activate remote storage
run_command([@remcmd, '/usr/sbin/pvesm', 'status', '--storage', $param->{storage}]); run_command([@remcmd, '/usr/sbin/pvesm', 'status', '--storage', $storage]);
}; };
die "can't activate storage '$param->{storage}' on node '$node': $@\n" if $@; die "can't activate storage '$storage' on node '$node': $@\n" if $@;
run_command( run_command(
[@remcmd, '/bin/mkdir', '-p', '--', PVE::Tools::shell_quote($dirname)], [@remcmd, '/bin/mkdir', '-p', '--', PVE::Tools::shell_quote($dirname)],
@ -511,7 +511,7 @@ __PACKAGE__->register_method ({
$err_cleanup = sub { run_command([@remcmd, 'rm', '-f', '--', $dest]) }; $err_cleanup = sub { run_command([@remcmd, 'rm', '-f', '--', $dest]) };
} else { } else {
PVE::Storage::activate_storage($cfg, $param->{storage}); PVE::Storage::activate_storage($cfg, $storage);
File::Path::make_path($dirname); File::Path::make_path($dirname);
$cmd = ['cp', '--', $tmpfilename, $dest]; $cmd = ['cp', '--', $tmpfilename, $dest];
} }
@ -687,7 +687,7 @@ __PACKAGE__->register_method({
$isOva = 1; $isOva = 1;
} }
$path = PVE::Storage::get_import_dir($cfg, $param->{storage}); $path = PVE::Storage::get_import_dir($cfg, $storage);
} else { } else {
raise_param_exc({ content => "upload content-type '$content' is not allowed" }); raise_param_exc({ content => "upload content-type '$content' is not allowed" });
} }