BE: linting fixes 2

Signed-off-by: jokob-sk <jokob.sk@gmail.com>

front/plugins/__template/rename_me.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/__test/test.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # Just a testing library plugin for development purposes
 import os
 import sys

front/plugins/_publisher_apprise/apprise.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import json
 import subprocess

front/plugins/_publisher_email/email_smtp.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 import os
 import sys
 import re

front/plugins/_publisher_mqtt/mqtt.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import json
 import os

front/plugins/_publisher_ntfy/ntfy.py

@@ -1,5 +1,5 @@
 
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import json
 import os

front/plugins/_publisher_pushover/pushover.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python3
+#!/usr/bin/env python3
 import conf
 from const import confFileName, logPath
 from pytz import timezone

front/plugins/_publisher_pushsafer/pushsafer.py

@@ -1,5 +1,5 @@
 
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import json
 import os

front/plugins/_publisher_telegram/tg.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import subprocess
 import os

front/plugins/_publisher_webhook/webhook.py

@@ -1,5 +1,5 @@
 
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import json
 import subprocess

front/plugins/arp_scan/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 import os
 import time
 import argparse

front/plugins/asuswrt_import/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 import os
 import sys
 

front/plugins/avahi_scan/avahi_scan.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python3
+#!/usr/bin/env python3
 import os
 import sys
 import socket

front/plugins/csv_backup/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import argparse

front/plugins/db_cleanup/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/ddns_update/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import argparse

front/plugins/dhcp_leases/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 import argparse

front/plugins/dhcp_servers/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # Based on the work of https://github.com/leiweibau/Pi.Alert
 
 import subprocess

front/plugins/dig_scan/digscan.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 import os
 import sys
 import subprocess

front/plugins/freebox/freebox.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/icmp_scan/icmp.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # test script by running:
 # tbc
 

front/plugins/internet_ip/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import time

front/plugins/internet_speedtest/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/ipneigh/ipneigh.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/luci_import/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 import os
 import sys
 

front/plugins/maintenance/maintenance.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/mikrotik_scan/mikrotik.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/nbtscan_scan/nbtscan.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/nmap_dev_scan/nmap_dev.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # test script by running:
 # tbc
 

front/plugins/nmap_scan/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import argparse

front/plugins/nslookup_scan/nslookup.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # test script by running:
 # tbc
 

front/plugins/omada_sdn_imp/omada_sdn.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 __author__ = "ffsb"
 __version__ = "0.1"  # initial
 __version__ = "0.2"  # added logic to retry omada api call once as it seems to sometimes fail for some reasons, and error handling logic...
@@ -134,7 +134,7 @@ def callomada(myargs):
 
     omada_output = ""
     retries = 2
-    while omada_output == "" and retries > 1:
+    while omada_output == "" and retries > 0:
         retries = retries - 1
         try:
             mf = io.StringIO()
@@ -183,51 +183,71 @@ def add_uplink(
     sadevices_linksbymac,
     port_byswitchmac_byclientmac,
 ):
-    # Ensure switch_mac exists in device_data_bymac
+    # Ensure switch exists
     if switch_mac not in device_data_bymac:
         mylog("none", [f"[{pluginName}] switch_mac '{switch_mac}' not found in device_data_bymac"])
         return
 
-    # Ensure SWITCH_AP key exists in the dictionary
-    if SWITCH_AP not in device_data_bymac[switch_mac]:
-        mylog("none", [f"[{pluginName}] Missing key '{SWITCH_AP}' in device_data_bymac[{switch_mac}]"])
+    dev_switch = device_data_bymac[switch_mac]
+
+    # Ensure list is long enough to contain SWITCH_AP index
+    if len(dev_switch) <= SWITCH_AP:
+        mylog("none", [f"[{pluginName}] SWITCH_AP index {SWITCH_AP} missing in record for {switch_mac}"])
         return
 
-    # Check if uplink should be added
-    if device_data_bymac[switch_mac][SWITCH_AP] in [None, "null"]:
-        device_data_bymac[switch_mac][SWITCH_AP] = uplink_mac
+    # Add uplink only if empty
+    if dev_switch[SWITCH_AP] in (None, "null"):
+        dev_switch[SWITCH_AP] = uplink_mac
 
-        # Ensure uplink_mac exists in device_data_bymac
+        # Validate uplink_mac exists
         if uplink_mac not in device_data_bymac:
             mylog("none", [f"[{pluginName}] uplink_mac '{uplink_mac}' not found in device_data_bymac"])
             return
 
