mirror of
https://git.ianrenton.com/ian/spothole.git
synced 2026-09-20 14:27:42 +00:00
Merge remote-tracking branch 'origin/main'
# Conflicts: # core/constants.py # pyproject.toml # templates/add_spot.html # templates/alerts.html # templates/bands.html # templates/base.html # templates/conditions.html # templates/map.html # templates/spots.html # templates/status.html
This commit is contained in:
+6
-7
@@ -1,5 +1,3 @@
|
||||
import re
|
||||
|
||||
from core.config import SERVER_OWNER_CALLSIGN
|
||||
from data.band import Band
|
||||
from data.sig import SIG
|
||||
@@ -11,11 +9,6 @@ SOFTWARE_VERSION = "2.0.2-pre"
|
||||
HTTP_HEADERS = {"User-Agent": f"Spothole v{SOFTWARE_VERSION} (operated by {SERVER_OWNER_CALLSIGN})"}
|
||||
HAMQTH_PRG = f"Spothole v{SOFTWARE_VERSION} operated by {SERVER_OWNER_CALLSIGN}".replace(" ", "_")
|
||||
|
||||
# Generally useful regexes
|
||||
CALL_REGEX = r"[A-Za-z0-9/\-]+"
|
||||
CALL_PATTERN = re.compile(CALL_REGEX)
|
||||
CALL_ONLY_PATTERN = re.compile(rf"^{CALL_REGEX}$")
|
||||
|
||||
# Special Interest Groups
|
||||
SIGS = [
|
||||
SIG(
|
||||
@@ -60,6 +53,12 @@ SIGS = [
|
||||
description="Islands on the Air",
|
||||
ref_regex=r"[A-Z]{2}\-\d{3}",
|
||||
),
|
||||
SIG(
|
||||
name="GMA Island",
|
||||
comment_names=[],
|
||||
description="Global Mountain Activity - Islands",
|
||||
ref_regex=r"(([A-Z]{2}\-\d{3})|([A-Z0-9]{1,3}\/[A-Z]{2}\-\d{3}))",
|
||||
),
|
||||
SIG(
|
||||
name="MOTA",
|
||||
comment_names=["MOTA"],
|
||||
|
||||
Reference in New Issue
Block a user