w1cdn/spothole
1
0
Fork 0
mirror of https://git.ianrenton.com/ian/spothole.git synced 2026-09-20 22:37:44 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

ruff format && ruff check --fix

Browse Source
This commit is contained in:
Ian Renton
2026-08-16 14:11:45 +01:00
parent 8e48287edf
commit 7220a0f58d
13 changed files with 106 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/status_reporter.py
+72 -54
View File
@@ -54,60 +54,78 @@ class StatusReporter:
DATA_STORE.status_data["mem_use_mb"] = round(psutil.Process(os.getpid()).memory_info().rss / (1024 * 1024), 3) DATA_STORE.status_data["mem_use_mb"] = round(psutil.Process(os.getpid()).memory_info().rss / (1024 * 1024), 3)
DATA_STORE.status_data["num_spots"] = len(DATA_STORE.spots.values()) DATA_STORE.status_data["num_spots"] = len(DATA_STORE.spots.values())
DATA_STORE.status_data["num_alerts"] = len(DATA_STORE.alerts.values()) DATA_STORE.status_data["num_alerts"] = len(DATA_STORE.alerts.values())
DATA_STORE.status_data["spot_providers"] = [{ DATA_STORE.status_data["spot_providers"] = [
"name": p.name, {
"enabled": p.enabled, "name": p.name,
"enabled_by_default_in_web_ui": p.enabled_by_default_in_web_ui, "enabled": p.enabled,
"status": p.status, "enabled_by_default_in_web_ui": p.enabled_by_default_in_web_ui,
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp() "status": p.status,
if p.last_update_time.year > 2000 "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
else 0, if p.last_update_time.year > 2000
"last_spot": p.last_spot_time.replace(tzinfo=pytz.UTC).timestamp() else 0,
if p.last_spot_time.year > 2000 "last_spot": p.last_spot_time.replace(tzinfo=pytz.UTC).timestamp()
else 0, if p.last_spot_time.year > 2000
} for p in DATA_PROVIDERS.spot_providers] else 0,
DATA_STORE.status_data["alert_providers"] = [{ }
"name": p.name, for p in DATA_PROVIDERS.spot_providers
"enabled": p.enabled, ]
"status": p.status, DATA_STORE.status_data["alert_providers"] = [
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp() {
if p.last_update_time.year > 2000 "name": p.name,
else 0, "enabled": p.enabled,
} for p in DATA_PROVIDERS.alert_providers] "status": p.status,
DATA_STORE.status_data["solar_condition_providers"] = [{ "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
"name": p.name, if p.last_update_time.year > 2000
"enabled": p.enabled, else 0,
"status": p.status, }
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp() for p in DATA_PROVIDERS.alert_providers
if p.last_update_time.year > 2000 ]
else 0, DATA_STORE.status_data["solar_condition_providers"] = [
} for p in DATA_PROVIDERS.solar_condition_providers] {
DATA_STORE.status_data["static_data_providers"] = [{ "name": p.name,
"name": p.name, "enabled": p.enabled,
"enabled": p.enabled, "status": p.status,
"status": p.status, "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp() if p.last_update_time.year > 2000
if p.last_update_time.year > 2000 else 0,
else 0, }
} for p in DATA_PROVIDERS.static_data_providers] for p in DATA_PROVIDERS.solar_condition_providers
DATA_STORE.status_data["sig_ref_data_providers"] = [{ ]
"sig_name": p.sig_name, DATA_STORE.status_data["static_data_providers"] = [
"enabled": p.enabled, {
"status": p.status, "name": p.name,
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp() "enabled": p.enabled,
if p.last_update_time.year > 2000 "status": p.status,
else 0, "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
"reference_count": p.reference_count, if p.last_update_time.year > 2000
} for p in DATA_PROVIDERS.sig_ref_data_providers] else 0,
DATA_STORE.status_data["callsign_data_providers"] = [{ }
"name": p.name, for p in DATA_PROVIDERS.static_data_providers
"enabled": p.enabled, ]
"status": p.status, DATA_STORE.status_data["sig_ref_data_providers"] = [
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp() {
if p.last_update_time.year > 2000 "sig_name": p.sig_name,
else 0, "enabled": p.enabled,
"lookup_count": p.lookup_count, "status": p.status,
} for p in DATA_PROVIDERS.callsign_data_providers] "last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
if p.last_update_time.year > 2000
else 0,
"reference_count": p.reference_count,
}
for p in DATA_PROVIDERS.sig_ref_data_providers
]
DATA_STORE.status_data["callsign_data_providers"] = [
{
"name": p.name,
"enabled": p.enabled,
"status": p.status,
"last_updated": p.last_update_time.replace(tzinfo=pytz.UTC).timestamp()
if p.last_update_time.year > 2000
else 0,
"lookup_count": p.lookup_count,
}
for p in DATA_PROVIDERS.callsign_data_providers
]
DATA_STORE.status_data["cleanup"] = { DATA_STORE.status_data["cleanup"] = {
"status": CLEANUP_TIMER.status, "status": CLEANUP_TIMER.status,
"last_ran": CLEANUP_TIMER.last_cleanup_time.replace(tzinfo=pytz.UTC).timestamp() "last_ran": CLEANUP_TIMER.last_cleanup_time.replace(tzinfo=pytz.UTC).timestamp()
providers/spot/dxcluster.py
+1 -3
View File
@@ -35,9 +35,7 @@ class DXCluster(SpotProvider):
self._hostname = provider_config["host"] self._hostname = provider_config["host"]
self._port = provider_config["port"] self._port = provider_config["port"]
self._login_prompt = provider_config.get("login_prompt", "login:") self._login_prompt = provider_config.get("login_prompt", "login:")
self._login_callsign = ( self._login_callsign = provider_config.get("login_callsign", SERVER_OWNER_CALLSIGN)
provider_config.get("login_callsign", SERVER_OWNER_CALLSIGN)
)
self._allow_rbn_spots = provider_config.get("allow_rbn_spots", False) self._allow_rbn_spots = provider_config.get("allow_rbn_spots", False)
self._spot_line_pattern = ( self._spot_line_pattern = (
self._LINE_PATTERN_ALLOW_RBN if self._allow_rbn_spots else self._LINE_PATTERN_EXCLUDE_RBN self._LINE_PATTERN_ALLOW_RBN if self._allow_rbn_spots else self._LINE_PATTERN_EXCLUDE_RBN
providers/spot/ukpacketnet.py
+1 -3
View File
@@ -98,9 +98,7 @@ class UKPacketNet(HTTPSpotProvider):
# data, and we can use that to look these up. # data, and we can use that to look these up.
for spot in new_spots: for spot in new_spots:
if spot.dx_call in nodes: if spot.dx_call in nodes:
spot.dx_grid = ( spot.dx_grid = nodes[spot.dx_call]["location"].get("locator", None)
nodes[spot.dx_call]["location"].get("locator", None)
)
spot.dx_latitude = nodes[spot.dx_call]["location"]["coords"]["lat"] spot.dx_latitude = nodes[spot.dx_call]["location"]["coords"]["lat"]
spot.dx_longitude = nodes[spot.dx_call]["location"]["coords"]["lon"] spot.dx_longitude = nodes[spot.dx_call]["location"]["coords"]["lon"]
server/handlers/api/options.py
+17 -9
View File
@@ -62,16 +62,24 @@ class APIOptionsHandler(tornado.web.RequestHandler):
# Spot/alert sources are filtered for only ones that are enabled in config, no point letting the user toggle # Spot/alert sources are filtered for only ones that are enabled in config, no point letting the user toggle
# things that aren't even available. # things that aren't even available.
spot_providers: list = [p["name"] for p in filter(lambda p: p["enabled"], self._status_data["spot_providers"])] spot_providers: list = [
p["name"] for p in filter(lambda p: p["enabled"], self._status_data["spot_providers"])
]
alert_providers = [p["name"] for p in filter(lambda p: p["enabled"], self._status_data["alert_providers"])] alert_providers = [p["name"] for p in filter(lambda p: p["enabled"], self._status_data["alert_providers"])]
callsign_data_providers = [p["name"] for p in filter( callsign_data_providers = [
lambda p: p["enabled"], p["name"]
self._status_data["callsign_data_providers"], for p in filter(
)] lambda p: p["enabled"],
spot_providers_enabled_by_default = [p["name"] for p in filter( self._status_data["callsign_data_providers"],
lambda p: p["enabled"] and p["enabled_by_default_in_web_ui"], )
self._status_data["spot_providers"], ]
)] spot_providers_enabled_by_default = [
p["name"]
for p in filter(
lambda p: p["enabled"] and p["enabled_by_default_in_web_ui"],
self._status_data["spot_providers"],
)
]
# If spotting to this server is enabled, "API" is another valid spot source even though it does not come from # If spotting to this server is enabled, "API" is another valid spot source even though it does not come from
# one of our providers. # one of our providers.
server/handlers/api/v1_compatability.py
-1
View File
@@ -1,7 +1,6 @@
import tornado import tornado
from tornado.httpclient import AsyncHTTPClient from tornado.httpclient import AsyncHTTPClient
from tornado.httputil import HTTPHeaders from tornado.httputil import HTTPHeaders
from tornado.iostream import StreamClosedError
class V1RedirectHandler(tornado.web.RequestHandler): class V1RedirectHandler(tornado.web.RequestHandler):
templates/add_spot.html
+1 -1
View File
@@ -76,7 +76,7 @@
</div> </div>
<script src="/static/js/add-spot.js?v=1786885342"></script> <script src="/static/js/add-spot.js?v=1786885905"></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>
templates/alerts.html
+1 -1
View File
@@ -84,7 +84,7 @@
</div> </div>
<script src="/static/js/alerts.js?v=1786885342"></script> <script src="/static/js/alerts.js?v=1786885905"></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>
templates/bands.html
+2 -2
View File
@@ -76,8 +76,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1786885342"></script> <script src="/static/js/spotsbandsandmap.js?v=1786885905"></script>
<script src="/static/js/bands.js?v=1786885342"></script> <script src="/static/js/bands.js?v=1786885905"></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>
templates/base.html
+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=1786885342" type="text/css"> <link rel="stylesheet" href="/static/css/style.css?v=1786885905" 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=1786885342"></script> <script src="/static/js/utils.js?v=1786885905"></script>
<script src="/static/js/ui-ham.js?v=1786885342"></script> <script src="/static/js/ui-ham.js?v=1786885905"></script>
<script src="/static/js/geo.js?v=1786885342"></script> <script src="/static/js/geo.js?v=1786885905"></script>
<script src="/static/js/common.js?v=1786885342"></script> <script src="/static/js/common.js?v=1786885905"></script>
{% end %} {% end %}
{% block body %} {% block body %}
<div class="container"> <div class="container">
templates/conditions.html
+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=1786885342"></script> <script src="/static/js/conditions.js?v=1786885905"></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>
templates/map.html
+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=1786885342"></script> <script src="/static/js/spotsbandsandmap.js?v=1786885905"></script>
<script src="/static/js/map.js?v=1786885342"></script> <script src="/static/js/map.js?v=1786885905"></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>
templates/spots.html
+2 -2
View File
@@ -113,8 +113,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1786885342"></script> <script src="/static/js/spotsbandsandmap.js?v=1786885905"></script>
<script src="/static/js/spots.js?v=1786885342"></script> <script src="/static/js/spots.js?v=1786885905"></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>
templates/status.html
+1 -1
View File
@@ -86,7 +86,7 @@
</div> </div>
</div> </div>
<script src="/static/js/status.js?v=1786885342"></script> <script src="/static/js/status.js?v=1786885905"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#nav-link-status").addClass("active"); $("#nav-link-status").addClass("active");