More defensive coding

This commit is contained in:
Ian Renton
2026-08-17 13:43:40 +01:00
parent 7623ae667e
commit 03164d747f
10 changed files with 27 additions and 19 deletions
+7
View File
@@ -129,6 +129,13 @@ class QRZ(APIQueryCallsignDataProvider):
def qrz_response_to_callsign(callsign, data): def qrz_response_to_callsign(callsign, data):
"""Convert the "Callsign" block in QRZ's API response to our own Callsign object.""" """Convert the "Callsign" block in QRZ's API response to our own Callsign object."""
# I have encountered a user passing multiple callsigns to the QRZ lookup function in a way that QRZ actually
# does handle, and returns a list of callsign data. If we encounter that, just take the first one, as our own
# functions can't deal with multiple calls this way.
if isinstance(data, list):
data = data[0]
callsign = data["call"]
# Get a name # Get a name
name = None name = None
if "name_fmt" in data: if "name_fmt" in data:
+5 -4
View File
@@ -61,10 +61,11 @@ class WOTA(HTTPSpotProvider):
try: try:
desc_split = source_spot.description.split(". ") desc_split = source_spot.description.split(". ")
freq_mode = desc_split[0].replace("Frequencies/modes:", "").strip() freq_mode = desc_split[0].replace("Frequencies/modes:", "").strip()
freq_mode_split = re.split(r"[\-\s]+", freq_mode) if freq_mode and freq_mode != "-":
freq_hz = float(freq_mode_split[0].replace("'", ".")) * 1000000 freq_mode_split = re.split(r"[\-\s]+", freq_mode)
if len(freq_mode_split) > 1: freq_hz = float(freq_mode_split[0].replace("'", ".")) * 1000000
mode = freq_mode_split[1].upper() if len(freq_mode_split) > 1:
mode = freq_mode_split[1].upper()
if len(desc_split) > 1: if len(desc_split) > 1:
comment = desc_split[1].strip() comment = desc_split[1].strip()
+1 -1
View File
@@ -76,7 +76,7 @@
</div> </div>
<script src="/static/js/add-spot.js?v=1786945640"></script> <script src="/static/js/add-spot.js?v=1786970620"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active"); $("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -84,7 +84,7 @@
</div> </div>
<script src="/static/js/alerts.js?v=1786945640"></script> <script src="/static/js/alerts.js?v=1786970620"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active"); $("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -76,8 +76,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1786945640"></script> <script src="/static/js/spotsbandsandmap.js?v=1786970620"></script>
<script src="/static/js/bands.js?v=1786945640"></script> <script src="/static/js/bands.js?v=1786970620"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-bands").addClass("active"); $("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %} {% extends "skeleton.html" %}
{% block head_extra %} {% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1786945640" type="text/css"> <link rel="stylesheet" href="/static/css/style.css?v=1786970620" type="text/css">
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet"> <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet"> <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet"> <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -15,10 +15,10 @@
window.fetchEventSource = fetchEventSource; window.fetchEventSource = fetchEventSource;
</script> </script>
<script src="/static/js/utils.js?v=1786945640"></script> <script src="/static/js/utils.js?v=1786970620"></script>
<script src="/static/js/ui-ham.js?v=1786945640"></script> <script src="/static/js/ui-ham.js?v=1786970620"></script>
<script src="/static/js/geo.js?v=1786945640"></script> <script src="/static/js/geo.js?v=1786970620"></script>
<script src="/static/js/common.js?v=1786945640"></script> <script src="/static/js/common.js?v=1786970620"></script>
{% end %} {% end %}
{% block body %} {% block body %}
<div class="container"> <div class="container">
+1 -1
View File
@@ -284,7 +284,7 @@
</div> </div>
<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script> <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
<script src="/static/js/conditions.js?v=1786945640"></script> <script src="/static/js/conditions.js?v=1786970620"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active"); $("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -109,8 +109,8 @@
<script src="/static/vendor/js/leaflet-cqzones.js"></script> <script src="/static/vendor/js/leaflet-cqzones.js"></script>
<script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script> <script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
<script src="/static/js/spotsbandsandmap.js?v=1786945640"></script> <script src="/static/js/spotsbandsandmap.js?v=1786970620"></script>
<script src="/static/js/map.js?v=1786945640"></script> <script src="/static/js/map.js?v=1786970620"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-map").addClass("active"); $("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -113,8 +113,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1786945640"></script> <script src="/static/js/spotsbandsandmap.js?v=1786970620"></script>
<script src="/static/js/spots.js?v=1786945640"></script> <script src="/static/js/spots.js?v=1786970620"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-spots").addClass("active"); $("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<script src="/static/js/status.js?v=1786945640"></script> <script src="/static/js/status.js?v=1786970620"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#nav-link-status").addClass("active"); $("#nav-link-status").addClass("active");