vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Override init fix of schedules + #913

Browse Source
This commit is contained in:
jokob-sk
2024-12-17 21:16:34 +11:00
parent 721a275fd8
commit 191afdf857
17 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
front/php/templates/language/ar_ar.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "",
"Gen_Search": "",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "",
"Gen_Switch": "",

1
front/php/templates/language/ca_ca.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Guardat",
"Gen_Search": "Cerca",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "Seleccioneu la vista prèvia",
"Gen_Selected_Devices": "Dispositius seleccionats:",
"Gen_Switch": "Switch",

1
front/php/templates/language/cs_cz.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "",
"Gen_Search": "",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "",
"Gen_Switch": "",

1
front/php/templates/language/de_de.json
View File

@@ -321,6 +321,7 @@
"Gen_Saved": "Gespeichert",
"Gen_Search": "Suchen",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "Zur Vorschau auswählen",
"Gen_Selected_Devices": "Ausgewählte Geräte:",
"Gen_Switch": "Umschalten",

1
front/php/templates/language/en_us.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Saved",
"Gen_Search": "Search",
"Gen_Select": "Select",
"Gen_SelectIcon": "<i class=\"fa-solid fa-chevron-down fa-fade\"></i>",
"Gen_SelectToPreview": "Select to preview",
"Gen_Selected_Devices": "Selected Devices:",
"Gen_Switch": "Switch",

1
front/php/templates/language/es_es.json
View File

@@ -319,6 +319,7 @@
"Gen_Saved": "Guardado",
"Gen_Search": "Buscar",
"Gen_Select": "Seleccionar",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "Seleccionar para previsualizar",
"Gen_Selected_Devices": "Dispositivos seleccionados:",
"Gen_Switch": "Cambiar",

1
front/php/templates/language/fr_fr.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Enregistré",
"Gen_Search": "Recherche",
"Gen_Select": "Sélectionner",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "Sélectionnez pour prévisualiser",
"Gen_Selected_Devices": "Appareils sélectionnés :",
"Gen_Switch": "Basculer",

1
front/php/templates/language/it_it.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Salvato",
"Gen_Search": "Cerca",
"Gen_Select": "Seleziona",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "Seleziona per anteprima",
"Gen_Selected_Devices": "Dispositivi selezionati:",
"Gen_Switch": "Cambia",

1
front/php/templates/language/nb_no.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Lagret",
"Gen_Search": "Søk",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "Valgte Enheter:",
"Gen_Switch": "Bytt",

1
front/php/templates/language/pl_pl.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Zapisano",
"Gen_Search": "Szukaj",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "Wybierz Urządzenia:",
"Gen_Switch": "Switch",

1
front/php/templates/language/pt_br.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Salvo",
"Gen_Search": "Procurar",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "Dispositivos selecionados:",
"Gen_Switch": "Trocar",

1
front/php/templates/language/ru_ru.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Сохранено",
"Gen_Search": "Поиск",
"Gen_Select": "Выбрать",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "Выберите для предварительного просмотра",
"Gen_Selected_Devices": "Выбранные устройства:",
"Gen_Switch": "Переключить",

1
front/php/templates/language/tr_tr.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "Kaydedildi",
"Gen_Search": "",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "Seçilmiş Cihazlar:",
"Gen_Switch": "",

1
front/php/templates/language/zh_cn.json
View File

@@ -309,6 +309,7 @@
"Gen_Saved": "已保存",
"Gen_Search": "搜索",
"Gen_Select": "",
"Gen_SelectIcon": "",
"Gen_SelectToPreview": "",
"Gen_Selected_Devices": "选定的设备：",
"Gen_Switch": "交换",

2
front/plugins/newdev_template/config.json
View File

@@ -390,7 +390,7 @@
"elementType": "span",
"elementOptions": [
{ "cssClasses": "input-group-addon iconPreview" },
{ "getStringKey": "Gen_SelectToPreview" },
{ "getStringKey": "Gen_SelectIcon" },
{ "customId": "NEWDEV_devIcon_preview" }
],
"transformers": []

2
front/plugins/nmap_scan/script.py
View File

@@ -162,7 +162,7 @@ def performNmapScan(deviceIPs, deviceMACs, timeoutSec, args):
elif 'Nmap done' in line:
duration = line.split('scanned in ')[1]
mylog('verbose', [ff'[{pluginName}] {newPortsPerDevice} ports found on {deviceMACs[devIndex]}'])
mylog('verbose', [f'[{pluginName}] {newPortsPerDevice} ports found on {deviceMACs[devIndex]}'])
index += 1
devIndex += 1

26
server/initialise.py
View File

@@ -192,7 +192,7 @@ def importConfigs (db, all_plugins):
plugin_indexes_to_remove = []
all_plugins_prefixes = [] # to init the LOADED_PLUGINS setting with correct options
loaded_plugins_prefixes = [] # to init the LOADED_PLUGINS setting with correct initially seelcted values
loaded_plugins_prefixes = [] # to init the LOADED_PLUGINS setting with correct initially selected values
# handle plugins
index = 0
@@ -254,11 +254,6 @@ def importConfigs (db, all_plugins):
# Save the user defined value into the object
set["value"] = v
# Setup schedules
if setFunction == 'RUN_SCHD':
newSchedule = Cron(v).schedule(start_date=datetime.datetime.now(conf.tz))
conf.mySchedules.append(schedule_class(pref, newSchedule, newSchedule.next(), False))
# Collect settings related language strings
# Creates an entry with key, for example ARPSCAN_CMD_name
stringSqlParams = collect_lang_strings(set, pref + "_" + set["function"], stringSqlParams)
@@ -331,6 +326,24 @@ def importConfigs (db, all_plugins):
else:
mylog('debug', [f"[Config] File {app_conf_override_path} does not exist."])
# setup execution schedules AFTER OVERRIDE handling
index = 0
for plugin in all_plugins:
pref = plugin["unique_prefix"]
plugin_run = ''
# get user-defined run value if available
if pref + "_RUN" in c_d:
plugin_run = c_d[pref + "_RUN" ]
# Setup schedules
if plugin_run == 'schedule':
newSchedule = Cron(c_d[pref + "_RUN_SCHD" ]).schedule(start_date=datetime.datetime.now(conf.tz))
conf.mySchedules.append(schedule_class(pref, newSchedule, newSchedule.next(), False))
# -----------------
# HANDLE APP was upgraded message - clear cache
@@ -353,6 +366,7 @@ def importConfigs (db, all_plugins):
write_notification(f'[Upgrade] : App upgraded 🚀 Please clear the cache: <ol> <li>Click OK below</li> <li>Clear the browser cache (shift + browser refresh button)</li> <li> Clear app cache with the 🔄 (reload) button in the header</li><li>Go to Settings and click Save</li> </ol> Check out new features and what has changed in the <a href="https://github.com/jokob-sk/NetAlertX/releases" target="_blank">📓 release notes</a>.', 'interrupt', timeNowTZ())
# -----------------
# Initialization finished, update DB and API endpoints