Initial commit on next_release branch

front/plugins/_publisher_mqtt/mqtt.py

@@ -293,9 +293,6 @@ def create_sensor(mqtt_client, deviceId, deviceName, sensorType, sensorName, ico
     #  check previous configs
     sensorConfig = sensor_config(deviceId, deviceName, sensorType, sensorName, icon, mac) 
 
-    mylog('verbose', [f"[{pluginName}] Publishing sensor number {len(mqtt_sensors)}"])
-    
-
     # send if new 
     if sensorConfig.isNew: 
 

front/plugins/avahi_scan/avahi_scan.py

@@ -18,7 +18,7 @@ from const import pluginsPath, fullDbPath, logPath
 from helper import timeNowTZ, get_setting_value 
 from notification import write_notification
 from database import DB
-from device import Device_obj
+from models.device_instance import DeviceInstance
 import conf
 from pytz import timezone
 
@@ -53,8 +53,8 @@ def main():
     # Initialize the Plugin obj output file
     plugin_objects = Plugin_Objects(RESULT_FILE)
 
-    # Create a Device_obj instance
-    device_handler = Device_obj(db)
+    # Create a DeviceInstance instance
+    device_handler = DeviceInstance(db)
 
     # Retrieve devices
     unknown_devices = device_handler.getUnknown()

front/plugins/db_cleanup/script.py

@@ -139,6 +139,7 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, HRS_TO_KEEP_NEWDEV, HRS_TO_KE
                             );"""
 
     cursor.execute(delete_query)
+    conn.commit()
 
 
     # -----------------------------------------------------

front/plugins/icmp_scan/icmp.py

@@ -23,7 +23,7 @@ from logger import mylog, Logger, append_line_to_file
 from helper import timeNowTZ, get_setting_value
 from const import logPath, applicationPath, fullDbPath
 from database import DB
-from device import Device_obj
+from models.device_instance import DeviceInstance
 import conf
 from pytz import timezone
 
@@ -57,8 +57,8 @@ def main():
     # Initialize the Plugin obj output file
     plugin_objects = Plugin_Objects(RESULT_FILE)
 
-    # Create a Device_obj instance
-    device_handler = Device_obj(db)
+    # Create a DeviceInstance instance
+    device_handler = DeviceInstance(db)
 
     # Retrieve devices
     all_devices = device_handler.getAll()

front/plugins/nbtscan_scan/nbtscan.py

@@ -18,7 +18,7 @@ from const import pluginsPath, fullDbPath, logPath
 from helper import timeNowTZ, get_setting_value 
 from notification import write_notification
 from database import DB
-from device import Device_obj
+from models.device_instance import DeviceInstance
 import conf
 from pytz import timezone
 
@@ -53,8 +53,8 @@ def main():
     # Initialize the Plugin obj output file
     plugin_objects = Plugin_Objects(RESULT_FILE)
 
-    # Create a Device_obj instance
-    device_handler = Device_obj(db)
+    # Create a DeviceInstance instance
+    device_handler = DeviceInstance(db)
 
     # Retrieve devices
     unknown_devices = device_handler.getUnknown()

front/plugins/nmap_dev_scan/nmap_dev.py

@@ -24,7 +24,7 @@ from logger import mylog, Logger, append_line_to_file
 from helper import timeNowTZ, get_setting_value, extract_between_strings, extract_ip_addresses, extract_mac_addresses
 from const import logPath, applicationPath, fullDbPath
 from database import DB
-from device import Device_obj
+from models.device_instance import DeviceInstance
 import conf
 from pytz import timezone
 

front/plugins/nslookup_scan/nslookup.py

@@ -23,7 +23,7 @@ from logger import mylog, Logger, append_line_to_file
 from helper import timeNowTZ, get_setting_value
 from const import logPath, applicationPath, fullDbPath
 from database import DB
-from device import Device_obj
+from models.device_instance import DeviceInstance
 import conf
 from pytz import timezone
 
@@ -55,8 +55,8 @@ def main():
     # Initialize the Plugin obj output file
     plugin_objects = Plugin_Objects(RESULT_FILE)
 
-    # Create a Device_obj instance
-    device_handler = Device_obj(db)
+    # Create a DeviceInstance instance
+    device_handler = DeviceInstance(db)
 
     # Retrieve devices
     unknown_devices = device_handler.getUnknown()

front/plugins/omada_sdn_imp/omada_sdn.py

@@ -251,12 +251,12 @@ def main():
 
     mylog("verbose", [f"[{pluginName}] starting execution"])
     from database import DB
-    from device import Device_obj
+    from models.device_instance import DeviceInstance
 
     db = DB()  # instance of class DB
     db.open()
-    # Create a Device_obj instance
-    device_handler = Device_obj(db)
+    # Create a DeviceInstance instance
+    device_handler = DeviceInstance(db)
     # Retrieve configuration settings
     # these should be self-explanatory
     omada_sites = []

front/plugins/wake_on_lan/wake_on_lan.py

@@ -19,7 +19,7 @@ from const import pluginsPath, fullDbPath, logPath
 from helper import timeNowTZ, get_setting_value 
 from notification import write_notification
 from database import DB
-from device import Device_obj
+from models.device_instance import DeviceInstance
 import conf
 
 # Make sure the TIMEZONE for logging is correct
@@ -54,8 +54,8 @@ def main():
     db = DB()  # instance of class DB
     db.open()
 
-    # Create a Device_obj instance
-    device_handler = Device_obj(db)
+    # Create a DeviceInstance instance
+    device_handler = DeviceInstance(db)
 
     # Retrieve devices
     if 'offline' in devices_to_wake: