From 191afdf8578149c34d06c42b099056ea7e328ad5 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Tue, 17 Dec 2024 21:16:34 +1100 Subject: [PATCH] Override init fix of schedules + #913 --- front/php/templates/language/ar_ar.json | 1 + front/php/templates/language/ca_ca.json | 1 + front/php/templates/language/cs_cz.json | 1 + front/php/templates/language/de_de.json | 1 + front/php/templates/language/en_us.json | 1 + front/php/templates/language/es_es.json | 3 ++- front/php/templates/language/fr_fr.json | 3 ++- front/php/templates/language/it_it.json | 3 ++- front/php/templates/language/nb_no.json | 1 + front/php/templates/language/pl_pl.json | 1 + front/php/templates/language/pt_br.json | 3 ++- front/php/templates/language/ru_ru.json | 3 ++- front/php/templates/language/tr_tr.json | 1 + front/php/templates/language/zh_cn.json | 1 + front/plugins/newdev_template/config.json | 2 +- front/plugins/nmap_scan/script.py | 2 +- server/initialise.py | 26 +++++++++++++++++------ 17 files changed, 41 insertions(+), 13 deletions(-) diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index 3325946d..7243a139 100755 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -309,6 +309,7 @@ "Gen_Saved": "", "Gen_Search": "", "Gen_Select": "", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "", "Gen_Selected_Devices": "", "Gen_Switch": "", diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json index 524ba155..c1028ff6 100755 --- a/front/php/templates/language/ca_ca.json +++ b/front/php/templates/language/ca_ca.json @@ -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", diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index 3325946d..7243a139 100755 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -309,6 +309,7 @@ "Gen_Saved": "", "Gen_Search": "", "Gen_Select": "", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "", "Gen_Selected_Devices": "", "Gen_Switch": "", diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index 6fcc7713..4dbd7452 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -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", diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 54b82d49..dec26a7d 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -309,6 +309,7 @@ "Gen_Saved": "Saved", "Gen_Search": "Search", "Gen_Select": "Select", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "Select to preview", "Gen_Selected_Devices": "Selected Devices:", "Gen_Switch": "Switch", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index 57609b99..19f8e144 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -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", @@ -811,4 +812,4 @@ "settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. O la validación no se realiza.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes." -} +} \ No newline at end of file diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index 53a6fdfa..72f3d29e 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -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", @@ -732,4 +733,4 @@ "settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. Il n'y a pas de pas de contrôle.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage." -} +} \ No newline at end of file diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index f9e393de..8bb08099 100755 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -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", @@ -732,4 +733,4 @@ "settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. La convalida non viene eseguita.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni." -} +} \ No newline at end of file diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index 22a70598..cf581519 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -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", diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index 89fe98ca..bd6f7d55 100755 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -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", diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index 8698adfb..4b40e494 100755 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -309,6 +309,7 @@ "Gen_Saved": "Salvo", "Gen_Search": "Procurar", "Gen_Select": "", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "", "Gen_Selected_Devices": "Dispositivos selecionados:", "Gen_Switch": "Trocar", @@ -732,4 +733,4 @@ "settings_update_item_warning": "", "test_event_icon": "", "test_event_tooltip": "" -} +} \ No newline at end of file diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index 2fb208b7..4d1bc970 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -309,6 +309,7 @@ "Gen_Saved": "Сохранено", "Gen_Search": "Поиск", "Gen_Select": "Выбрать", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "Выберите для предварительного просмотра", "Gen_Selected_Devices": "Выбранные устройства:", "Gen_Switch": "Переключить", @@ -732,4 +733,4 @@ "settings_update_item_warning": "Обновить значение ниже. Будьте осторожны, следуя предыдущему формату. Проверка не выполняется.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки." -} +} \ No newline at end of file diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index 23d27c35..3fb6327d 100755 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -309,6 +309,7 @@ "Gen_Saved": "Kaydedildi", "Gen_Search": "", "Gen_Select": "", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "", "Gen_Selected_Devices": "Seçilmiş Cihazlar:", "Gen_Switch": "", diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 6c397ffb..0d32f8c3 100755 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -309,6 +309,7 @@ "Gen_Saved": "已保存", "Gen_Search": "搜索", "Gen_Select": "", + "Gen_SelectIcon": "", "Gen_SelectToPreview": "", "Gen_Selected_Devices": "选定的设备：", "Gen_Switch": "交换", diff --git a/front/plugins/newdev_template/config.json b/front/plugins/newdev_template/config.json index d3c96bbd..c63bc8b2 100755 --- a/front/plugins/newdev_template/config.json +++ b/front/plugins/newdev_template/config.json @@ -390,7 +390,7 @@ "elementType": "span", "elementOptions": [ { "cssClasses": "input-group-addon iconPreview" }, - { "getStringKey": "Gen_SelectToPreview" }, + { "getStringKey": "Gen_SelectIcon" }, { "customId": "NEWDEV_devIcon_preview" } ], "transformers": [] diff --git a/front/plugins/nmap_scan/script.py b/front/plugins/nmap_scan/script.py index 4cf1ce95..15b2a462 100755 --- a/front/plugins/nmap_scan/script.py +++ b/front/plugins/nmap_scan/script.py @@ -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 diff --git a/server/initialise.py b/server/initialise.py index 5d22d27a..d94121ba 100755 --- a/server/initialise.py +++ b/server/initialise.py @@ -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 @@ -352,6 +365,7 @@ def importConfigs (db, all_plugins): write_notification(f'[Upgrade] : App upgraded 🚀 Please clear the cache:
  1. Click OK below
  2. Clear the browser cache (shift + browser refresh button)
  3. Clear app cache with the 🔄 (reload) button in the header
  4. Go to Settings and click Save
Check out new features and what has changed in the 📓 release notes.', 'interrupt', timeNowTZ()) + # ----------------- # Initialization finished, update DB and API endpoints