Fix a bug where the software would crash on startup if GMA API key was not provided. #112

This commit is contained in:
Ian Renton
2026-06-21 11:07:17 +01:00
parent 316a356811
commit 96e2b0ce8b
9 changed files with 21 additions and 19 deletions

View File

@@ -19,13 +19,15 @@ class GMA(HTTPSpotProvider):
REF_INFO_URL_ROOT = "https://www.cqgma.org/api/ref/?"
def __init__(self, provider_config):
# Ensure there is an API key in our config, and set up the query URL using it
# Ensure there is an API key in our config, and set up the query URL using it. If no key is provided,
# disable this spot provider.
self.api_key = provider_config.get("api-key", "")
if self.api_key != "":
super().__init__(provider_config, self.SPOTS_URL + "?key=" + self.api_key, self.POLL_INTERVAL_SEC)
else:
if self.api_key == "":
provider_config["enabled"] = False
logging.warning("GMA spot provider configured but no api key was provided, this API will not be queried.")
super().__init__(provider_config, self.SPOTS_URL + "?key=" + self.api_key, self.POLL_INTERVAL_SEC)
def _http_response_to_spots(self, http_response):
new_spots = []
# Iterate through source data

View File

@@ -76,7 +76,7 @@
</div>
<script src="/js/add-spot.js?v=1782036161"></script>
<script src="/js/add-spot.js?v=1782036437"></script>
<script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script>

View File

@@ -75,7 +75,7 @@
</div>
<script src="/js/alerts.js?v=1782036161"></script>
<script src="/js/alerts.js?v=1782036437"></script>
<script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script>

View File

@@ -77,8 +77,8 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/spotsbandsandmap.js?v=1782036161"></script>
<script src="/js/bands.js?v=1782036161"></script>
<script src="/js/spotsbandsandmap.js?v=1782036437"></script>
<script src="/js/bands.js?v=1782036437"></script>
<script>$(document).ready(function () {
$("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script>

View File

@@ -1,6 +1,6 @@
{% extends "skeleton.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/css/style.css?v=1782036161" type="text/css">
<link rel="stylesheet" href="/css/style.css?v=1782036437" type="text/css">
<link href="/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
<link href="/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
<script src="/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
<script src="/vendor/js/tinycolor2-1.6.0.min.js"></script>
<script src="/js/utils.js?v=1782036161"></script>
<script src="/js/ui-ham.js?v=1782036161"></script>
<script src="/js/geo.js?v=1782036161"></script>
<script src="/js/common.js?v=1782036161"></script>
<script src="/js/utils.js?v=1782036437"></script>
<script src="/js/ui-ham.js?v=1782036437"></script>
<script src="/js/geo.js?v=1782036437"></script>
<script src="/js/common.js?v=1782036437"></script>
{% end %}
{% block body %}
<div class="container">

View File

@@ -284,7 +284,7 @@
</div>
<script src="/vendor/js/chart-4.4.9.umd.min.js"></script>
<script src="/js/conditions.js?v=1782036161"></script>
<script src="/js/conditions.js?v=1782036437"></script>
<script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script>

View File

@@ -95,8 +95,8 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/spotsbandsandmap.js?v=1782036161"></script>
<script src="/js/map.js?v=1782036161"></script>
<script src="/js/spotsbandsandmap.js?v=1782036437"></script>
<script src="/js/map.js?v=1782036437"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>

View File

@@ -116,8 +116,8 @@
<script>
let spotProvidersEnabledByDefault = {% raw json_encode(web_ui_options["spot-providers-enabled-by-default"]) %};
</script>
<script src="/js/spotsbandsandmap.js?v=1782036161"></script>
<script src="/js/spots.js?v=1782036161"></script>
<script src="/js/spotsbandsandmap.js?v=1782036437"></script>
<script src="/js/spots.js?v=1782036437"></script>
<script>$(document).ready(function () {
$("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script>

View File

@@ -59,7 +59,7 @@
</div>
</div>
<script src="/js/status.js?v=1782036161"></script>
<script src="/js/status.js?v=1782036437"></script>
<script>
$(document).ready(function () {
$("#nav-link-status").addClass("active");