From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 216121FF0DA for ; Thu, 19 Nov 2026 18:12:05 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 47A3C216A8; Thu, 19 Nov 2026 18:11:58 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v3 1/3] api: factor out read_pwt_version and pwt_base_dir Date: Thu, 19 Nov 2026 18:09:07 +0100 Message-ID: <20261119171151.475428-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119171151.475428-1-d.csapak@proxmox.com> References: <20261119171151.475428-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.273 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: OGFSVACFZQNMBV63P6JBNJCV2UBAGCCN X-Message-ID-Hash: OGFSVACFZQNMBV63P6JBNJCV2UBAGCCN X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Getting the pwt version will be useful in other places later, so factor it out into API2Tools. While at it, change it to use 'PVE::File' and handle missing pwt file by providing the default '' (to avoid a perl warning in that case). Signed-off-by: Dominik Csapak --- PVE/API2Tools.pm | 14 ++++++++++++++ PVE/Service/pveproxy.pm | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm index bca21aa5..c53ec03f 100644 --- a/PVE/API2Tools.pm +++ b/PVE/API2Tools.pm @@ -12,6 +12,7 @@ use URI; use PVE::Cluster; use PVE::DataCenterConfig; # so we can cfs-read datacenter.cfg use PVE::Exception qw(raise_param_exc); +use PVE::File; use PVE::INotify; use PVE::RPCEnvironment; use PVE::SafeSyslog; @@ -272,4 +273,17 @@ sub get_resource_pool_guest_members { return $pool_members; } +my $PWT_BASE_DIR = '/usr/share/javascript/proxmox-widget-toolkit'; +my $PWT_FILE = "$PWT_BASE_DIR/proxmoxlib.js"; + +sub pwt_base_dir { + return $PWT_BASE_DIR; +} + +sub read_pwt_version { + my $wtversionraw = PVE::File::file_read_first_line($PWT_FILE) // ''; + my $wtversion = $wtversionraw =~ m|^// (.*)$| ? $1 : ''; + return $wtversion; +} + 1; diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index acd23416..dc97f815 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -11,6 +11,7 @@ use URI::QueryParam; use URI; use PVE::API2; +use PVE::API2Tools; use PVE::APIServer::AnyEvent; use PVE::APIServer::Formatter::HTML; use PVE::APIServer::Formatter::Standard; @@ -56,7 +57,7 @@ my $basedirs = { novnc => '/usr/share/novnc-pve', yew_mobile => '/usr/share/pve-yew-mobile-gui', i18n_yew => '/usr/share/pve-yew-mobile-i18n', - widgettoolkit => '/usr/share/javascript/proxmox-widget-toolkit', + widgettoolkit => PVE::API2Tools::pwt_base_dir(), xtermjs => '/usr/share/pve-xtermjs', }; @@ -261,8 +262,7 @@ sub get_index { my $version = PVE::pvecfg::version(); - my $wtversionraw = PVE::Tools::file_read_firstline("$basedirs->{widgettoolkit}/proxmoxlib.js"); - my $wtversion = $wtversionraw =~ m|^// (.*)$| ? $1 : ''; + my $wtversion = PVE::API2Tools::read_pwt_version(); # while we could use the actual pkg version (e.g., shipped as pkg-version file in each # respective package's /usr/share/ folder, this way it should also work when using make -- 2.47.3