mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-09-20 14:27:42 +00:00
More defensive coding
This commit is contained in:
@@ -129,6 +129,13 @@ class QRZ(APIQueryCallsignDataProvider):
|
||||
def qrz_response_to_callsign(callsign, data):
|
||||
"""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
|
||||
name = None
|
||||
if "name_fmt" in data:
|
||||
|
||||
@@ -61,10 +61,11 @@ class WOTA(HTTPSpotProvider):
|
||||
try:
|
||||
desc_split = source_spot.description.split(". ")
|
||||
freq_mode = desc_split[0].replace("Frequencies/modes:", "").strip()
|
||||
freq_mode_split = re.split(r"[\-\s]+", freq_mode)
|
||||
freq_hz = float(freq_mode_split[0].replace("'", ".")) * 1000000
|
||||
if len(freq_mode_split) > 1:
|
||||
mode = freq_mode_split[1].upper()
|
||||
if freq_mode and freq_mode != "-":
|
||||
freq_mode_split = re.split(r"[\-\s]+", freq_mode)
|
||||
freq_hz = float(freq_mode_split[0].replace("'", ".")) * 1000000
|
||||
if len(freq_mode_split) > 1:
|
||||
mode = freq_mode_split[1].upper()
|
||||
|
||||
if len(desc_split) > 1:
|
||||
comment = desc_split[1].strip()
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
|
||||
</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 () {
|
||||
$("#nav-link-add-spot").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/alerts.js?v=1786945640"></script>
|
||||
<script src="/static/js/alerts.js?v=1786970620"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-alerts").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -76,8 +76,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786945640"></script>
|
||||
<script src="/static/js/bands.js?v=1786945640"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786970620"></script>
|
||||
<script src="/static/js/bands.js?v=1786970620"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-bands").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
{% extends "skeleton.html" %}
|
||||
{% 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/fontawesome-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;
|
||||
</script>
|
||||
|
||||
<script src="/static/js/utils.js?v=1786945640"></script>
|
||||
<script src="/static/js/ui-ham.js?v=1786945640"></script>
|
||||
<script src="/static/js/geo.js?v=1786945640"></script>
|
||||
<script src="/static/js/common.js?v=1786945640"></script>
|
||||
<script src="/static/js/utils.js?v=1786970620"></script>
|
||||
<script src="/static/js/ui-ham.js?v=1786970620"></script>
|
||||
<script src="/static/js/geo.js?v=1786970620"></script>
|
||||
<script src="/static/js/common.js?v=1786970620"></script>
|
||||
{% end %}
|
||||
{% block body %}
|
||||
<div class="container">
|
||||
|
||||
@@ -284,7 +284,7 @@
|
||||
</div>
|
||||
|
||||
<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 () {
|
||||
$("#nav-link-conditions").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
+2
-2
@@ -109,8 +109,8 @@
|
||||
<script src="/static/vendor/js/leaflet-cqzones.js"></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/map.js?v=1786945640"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786970620"></script>
|
||||
<script src="/static/js/map.js?v=1786970620"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-map").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -113,8 +113,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786945640"></script>
|
||||
<script src="/static/js/spots.js?v=1786945640"></script>
|
||||
<script src="/static/js/spotsbandsandmap.js?v=1786970620"></script>
|
||||
<script src="/static/js/spots.js?v=1786970620"></script>
|
||||
<script>$(document).ready(function () {
|
||||
$("#nav-link-spots").addClass("active");
|
||||
}); <!-- highlight active page in nav --></script>
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/static/js/status.js?v=1786945640"></script>
|
||||
<script src="/static/js/status.js?v=1786970620"></script>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$("#nav-link-status").addClass("active");
|
||||
|
||||
Reference in New Issue
Block a user