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 ECE438701 for ; Thu, 27 Jul 2023 17:28:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D0E85D571 for ; Thu, 27 Jul 2023 17:28:25 +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 ; Thu, 27 Jul 2023 17:28:24 +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 7C58840E45 for ; Thu, 27 Jul 2023 17:28:24 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Thu, 27 Jul 2023 17:28:16 +0200 Message-Id: <20230727152817.775699-3-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230727152817.775699-1-p.hufnagl@proxmox.com> References: <20230727152817.775699-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH V2 manager 1/1] fix #4849: 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: Thu, 27 Jul 2023 15:28:56 -0000 Signed-off-by: Philipp Hufnagl --- PVE/API2/Nodes.pm | 21 ++++++++++++++++++++- www/manager6/Makefile | 1 + www/manager6/form/DecompressionSelector.js | 14 ++++++++++++++ www/manager6/window/DownloadUrlToStorage.js | 21 +++++++++++++++++++-- 4 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 www/manager6/form/DecompressionSelector.js diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 9269694d..3e9ec034 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -1564,6 +1564,12 @@ __PACKAGE__->register_method({ type => 'boolean', optional => 1, default => 1, + }, + 'detect-compression' => { + description => "If true an auto detect of used compression will be attempted", + type => 'boolean', + optional => 1, + default => 0, } }, }, @@ -1583,6 +1589,11 @@ __PACKAGE__->register_method({ type => 'string', optional => 1, }, + compression => { + type => 'string', + enum => $PVE::Storage::Status::KNOWN_COMPRESSION_FORMATS, + optional => 1, + }, }, }, code => sub { @@ -1606,6 +1617,8 @@ __PACKAGE__->register_method({ ); } + my $detect_compression = $param->{'detect-compression'}; + my $req = HTTP::Request->new(HEAD => $url); my $res = $ua->request($req); @@ -1614,7 +1627,7 @@ __PACKAGE__->register_method({ my $size = $res->header("Content-Length"); my $disposition = $res->header("Content-Disposition"); my $type = $res->header("Content-Type"); - + my $compression; my $filename; if ($disposition && ($disposition =~ m/filename="([^"]*)"/ || $disposition =~ m/filename=([^;]*)/)) { @@ -1628,10 +1641,16 @@ __PACKAGE__->register_method({ $type = $1; } + if ($detect_compression && $filename =~ m!^((.+)\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))$!) { + $filename = $2; + $compression = $3; + } + my $ret = {}; $ret->{filename} = $filename if $filename; $ret->{size} = $size + 0 if $size; $ret->{mimetype} = $type if $type; + $ret->{compression} = $compression if $compression; return $ret; }}); 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..87c0ae95 --- /dev/null +++ b/www/manager6/form/DecompressionSelector.js @@ -0,0 +1,14 @@ + +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 48543d28..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'; + }, 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, }, 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__', }); }, }); @@ -215,7 +220,7 @@ Ext.define('PVE.window.DownloadUrlToStorage', { ], initComponent: function() { - var me = this; + var me = this; if (!me.nodename) { throw "no node name specified"; @@ -223,8 +228,20 @@ 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__', + }); + } - me.callParent(); + me.callParent(); }, }); -- 2.39.2