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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BE73F8D63 for ; Wed, 23 Aug 2023 11:04:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A85E91451D for ; Wed, 23 Aug 2023 11:04:35 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 23 Aug 2023 11:04:35 +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 D5159437B3; Wed, 23 Aug 2023 11:04:34 +0200 (CEST) Message-ID: Date: Wed, 23 Aug 2023 11:04:34 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox VE development discussion , Philipp Hufnagl References: <20230814144217.2082571-1-p.hufnagl@proxmox.com> <20230814144217.2082571-3-p.hufnagl@proxmox.com> From: Dominik Csapak In-Reply-To: <20230814144217.2082571-3-p.hufnagl@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 manager v6 2/2] fix #4849: ui: download to storage: automatically dectect and configure compression 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: Wed, 23 Aug 2023 09:04:35 -0000 a few comments inline On 8/14/23 16:42, Philipp Hufnagl wrote: > extends the download iso prompt with a "compression algorithm" drop down > under advanced. User can configure there if a decompression algorithm > should be used from the storage backend. The compression algorithm will > be automatically guessed when calling query_url_metadata > > Signed-off-by: Philipp Hufnagl > --- > www/manager6/Makefile | 1 + > www/manager6/form/DecompressionSelector.js | 13 +++++++++++++ > www/manager6/window/DownloadUrlToStorage.js | 17 +++++++++++++++++ > 3 files changed, 31 insertions(+) > create mode 100644 www/manager6/form/DecompressionSelector.js > > diff --git a/www/manager6/Makefile b/www/manager6/Makefile > index 7ec9d7a5..42a27548 100644 > --- a/www/manager6/Makefile > +++ b/www/manager6/Makefile > @@ -34,6 +34,7 @@ JSSRC= \ > form/ContentTypeSelector.js \ > form/ControllerSelector.js \ > form/DayOfWeekSelector.js \ > + form/DecompressionSelector.js \ > form/DiskFormatSelector.js \ > form/DiskStorageSelector.js \ > form/EmailNotificationSelector.js \ > diff --git a/www/manager6/form/DecompressionSelector.js b/www/manager6/form/DecompressionSelector.js > new file mode 100644 > index 00000000..abd19316 > --- /dev/null > +++ b/www/manager6/form/DecompressionSelector.js > @@ -0,0 +1,13 @@ > +Ext.define('PVE.form.DecompressionSelector', { > + extend: 'Proxmox.form.KVComboBox', > + alias: ['widget.pveDecompressionSelector'], > + config: { > + deleteEmpty: false, > + }, > + comboItems: [ > + ['__default__', Proxmox.Utils.NoneText], > + ['lzo', 'LZO'], > + ['gz', 'GZIP'], > + ['zst', 'ZSTD'], > + ], > +}); > diff --git a/www/manager6/window/DownloadUrlToStorage.js b/www/manager6/window/DownloadUrlToStorage.js > index 90320da4..559a1c05 100644 > --- a/www/manager6/window/DownloadUrlToStorage.js > +++ b/www/manager6/window/DownloadUrlToStorage.js > @@ -49,6 +49,9 @@ Ext.define('PVE.window.DownloadUrlToStorage', { > vm.set('size', '-'); > vm.set('mimetype', '-'); > }, > + decompressionPossible: function() { > + return this.view.content === 'iso'; > + }, this is a oneline that's only used one time, i'd rather implement it where we need it also 'this.getView()' is preferred to 'this.view', but in this case it does not matter because... > > urlCheck: function(field) { > let me = this; > @@ -66,6 +69,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', { > params: { > url: queryParam.url, > 'verify-certificates': queryParam['verify-certificates'], > + 'detect-compression': me.decompressionPossible() ? 1 : 0, if you do it here, there is already a 'view' variable, so you could do 'detect-compression': view.content === 'iso' ? 1 : 0, (also is it even necessary to cast to 1/0? i'd hoped that we can simply have true/false here too, so it'd simplify to 'detect-compression': view.content === 'iso' also, see my notes on the other patch if we even need this > }, > waitMsgTarget: view, > failure: res => { > @@ -84,6 +88,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', { > filename: data.filename || "", > size: (data.size && Proxmox.Utils.format_size(data.size)) || gettext("Unknown"), > mimetype: data.mimetype || gettext("Unknown"), > + compression: data.compression || '__default__', > }); > }, > }); > @@ -223,6 +228,18 @@ Ext.define('PVE.window.DownloadUrlToStorage', { > if (!me.storage) { > throw "no storage ID specified"; > } > + if (me.content === 'iso') { > + me.items[0].advancedColumn2.push( > + > + { > + xtype: 'pveDecompressionSelector', > + name: 'compression', > + fieldLabel: gettext('Decompression algorithm'), > + allowBlank: true, > + hasNoneOption: true, > + value: '__default__', > + }); > + } while this works here (by accident?), this pattern is dangerous, because you modify not the instance items, but the variable of the class itself (that's not copied before callParent) so it would be better to always add the field in the 'items' property, but use the cbind variables to hide/disable it when necessary > > me.callParent(); > },