Improve checking callsign validity by regex, and fix passing v1 type credentials into v2 APIs

providers/alert/ng3k.py

@@ -6,6 +6,7 @@ import pytz
 from rss_parser import Parser
 from rss_parser.models.rss import RSS
 
+from core.constants import CALL_REGEX
 from data.alert import Alert
 from providers.alert.http_alert_provider import HTTPAlertProvider
 
@@ -15,7 +16,7 @@ class NG3K(HTTPAlertProvider):
 
     POLL_INTERVAL_SEC = 1800
     ALERTS_URL = "https://www.ng3k.com/adxo.xml"
-    AS_CALL_PATTERN = re.compile("as ([a-z0-9/]+)", re.IGNORECASE)
+    AS_CALL_PATTERN = re.compile(rf"as ({CALL_REGEX})", re.IGNORECASE)
 
     def __init__(self, provider_config):
         super().__init__("NG3K", provider_config, self.ALERTS_URL, self.POLL_INTERVAL_SEC)

providers/spot/dxcluster.py

@@ -8,6 +8,7 @@ import pytz
 import telnetlib3
 
 from core.config import SERVER_OWNER_CALLSIGN
+from core.constants import CALL_REGEX
 from data.spot import Spot
 from providers.spot.spot_provider import SpotProvider
 
@@ -19,11 +20,11 @@ class DXCluster(SpotProvider):
     See config-example.yml for examples."""
 
     _LINE_PATTERN_EXCLUDE_RBN = re.compile(
-        r"^DX de ([a-z0-9/]+):\s+([0-9.]+)\s+([a-z0-9/]+)\s+(.*)\s+(\d{4}Z)",
+        rf"^DX de ({CALL_REGEX}):\s+([0-9.]+)\s+({CALL_REGEX})\s+(.*)\s+(\d{4}Z)",
         re.IGNORECASE,
     )
     _LINE_PATTERN_ALLOW_RBN = re.compile(
-        r"^DX de ([a-z0-9/]+)-?#?:\s+([0-9.]+)\s+([a-z0-9/]+)\s+(.*)\s+(\d{4}Z)",
+        rf"^DX de ({CALL_REGEX})-?#?:\s+([0-9.]+)\s+({CALL_REGEX})\s+(.*)\s+(\d{4}Z)",
         re.IGNORECASE,
     )
 

providers/spot/parksnpeaks.py

@@ -5,7 +5,7 @@ from datetime import datetime
 import pytz
 import requests
 
-from core.constants import HTTP_HEADERS
+from core.constants import HTTP_HEADERS, CALL_REGEX
 from data.sig_ref import SIGRef
 from data.spot import Spot
 from providers.spot.http_spot_provider import HTTPSpotProvider
@@ -60,7 +60,7 @@ class ParksNPeaks(HTTPSpotProvider):
                 )
 
                 # Extract a de_call if it's in the comment but not in the "actSpoter" field
-                m = re.search(r"\(de ([A-Za-z0-9]*)\)", spot.comment or "")
+                m = re.search(rf"\(de ({CALL_REGEX})\)", spot.comment or "")
                 if not spot.de_call and m:
                     spot.de_call = str(m.group(1))
 

providers/spot/rbn.py

@@ -8,6 +8,7 @@ import pytz
 import telnetlib3
 
 from core.config import SERVER_OWNER_CALLSIGN
+from core.constants import CALL_REGEX
 from data.spot import Spot
 from providers.spot.spot_provider import SpotProvider
 
@@ -19,7 +20,7 @@ class RBN(SpotProvider):
     (port 7001) you need to instantiate two copies of this. The port is provided as an argument to the constructor."""
 
     _LINE_PATTERN = re.compile(
-        r"^DX de ([a-z0-9/]+)-.*:\s+([0-9.]+)\s+([a-z0-9/]+)\s+(.*)\s+(\d{4}Z)",
+        rf"^DX de ({CALL_REGEX})-.*:\s+([0-9.]+)\s+({CALL_REGEX})\s+(.*)\s+(\d{4}Z)",
         re.IGNORECASE,
     )