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

Update flask_server.py

Browse Source
This commit is contained in:
MacRimi
2025-10-07 21:59:57 +02:00
parent b41b52df84
commit cf07004fcd
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
AppImage/scripts/flask_server.py
View File

@@ -806,6 +806,7 @@ def get_smart_data(disk_name):
break break
elif smart_data['model'] != 'Unknown' or smart_data['serial'] != 'Unknown': elif smart_data['model'] != 'Unknown' or smart_data['serial'] != 'Unknown':
print(f"[v0] Extracted partial data from text output, continuing to next attempt...") print(f"[v0] Extracted partial data from text output, continuing to next attempt...")
else: else:
print(f"[v0] No usable output (return code {result.returncode}), trying next command...") print(f"[v0] No usable output (return code {result.returncode}), trying next command...")
@@ -1640,7 +1641,7 @@ def get_detailed_gpu_info(gpu):
# Read output with timeout # Read output with timeout
output_lines = [] output_lines = []
start_time = time.time() start_time = time.time()
timeout_seconds = 3.0 timeout_seconds = 5.0
json_objects_found = 0 json_objects_found = 0
while time.time() - start_time < timeout_seconds: while time.time() - start_time < timeout_seconds:
@@ -1659,7 +1660,15 @@ def get_detailed_gpu_info(gpu):
# Find all complete JSON objects # Find all complete JSON objects
search_start = 0 search_start = 0
while True: while True:
object_start = output.find('{', search_start) object_start = -1
for i in range(search_start, len(output)):
if output[i] == '{':
object_start = i
break
elif output[i] not in [',', '\n', '\r', ' ', '\t']:
# Si encontramos algo que no es separador ni llave, salir
break
if object_start == -1: if object_start == -1:
break break
@@ -1683,6 +1692,9 @@ def get_detailed_gpu_info(gpu):
if json_objects_found == 1: if json_objects_found == 1:
print(f"[v0] Found first JSON object ({len(json_str)} chars) - skipping (baseline)") print(f"[v0] Found first JSON object ({len(json_str)} chars) - skipping (baseline)")
search_start = object_end search_start = object_end
# Saltar comas y espacios después del primer objeto
while search_start < len(output) and output[search_start] in [',', '\n', '\r', ' ', '\t']:
search_start += 1
continue continue
print(f"[v0] Found second JSON object ({len(json_str)} chars) - using this one") print(f"[v0] Found second JSON object ({len(json_str)} chars) - using this one")
@@ -1782,6 +1794,8 @@ def get_detailed_gpu_info(gpu):
except json.JSONDecodeError as e: except json.JSONDecodeError as e:
print(f"[v0] JSON decode error: {e}") print(f"[v0] JSON decode error: {e}")
search_start = object_end search_start = object_end
while search_start < len(output) and output[search_start] in [',', '\n', '\r', ' ', '\t']:
search_start += 1
continue continue
else: else:
break break
@@ -1790,7 +1804,7 @@ def get_detailed_gpu_info(gpu):
if json_objects_found >= 2 and data_retrieved: if json_objects_found >= 2 and data_retrieved:
break break
else: else:
time.sleep(0.1) time.sleep(0.05)
except Exception as e: except Exception as e:
print(f"[v0] Error reading intel_gpu_top output: {e}") print(f"[v0] Error reading intel_gpu_top output: {e}")