From edd4b6b6ac4cef98ccf52f385549ace430a8de54 Mon Sep 17 00:00:00 2001 From: Meliox Date: Mon, 6 Apr 2026 16:21:18 +0200 Subject: [PATCH] fix variable references --- PveMod_SensorInfo.pm | 4 ++-- PveMod_pvemanagerlib.js | 12 ++++++------ pve-mod-gui-sensors.sh | 26 +++++++++++++------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/PveMod_SensorInfo.pm b/PveMod_SensorInfo.pm index 6ff9e82..baa96c6 100644 --- a/PveMod_SensorInfo.pm +++ b/PveMod_SensorInfo.pm @@ -1,4 +1,4 @@ -package PVE::API2::GPUMonitor; +package PVE::API2::PVEMod_SensorInfo; use strict; use warnings; @@ -10,7 +10,7 @@ use File::Path qw(remove_tree); # debug configuration - set to 0 to disable all _debug output my $DEBUG_ENABLED = 1; -my $VERSION = '1.0.0'; +my $VERSION = '1.0'; # ============================================================================ # Configuration diff --git a/PveMod_pvemanagerlib.js b/PveMod_pvemanagerlib.js index 7c1c2e9..9342af0 100644 --- a/PveMod_pvemanagerlib.js +++ b/PveMod_pvemanagerlib.js @@ -279,7 +279,7 @@ Ext.define('PVE.node.StatusView', { printBar: false, title: gettext('CPU Thermal State'), iconCls: 'fa fa-fw fa-thermometer-half', - textField: 'sensorsOutput', + textField: 'pveMod_sensorInfo_json', renderer: function(value){ // sensors configuration const cpuTempHelper = Ext.create('PVE.mod.TempHelper', {srcUnit: PVE.mod.TempHelper.CELSIUS, dstUnit: PVE.mod.TempHelper.CELSIUS}); @@ -564,7 +564,7 @@ Ext.define('PVE.node.StatusView', { printBar: false, title: gettext('NVMe Temperatures'), iconCls: 'fa fa-fw fa-thermometer-half', - textField: 'sensorsOutput', + textField: 'pveMod_sensorInfo_json', renderer: function(value) { // sensors configuration const addressPrefix = "nvme-pci-"; @@ -649,7 +649,7 @@ Ext.define('PVE.node.StatusView', { printBar: false, title: gettext('System Fans'), iconCls: 'fa fa-fw fa-snowflake-o', - textField: 'sensorsOutput', + textField: 'pveMod_sensorInfo_json', renderer: function(value) { // --- let objValue; @@ -985,7 +985,7 @@ Ext.define('PVE.node.StatusView', { colspan: 2, printBar: false, title: gettext('Sensor Mod Version'), - textField: 'pveModVersion', + textField: 'pveMod_sensorInfo_version', value: '', }, { @@ -993,7 +993,7 @@ Ext.define('PVE.node.StatusView', { colspan: 2, printBar: false, title: gettext('Information'), - textField: 'systemInfo', + textField: 'pveMod_sensorInfo_systemInfo', renderer: function(value) { if (value === null || value === undefined) { return ''; @@ -1029,4 +1029,4 @@ Ext.define('PVE.node.StatusView', { me.callParent(); }, -}); \ No newline at end of file +}); diff --git a/pve-mod-gui-sensors.sh b/pve-mod-gui-sensors.sh index 640177c..fda800b 100644 --- a/pve-mod-gui-sensors.sh +++ b/pve-mod-gui-sensors.sh @@ -9,7 +9,7 @@ KNOWN_CPU_SENSORS=("coretemp-isa-" "k10temp-pci-") # Overwrite default backup location -BACKUP_DIR="" +BACKUP_DIR="/root/PVE-MOD2/Backup" ##################### DO NOT EDIT BELOW ####################### # Only to be used to debug on other systems. Save the "sensor -j" output into a json file. @@ -475,6 +475,7 @@ function install_mod { msgb "\n=== Installing sensor info module ===" install_sensor_monitor_module insert_sensor_monitor_into_pve + insert_system_info_into_pve #### Install UI modification module #### msgb "\n=== Installing UI modification module ===" @@ -567,23 +568,23 @@ insert_sensor_monitor_into_pve() { sed -i '/my \$dinfo = df('\''\/'\'', 1);/i\ # Collect sensor data from PveMod_SensorInfo\ # Bad practice to add use here, but cleaner implementation would require several extensive modifications.\ - use PVE::API2::PveMod_SensorInfo;\ - $res->{sensorsJSONOutput} = PVE::API2::PveMod_SensorInfo::get_sensors_stats();\ + use PVE::API2::PVEMod_SensorInfo;\ + $res->{pveMod_sensorInfo_json} = PVE::API2::PVEMod_SensorInfo::get_sensors_stats();\ + $res->{pveMod_sensorInfo_version} = PVE::API2::PVEMod_SensorInfo::get_pve_mod_version();\ ' "$NODES_PM_FILE" #endregion PveSensorInfoMod heredoc info "Sensor data retriever added to \"$NODES_PM_FILE\"." - - # Add system information if enabled - if [[ $ENABLE_SYSTEM_INFO == true ]]; then - collect_system_info "$NODES_PM_FILE" - fi } # Collect system information -collect_system_info() { +insert_system_info_into_pve() { local output_file="$1" local systemInfoCmd + if [[ $ENABLE_SYSTEM_INFO == false ]]; then + return + fi + systemInfoCmd=$(dmidecode -t "${SYSTEM_INFO_TYPE}" \ | awk -F': ' '/Manufacturer|Product Name|Serial Number/ {print $1": "$2}' \ | awk '{$1=$1};1' \ @@ -593,7 +594,7 @@ collect_system_info() { #region system info heredoc sed -i "/my \$dinfo = df('\/', 1);/i\\ # Add system information to response\\ - \$res->{systemInfo} = \"$(echo "$systemInfoCmd")\";\\ + \$res->{pveMod_sensorInfo_systemInfo} = \"$(echo "$systemInfoCmd")\";\\ " "$NODES_PM_FILE" #endregion system info heredoc info "System information retriever added to \"$output_file\"." @@ -647,7 +648,7 @@ function uninstall_mod { check_root_privileges - if [[ -z $(grep -e "\$res->{sensorsOutput}" "$NODES_PM_FILE") ]] && [[ -z $(grep -e "\$res->{systemInfo}" "$NODES_PM_FILE") ]]; then + if [[ -z $(grep -e "\$res->{PveMod_SensorInfo_JSON}" "$NODES_PM_FILE") ]] && [[ -z $(grep -e "\$res->{systemInfo}" "$NODES_PM_FILE") ]]; then err "Mod is not installed." fi @@ -715,9 +716,8 @@ function uninstall_mod { # Function to check if the modification is installed check_mod_installation() { if [[ -n $(grep -F 'use PVE::API2::PveMod_SensorInfo' "$NODES_PM_FILE") ]] || \ - [[ -n $(grep -F 'use PVE::API2::GPUMonitor' "$NODES_PM_FILE") ]] || \ + [[ -n $(grep -F 'use PVE::API2::PVEMod_SensorInfo' "$NODES_PM_FILE") ]] || \ [[ -n $(grep -F '$res->{sensorsJSONOutput}' "$NODES_PM_FILE") ]] || \ - [[ -n $(grep -F '$res->{sensorsOutput}' "$NODES_PM_FILE") ]] || \ [[ -n $(grep -F '$res->{systemInfo}' "$NODES_PM_FILE") ]] || \ [[ -f "$PVE_MOD_JS_TARGET_FILE" ]]; then err "Mod is already installed. Uninstall existing before installing."