From abd2f668147c3787d6ca124f12b014b79200a349 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sat, 19 Oct 2024 12:03:20 +1100 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=95Source=20Plugin=20Column?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/devices.php | 3 ++- front/php/server/devices.php | 6 ++++-- front/php/server/util.php | 3 ++- front/php/templates/language/ar_ar.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 | 1 + front/php/templates/language/fr_fr.json | 1 + front/php/templates/language/it_it.json | 1 + front/php/templates/language/nb_no.json | 1 + front/php/templates/language/pl_pl.json | 1 + front/php/templates/language/pt_br.json | 1 + front/php/templates/language/ru_ru.json | 1 + front/php/templates/language/tr_tr.json | 1 + front/php/templates/language/zh_cn.json | 1 + front/plugins/ui_settings/config.json | 6 ++++-- server/database.py | 11 +++++++++++ server/device.py | 6 ++++-- 19 files changed, 40 insertions(+), 8 deletions(-) diff --git a/front/devices.php b/front/devices.php index b4a928c4..d45a0f49 100755 --- a/front/devices.php +++ b/front/devices.php @@ -456,7 +456,8 @@ function initializeDatatable (status) { item.dev_GUID || "", item.dev_SyncHubNodeName || "", item.dev_NetworkSite || "", - item.dev_SSID || "" + item.dev_SSID || "", + item.dev_SourcePlugin || "" ]; var newRow = []; diff --git a/front/php/server/devices.php b/front/php/server/devices.php index cc71159d..51fa5204 100755 --- a/front/php/server/devices.php +++ b/front/php/server/devices.php @@ -620,7 +620,8 @@ function getDevicesList() { array("dev_GUID", 19, 19), array("dev_SyncHubNodeName", 20, 20), array("dev_NetworkSite", 21, 21), - array("dev_SSID", 22, 22) + array("dev_SSID", 22, 22), + array("dev_SourcePlugin", 23, 23) ); if($forceDefaultOrder == FALSE) @@ -693,7 +694,8 @@ function getDevicesList() { handleNull($row['dev_GUID']), handleNull($row['dev_SyncHubNodeName']), handleNull($row['dev_NetworkSite']), - handleNull($row['dev_SSID']) + handleNull($row['dev_SSID']), + handleNull($row['dev_SourcePlugin']) ); $newOrder = array(); diff --git a/front/php/server/util.php b/front/php/server/util.php index dd43dd92..df6c009b 100755 --- a/front/php/server/util.php +++ b/front/php/server/util.php @@ -576,7 +576,8 @@ function getDevicesColumns(){ "dev_GUID", "dev_SyncHubNodeName", "dev_NetworkSite", - "dev_SSID" + "dev_SSID", + "dev_SourcePlugin" ]; return $columns; diff --git a/front/php/templates/language/ar_ar.json b/front/php/templates/language/ar_ar.json index cc88796d..aec71fb2 100755 --- a/front/php/templates/language/ar_ar.json +++ b/front/php/templates/language/ar_ar.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "", "Device_TableHead_Rowid": "", "Device_TableHead_SSID": "", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "", "Device_TableHead_SyncHubNodeName": "", "Device_TableHead_Type": "", diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json index cc88796d..aec71fb2 100755 --- a/front/php/templates/language/cs_cz.json +++ b/front/php/templates/language/cs_cz.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "", "Device_TableHead_Rowid": "", "Device_TableHead_SSID": "", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "", "Device_TableHead_SyncHubNodeName": "", "Device_TableHead_Type": "", diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json index d20344ba..f0bd23dc 100755 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -229,6 +229,7 @@ "Device_TableHead_RowID": "Zeilen ID", "Device_TableHead_Rowid": "Zeilennummer", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Status", "Device_TableHead_SyncHubNodeName": "Synchronisationsknoten", "Device_TableHead_Type": "Typ", diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index ed4f29d7..e88f2544 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "Row ID", "Device_TableHead_Rowid": "Row ID", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "Source Plugin", "Device_TableHead_Status": "Status", "Device_TableHead_SyncHubNodeName": "Sync Node", "Device_TableHead_Type": "Type", diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json index af297ce4..0368752b 100755 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -227,6 +227,7 @@ "Device_TableHead_RowID": "Row ID", "Device_TableHead_Rowid": "Row ID", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Situación", "Device_TableHead_SyncHubNodeName": "Nodo de sincronización", "Device_TableHead_Type": "Tipo", diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index f2949f2f..856ede36 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "ID de colonne", "Device_TableHead_Rowid": "ID de colonne", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "État", "Device_TableHead_SyncHubNodeName": "Noeud de synchro", "Device_TableHead_Type": "Type", diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json index 63a834fc..65d3d024 100755 --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "ID riga", "Device_TableHead_Rowid": "ID riga", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Stato", "Device_TableHead_SyncHubNodeName": "Sincronizza nodo", "Device_TableHead_Type": "Tipo", diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json index 66256dd6..5f5ec21e 100755 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "Rad ID", "Device_TableHead_Rowid": "Rad ID", "Device_TableHead_SSID": "", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Status", "Device_TableHead_SyncHubNodeName": "Synkroniser Node", "Device_TableHead_Type": "Type", diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json index 9edc9505..65a32784 100755 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "ID wiersza", "Device_TableHead_Rowid": "ID wiersza", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Status", "Device_TableHead_SyncHubNodeName": "Węzeł Synchronizacji", "Device_TableHead_Type": "Typ", diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json index 5e4ea2b7..24c3bcfe 100755 --- a/front/php/templates/language/pt_br.json +++ b/front/php/templates/language/pt_br.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "ID da linha", "Device_TableHead_Rowid": "ID da linha", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Status", "Device_TableHead_SyncHubNodeName": "Nó de sincronização", "Device_TableHead_Type": "Tipo", diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json index ec56b01d..8c2d3764 100755 --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "ID строки", "Device_TableHead_Rowid": "ID строки", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Статус", "Device_TableHead_SyncHubNodeName": "Узел синхронизации", "Device_TableHead_Type": "Тип", diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json index 302254cc..a1f4e70b 100755 --- a/front/php/templates/language/tr_tr.json +++ b/front/php/templates/language/tr_tr.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "", "Device_TableHead_Rowid": "", "Device_TableHead_SSID": "", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "Durum", "Device_TableHead_SyncHubNodeName": "", "Device_TableHead_Type": "", diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json index 9f88c4b1..f537e14a 100755 --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -217,6 +217,7 @@ "Device_TableHead_RowID": "排行", "Device_TableHead_Rowid": "排行", "Device_TableHead_SSID": "SSID", + "Device_TableHead_SourcePlugin": "", "Device_TableHead_Status": "状态", "Device_TableHead_SyncHubNodeName": "同步节点", "Device_TableHead_Type": "类型", diff --git a/front/plugins/ui_settings/config.json b/front/plugins/ui_settings/config.json index 6f32e476..3139c224 100755 --- a/front/plugins/ui_settings/config.json +++ b/front/plugins/ui_settings/config.json @@ -346,7 +346,8 @@ "Device_TableHead_Type", "Device_TableHead_LastIP", "Device_TableHead_Status", - "Device_TableHead_MAC_full" + "Device_TableHead_MAC_full", + "Device_TableHead_SourcePlugin" ], "options": [ "Device_TableHead_Name", @@ -371,7 +372,8 @@ "Device_TableHead_GUID", "Device_TableHead_SyncHubNodeName", "Device_TableHead_NetworkSite", - "Device_TableHead_SSID" + "Device_TableHead_SSID", + "Device_TableHead_SourcePlugin" ], "localized": ["name", "description"], "name": [ diff --git a/server/database.py b/server/database.py index 1a5ef6fc..08ed187b 100755 --- a/server/database.py +++ b/server/database.py @@ -213,6 +213,17 @@ class DB(): self.sql.execute(""" ALTER TABLE "Devices" ADD "dev_SyncHubNodeName" TEXT """) + + # dev_SourcePlugin column + dev_SourcePlugin_missing = self.sql.execute (""" + SELECT COUNT(*) AS CNTREC FROM pragma_table_info('Devices') WHERE name='dev_SourcePlugin' + """).fetchone()[0] == 0 + + if dev_SourcePlugin_missing : + mylog('verbose', ["[upgradeDB] Adding dev_SourcePlugin to the Devices table"]) + self.sql.execute(""" + ALTER TABLE "Devices" ADD "dev_SourcePlugin" TEXT + """) # ------------------------------------------------------------------------- # Settings table setup diff --git a/server/device.py b/server/device.py index dbf2fb1a..ffabdb53 100755 --- a/server/device.py +++ b/server/device.py @@ -229,7 +229,7 @@ def create_new_devices (db): '{sanitize_SQL_input(get_setting_value('NEWDEV_dev_Location'))}'""" # Fetch data from CurrentScan skipping ignored devices by IP and MAC - query = f"""SELECT cur_MAC, cur_Name, cur_Vendor, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type + query = f"""SELECT cur_MAC, cur_Name, cur_Vendor, cur_ScanMethod, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type FROM CurrentScan """ @@ -237,7 +237,7 @@ def create_new_devices (db): current_scan_data = sql.execute(query).fetchall() for row in current_scan_data: - cur_MAC, cur_Name, cur_Vendor, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type = row + cur_MAC, cur_Name, cur_Vendor, cur_ScanMethod, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type = row # Handle NoneType cur_Name = cur_Name.strip() if cur_Name else '(unknown)' @@ -262,6 +262,7 @@ def create_new_devices (db): dev_NetworkSite, dev_SSID, dev_DeviceType, + dev_SourcePlugin, {newDevColumns} ) VALUES @@ -279,6 +280,7 @@ def create_new_devices (db): '{sanitize_SQL_input(cur_NetworkSite)}', '{sanitize_SQL_input(cur_SSID)}', '{sanitize_SQL_input(cur_Type)}', + '{sanitize_SQL_input(cur_ScanMethod)}', {newDevDefaults} )"""