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

Merge branch 'main' into 147-sig-activity-changes

Browse Source 
# Conflicts:
#	providers/activityrefdata/activity_ref_data_provider.py
This commit is contained in:
Ian Renton
2026-09-18 18:58:22 +01:00
parent c2c3981cda 4b51dd9ba5
commit eea045e4b8
9 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
providers/activityrefdata/activity_ref_data_provider.py
+4 -2
View File
@@ -38,8 +38,10 @@ class ActivityRefDataProvider:
def _add_data(self, new_data):
"""Add all the provided reference data objects to the data store."""
# with transact() batches all writes together to save making thousands of individual sqlite writes
with DATA_STORE.activity_refs.transact():
# with transact() batches all writes together to save making thousands of individual sqlite writes. However,
# that means that each provider holds the lock while it writes, and the default behaviour for other attempted
# transact()s is to fail if they can't get the lock (?!). This behaviour is fixed by retry=True.
with DATA_STORE.activity_refs.transact(retry=True):
for d in new_data:
DATA_STORE.activity_refs.set(f"{self.sig_name}:{d.id}", d)
templates/add_spot.html
+1 -1
View File
@@ -77,7 +77,7 @@
</div>
<script src="/static/js/add-spot.js?v=1789731849"></script>
<script src="/static/js/add-spot.js?v=1789754238"></script>
<script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/alerts.html
+1 -1
View File
@@ -83,7 +83,7 @@
</div>
<script src="/static/js/alerts.js?v=1789731849"></script>
<script src="/static/js/alerts.js?v=1789754238"></script>
<script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/bands.html
+2 -2
View File
@@ -76,8 +76,8 @@
</div>
<script src="/static/js/spotsbandsandmap.js?v=1789731849"></script>
<script src="/static/js/bands.js?v=1789731849"></script>
<script src="/static/js/spotsbandsandmap.js?v=1789754238"></script>
<script src="/static/js/bands.js?v=1789754238"></script>
<script>$(document).ready(function () {
$("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/base.html
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %}
{% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1789731849" type="text/css">
<link rel="stylesheet" href="/static/css/style.css?v=1789754238" 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">
@@ -16,10 +16,10 @@
window.fetchEventSource = fetchEventSource;
</script>
<script src="/static/js/utils.js?v=1789731849"></script>
<script src="/static/js/ui-ham.js?v=1789731849"></script>
<script src="/static/js/geo.js?v=1789731849"></script>
<script src="/static/js/common.js?v=1789731849"></script>
<script src="/static/js/utils.js?v=1789754238"></script>
<script src="/static/js/ui-ham.js?v=1789754238"></script>
<script src="/static/js/geo.js?v=1789754238"></script>
<script src="/static/js/common.js?v=1789754238"></script>
{% end %}
{% block body %}
<div class="container">
templates/conditions.html
+1 -1
View File
@@ -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=1789731849"></script>
<script src="/static/js/conditions.js?v=1789754238"></script>
<script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/map.html
+2 -2
View File
@@ -113,8 +113,8 @@
const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
</script>
<script src="/static/js/spotsbandsandmap.js?v=1789731849"></script>
<script src="/static/js/map.js?v=1789731849"></script>
<script src="/static/js/spotsbandsandmap.js?v=1789754238"></script>
<script src="/static/js/map.js?v=1789754238"></script>
<script>$(document).ready(function () {
$("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/spots.html
+2 -2
View File
@@ -125,8 +125,8 @@
</div>
<script src="/static/js/spotsbandsandmap.js?v=1789731849"></script>
<script src="/static/js/spots.js?v=1789731849"></script>
<script src="/static/js/spotsbandsandmap.js?v=1789754238"></script>
<script src="/static/js/spots.js?v=1789754238"></script>
<script>$(document).ready(function () {
$("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script>
templates/status.html
+1 -1
View File
@@ -96,7 +96,7 @@
</div>
</div>
<script src="/static/js/status.js?v=1789731849"></script>
<script src="/static/js/status.js?v=1789754238"></script>
<script>
$(document).ready(function () {
$("#nav-link-status").addClass("active");