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

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-07 11:10:20 +02:00
parent e247d8095e
commit e81438e49f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AppImage/components/hardware.tsx
View File

@@ -383,6 +383,7 @@ export default function Hardware() {
<Dialog <Dialog
open={loadingGPUData} open={loadingGPUData}
onOpenChange={() => { onOpenChange={() => {
// Prevent closing while loading
if (!loadingGPUData) { if (!loadingGPUData) {
setSelectedGPU(null) setSelectedGPU(null)
setRealtimeGPUData(null) setRealtimeGPUData(null)
@@ -404,7 +405,7 @@ export default function Hardware() {
</Dialog> </Dialog>
<Dialog <Dialog
open={selectedGPU !== null && !loadingGPUData} open={selectedGPU !== null && !loadingGPUData && realtimeGPUData !== null}
onOpenChange={() => { onOpenChange={() => {
setSelectedGPU(null) setSelectedGPU(null)
setRealtimeGPUData(null) setRealtimeGPUData(null)

12
AppImage/scripts/flask_server.py
View File

@@ -2671,6 +2671,10 @@ def api_hardware():
"""Get comprehensive hardware information""" """Get comprehensive hardware information"""
hardware_info = get_hardware_info() hardware_info = get_hardware_info()
all_fans = hardware_info.get('sensors', {}).get('fans', [])
ipmi_fans = hardware_info.get('ipmi_fans', [])
all_fans.extend(ipmi_fans)
# Format data for frontend # Format data for frontend
formatted_data = { formatted_data = {
'cpu': hardware_info.get('cpu', {}), 'cpu': hardware_info.get('cpu', {}),
@@ -2679,17 +2683,17 @@ def api_hardware():
'storage_devices': hardware_info.get('storage_devices', []), 'storage_devices': hardware_info.get('storage_devices', []),
'pci_devices': hardware_info.get('pci_devices', []), 'pci_devices': hardware_info.get('pci_devices', []),
'temperatures': hardware_info.get('sensors', {}).get('temperatures', []), 'temperatures': hardware_info.get('sensors', {}).get('temperatures', []),
'fans': hardware_info.get('sensors', {}).get('fans', []), # Use sensors fans 'fans': all_fans, # Return combined fans (sensors + IPMI)
'power_supplies': hardware_info.get('ipmi_power', {}).get('power_supplies', []), # Use IPMI power supplies 'power_supplies': hardware_info.get('ipmi_power', {}).get('power_supplies', []),
'power_meter': hardware_info.get('power_meter'), 'power_meter': hardware_info.get('power_meter'),
'ups': hardware_info.get('ups') if hardware_info.get('ups') else None, 'ups': hardware_info.get('ups') if hardware_info.get('ups') else None,
'gpus': hardware_info.get('gpus', []) # Include GPU data 'gpus': hardware_info.get('gpus', [])
} }
print(f"[v0] /api/hardware returning data") print(f"[v0] /api/hardware returning data")
print(f"[v0] - CPU: {formatted_data['cpu'].get('model', 'Unknown')}") print(f"[v0] - CPU: {formatted_data['cpu'].get('model', 'Unknown')}")
print(f"[v0] - Temperatures: {len(formatted_data['temperatures'])} sensors") print(f"[v0] - Temperatures: {len(formatted_data['temperatures'])} sensors")
print(f"[v0] - Fans: {len(formatted_data['fans'])} fans") print(f"[v0] - Fans: {len(formatted_data['fans'])} fans") # Now includes IPMI fans
print(f"[v0] - Power supplies: {len(formatted_data['power_supplies'])} PSUs") print(f"[v0] - Power supplies: {len(formatted_data['power_supplies'])} PSUs")
print(f"[v0] - Power meter: {'Yes' if formatted_data['power_meter'] else 'No'}") print(f"[v0] - Power meter: {'Yes' if formatted_data['power_meter'] else 'No'}")
print(f"[v0] - UPS: {'Yes' if formatted_data['ups'] else 'No'}") print(f"[v0] - UPS: {'Yes' if formatted_data['ups'] else 'No'}")