Merge branch 'next_release' of github.com:netalertx/NetAlertX into next_release

This commit is contained in:
jokob-sk committed 2026-08-10 16:33:09 +10:00
commit edae729346
6 files changed
+10 -9

No files matched your search

+1 -2
View File
@@ -35,8 +35,7 @@
"chat.tools.terminal.autoApprove": {
"test": true,
"git check-ignore": true,
"mkdir": true,
"cp": true
"mkdir": true
},
}
+1 -1
View File
@@ -47,7 +47,7 @@ Edit `my_plugin/script.py` and implement your data collection logic:
import sys
import os
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../server'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../plugins'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../server/plugins'))
from plugin_helper import Plugin_Objects, mylog
from helper import get_setting_value
+1 -1
View File
@@ -4,7 +4,7 @@ import sys
import requests
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../server'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../plugins'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../server/plugins'))
from plugin_helper import Plugin_Objects, mylog, is_mac # noqa: E402 [flake8 lint suppression]
from helper import get_setting_value # noqa: E402 [flake8 lint suppression]
+3 -2
View File
@@ -21,9 +21,10 @@ import pytest
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
_SERVER = os.path.join(_ROOT, "server")
_PLUGIN_DIR = os.path.join(_ROOT, "front", "plugins", "fritzbox")
_PLUGINS = os.path.join(_ROOT, "server", "plugins")
_PLUGIN_DIR = os.path.join(_ROOT, "server", "plugins", "fritzbox")
for _p in [_ROOT, _SERVER, _PLUGIN_DIR]:
for _p in [_ROOT, _SERVER, _PLUGINS, _PLUGIN_DIR]:
if _p not in sys.path:
sys.path.insert(0, _p)
+3 -2
View File
@@ -18,9 +18,10 @@ import pytest
_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
_SERVER = os.path.join(_ROOT, 'server')
_PLUGIN_DIR = os.path.join(_ROOT, 'front', 'plugins', 'rest_import')
_PLUGINS = os.path.join(_ROOT, 'server', 'plugins')
_PLUGIN_DIR = os.path.join(_ROOT, 'server', 'plugins', 'rest_import')
for _p in [_ROOT, _SERVER, _PLUGIN_DIR, os.path.join(_ROOT, 'front', 'plugins')]:
for _p in [_ROOT, _SERVER, _PLUGINS, _PLUGIN_DIR]:
if _p not in sys.path:
sys.path.insert(0, _p)
+1 -1
View File
@@ -17,7 +17,7 @@ from unittest.mock import patch
# Add server and plugins to path
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'server'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'front', 'plugins'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'server', 'plugins'))
from models.device_instance import DeviceInstance # noqa: E402 [flake8 lint suppression]
from plugin_helper import normalize_mac # noqa: E402 [flake8 lint suppression]