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

storage: rename REs for iso and vztmpl extensions

Browse Source 
these changes make it more clear, how many capture groups each
RE inclues.

Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
This commit is contained in:
Lorenz Stechauner
2021-10-22 14:23:10 +02:00
committed by Thomas Lamprecht
parent 726c432964
commit cd461a5012
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Storage.pm
View File

@ -101,9 +101,15 @@ if ( -d '/usr/share/perl5/PVE/Storage/Custom' ) {
# initialize all plugins
PVE::Storage::Plugin->init();
our $iso_extension_re = qr/\.(?:iso|img)/i;
# the following REs indicate the number or capture groups via the trailing digit
# CAUTION don't forget to update the digits accordingly after messing with the capture groups
our $vztmpl_extension_re = qr/\.tar\.(gz|xz|zst)/i;
our $ISO_EXT_RE_0 = qr/\.(?:iso|img)/i;
our $VZTMPL_EXT_RE_1 = qr/\.tar\.(gz|xz|zst)/i;
# FIXME remove with PVE 8.0, add versioned breaks for pve-manager
our $vztmpl_extension_re = $VZTMPL_EXT_RE_1;
# PVE::Storage utility functions
@ -568,10 +574,10 @@ sub path_to_volume_id {
return ('images', $info->{volid});
}
}
} elsif ($path =~ m!^$isodir/([^/]+$iso_extension_re)$!) {
} elsif ($path =~ m!^$isodir/([^/]+$ISO_EXT_RE_0)$!) {
my $name = $1;
return ('iso', "$sid:iso/$name");
} elsif ($path =~ m!^$tmpldir/([^/]+$vztmpl_extension_re)$!) {
} elsif ($path =~ m!^$tmpldir/([^/]+$VZTMPL_EXT_RE_1)$!) {
my $name = $1;
return ('vztmpl', "$sid:vztmpl/$name");
} elsif ($path =~ m!^$privatedir/(\d+)$!) {