vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-15 22:51:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

PLG: INTRSPD cleanup

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2026-01-03 08:55:23 +11:00
parent 54e8a2fe00
commit 44c2297c25
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/plugins/internet_speedtest/script.py
+11 -19
View File
@@ -16,7 +16,7 @@ from logger import mylog, Logger # noqa: E402 [flake8 lint suppression]
from helper import get_setting_value # noqa: E402 [flake8 lint suppression] from helper import get_setting_value # noqa: E402 [flake8 lint suppression]
import conf # noqa: E402 [flake8 lint suppression] import conf # noqa: E402 [flake8 lint suppression]
from pytz import timezone # noqa: E402 [flake8 lint suppression] from pytz import timezone # noqa: E402 [flake8 lint suppression]
from const import logPath, NATIVE_SPEEDTEST_PATH from const import logPath, NATIVE_SPEEDTEST_PATH # noqa: E402 [flake8 lint suppression]
# Make sure the TIMEZONE for logging is correct # Make sure the TIMEZONE for logging is correct
conf.tz = timezone(get_setting_value('TIMEZONE')) conf.tz = timezone(get_setting_value('TIMEZONE'))
@@ -31,7 +31,7 @@ RESULT_FILE = os.path.join(LOG_PATH, f'last_result.{pluginName}.log')
def main(): def main():
mylog('verbose', ['[INTRSPD] In script']) mylog('verbose', [f"[{pluginName}] In script"])
plugin_objects = Plugin_Objects(RESULT_FILE) plugin_objects = Plugin_Objects(RESULT_FILE)
speedtest_result = run_speedtest() speedtest_result = run_speedtest()
@@ -50,19 +50,11 @@ def main():
def run_speedtest(): def run_speedtest():
native_path = NATIVE_SPEEDTEST_PATH native_path = NATIVE_SPEEDTEST_PATH
mylog('verbose', [f"[INTRSPD] Using native binary path: {native_path}"]) mylog('verbose', [f"[{pluginName}] Using native binary path: {native_path}"])
if os.path.exists(native_path): if os.path.exists(native_path):
mylog('verbose', ["[INTRSPD] Native speedtest binary detected, using it."]) mylog('verbose', [f"[{pluginName}] Native speedtest binary detected, using it."])
try: try:
# Safe parsing of timeout setting timeout = get_setting_value('INTRSPD_RUN_TIMEOUT')
try:
raw_timeout = get_setting_value('INTRSPD_RUN_TIMEOUT')
timeout = int(raw_timeout) if raw_timeout else 60
except (ValueError, TypeError):
timeout = 60
if timeout < 60:
timeout = 60
cmd = [native_path, "--format=json", "--accept-license", "--accept-gdpr"] cmd = [native_path, "--format=json", "--accept-license", "--accept-gdpr"]
result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout) result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
@@ -73,10 +65,10 @@ def run_speedtest():
download_speed = round(data['download']['bandwidth'] * 8 / 10**6, 2) download_speed = round(data['download']['bandwidth'] * 8 / 10**6, 2)
upload_speed = round(data['upload']['bandwidth'] * 8 / 10**6, 2) upload_speed = round(data['upload']['bandwidth'] * 8 / 10**6, 2)
except (json.JSONDecodeError, KeyError, TypeError) as parse_error: except (json.JSONDecodeError, KeyError, TypeError) as parse_error:
mylog('none', [f"[INTRSPD] Failed to parse native JSON: {parse_error}"]) mylog('none', [f"[{pluginName}] Failed to parse native JSON: {parse_error}"])
# Fall through to baseline fallback # Fall through to baseline fallback
else: else:
mylog('verbose', [f"[INTRSPD] Native Result (down|up): {download_speed} Mbps|{upload_speed} Mbps"]) mylog('verbose', [f"[{pluginName}] Native Result (down|up): {download_speed} Mbps|{upload_speed} Mbps"])
return { return {
'download_speed': download_speed, 'download_speed': download_speed,
'upload_speed': upload_speed, 'upload_speed': upload_speed,
@@ -84,9 +76,9 @@ def run_speedtest():
} }
except subprocess.TimeoutExpired: except subprocess.TimeoutExpired:
mylog('none', ["[INTRSPD] Native speedtest timed out, falling back to baseline."]) mylog('none', [f"[{pluginName}] Native speedtest timed out, falling back to baseline."])
except Exception as e: except Exception as e:
mylog('none', [f"[INTRSPD] Error running native speedtest: {e!s}, falling back to baseline."]) mylog('none', [f"[{pluginName}] Error running native speedtest: {e!s}, falling back to baseline."])
# Baseline fallback # Baseline fallback
try: try:
@@ -94,14 +86,14 @@ def run_speedtest():
st.get_best_server() st.get_best_server()
download_speed = round(st.download() / 10**6, 2) download_speed = round(st.download() / 10**6, 2)
upload_speed = round(st.upload() / 10**6, 2) upload_speed = round(st.upload() / 10**6, 2)
mylog('verbose', [f"[INTRSPD] Baseline Result (down|up): {download_speed} Mbps|{upload_speed} Mbps"]) mylog('verbose', [f"[{pluginName}] Baseline Result (down|up): {download_speed} Mbps|{upload_speed} Mbps"])
return { return {
'download_speed': download_speed, 'download_speed': download_speed,
'upload_speed': upload_speed, 'upload_speed': upload_speed,
'full_json': json.dumps(st.results.dict()) 'full_json': json.dumps(st.results.dict())
} }
except Exception as e: except Exception as e:
mylog('verbose', [f"[INTRSPD] Error running speedtest: {str(e)}"]) mylog('verbose', [f"[{pluginName}] Error running speedtest: {str(e)}"])
return { return {
'download_speed': -1, 'download_speed': -1,
'upload_speed': -1, 'upload_speed': -1,