Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-11-18 03:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-23 18:22:00 +02:00
parent 44b9bfee68
commit c4cdf4a834
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AppImage/components/system-overview.tsx
View File

@@ -575,9 +575,9 @@ export function SystemOverview() {
<Progress value={vmLxcStoragePercent} className="mt-2 [&>div]:bg-blue-500" /> <Progress value={vmLxcStoragePercent} className="mt-2 [&>div]:bg-blue-500" />
<div className="flex justify-between items-center mt-1"> <div className="flex justify-between items-center mt-1">
<span className="text-xs text-muted-foreground"> <span className="text-xs text-muted-foreground">
{formatStorage(vmLxcStorageAvailable)} available of {formatStorage(vmLxcStorageTotal)} {formatStorage(vmLxcStorageUsed)} / {formatStorage(vmLxcStorageTotal)}
</span> </span>
<span className="text-xs text-muted-foreground">{vmLxcStoragePercent.toFixed(1)}% used</span> <span className="text-xs text-muted-foreground">{vmLxcStoragePercent.toFixed(1)}%</span>
</div> </div>
{vmLxcStorages.length > 1 && ( {vmLxcStorages.length > 1 && (
<div className="text-xs text-muted-foreground mt-1"> <div className="text-xs text-muted-foreground mt-1">

15
AppImage/scripts/flask_server.py
View File

@@ -105,11 +105,17 @@ def get_cpu_temperature():
if hasattr(psutil, "sensors_temperatures"): if hasattr(psutil, "sensors_temperatures"):
temps = psutil.sensors_temperatures() temps = psutil.sensors_temperatures()
if temps: if temps:
# Priority order for temperature sensors # Priority order for temperature sensors:
sensor_priority = ['coretemp', 'cpu_thermal', 'acpi', 'thermal_zone'] # - coretemp: Intel CPU sensor
# - k10temp: AMD CPU sensor (Ryzen, EPYC, etc.)
# - cpu_thermal: Generic CPU thermal sensor
# - zenpower: Alternative AMD sensor (if zenpower driver is used)
# - acpitz: ACPI thermal zone (fallback, usually motherboard)
sensor_priority = ['coretemp', 'k10temp', 'cpu_thermal', 'zenpower', 'acpitz']
for sensor_name in sensor_priority: for sensor_name in sensor_priority:
if sensor_name in temps and temps[sensor_name]: if sensor_name in temps and temps[sensor_name]:
temp = temps[sensor_name][0].current temp = temps[sensor_name][0].current
print(f"[v0] Using temperature sensor: {sensor_name} = {temp}°C")
break break
# If no priority sensor found, use first available # If no priority sensor found, use first available
@@ -117,6 +123,7 @@ def get_cpu_temperature():
for name, entries in temps.items(): for name, entries in temps.items():
if entries: if entries:
temp = entries[0].current temp = entries[0].current
print(f"[v0] Using fallback temperature sensor: {name} = {temp}°C")
break break
except Exception as e: except Exception as e:
print(f"Warning: Error reading temperature sensors: {e}") print(f"Warning: Error reading temperature sensors: {e}")
@@ -1509,7 +1516,7 @@ def get_network_info():
bond_info = get_bond_info(interface_name) bond_info = get_bond_info(interface_name)
interface_info['bond_mode'] = bond_info['mode'] interface_info['bond_mode'] = bond_info['mode']
interface_info['bond_slaves'] = bond_info['slaves'] interface_info['bond_slaves'] = bond_info['slaves']
interface_info['bond_active_slave'] = bond_info['active_slave'] interface_info['bond_active_slave'] = bond_info['bond_active_slave']
if interface_type == 'bridge': if interface_type == 'bridge':
bridge_info = get_bridge_info(interface_name) bridge_info = get_bridge_info(interface_name)
@@ -4725,7 +4732,7 @@ def api_hardware():
'bios': hardware_info.get('motherboard', {}).get('bios', {}), # Extract BIOS info 'bios': hardware_info.get('motherboard', {}).get('bios', {}), # Extract BIOS info
'memory_modules': hardware_info.get('memory_modules', []), 'memory_modules': hardware_info.get('memory_modules', []),
'storage_devices': hardware_info.get('storage_devices', []), # Fixed: use hardware_info 'storage_devices': hardware_info.get('storage_devices', []), # Fixed: use hardware_info
'pci_devices': hardware_info.get('pci_devices', []), 'pci_devices': hardware_info.get('pci_devices', []), # Fixed: use hardware_info
'temperatures': hardware_info.get('sensors', {}).get('temperatures', []), 'temperatures': hardware_info.get('sensors', {}).get('temperatures', []),
'fans': all_fans, # Return combined fans (sensors + IPMI) 'fans': all_fans, # Return combined fans (sensors + IPMI)
'power_supplies': hardware_info.get('ipmi_power', {}).get('power_supplies', []), 'power_supplies': hardware_info.get('ipmi_power', {}).get('power_supplies', []),