From ac8bbca37fc0fb3671958a693a91c19c650ae93b Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Thu, 6 Jun 2024 18:50:15 +1000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=83=20Sync=20Hub=20v0.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/php/templates/language/de_de.json | 0 front/php/templates/language/es_es.json | 0 front/php/templates/language/it_it.json | 0 front/php/templates/language/merge_translations.py | 1 + front/php/templates/language/ru_ru.json | 0 front/plugins/sync/hub.php | 1 + server/device.py | 3 ++- 7 files changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 front/php/templates/language/de_de.json mode change 100644 => 100755 front/php/templates/language/es_es.json mode change 100644 => 100755 front/php/templates/language/it_it.json mode change 100644 => 100755 front/php/templates/language/ru_ru.json diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/merge_translations.py b/front/php/templates/language/merge_translations.py index 45f8a857..c454212e 100755 --- a/front/php/templates/language/merge_translations.py +++ b/front/php/templates/language/merge_translations.py @@ -32,6 +32,7 @@ def merge_translations(main_file, other_files): if __name__ == "__main__": current_path = os.path.dirname(os.path.abspath(__file__)) + # language codes can be found here: http://www.lingoes.net/en/translator/langcode.htm json_files = ["en_us.json", "de_de.json", "es_es.json", "fr_fr.json", "nb_no.json", "ru_ru.json", "it_it.json", "pt_br.json", "pl_pl.json", "zh_cn.json", "tr_tr.json"] file_paths = [os.path.join(current_path, file) for file in json_files] merge_translations(file_paths[0], file_paths[1:]) diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json old mode 100644 new mode 100755 diff --git a/front/plugins/sync/hub.php b/front/plugins/sync/hub.php index 92a1557f..3b6cfac4 100755 --- a/front/plugins/sync/hub.php +++ b/front/plugins/sync/hub.php @@ -43,6 +43,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { file_put_contents($file_path, $data); http_response_code(200); echo 'Data received and stored successfully'; + write_notification("[Plugin: Sync hub API] Data received", "info"); } else { http_response_code(405); echo 'Method Not Allowed'; diff --git a/server/device.py b/server/device.py index 647e4d9c..181bf59e 100755 --- a/server/device.py +++ b/server/device.py @@ -268,7 +268,8 @@ def update_devices_data_from_scan (db): mylog('debug','[Update Devices] - 4 Unknown Name') sql.execute ("""UPDATE Devices SET dev_NAME = (SELECT cur_Name FROM CurrentScan - WHERE cur_MAC = dev_MAC) + WHERE cur_MAC = dev_MAC + and dev_Name not in ("(unknown)", "(name not found)", "")) WHERE (dev_Name in ("(unknown)", "(name not found)", "" ) OR dev_Name IS NULL) AND EXISTS (SELECT 1 FROM CurrentScan