Merge branch 'jokob-sk:main' into main

front/plugins/README.md

@@ -37,7 +37,7 @@ Device-detecting plugins insert values into the `CurrentScan` database table.  T
 | `INTRSPD`     | ♻       | Internet speed test                         |          | Script       | [internet_speedtest](/front/plugins/internet_speedtest/)          |
 | `MAINT`       | ⚙       | Maintenance of logs, etc.                   |          | Script       | [maintenance](/front/plugins/maintenance/)                        |
 | `MQTT`        | ▶️      | MQTT for synching to Home Assistant         |          | Script       | [_publisher_mqtt](/front/plugins/_publisher_mqtt/)                |
-| `NBTSCAN`     | ♻       | NSLookup (NetBIOS-based) name resolution    |          | Script       | [nbtscan_scan](/front/plugins/nbtscan_scan/)                      |
+| `NBTSCAN`     | ♻       | Nbtscan (NetBIOS-based) name resolution    |          | Script       | [nbtscan_scan](/front/plugins/nbtscan_scan/)                      |
 | `NEWDEV`      | ⚙       | New device template                         |  Yes     | Template     | [newdev_template](/front/plugins/newdev_template/)                |
 | `NMAP`        | ♻       | Nmap port scanning & discovery              |          | Script       | [nmap_scan](/front/plugins/nmap_scan/)                            |
 | `NMAPDEV`     | 🔍      | Nmap dev scan on current network            |          | Script       | [nmap_dev_scan](/front/plugins/nmap_dev_scan/)                    |
@@ -80,7 +80,7 @@ Device-detecting plugins insert values into the `CurrentScan` database table.  T
 
 Plugins can be enabled via Settings, and can be disabled as needed. 
 
-1. Research which plugin you'd like to use below and then load the required plugins in Settings via the `LOADED_PLUGINS` setting.
+1. Research which plugin you'd like to use and load the required plugins in Settings via the `LOADED_PLUGINS` setting.
 1. Save the changes and review the Settings of the newly loaded plugins. 
 1. Change the `<prefix>_RUN` Setting to the recommended or custom value as per the documentation of the given setting  
     - If using `schedule` on a `🔍 dev scanner` plugin, make sure the schedules are the same across all `🔍 dev scanner` plugins

front/plugins/__test/test.py

@@ -60,11 +60,11 @@ def main():
     print(subnets)
 
     for rgx in regexes: 
-        mylog('debug', ["[cleanDeviceName] applying regex    : " + rgx])
-        mylog('debug', ["[cleanDeviceName] name before regex : " + str])
+        mylog('trace', ["[cleanDeviceName] applying regex    : " + rgx])
+        mylog('trace', ["[cleanDeviceName] name before regex : " + str])
         
         str = re.sub(rgx, "", str)
-        mylog('debug', ["[cleanDeviceName] name after regex  : " + str])
+        mylog('trace', ["[cleanDeviceName] name after regex  : " + str])
 
     mylog('debug', ["[cleanDeviceName] output: " + str])
     

front/plugins/newdev_template/config.json

@@ -176,34 +176,6 @@
         }
       ]
     },
-    {
-      "function": "LESS_NAME_CLEANUP",
-      "type": {
-        "dataType": "boolean",
-        "elements": [
-          {
-            "elementType": "input",
-            "elementOptions": [{ "type": "checkbox" }],
-            "transformers": []
-          }
-        ]
-      },
-      "default_value": 0,
-      "options": [],
-      "localized": ["name", "description"],
-      "name": [
-        {
-          "language_code": "en_us",
-          "string": "Less Name Cleanup"
-        }
-      ],
-      "description": [
-        {
-          "language_code": "en_us",
-          "string": "Check to start using the new code for cleaning device names. Removes all labels starting with underscore and removes network domain and search list."
-        }
-      ]
-    },
     {
       "function": "NAME_CLEANUP_REGEX",
       "type": {