Custom Device Properties v0.1 #876

server/const.py

@@ -59,6 +59,7 @@ sql_devices_all = """
                         IFNULL(devSSID, '') AS devSSID,
                         IFNULL(devSyncHubNode, '') AS devSyncHubNode,
                         IFNULL(devSourcePlugin, '') AS devSourcePlugin,
+                        IFNULL(devCustomProps, '') AS devCustomProps,
                         CASE 
                             WHEN devIsNew = 1 THEN 'New'
                             WHEN devPresentLastScan = 1 THEN 'On-line'

server/database.py

@@ -475,6 +475,20 @@ class DB():
         
         self.sql.execute(""" DROP VIEW IF EXISTS Sessions_Devices;""")
         self.sql.execute("""CREATE VIEW Sessions_Devices AS SELECT * FROM Sessions LEFT JOIN "Devices" ON ses_MAC = devMac;""")
+
+
+        # add fields if missing
+
+        # devCustomProps column
+        devCustomProps_missing = self.sql.execute ("""
+            SELECT COUNT(*) AS CNTREC FROM pragma_table_info('Devices') WHERE name='devCustomProps'
+          """).fetchone()[0] == 0
+
+        if devCustomProps_missing :
+          mylog('verbose', ["[upgradeDB] Adding devCustomProps to the Devices table"])
+          self.sql.execute("""
+            ALTER TABLE "Devices" ADD "devCustomProps" TEXT
+          """)
         
         # -------------------------------------------------------------------------
         # Settings table setup

server/device.py

@@ -226,7 +226,8 @@ def create_new_devices (db):
                         devGroup, 
                         devComments, 
                         devLogEvents, 
-                        devLocation"""
+                        devLocation,
+                        devCustomProps"""
 
     newDevDefaults = f"""{get_setting_value('NEWDEV_devAlertEvents')}, 
                         {get_setting_value('NEWDEV_devAlertDown')}, 
@@ -240,7 +241,9 @@ def create_new_devices (db):
                         '{sanitize_SQL_input(get_setting_value('NEWDEV_devGroup'))}', 
                         '{sanitize_SQL_input(get_setting_value('NEWDEV_devComments'))}', 
                         {get_setting_value('NEWDEV_devLogEvents')}, 
-                        '{sanitize_SQL_input(get_setting_value('NEWDEV_devLocation'))}'"""
+                        '{sanitize_SQL_input(get_setting_value('NEWDEV_devLocation'))}',
+                        '{sanitize_SQL_input(get_setting_value('NEWDEV_devCustomProps'))}'
+                        """
 
     # Fetch data from CurrentScan skipping ignored devices by IP and MAC
     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 

server/graphql_server/graphql_schema.py

@@ -62,6 +62,7 @@ class Device(ObjectType):
     devSSID = String() 
     devSyncHubNode = String() 
     devSourcePlugin = String()
+    devCustomProps = String()
     devStatus = String()
     devIsRandomMac = Int()  
     devParentChildrenCount = Int() 

server/initialise.py

@@ -202,7 +202,7 @@ def importConfigs (db, all_plugins):
     # Plugins START
     # -----------------
 
-    necessary_plugins = ['UI', 'DBCLNP', 'INTRNT','MAINT','NEWDEV', 'SETPWD', 'SYNC', 'VNDRPDT', 'WORKFLOWS']
+    necessary_plugins = ['UI', 'CUSTPROP', 'DBCLNP', 'INTRNT','MAINT','NEWDEV', 'SETPWD', 'SYNC', 'VNDRPDT', 'WORKFLOWS']
     # make sure necessary plugins are loaded
     conf.LOADED_PLUGINS += [plugin for plugin in necessary_plugins if plugin not in conf.LOADED_PLUGINS]