From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 26F1B6D78A for ; Mon, 16 Aug 2021 10:46:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 142BD16AAE for ; Mon, 16 Aug 2021 10:46:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 518D316AA0 for ; Mon, 16 Aug 2021 10:46:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1C1D24339C for ; Mon, 16 Aug 2021 10:46:17 +0200 (CEST) To: Fabian Ebner , pve-devel@lists.proxmox.com References: <20210805073447.1201979-1-l.stechauner@proxmox.com> <20210805073447.1201979-2-l.stechauner@proxmox.com> <1a3e25df-8de1-7abb-3845-d230bb8854a9@proxmox.com> From: Lorenz Stechauner Message-ID: Date: Mon, 16 Aug 2021 10:46:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <1a3e25df-8de1-7abb-3845-d230bb8854a9@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 1.562 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -2.147 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH v2 storage 1/2] storage: rename REs for iso and vztmpl extensions X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2021 08:46:58 -0000 On 13.08.21 12:09, Fabian Ebner wrote: > Am 05.08.21 um 09:34 schrieb Lorenz Stechauner: >> these changes make it more clear, how many capture groups each >> RE inclues. >> >> Signed-off-by: Lorenz Stechauner >> --- >>   PVE/API2/Storage/Status.pm |  8 ++++---- >>   PVE/Storage.pm             | 11 +++++++---- >>   PVE/Storage/Plugin.pm      |  8 ++++---- >>   3 files changed, 15 insertions(+), 12 deletions(-) >> >> diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm >> index b838461..3acb647 100644 >> --- a/PVE/API2/Storage/Status.pm >> +++ b/PVE/API2/Storage/Status.pm >> @@ -424,12 +424,12 @@ __PACKAGE__->register_method ({ >>       my $path; >>         if ($content eq 'iso') { >> -        if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { >> +        if ($filename !~ m![^/]+$PVE::Storage::ISO_EXT_RE_0$!) { >>           raise_param_exc({ filename => "wrong file extension" }); >>           } >>           $path = PVE::Storage::get_iso_dir($cfg, $param->{storage}); >>       } elsif ($content eq 'vztmpl') { >> -        if ($filename !~ m![^/]+$PVE::Storage::vztmpl_extension_re$!) { >> +        if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) { >>           raise_param_exc({ filename => "wrong file extension" }); >>           } >>           $path = PVE::Storage::get_vztmpl_dir($cfg, $param->{storage}); >> @@ -584,12 +584,12 @@ __PACKAGE__->register_method({ >>         my $path; >>       if ($content eq 'iso') { >> -        if ($filename !~ m![^/]+$PVE::Storage::iso_extension_re$!) { >> +        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_extension_re$!) { >> +        if ($filename !~ m![^/]+$PVE::Storage::VZTMPL_EXT_RE_1$!) { >>           raise_param_exc({ filename => "wrong file extension" }); >>           } >>           $path = PVE::Storage::get_vztmpl_dir($cfg, $storage); >> diff --git a/PVE/Storage.pm b/PVE/Storage.pm >> index c04b5a2..b5c2460 100755 >> --- a/PVE/Storage.pm >> +++ b/PVE/Storage.pm >> @@ -101,9 +101,12 @@ 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\.([gx]z)/i; > > Removing this is not backwards compatible and requires a versioned > Breaks for pve-manager. makes sense. should I split this commit in two, where in the first part I add the new variable and in the second part remove the old one? or is it enough to state the need for "breaks" in the commit message? > >> +our $ISO_EXT_RE_0 = qr/\.(?:iso|img)/i; >> + >> +our $VZTMPL_EXT_RE_1 = qr/\.tar\.([gx]z)/i; >>     #  PVE::Storage utility functions >>   @@ -574,10 +577,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+)$!) { >> diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm >> index b1865cb..502951f 100644 >> --- a/PVE/Storage/Plugin.pm >> +++ b/PVE/Storage/Plugin.pm >> @@ -516,9 +516,9 @@ sub parse_volname { >>       my ($vmid, $name) = ($1, $2); >>       my (undef, $format, $isBase) = parse_name_dir($name); >>       return ('images', $name, $vmid, undef, undef, $isBase, $format); >> -    } elsif ($volname =~ >> m!^iso/([^/]+$PVE::Storage::iso_extension_re)$!) { >> +    } elsif ($volname =~ m!^iso/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!) { >>       return ('iso', $1); >> -    } elsif ($volname =~ >> m!^vztmpl/([^/]+$PVE::Storage::vztmpl_extension_re)$!) { >> +    } elsif ($volname =~ >> m!^vztmpl/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!) { >>       return ('vztmpl', $1); >>       } elsif ($volname =~ m!^rootdir/(\d+)$!) { >>       return ('rootdir', $1, $1); >> @@ -1045,12 +1045,12 @@ my $get_subdir_files = sub { >>       my $info; >>         if ($tt eq 'iso') { >> -        next if $fn !~ m!/([^/]+$PVE::Storage::iso_extension_re)$!i; >> +        next if $fn !~ m!/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!i; >>             $info = { volid => "$sid:iso/$1", format => 'iso' }; >>         } elsif ($tt eq 'vztmpl') { >> -        next if $fn !~ m!/([^/]+$PVE::Storage::vztmpl_extension_re)$!; >> +        next if $fn !~ m!/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!; >>             $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; >>