-        # Determine port to uplink
-        if (
-            device_data_bymac[switch_mac].get(TYPE) == "Switch" and device_data_bymac[uplink_mac].get(TYPE) == "Switch"
-        ):
+        dev_uplink = device_data_bymac[uplink_mac]
+
+        # Get TYPE safely
+        switch_type = dev_switch[TYPE] if len(dev_switch) > TYPE else None
+        uplink_type = dev_uplink[TYPE] if len(dev_uplink) > TYPE else None
+
+        # Switch-to-switch link → use port mapping
+        if switch_type == "Switch" and uplink_type == "Switch":
             port_to_uplink = port_byswitchmac_byclientmac.get(switch_mac, {}).get(uplink_mac)
             if port_to_uplink is None:
-                mylog("none", [f"[{pluginName}] Missing port info for switch_mac '{switch_mac}' and uplink_mac '{uplink_mac}'"])
+                mylog("none", [
+                    f"[{pluginName}] Missing port info for {switch_mac} → {uplink_mac}"
+                ])
                 return
         else:
-            port_to_uplink = device_data_bymac[uplink_mac].get(PORT_SSID)
+            # Other device types → read PORT_SSID index
+            if len(dev_uplink) <= PORT_SSID:
+                mylog("none", [
+                    f"[{pluginName}] PORT_SSID index missing for uplink {uplink_mac}"
+                ])
+                return
+            port_to_uplink = dev_uplink[PORT_SSID]
 
-        # Assign port to switch_mac
-        device_data_bymac[switch_mac][PORT_SSID] = port_to_uplink
+        # Assign port to switch
+        if len(dev_switch) > PORT_SSID:
+            dev_switch[PORT_SSID] = port_to_uplink
+        else:
+            mylog("none", [
+                f"[{pluginName}] PORT_SSID index missing in switch {switch_mac}"
+            ])
 
-    # Recursively add uplinks for linked devices
+    # Process children recursively
     for link in sadevices_linksbymac.get(switch_mac, []):
         if (
-            link in device_data_bymac and device_data_bymac[link].get(SWITCH_AP) in [None, "null"] and device_data_bymac[switch_mac].get(TYPE) == "Switch"
+            link in device_data_bymac and len(device_data_bymac[link]) > SWITCH_AP and device_data_bymac[link][SWITCH_AP] in (None, "null") and len(dev_switch) > TYPE
         ):
-            add_uplink(
-                switch_mac,
-                link,
-                device_data_bymac,
-                sadevices_linksbymac,
-                port_byswitchmac_byclientmac,
-            )
+            if dev_switch[TYPE] == "Switch":
+                add_uplink(
+                    switch_mac,
+                    link,
+                    device_data_bymac,
+                    sadevices_linksbymac,
+                    port_byswitchmac_byclientmac,
+                )
 
 
 # ----------------------------------------------

front/plugins/omada_sdn_openapi/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 """
 This plugin imports devices and clients from Omada Controller using their OpenAPI.
@@ -296,7 +296,7 @@ class OmadaAPI:
             OmadaHelper.verbose(f"{method} request error: {str(ex)}")
             return OmadaHelper.response("error", f"{method} request failed to endpoint '{endpoint}' with error: {str(ex)}")
 
-    def authenticate(self) -> Dict[str, any]:
+    def authenticate(self) -> Dict[str, Any]:
         """Make an endpoint request to get access token."""
         OmadaHelper.verbose("Starting authentication process")
 

front/plugins/pihole_api_scan/pihole_api_scan.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 """
 NetAlertX plugin: PIHOLEAPI
 Imports devices from Pi-hole v6 API (Network endpoints) into NetAlertX plugin results.

front/plugins/snmp_discovery/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 from __future__ import unicode_literals
 import subprocess

front/plugins/sync/sync.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/unifi_api_import/unifi_api_import.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/unifi_import/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # Inspired by https://github.com/stevehoek/Pi.Alert
 
 from __future__ import unicode_literals

front/plugins/vendor_update/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/wake_on_lan/wake_on_lan.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 
 import os
 import sys

front/plugins/website_monitor/script.py

@@ -1,4 +1,4 @@
-# !/usr/bin/env python
+#!/usr/bin/env python
 # Based on the work of https://github.com/leiweibau/Pi.Alert
 
 import requests