Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5f79b18c2 | ||
|
|
1605e30f60 | ||
|
|
6aff322be6 | ||
|
|
ed3c132f70 | ||
|
|
385e8c4c86 | ||
|
|
61e5736f1e | ||
|
|
6ca808a6c9 | ||
|
|
f698096f53 | ||
|
|
ef628e066a | ||
|
|
4ffdfc2548 | ||
|
|
83e7727aab | ||
|
|
1348dc2177 | ||
|
|
57ac382f91 | ||
|
|
858c04d267 | ||
|
|
2484cd2515 | ||
|
|
62256942a1 | ||
|
|
3c8aadf41f | ||
|
|
2f5fd63afd | ||
|
|
4f3c3edaee | ||
|
|
7d33379fe1 | ||
|
|
82a49150d2 | ||
|
|
1ef9e553f7 | ||
|
|
39fab68bd4 | ||
|
|
bbddba6e74 | ||
|
|
b659f6f16d | ||
|
|
b4ad12bdc6 | ||
|
|
5dd3532074 | ||
|
|
dd7b63c059 | ||
|
|
8fc6673611 | ||
|
|
d33291b521 | ||
|
|
1b32b1ddec | ||
|
|
65bbaa85f3 | ||
|
|
99d903eb44 | ||
|
|
13515c58c0 | ||
|
|
e4014e11d2 | ||
|
|
025472820b | ||
|
|
8b66030c89 | ||
|
|
d4f23a52af | ||
|
|
b4b9674d8c | ||
|
|
f7d2de0777 | ||
|
|
344e8b2091 | ||
|
|
c5e0ec9033 | ||
|
|
210a99983e | ||
|
|
2a6e09a1d7 | ||
|
|
1b7f8ec9c1 | ||
|
|
75a2f73992 | ||
|
|
deee8c4618 | ||
|
|
92a5f30ac0 | ||
|
|
d3a405f4f6 | ||
|
|
f7b9bfd0bc | ||
|
|
102097c5c4 | ||
|
|
3b90ef6b7a | ||
|
|
839cf0aafd | ||
|
|
9fd801ea69 | ||
|
|
298c2fde44 | ||
|
|
78e99afc63 | ||
|
|
740f007395 | ||
|
|
43095a1d89 | ||
|
|
fa01968207 | ||
|
|
91452cefc0 | ||
|
|
904b451951 | ||
|
|
c4d90e6880 | ||
|
|
1ac00c101e | ||
|
|
e107b0b741 | ||
|
|
24668d5981 | ||
|
|
8aa0e39aff | ||
|
|
96c99f0ae6 | ||
|
|
0550ecdac3 | ||
|
|
9c33feecfa | ||
|
|
8afba2c4e8 | ||
|
|
2d3bfa704e | ||
|
|
29bdea1e43 | ||
|
|
b93c67f3cb | ||
|
|
735dfe69db | ||
|
|
67fe5bcff0 | ||
|
|
d36d431d9a | ||
|
|
0c8d79e2fa | ||
|
|
796a1d8e7d | ||
|
|
9531a54ac1 | ||
|
|
d2d64706f5 | ||
|
|
cfdd24d52e | ||
|
|
8052bd2935 | ||
|
|
55879809f2 | ||
|
|
6969560efb | ||
|
|
7eff19f6e2 | ||
|
|
e0dfa53f54 | ||
|
|
4f87cedc2c | ||
|
|
d273d21f1a | ||
|
|
bde136b98b | ||
|
|
ae7472a67d | ||
|
|
0d48dbfd17 | ||
|
|
d6ed9f03eb | ||
|
|
c95a1137fc | ||
|
|
d41352a3a5 | ||
|
|
9b2115be8f | ||
|
|
0a8c1ac45f |
@@ -16,6 +16,8 @@ var deniedCallHashes = map[string]struct{}{
|
||||
"2282a88b3e5e4eebc6b8174d005bb46d32025758b7741bdcf34f2b3621c02205": {},
|
||||
"0ee09fe60817a2a4982f5e5b14a60b8dbb11cff55b3d36661213c4cbdd0933ea": {},
|
||||
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
||||
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
||||
}
|
||||
|
||||
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||
|
||||
+159
@@ -0,0 +1,159 @@
|
||||
package main
|
||||
|
||||
// Row colouring for the log grid, by QSL / LoTW status — the thing Logger32 does
|
||||
// and the reason an operator can tell at a glance what still needs sending.
|
||||
//
|
||||
// Rules are ORDERED and the first match wins, because a contact is usually
|
||||
// several things at once: one confirmed on LoTW and by card is confirmed, not
|
||||
// "sent, awaiting reply". Putting the order in the data rather than in a chain
|
||||
// of ifs is what lets the settings panel show it in the same order it applies.
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// RowColorRule is one status and the colour it paints.
|
||||
type RowColorRule struct {
|
||||
ID string `json:"id"`
|
||||
Color string `json:"color"`
|
||||
Enabled bool `json:"enabled"`
|
||||
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz.
|
||||
//
|
||||
// Empty means ALL of them — what an operator expects from a rule they have
|
||||
// not narrowed, and what keeps a config written before this field meaningful.
|
||||
Channels []string `json:"channels"`
|
||||
}
|
||||
|
||||
// The QSL channels a rule can be scoped to.
|
||||
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
|
||||
|
||||
// RowColorSettings is the whole appearance block.
|
||||
type RowColorSettings struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
// Style is how the colour is shown: "bar" paints a stripe down the left edge,
|
||||
// "tint" washes the row, "both" does each.
|
||||
//
|
||||
// A bar is the default because a filled row is a poor signal in a log where
|
||||
// nearly every contact has SOME QSL state: colour that is always present
|
||||
// stops being information and becomes a striped background, with the data
|
||||
// behind it. The stripe says the same thing and costs nothing to read.
|
||||
Style string `json:"style"`
|
||||
// Intensity is the tint strength in percent. Only used by "tint"/"both".
|
||||
Intensity int `json:"intensity"`
|
||||
// BandMapLotw marks stations that upload to LoTW on the band map, with the
|
||||
// same "L" badge the cluster list uses — one visual vocabulary across the two
|
||||
// views rather than a second invention.
|
||||
BandMapLotw bool `json:"bandmap_lotw"`
|
||||
// Configured distinguishes "saved with this off" from "saved before the
|
||||
// option existed", so a new marker can default ON without silently turning
|
||||
// itself back on for an operator who switched it off.
|
||||
Configured bool `json:"configured"`
|
||||
Rules []RowColorRule `json:"rules"`
|
||||
}
|
||||
|
||||
// The rule ids, in priority order. The frontend matches on these and holds the
|
||||
// labels, so a translated name never has to travel through the settings.
|
||||
// The four categories, in the order they are tested — first match wins.
|
||||
//
|
||||
// "To send" comes FIRST on purpose. A contact can be confirmed on LoTW and
|
||||
// still owe a paper card, and the colour an operator scans for is the one that
|
||||
// means "there is something left to do here". Put after "confirmed", that row
|
||||
// would go green and the card would never be printed.
|
||||
//
|
||||
// "Worked" is the catch-all: a contact with nothing sent, nothing asked for and
|
||||
// nothing back. Off by default — with it on, every remaining row is painted.
|
||||
var rowColorOrder = []string{
|
||||
"to_send", // requested or queued on a watched channel, not gone out
|
||||
"confirmed", // a watched channel has a confirmation back
|
||||
"sent", // gone out on a watched channel, nothing back yet
|
||||
"worked", // none of the above
|
||||
}
|
||||
|
||||
// Defaults: green for done, amber for waiting, blue for owed. Deliberately
|
||||
// muted — they are composited at low opacity over a dark grid, and a saturated
|
||||
// value there reads as an error state rather than a status.
|
||||
var rowColorDefaults = map[string]string{
|
||||
"to_send": "#a855f7",
|
||||
"confirmed": "#16a34a",
|
||||
"sent": "#f59e0b",
|
||||
"worked": "#64748b",
|
||||
}
|
||||
|
||||
// hexColor guards what reaches the stylesheet. The value is interpolated into a
|
||||
// CSS color-mix() by the grid, so anything that is not plainly a hex colour is
|
||||
// refused rather than passed through.
|
||||
var hexColor = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
|
||||
|
||||
func normRowColors(s RowColorSettings) RowColorSettings {
|
||||
byID := map[string]RowColorRule{}
|
||||
for _, r := range s.Rules {
|
||||
byID[r.ID] = r
|
||||
}
|
||||
out := RowColorSettings{
|
||||
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
||||
BandMapLotw: s.BandMapLotw, Configured: true,
|
||||
}
|
||||
if !s.Configured {
|
||||
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
||||
}
|
||||
switch out.Style {
|
||||
case "bar", "tint", "both":
|
||||
default:
|
||||
out.Style = "bar"
|
||||
}
|
||||
// Clamped rather than rejected: the value only shapes a colour-mix, and a
|
||||
// number outside the range is a slider that got away, not a fault worth
|
||||
// resetting the operator's whole choice for.
|
||||
if out.Intensity < 5 {
|
||||
out.Intensity = 12
|
||||
} else if out.Intensity > 45 {
|
||||
out.Intensity = 45
|
||||
}
|
||||
ok := map[string]bool{}
|
||||
for _, c := range rowColorChannels {
|
||||
ok[c] = true
|
||||
}
|
||||
for _, id := range rowColorOrder {
|
||||
r := byID[id]
|
||||
r.ID = id
|
||||
if !hexColor.MatchString(strings.TrimSpace(r.Color)) {
|
||||
r.Color = rowColorDefaults[id]
|
||||
}
|
||||
// Keep only channels we know, in the canonical order, de-duplicated.
|
||||
want := map[string]bool{}
|
||||
for _, c := range r.Channels {
|
||||
want[strings.ToLower(strings.TrimSpace(c))] = true
|
||||
}
|
||||
chans := []string{}
|
||||
for _, c := range rowColorChannels {
|
||||
if want[c] {
|
||||
chans = append(chans, c)
|
||||
}
|
||||
}
|
||||
r.Channels = chans
|
||||
out.Rules = append(out.Rules, r)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// GetRowColors returns the row-colouring configuration, defaults included so the
|
||||
// panel never has to invent one.
|
||||
func (a *App) GetRowColors() RowColorSettings {
|
||||
var s RowColorSettings
|
||||
if raw := a.settingOr(keyRowColors, ""); raw != "" {
|
||||
_ = json.Unmarshal([]byte(raw), &s)
|
||||
}
|
||||
return normRowColors(s)
|
||||
}
|
||||
|
||||
// SaveRowColors persists it.
|
||||
func (a *App) SaveRowColors(s RowColorSettings) error {
|
||||
b, err := json.Marshal(normRowColors(s))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.setSetting(keyRowColors, string(b))
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// The colour is interpolated into a CSS color-mix() by the grid, so anything
|
||||
// that is not plainly a hex colour has to be refused rather than passed on.
|
||||
func TestRowColorsRefuseAnythingButHex(t *testing.T) {
|
||||
in := RowColorSettings{Enabled: true, Rules: []RowColorRule{
|
||||
{ID: "confirmed", Color: "#123abc", Enabled: true},
|
||||
{ID: "sent", Color: "red; background:url(x)", Enabled: true},
|
||||
{ID: "to_send", Color: "", Enabled: true},
|
||||
}}
|
||||
got := normRowColors(in)
|
||||
|
||||
byID := map[string]RowColorRule{}
|
||||
for _, r := range got.Rules {
|
||||
byID[r.ID] = r
|
||||
}
|
||||
if byID["confirmed"].Color != "#123abc" {
|
||||
t.Errorf("a valid colour was rewritten: %q", byID["confirmed"].Color)
|
||||
}
|
||||
if byID["sent"].Color != rowColorDefaults["sent"] {
|
||||
t.Errorf("an injection attempt survived: %q", byID["sent"].Color)
|
||||
}
|
||||
if byID["to_send"].Color != rowColorDefaults["to_send"] {
|
||||
t.Errorf("an empty colour was kept: %q", byID["to_send"].Color)
|
||||
}
|
||||
}
|
||||
|
||||
// Priority lives in the data, not in a chain of ifs: a contact confirmed on
|
||||
// LoTW AND by card is confirmed, not "sent, awaiting reply". The panel shows
|
||||
// the rules in the order they apply, so that order must survive a round trip.
|
||||
func TestRowColorsKeepPriorityOrder(t *testing.T) {
|
||||
// Saved in a jumbled order, as a hand-edited settings row could be.
|
||||
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||
{ID: "to_send", Color: "#111111"},
|
||||
{ID: "confirmed", Color: "#222222"},
|
||||
}})
|
||||
if len(got.Rules) != len(rowColorOrder) {
|
||||
t.Fatalf("got %d rules, want every one present", len(got.Rules))
|
||||
}
|
||||
for i, id := range rowColorOrder {
|
||||
if got.Rules[i].ID != id {
|
||||
t.Errorf("rule %d is %q, want %q", i, got.Rules[i].ID, id)
|
||||
}
|
||||
}
|
||||
// The saved colours survived the reordering: each stayed with its own rule.
|
||||
byID := map[string]string{}
|
||||
for _, r := range got.Rules {
|
||||
byID[r.ID] = r.Color
|
||||
}
|
||||
if byID["to_send"] != "#111111" || byID["confirmed"] != "#222222" {
|
||||
t.Errorf("colours moved between rules: %v", byID)
|
||||
}
|
||||
}
|
||||
|
||||
// Style and strength are normalised, not rejected: they only shape a colour, and
|
||||
// a value that got away is a slider, not a fault worth resetting the operator's
|
||||
// whole choice for.
|
||||
func TestRowColorsNormaliseStyleAndIntensity(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
inStyle string
|
||||
inPct int
|
||||
wantStyle string
|
||||
wantPct int
|
||||
}{
|
||||
{"bar", 12, "bar", 12},
|
||||
{"tint", 30, "tint", 30},
|
||||
{"both", 45, "both", 45},
|
||||
{"", 0, "bar", 12}, // never configured
|
||||
{"wallpaper", 12, "bar", 12}, // not a style we draw
|
||||
{"tint", 900, "tint", 45}, // clamped, not reset
|
||||
{"tint", -5, "tint", 12},
|
||||
} {
|
||||
got := normRowColors(RowColorSettings{Style: tc.inStyle, Intensity: tc.inPct})
|
||||
if got.Style != tc.wantStyle || got.Intensity != tc.wantPct {
|
||||
t.Errorf("(%q,%d) -> (%q,%d), want (%q,%d)",
|
||||
tc.inStyle, tc.inPct, got.Style, got.Intensity, tc.wantStyle, tc.wantPct)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Channels are normalised to the canonical order, and anything unknown is
|
||||
// dropped. Empty stays empty, because empty means "every channel" — a rule the
|
||||
// operator has not narrowed must not silently become a rule about nothing.
|
||||
func TestRowColorChannelsNormalise(t *testing.T) {
|
||||
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||
{ID: "confirmed", Color: "#111111", Channels: []string{"LOTW", "pigeon", "qsl", "lotw"}},
|
||||
{ID: "sent", Color: "#222222"},
|
||||
}})
|
||||
byID := map[string][]string{}
|
||||
for _, r := range got.Rules {
|
||||
byID[r.ID] = r.Channels
|
||||
}
|
||||
if len(byID["confirmed"]) != 2 || byID["confirmed"][0] != "qsl" || byID["confirmed"][1] != "lotw" {
|
||||
t.Errorf("confirmed channels = %v, want [qsl lotw] — canonical order, deduped, unknown dropped", byID["confirmed"])
|
||||
}
|
||||
if len(byID["sent"]) != 0 {
|
||||
t.Errorf("sent channels = %v, want empty (meaning every channel)", byID["sent"])
|
||||
}
|
||||
}
|
||||
|
||||
// The order IS the priority, and "to send" leads. A contact confirmed on LoTW
|
||||
// that still owes a paper card must read as owing the card — put after
|
||||
// "confirmed" it would go green and never be printed.
|
||||
func TestToSendOutranksConfirmed(t *testing.T) {
|
||||
got := normRowColors(RowColorSettings{})
|
||||
if got.Rules[0].ID != "to_send" {
|
||||
t.Errorf("first rule is %q, want to_send", got.Rules[0].ID)
|
||||
}
|
||||
if got.Rules[len(got.Rules)-1].ID != "worked" {
|
||||
t.Errorf("last rule is %q, want worked as the catch-all", got.Rules[len(got.Rules)-1].ID)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,260 @@
|
||||
package main
|
||||
|
||||
// The data sources band-opening detection depends on, and the settings that
|
||||
// switch them on.
|
||||
//
|
||||
// The detection shipped reading whatever the operator's cluster nodes happened
|
||||
// to carry. That was a design mistake of the worst kind: the feature depended
|
||||
// on RBN feeds and a PSK Reporter subscription that nobody could know were
|
||||
// needed, so it looked broken rather than unconfigured. Nexus showed a 6 m
|
||||
// opening with 869 stations while OpsLog, on the same PC, showed nothing.
|
||||
//
|
||||
// So enabling the watch ARRANGES ITS OWN SOURCES: it adds the two RBN nodes if
|
||||
// they are missing and brings the PSK Reporter feed up. Turning it off leaves
|
||||
// the nodes alone — they may have been wanted for their own sake, and silently
|
||||
// removing a cluster node an operator is using would be worse than leaving one
|
||||
// they no longer need.
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/bandopen"
|
||||
"hamlog/internal/cluster"
|
||||
"hamlog/internal/geo"
|
||||
"hamlog/internal/gridcache"
|
||||
"hamlog/internal/pskr"
|
||||
)
|
||||
|
||||
const (
|
||||
keyBandOpenEnabled = "bandopen.enabled"
|
||||
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
||||
)
|
||||
|
||||
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
||||
// digital are separate ports and carry different skimmers.
|
||||
var rbnNodes = []cluster.ServerConfig{
|
||||
{Name: "RBN CW", Host: "telnet.reversebeacon.net", Port: 7000, Enabled: true},
|
||||
{Name: "RBN FTx", Host: "telnet.reversebeacon.net", Port: 7001, Enabled: true},
|
||||
}
|
||||
|
||||
// BandOpenSettings is the panel's shape.
|
||||
type BandOpenSettings struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Bands []string `json:"bands"`
|
||||
// Available is every band that can be watched, so the UI does not carry its
|
||||
// own copy of a list that belongs to the detector.
|
||||
Available []string `json:"available"`
|
||||
}
|
||||
|
||||
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
||||
s := BandOpenSettings{
|
||||
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
||||
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
||||
Available: pskr.Bands,
|
||||
}
|
||||
// Keep only bands that are still offered. A saved selection outlives the code
|
||||
// that made it: 12 m was dropped from the watched set, but every operator who
|
||||
// had already enabled the watch kept subscribing to it — paying for a firehose
|
||||
// whose messages the detector then threw away.
|
||||
s.Bands = keepKnownBands(s.Bands)
|
||||
if len(s.Bands) == 0 {
|
||||
s.Bands = append(s.Bands, pskr.Bands...)
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
func keepKnownBands(want []string) []string {
|
||||
ok := make(map[string]bool, len(pskr.Bands))
|
||||
for _, b := range pskr.Bands {
|
||||
ok[b] = true
|
||||
}
|
||||
out := make([]string, 0, len(want))
|
||||
for _, b := range want {
|
||||
if ok[strings.ToLower(strings.TrimSpace(b))] {
|
||||
out = append(out, b)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
||||
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
||||
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
||||
if s.Enabled {
|
||||
a.ensureRBNNodes()
|
||||
}
|
||||
a.startBandOpenFeed()
|
||||
return nil
|
||||
}
|
||||
|
||||
// ensureRBNNodes adds the RBN endpoints when they are absent.
|
||||
//
|
||||
// Matched on host AND port rather than on name: an operator who renamed theirs
|
||||
// "Skimmers CW" has the node, and adding a second one pointed at the same
|
||||
// server would give them every spot twice — which the detector would read as
|
||||
// twice as many stations, i.e. an opening that is not there.
|
||||
func (a *App) ensureRBNNodes() {
|
||||
have, err := a.ListClusterServers()
|
||||
if err != nil {
|
||||
applog.Printf("bandopen: cannot read the cluster nodes (%v) — not adding RBN", err)
|
||||
return
|
||||
}
|
||||
for _, want := range rbnNodes {
|
||||
found := false
|
||||
for _, h := range have {
|
||||
if strings.EqualFold(strings.TrimSpace(h.Host), want.Host) && h.Port == want.Port {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if found {
|
||||
continue
|
||||
}
|
||||
if _, err := a.SaveClusterServer(want); err != nil {
|
||||
applog.Printf("bandopen: could not add %s: %v", want.Name, err)
|
||||
continue
|
||||
}
|
||||
applog.Printf("bandopen: added cluster node %s (%s:%d) — the watch needs it",
|
||||
want.Name, want.Host, want.Port)
|
||||
}
|
||||
}
|
||||
|
||||
// startBandOpenFeed brings the PSK Reporter subscription up or down to match
|
||||
// the setting. Called at startup and whenever the setting is saved.
|
||||
func (a *App) startBandOpenFeed() {
|
||||
if a.pskr != nil {
|
||||
a.pskr.Stop()
|
||||
a.pskr = nil
|
||||
}
|
||||
s := a.GetBandOpenSettings()
|
||||
a.bandOpen.on.Store(s.Enabled)
|
||||
a.setBandOpenBands(s.Bands)
|
||||
if !s.Enabled {
|
||||
// Put out whatever is currently lit. Leaving the badges up would keep
|
||||
// announcing an opening from a watch that is now off, and they only fade
|
||||
// on a timer fed by spots this path no longer looks at — so they would
|
||||
// hang there until the app restarted.
|
||||
a.clearBandOpenings()
|
||||
}
|
||||
chaseGrids := a.gridStore != nil
|
||||
if !s.Enabled && !chaseGrids {
|
||||
return
|
||||
}
|
||||
// Every spot is measured from the operator's position. Without one there is
|
||||
// nothing to measure, and a detector fed unmeasurable spots reports nothing
|
||||
// while looking like it is working.
|
||||
if !a.opSet {
|
||||
applog.Printf("pskr: no station grid set — the feed needs one to measure a path")
|
||||
return
|
||||
}
|
||||
|
||||
// Grid chasing wants every band; the opening watch wants its four. "+" is the
|
||||
// MQTT single-level wildcard, so one subscription per square covers the lot.
|
||||
bands := s.Bands
|
||||
if chaseGrids {
|
||||
bands = []string{"+"}
|
||||
}
|
||||
// Filter at the BROKER on the receiver's square rather than receiving the
|
||||
// world and discarding it here. Measured on the live feed: the four opening
|
||||
// bands unfiltered are 83 messages a second, of which roughly one in a
|
||||
// hundred survived the NearKm test below. One ring of squares — about the
|
||||
// same 300 km — is 0.2 to 1.2 a second, and the same for every operator,
|
||||
// where filtering by DXCC ranged from 1.2 (OH) to 72.5 (K).
|
||||
rxGrids := geo.NeighbourGrids(a.opLat, a.opLon, 1)
|
||||
|
||||
var onGrid func(call, grid string)
|
||||
if chaseGrids {
|
||||
onGrid = func(call, grid string) { a.rememberDecodeGrid(call, grid, gridcache.SourceMQTT) }
|
||||
}
|
||||
var onSpot func(pskr.Spot)
|
||||
if s.Enabled {
|
||||
onSpot = a.feedBandOpen
|
||||
}
|
||||
|
||||
a.pskr = pskr.New(pskr.Config{
|
||||
Bands: bands,
|
||||
RxGrids: rxGrids,
|
||||
OpLat: a.opLat, OpLon: a.opLon,
|
||||
Geo: func(grid string) (int, int, bool) {
|
||||
lat, lon, ok := gridToLatLon(grid)
|
||||
if !ok {
|
||||
return 0, 0, false
|
||||
}
|
||||
// The same arithmetic the cluster path uses, so one spot cannot be
|
||||
// 2000 km away down one road and 2100 km down the other.
|
||||
d := int(haversineKm(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||
b := int(initialBearingDeg(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||
return d, b, true
|
||||
},
|
||||
OnSpot: onSpot,
|
||||
OnGrid: onGrid,
|
||||
Logf: applog.Printf,
|
||||
})
|
||||
if err := a.pskr.Start(); err != nil {
|
||||
applog.Printf("pskr: feed did not start: %v", err)
|
||||
return
|
||||
}
|
||||
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v)",
|
||||
bands, len(rxGrids), s.Enabled, chaseGrids)
|
||||
}
|
||||
|
||||
// feedBandOpen hands one PSK Reporter decode to the detector.
|
||||
//
|
||||
// Called from the MQTT goroutine at up to thousands a minute when 6 m is open,
|
||||
// so it does the least possible: the detector's own window and de-duplication
|
||||
// by callsign are what turn that flood into one announcement.
|
||||
func (a *App) feedBandOpen(s pskr.Spot) {
|
||||
if !a.bandOpenWanted(s.Band) {
|
||||
return
|
||||
}
|
||||
a.bandOpen.mu.Lock()
|
||||
if a.bandOpen.det == nil {
|
||||
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||
}
|
||||
op := a.bandOpen.det.Add(bandopen.Spot{
|
||||
Call: s.Call, Band: s.Band, DistKm: s.DistKm, Bearing: s.Bearing, At: s.At,
|
||||
}, a.opLat)
|
||||
if op != nil {
|
||||
a.rememberOpening(*op)
|
||||
}
|
||||
if s.DistKm >= bandopen.DefaultConfig().MinKm {
|
||||
a.markBandAlive(s.Band, s.At)
|
||||
}
|
||||
a.bandOpen.mu.Unlock()
|
||||
if op != nil {
|
||||
a.announceOpening(*op)
|
||||
}
|
||||
}
|
||||
|
||||
// GetPSKReporterStatus is what the settings panel polls.
|
||||
func (a *App) GetPSKReporterStatus() pskr.Status {
|
||||
if a.pskr == nil {
|
||||
return pskr.Status{Bands: pskr.Bands}
|
||||
}
|
||||
return a.pskr.Status()
|
||||
}
|
||||
|
||||
// settingOr reads one key, falling back when the store is not up yet or the
|
||||
// value is blank. The settings store is a plain string key/value and every
|
||||
// caller does this by hand; two of them here earn the helper.
|
||||
func (a *App) settingOr(key, def string) string {
|
||||
if a.settings == nil {
|
||||
return def
|
||||
}
|
||||
v, _ := a.settings.Get(a.ctx, key)
|
||||
if strings.TrimSpace(v) == "" {
|
||||
return def
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
func splitCSV(s string) []string {
|
||||
var out []string
|
||||
for _, p := range strings.Split(s, ",") {
|
||||
if p = strings.TrimSpace(p); p != "" {
|
||||
out = append(out, p)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
+155
-7
@@ -11,6 +11,8 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/bandopen"
|
||||
@@ -20,15 +22,54 @@ import (
|
||||
)
|
||||
|
||||
type bandOpenState struct {
|
||||
mu sync.Mutex
|
||||
// on mirrors the "Watch for band openings" setting.
|
||||
//
|
||||
// Cached rather than read per spot: this is the cluster hot path, where a
|
||||
// settings query per spot is exactly what the rest of this file avoids.
|
||||
// startBandOpenFeed owns it — it runs at startup and again on every save, so
|
||||
// the switch takes effect without a restart.
|
||||
on atomic.Bool
|
||||
// bands is the operator's SELECTED set, held as map[string]bool.
|
||||
//
|
||||
// bandopen.Watched only says which bands the detector is capable of; it
|
||||
// knows nothing about the chips in Settings. Nothing checked the selection
|
||||
// on either feed path, so unticking 10 m and 2 m changed the subscription and
|
||||
// left the cluster path announcing them anyway.
|
||||
bands atomic.Value
|
||||
mu sync.Mutex
|
||||
det *bandopen.Detector
|
||||
last []bandopen.Opening // most recent first, for the UI
|
||||
// live holds the announced openings that are still going, keyed by band, and
|
||||
// aliveUntil says when each stops counting as current.
|
||||
//
|
||||
// The detector announces an opening ONCE and then goes quiet for 45 minutes,
|
||||
// which is right for a message but useless for a badge that has to stay lit
|
||||
// while the band is open and go out when it closes. Nothing tells us an
|
||||
// opening ended, so it is inferred: every qualifying spot on that band pushes
|
||||
// the deadline out, and when they stop arriving the badge fades by itself.
|
||||
live map[string]bandopen.Opening
|
||||
aliveUntil map[string]time.Time
|
||||
}
|
||||
|
||||
// openingIdle is how long a band may go without a qualifying spot before its
|
||||
// badge goes out. Longer than the detector's own 12-minute window, so a quiet
|
||||
// couple of minutes mid-opening does not blink the badge off and on again.
|
||||
const openingIdle = 15 * time.Minute
|
||||
|
||||
const maxRememberedOpenings = 20
|
||||
|
||||
// detectBandOpening feeds one spot to the detector and announces a hit.
|
||||
func (a *App) detectBandOpening(s cluster.Spot) {
|
||||
// The watch has to be switched on.
|
||||
//
|
||||
// It was not checked here at all: the setting only ever governed the extra
|
||||
// DATA SOURCES (the RBN nodes and the PSK Reporter feed), while the detector
|
||||
// itself ran on every ordinary cluster spot. So an operator who had never
|
||||
// enabled the watch still got opening banners, from a feature they had
|
||||
// deliberately left off.
|
||||
if !a.bandOpen.on.Load() || !a.bandOpenWanted(s.Band) {
|
||||
return
|
||||
}
|
||||
// No operator grid = no distance and no bearing on the spot, and the whole
|
||||
// detection rests on those two. Say nothing rather than guess.
|
||||
if !a.opSet || s.DistanceKm <= 0 || !bandopen.Watched(s.Band) {
|
||||
@@ -43,16 +84,123 @@ func (a *App) detectBandOpening(s cluster.Spot) {
|
||||
Bearing: s.ShortPath, At: s.ReceivedAt,
|
||||
}, a.opLat)
|
||||
if op != nil {
|
||||
a.bandOpen.last = append([]bandopen.Opening{*op}, a.bandOpen.last...)
|
||||
if len(a.bandOpen.last) > maxRememberedOpenings {
|
||||
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
|
||||
}
|
||||
a.rememberOpening(*op)
|
||||
}
|
||||
// Keeps a lit badge lit. Gated on the same floor the detector uses, or a
|
||||
// band busy with short-range tropo would hold an Es badge on for ever.
|
||||
if s.DistanceKm >= bandopen.DefaultConfig().MinKm {
|
||||
a.markBandAlive(s.Band, s.ReceivedAt)
|
||||
}
|
||||
a.bandOpen.mu.Unlock()
|
||||
if op == nil {
|
||||
return
|
||||
if op != nil {
|
||||
a.announceOpening(*op)
|
||||
}
|
||||
}
|
||||
|
||||
// markBandAlive pushes a band's badge deadline out. Called for every spot the
|
||||
// detector accepted, from either feed. Cheap on purpose: this runs on the MQTT
|
||||
// goroutine at thousands a minute when 6 m is open.
|
||||
//
|
||||
// Caller holds bandOpen.mu.
|
||||
func (a *App) markBandAlive(band string, at time.Time) {
|
||||
if _, lit := a.bandOpen.live[strings.ToLower(band)]; !lit {
|
||||
return // nothing announced for this band, nothing to keep alive
|
||||
}
|
||||
if a.bandOpen.aliveUntil == nil {
|
||||
a.bandOpen.aliveUntil = map[string]time.Time{}
|
||||
}
|
||||
a.bandOpen.aliveUntil[strings.ToLower(band)] = at.Add(openingIdle)
|
||||
}
|
||||
|
||||
// rememberOpening files a detection and lights its badge. Caller holds the mutex.
|
||||
func (a *App) rememberOpening(op bandopen.Opening) {
|
||||
a.bandOpen.last = append([]bandopen.Opening{op}, a.bandOpen.last...)
|
||||
if len(a.bandOpen.last) > maxRememberedOpenings {
|
||||
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
|
||||
}
|
||||
if a.bandOpen.live == nil {
|
||||
a.bandOpen.live = map[string]bandopen.Opening{}
|
||||
a.bandOpen.aliveUntil = map[string]time.Time{}
|
||||
}
|
||||
b := strings.ToLower(op.Band)
|
||||
a.bandOpen.live[b] = op
|
||||
a.bandOpen.aliveUntil[b] = op.At.Add(openingIdle)
|
||||
}
|
||||
|
||||
// GetLiveOpenings returns the openings still under way, for the status-bar
|
||||
// badge. Expired ones are dropped as they are noticed — there is no janitor for
|
||||
// something that holds at most five entries.
|
||||
func (a *App) GetLiveOpenings() []bandopen.Opening {
|
||||
now := time.Now()
|
||||
a.bandOpen.mu.Lock()
|
||||
defer a.bandOpen.mu.Unlock()
|
||||
out := make([]bandopen.Opening, 0, len(a.bandOpen.live))
|
||||
for b, op := range a.bandOpen.live {
|
||||
if until, ok := a.bandOpen.aliveUntil[b]; !ok || now.After(until) {
|
||||
delete(a.bandOpen.live, b)
|
||||
delete(a.bandOpen.aliveUntil, b)
|
||||
applog.Printf("bandopen: %s opening has gone quiet", strings.ToUpper(b))
|
||||
continue
|
||||
}
|
||||
out = append(out, op)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// bandOpenWanted reports whether the operator has this band ticked. Falls back
|
||||
// to the detector's own set until a selection has been stored, so a band is
|
||||
// never silently dropped before the settings have been read.
|
||||
func (a *App) bandOpenWanted(band string) bool {
|
||||
if !bandopen.Watched(band) {
|
||||
return false
|
||||
}
|
||||
sel, ok := a.bandOpen.bands.Load().(map[string]bool)
|
||||
if !ok || len(sel) == 0 {
|
||||
return true
|
||||
}
|
||||
return sel[strings.ToLower(strings.TrimSpace(band))]
|
||||
}
|
||||
|
||||
// setBandOpenBands records the selection and puts out badges for bands that
|
||||
// have just been unticked — they fade on a timer fed by spots the detector no
|
||||
// longer looks at, so they would otherwise stay lit until the next restart.
|
||||
func (a *App) setBandOpenBands(bands []string) {
|
||||
sel := make(map[string]bool, len(bands))
|
||||
for _, b := range bands {
|
||||
sel[strings.ToLower(strings.TrimSpace(b))] = true
|
||||
}
|
||||
a.bandOpen.bands.Store(sel)
|
||||
|
||||
a.bandOpen.mu.Lock()
|
||||
defer a.bandOpen.mu.Unlock()
|
||||
for b := range a.bandOpen.live {
|
||||
if len(sel) > 0 && !sel[b] {
|
||||
delete(a.bandOpen.live, b)
|
||||
delete(a.bandOpen.aliveUntil, b)
|
||||
applog.Printf("bandopen: %s is no longer watched — badge cleared", strings.ToUpper(b))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// clearBandOpenings puts out every lit badge and forgets the detector's window.
|
||||
// Called when the watch is switched off: the badges fade on a timer fed by
|
||||
// spots the detector no longer looks at, so without this they would stay up
|
||||
// until the next restart. The remembered list is left alone — those openings
|
||||
// really did happen, and the operator may still want to see what he missed.
|
||||
func (a *App) clearBandOpenings() {
|
||||
a.bandOpen.mu.Lock()
|
||||
defer a.bandOpen.mu.Unlock()
|
||||
a.bandOpen.live = nil
|
||||
a.bandOpen.aliveUntil = nil
|
||||
// Drop the accumulated spot window too, so switching the watch back on starts
|
||||
// from what is on the air now rather than from an hour-old burst.
|
||||
a.bandOpen.det = nil
|
||||
}
|
||||
|
||||
// announceOpening logs and pushes one detection. Shared by both feeds — the
|
||||
// cluster path here and the PSK Reporter path in bandopen_sources.go — so an
|
||||
// opening reads the same however it was noticed.
|
||||
func (a *App) announceOpening(op bandopen.Opening) {
|
||||
applog.Printf("bandopen: %s opening — %d stations, ~%d km, %s%s (%s)",
|
||||
op.Band, op.Calls, op.MedianKm, op.Sector(),
|
||||
map[bool]string{true: "", false: " — UNUSUAL for the season"}[op.InSeason],
|
||||
|
||||
@@ -0,0 +1,118 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/bandopen"
|
||||
"hamlog/internal/cluster"
|
||||
)
|
||||
|
||||
// The "Watch for band openings" switch has to gate the DETECTOR, not just the
|
||||
// extra data sources.
|
||||
//
|
||||
// It originally governed only the RBN nodes and the PSK Reporter feed, while
|
||||
// the detector itself ran on every ordinary cluster spot — so an operator who
|
||||
// had never enabled the watch still got opening banners for a feature he had
|
||||
// deliberately left off. That is what this pins.
|
||||
func TestBandOpenWatchGatesTheDetector(t *testing.T) {
|
||||
spot := func() cluster.Spot {
|
||||
return cluster.Spot{
|
||||
DXCall: "EA1ABC", Band: "6m", DistanceKm: 1400, ShortPath: 210,
|
||||
ReceivedAt: time.Now(),
|
||||
}
|
||||
}
|
||||
|
||||
// Switched off: the spot must not even reach the detector.
|
||||
off := &App{opSet: true, opLat: 48.0, opLon: 2.0}
|
||||
off.detectBandOpening(spot())
|
||||
if off.bandOpen.det != nil {
|
||||
t.Error("the detector ran with the watch switched off")
|
||||
}
|
||||
|
||||
// Switched on: the same spot is accepted (one spot is not an opening, so
|
||||
// nothing is announced — but the detector now exists and is collecting).
|
||||
on := &App{opSet: true, opLat: 48.0, opLon: 2.0}
|
||||
on.bandOpen.on.Store(true)
|
||||
on.detectBandOpening(spot())
|
||||
if on.bandOpen.det == nil {
|
||||
t.Error("the detector did not run with the watch switched on")
|
||||
}
|
||||
}
|
||||
|
||||
// Switching the watch off must put the badges out. They fade on a timer fed by
|
||||
// spots the detector no longer looks at, so left alone they would stay lit
|
||||
// until the next restart.
|
||||
func TestClearBandOpeningsPutsTheBadgesOut(t *testing.T) {
|
||||
a := &App{}
|
||||
a.bandOpen.live = map[string]bandopen.Opening{"6m": {Band: "6m", Calls: 9}}
|
||||
a.bandOpen.aliveUntil = map[string]time.Time{"6m": time.Now().Add(time.Hour)}
|
||||
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||
a.bandOpen.last = []bandopen.Opening{{Band: "6m", Calls: 9}}
|
||||
|
||||
a.clearBandOpenings()
|
||||
|
||||
if got := a.GetLiveOpenings(); len(got) != 0 {
|
||||
t.Errorf("a badge stayed lit after the watch was switched off: %v", got)
|
||||
}
|
||||
if a.bandOpen.det != nil {
|
||||
t.Error("the accumulated spot window survived — switching back on would start from a stale burst")
|
||||
}
|
||||
// The history is NOT cleared: those openings really happened.
|
||||
if len(a.GetBandOpenings()) != 1 {
|
||||
t.Error("the remembered openings were thrown away")
|
||||
}
|
||||
}
|
||||
|
||||
// Unticking a band in Settings must actually stop its announcements.
|
||||
//
|
||||
// Nothing checked the operator's selection on either feed path: bandopen.Watched
|
||||
// only says which bands the detector is CAPABLE of. So a station with just 6 m
|
||||
// ticked still got 10 m and 2 m badges, from the cluster path and — once grid
|
||||
// chasing widened the subscription to every band — from PSK Reporter too.
|
||||
func TestBandOpenHonoursTheSelectedBands(t *testing.T) {
|
||||
a := &App{opSet: true, opLat: 48, opLon: 2}
|
||||
a.bandOpen.on.Store(true)
|
||||
a.setBandOpenBands([]string{"6m"})
|
||||
|
||||
if !a.bandOpenWanted("6m") {
|
||||
t.Error("6m is ticked and was refused")
|
||||
}
|
||||
for _, b := range []string{"10m", "2m", "4m"} {
|
||||
if a.bandOpenWanted(b) {
|
||||
t.Errorf("%s is not ticked and was accepted", b)
|
||||
}
|
||||
}
|
||||
// A band the detector cannot watch at all stays out whatever is stored.
|
||||
if a.bandOpenWanted("20m") {
|
||||
t.Error("20m is not a watched band and was accepted")
|
||||
}
|
||||
|
||||
// And the cluster path must obey it too.
|
||||
a.detectBandOpening(cluster.Spot{
|
||||
DXCall: "K1ABC", Band: "10m", DistanceKm: 6000, ShortPath: 280, ReceivedAt: time.Now(),
|
||||
})
|
||||
if a.bandOpen.det != nil {
|
||||
t.Error("a spot on an unticked band reached the detector")
|
||||
}
|
||||
}
|
||||
|
||||
// Unticking a band puts its badge out. They fade on a timer fed by spots the
|
||||
// detector no longer looks at, so it would otherwise stay lit until a restart.
|
||||
func TestUntickingABandClearsItsBadge(t *testing.T) {
|
||||
a := &App{}
|
||||
a.bandOpen.live = map[string]bandopen.Opening{
|
||||
"6m": {Band: "6m", Calls: 9},
|
||||
"10m": {Band: "10m", Calls: 5},
|
||||
}
|
||||
a.bandOpen.aliveUntil = map[string]time.Time{
|
||||
"6m": time.Now().Add(time.Hour),
|
||||
"10m": time.Now().Add(time.Hour),
|
||||
}
|
||||
a.setBandOpenBands([]string{"6m"})
|
||||
|
||||
live := a.GetLiveOpenings()
|
||||
if len(live) != 1 || live[0].Band != "6m" {
|
||||
t.Errorf("live openings = %v, want only 6m", live)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
// A bulk-editable field passes through THREE tables: the field list in the UI,
|
||||
// bulkFieldColumns here, and bulkEditableCols in internal/qso. Mode and RST were
|
||||
// added to the first and the third and not the second, so the dialog offered
|
||||
// them and the save failed with "unknown field" — reported from the field.
|
||||
//
|
||||
// Nothing warns about that: each table is valid on its own. This is the check.
|
||||
func TestEveryMappedBulkFieldIsWhitelisted(t *testing.T) {
|
||||
for id, col := range bulkFieldColumns {
|
||||
if !qso.BulkEditable(col) {
|
||||
t.Errorf("bulk field %q maps to column %q, which internal/qso refuses to write", id, col)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// And the reverse: a column the qso layer allows but nothing maps to is dead
|
||||
// weight — it looks supported from the inside and cannot be reached from outside.
|
||||
func TestNoUnreachableBulkColumn(t *testing.T) {
|
||||
mapped := map[string]bool{}
|
||||
for _, col := range bulkFieldColumns {
|
||||
mapped[col] = true
|
||||
}
|
||||
for _, col := range qso.BulkEditableColumns() {
|
||||
if !mapped[col] {
|
||||
t.Errorf("column %q is bulk-writable but no field maps to it — unreachable", col)
|
||||
}
|
||||
}
|
||||
}
|
||||
+141
-1
@@ -1,4 +1,144 @@
|
||||
[
|
||||
{
|
||||
"version": "0.24.9",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Appearance: row colouring now defaults to a left stripe, with a filled row and its strength offered as choices.",
|
||||
"The band map now follows the cluster filters — LoTW only, spotter continent, hide worked, status and mode chips.",
|
||||
"Band map: stations that upload to LoTW now carry the same L badge as the cluster list, switchable in Appearance.",
|
||||
"LoTW: contacts TQSL leaves out — already uploaded, or outside the certificate date range — are no longer reported as uploaded.",
|
||||
"FT8: a contact is logged with the grid the station actually sent, not the home square from QRZ — expeditions were logged in the wrong place.",
|
||||
"SPE amplifier: switching it off is shown at once, instead of needing a second press of OFF.",
|
||||
"Appearance: row colouring is now Worked / Confirmed / QSL sent / To be sent, each scoped to the channels you pick — paper, LoTW, eQSL, QRZ.com."
|
||||
],
|
||||
"fr": [
|
||||
"Apparence : la coloration des lignes se fait par défaut sur une barre à gauche, la ligne remplie et son intensité restant proposées.",
|
||||
"La band map suit désormais les filtres du cluster — LoTW seulement, continent du spotter, masquer les contactés, statuts et modes.",
|
||||
"Band map : les stations qui utilisent LoTW portent le même badge L que la liste du cluster, activable dans Apparence.",
|
||||
"LoTW : les contacts que TQSL écarte — déjà envoyés, ou hors de la plage de dates du certificat — ne sont plus annoncés comme envoyés.",
|
||||
"FT8 : un contact est enregistré avec le locator réellement émis par la station, et non le carré du domicile depuis QRZ — les expéditions étaient logguées au mauvais endroit.",
|
||||
"Amplificateur SPE : l extinction s affiche immédiatement, au lieu de demander un second appui sur OFF.",
|
||||
"Apparence : la coloration des lignes devient Contacté / Confirmé / QSL envoyée / À envoyer, chacune limitée aux canaux choisis — papier, LoTW, eQSL, QRZ.com."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.8",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Cluster: the grid cache now holds 100,000 callsigns and rotates instead of emptying itself, so locators stop vanishing from the list.",
|
||||
"New option \"Chase new grids\": locators learnt from your decodes and from PSK Reporter are kept in their own database, with their source.",
|
||||
"Band openings: the PSK Reporter feed is now filtered at the broker, which cuts it from about 83 messages a second to under two.",
|
||||
"Band openings: unticking a band now actually stops its announcements, and puts its badge out.",
|
||||
"Callsign lookup: the website, postal code and HamQTH profile picture are now read — the QSO web column was never filled by any lookup.",
|
||||
"New selectable column \"QSO number\": position in the log, 1 for the oldest contact.",
|
||||
"New Appearance settings: colour whole log rows by QSL status, with your own colours from a palette.",
|
||||
"The QSO number was missing on contacts logged from WSJT-X — that path bypassed the numbering."
|
||||
],
|
||||
"fr": [
|
||||
"Cluster : le cache de locators garde 100 000 indicatifs et tourne au lieu de se vider, les locators ne disparaissent donc plus de la liste.",
|
||||
"Nouvelle option « Chasse aux nouveaux carrés » : les locators appris de tes décodes et de PSK Reporter sont conservés dans leur propre base, avec leur source.",
|
||||
"Ouvertures de bande : le flux PSK Reporter est désormais filtré chez le broker, ce qui le fait passer d environ 83 messages par seconde à moins de deux.",
|
||||
"Ouvertures de bande : décocher une bande arrête réellement ses annonces et éteint son badge.",
|
||||
"Recherche d indicatif : le site web, le code postal et la photo de profil HamQTH sont désormais lus — la colonne web du QSO n était jamais remplie.",
|
||||
"Nouvelle colonne sélectionnable « Numéro de QSO » : position dans le log, 1 pour le contact le plus ancien.",
|
||||
"Nouveaux réglages Apparence : colorer les lignes entières du log selon le statut QSL, avec tes couleurs choisies dans une palette.",
|
||||
"Le numéro de QSO manquait sur les contacts enregistrés depuis WSJT-X — ce chemin contournait la numérotation."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.7",
|
||||
"date": "",
|
||||
"en": [
|
||||
"QSOs logged from WSJT-X now carry the space weather and the distance, like hand-logged ones.",
|
||||
"Band openings: EME contacts are no longer mistaken for an opening. Each band now has the longest path the atmosphere can carry.",
|
||||
"Kenwood: WSJT-X \"Fake It\" no longer leaves the dial on the transmit frequency.",
|
||||
"PowerGenius XL: the Station Control card now shows power, current, SWR and temperature without a FlexRadio.",
|
||||
"Motorized antennas: tracking now offers three modes — every frequency change, past a step, or band change only.",
|
||||
"Motorized antennas: each covered band now has its own tune frequency, set in Settings.",
|
||||
"Awards: a single award can now be exported on its own.",
|
||||
"Awards: each reference now has its own validity window, so a reference that ceased to exist stops counting for later QSOs.",
|
||||
"Band openings: the watch switch now governs the detection itself, not just the extra data sources."
|
||||
],
|
||||
"fr": [
|
||||
"Les QSO enregistrés depuis WSJT-X portent désormais la météo spatiale et la distance, comme ceux saisis à la main.",
|
||||
"Ouvertures de bande : les contacts EME ne sont plus pris pour une ouverture. Chaque bande a désormais la distance maximale que l atmosphère peut porter.",
|
||||
"Kenwood : le « Fake It » de WSJT-X ne laisse plus le VFO sur la fréquence d émission.",
|
||||
"PowerGenius XL : la carte du Contrôle station affiche puissance, courant, ROS et température sans FlexRadio.",
|
||||
"Antennes motorisées : le suivi propose trois modes — à chaque changement de fréquence, au-delà d un pas, ou au changement de bande.",
|
||||
"Antennes motorisées : chaque bande couverte a désormais sa propre fréquence d accord, réglable dans les Réglages.",
|
||||
"Diplômes : un diplôme peut désormais être exporté seul.",
|
||||
"Diplômes : chaque référence a désormais sa fenêtre de validité, une référence disparue cesse donc de compter pour les QSO suivants.",
|
||||
"Ouvertures de bande : l interrupteur de la veille gouverne désormais la détection elle-même, plus seulement les sources de données."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.6",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Bulk edit can now set mode, submode and RST. They were excluded as per-QSO fields, which missed the point: bulk edit is for repairing a batch — an import that mapped every contact to SSB, an ADIF with no mode at all — and refusing meant editing a hundred rows one at a time. Setting the mode clears the submode, since one left over from the old mode contradicts the new one. Band stays with frequency, which already sets the two together.",
|
||||
"Web publishing: the page now widens to fit the table. It was capped at a comfortable reading width, so with more than about eight columns the rest sat behind a scrollbar on a screen wide enough to show them all — and Windows hides that scrollbar until something moves, which made a table that scrolls look like a table missing columns. Columns also take the width their contents need instead of being squeezed to fit first.",
|
||||
"Every QSO now carries its distance. Nothing ever recorded one, so the field went out empty in every ADIF export and left the Distance column blank on a published page. It is computed from the two locators when a contact is logged and when an ADIF is imported, and a one-time pass fills in the QSOs already in your log the first time this version runs — in the background, without asking. A distance the imported file supplied is always kept.",
|
||||
"RDA: 1015 districts were filed under the wrong DXCC entity. Every reference sat on European Russia; 991 belong to Asiatic Russia and the 24 KA- districts to Kaliningrad, which is a separate entity altogether. Corrected against the reference list, and Kaliningrad added to the award filter so those 24 can be claimed at all.",
|
||||
"QSO filter: asking a field to equal nothing now finds the empty ones. SQL answers that question with nothing at all — a missing value never equals an empty one — so the filter looked broken rather than wrong. Empty on a numeric field also covers zero as well as missing, which SQLite and MySQL disagreed about.",
|
||||
"Callsign lookup: a /QRP call now returns its locator. The lookup falls back to the home callsign when the slashed form is not registered, and then cleared the location — right for /P and /M, where the operator is somewhere other than their registered address, and wrong for /QRP, which says something about power and nothing about place. The grid came back empty while the same call without the suffix answered perfectly."
|
||||
],
|
||||
"fr": [
|
||||
"L édition groupée sait enfin régler le mode, le sous-mode et le RST. Ils étaient exclus comme champs propres à chaque QSO, ce qui manquait l essentiel : l édition groupée sert à RÉPARER un lot — un import qui a tout mis en SSB, un ADIF sans aucun mode — et refuser obligeait à corriger cent lignes une par une. Régler le mode efface le sous-mode, celui de l ancien mode contredisant le nouveau. La bande reste avec la fréquence, qui pose déjà les deux ensemble.",
|
||||
"Publication web : la page s élargit désormais à la taille du tableau. Elle était bridée à une largeur de lecture confortable, donc au-delà de huit colonnes environ le reste passait derrière une barre de défilement sur un écran assez large pour tout montrer — et Windows masque cette barre tant que rien ne bouge, si bien qu un tableau qui défile ressemblait à un tableau amputé. Les colonnes prennent aussi la largeur qu il leur faut au lieu d être comprimées d abord.",
|
||||
"Chaque QSO porte désormais sa distance. Rien ne l enregistrait, elle partait donc vide dans chaque export ADIF et laissait la colonne Distance blanche sur une page publiée. Elle est calculée depuis les deux locators à l enregistrement d un contact et à l import d un ADIF, et une passe unique complète les QSO déjà présents au premier lancement de cette version — en tâche de fond, sans rien demander. Une distance fournie par le fichier importé est toujours conservée.",
|
||||
"RDA : 1015 districts étaient rangés sous la mauvaise entité DXCC. Toutes les références étaient sur la Russie européenne ; 991 relèvent de la Russie asiatique et les 24 districts KA- de Kaliningrad, qui est une entité à part entière. Corrigé d après la liste de référence, et Kaliningrad ajouté au filtre de l award pour que ces 24 puissent être revendiqués.",
|
||||
"Filtre QSO : demander à un champ d être égal à rien trouve désormais les vides. SQL répond à cette question par rien du tout — une valeur absente n est jamais égale à une valeur vide — et le filtre paraissait cassé plutôt que mal posé. Vide sur un champ numérique couvre aussi le zéro autant que l absence, ce sur quoi SQLite et MySQL n étaient pas d accord.",
|
||||
"Recherche d indicatif : un indicatif en /QRP rend enfin son locator. La recherche se rabat sur l indicatif de base quand la forme avec barre n est pas enregistrée, puis effaçait la localisation — ce qui est juste pour /P et /M, où l opérateur n est pas à son adresse déclarée, et faux pour /QRP, qui parle de puissance et pas de lieu. Le locator revenait vide alors que le même indicatif sans le suffixe répondait parfaitement."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.5",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Digital decodes: a station's grid square could be logged as its callsign when the message text was unusual. A grid in the callsign position is now refused.",
|
||||
"CW over CAT now works on a Kenwood. The KY command was sent in Elecraft's variable-length form; a Kenwood needs exactly 24 characters, so every message was refused.",
|
||||
"Shared CAT is steadier and now diagnoses itself. It survives a rig answering \"busy\" just after transmit instead of dropping the link, stops repeating a PTT state the client never changed, and logs a plain explanation when another program has taken its port or when a client is set to a rig model instead of Hamlib NET rigctl. It also answers the lock-mode and stop-morse commands some clients send around every transmit, instead of refusing them.",
|
||||
"Web publishing now offers every field a QSO carries, awards included — 123 instead of 23 — from a searchable dropdown, with the chosen columns listed above it in publication order. Choose carefully: the page is public and the list includes addresses and e-mail.",
|
||||
"Band-opening detection now works on the bands it was meant for. Switching on \"Watch for band openings\" (Settings › DX Cluster) subscribes to the PSK Reporter feed and adds the two RBN nodes it needs — it was reading a handful of VHF cluster spots while thousands of stations were reporting. It watches 10, 6, 4 and 2 m, counts only reports collected within 300 km of you so an opening means an opening HERE, no longer throws away paths beyond 2400 km, and looks for the busiest direction instead of demanding that every station heard sit in one sector. An opening under way shows as a blinking badge beside the clock the moment it is found — band, direction and typical distance, with a mark when it is unusual for the season — and stays until the band goes quiet, and the direction it names is right — a sector crossing north used to be announced as its opposite.",
|
||||
"Test connection now actually tests. Club Log checked that the three fields were not empty and reported success without contacting anyone, so a wrong password looked exactly like a right one; it now signs in for real, through the read-only endpoint so a test can never add a record. LoTW reports its two credentials separately: TQSL signs uploads and never uses the website password, so a wrong one used to break nothing until the day confirmations were downloaded.",
|
||||
"The Ultrabeam / SteppIR widget in Station Control can now drive the antenna, not just describe it: a button per configured band tunes it there, up and down move it 25 kHz at a time, and tracking can be switched on or off with its 25 / 50 / 100 kHz threshold beside it. The band you are on lights up, and the commanded frequency is shown in the header.",
|
||||
"The QSO filter can express a real question. Every condition was joined by one global AND or OR, so \"2 m or 70 cm, in FT8, since January\" had no form: AND killed the two bands, OR let every FT8 QSO through. Two operators — is one of / is none of — take a comma-separated list, so the OR sits inside one condition and the rest keeps ANDing.",
|
||||
"Split works properly on a Kenwood. Split Operating: Rig in WSJT-X and JTDX did nothing at all through the shared CAT — OpsLog answered \"done\" to both split commands and left the radio on the receive frequency, so on a pileup you transmitted straight onto the DX while the software showed exactly what you had asked for. A radio whose backend cannot set split now refuses, so WSJT-X says so and you can switch to Fake It. And the two frequencies no longer swap the moment you key up: the rig reports the VFO in use, which is the receive one on receive and the transmit one on transmit, and that decided which frequency a split QSO was logged on."
|
||||
],
|
||||
"fr": [
|
||||
"Décodes digitaux : le carré locator d une station pouvait être enregistré comme son indicatif quand le texte du message sortait de l ordinaire. Un grid à la place de l indicatif est maintenant refusé.",
|
||||
"Le CW par CAT fonctionne sur Kenwood. La commande KY partait sous la forme Elecraft à longueur libre ; un Kenwood exige exactement 24 caractères, donc chaque message était refusé.",
|
||||
"Le CAT partagé est plus solide et se diagnostique tout seul. Il survit à un rig qui répond « occupé » juste après une émission au lieu de lâcher le lien, cesse de répéter un état PTT que le client n a pas changé, et écrit une explication claire quand un autre programme lui a pris son port ou qu un client est réglé sur un modèle de rig au lieu de Hamlib NET rigctl. Il répond aussi aux commandes de verrouillage et d arrêt du morse que certains logiciels envoient à chaque émission, au lieu de les refuser.",
|
||||
"La publication web propose désormais tous les champs d un QSO, awards compris — 123 au lieu de 23 — depuis une liste déroulante cherchable, les colonnes choisies étant listées au-dessus dans l ordre de publication. À choisir avec soin : la page est publique et la liste contient adresses et e-mails.",
|
||||
"La détection d ouverture de bande fonctionne enfin sur les bandes visées. Activer « Surveiller les ouvertures de bande » (Paramètres › Cluster DX) souscrit au flux PSK Reporter et ajoute les deux nœuds RBN nécessaires — elle lisait quelques spots VHF du cluster alors que des milliers de stations rapportaient. Elle surveille le 10, 6, 4 et 2 m, ne retient que les reports collectés à moins de 300 km de toi pour qu une ouverture veuille dire une ouverture ICI, ne jette plus les chemins au-delà de 2400 km, et cherche la direction la plus dense au lieu d exiger que toutes les stations entendues soient dans un même secteur. Une ouverture en cours s affiche en pastille clignotante à côté de l heure dès qu elle est détectée — bande, direction et distance typique, avec une marque si elle est inhabituelle pour la saison — et y reste jusqu à ce que la bande se taise, et la direction annoncée est juste — un secteur traversant le nord était auparavant annoncé à l opposé.",
|
||||
"Le bouton Tester la connexion teste vraiment. Club Log vérifiait que les trois champs n étaient pas vides et annonçait la réussite sans contacter personne : un mauvais mot de passe ressemblait exactement à un bon. Il s authentifie maintenant pour de vrai, via le point d accès en lecture seule pour qu un test ne puisse jamais ajouter un enregistrement. LoTW annonce ses deux identifiants séparément : TQSL signe les envois et n utilise jamais le mot de passe du site, donc un mauvais ne cassait rien jusqu au jour du téléchargement des confirmations.",
|
||||
"Le widget Ultrabeam / SteppIR de Station Control pilote enfin l antenne au lieu de seulement la décrire : un bouton par bande configurée l accorde dessus, haut et bas la déplacent par pas de 25 kHz, et le suivi s active ou se coupe avec son seuil de 25 / 50 / 100 kHz à côté. La bande courante s allume, et la fréquence commandée s affiche dans l en-tête.",
|
||||
"Le filtre des QSO sait exprimer une vraie question. Toutes les conditions étaient jointes par un seul ET ou OU global, donc « 2 m ou 70 cm, en FT8, depuis janvier » n avait aucune forme : le ET tuait les deux bandes, le OU laissait passer tous les QSO FT8. Deux opérateurs — est parmi / n est pas parmi — acceptent une liste séparée par des virgules, le OU tient donc dans une seule condition et le reste continue de se combiner en ET.",
|
||||
"Le split fonctionne correctement sur Kenwood. Split Operating: Rig dans WSJT-X et JTDX ne faisait rien du tout via le CAT partagé — OpsLog répondait « fait » aux deux commandes et laissait la radio sur la fréquence de réception, donc sur un pileup tu émettais en plein sur le DX pendant que le logiciel affichait exactement ce que tu avais demandé. Une radio dont le backend ne sait pas régler le split refuse désormais, WSJT-X le dit et tu peux passer en Fake It. Et les deux fréquences ne s inversent plus dès le passage en émission : le rig annonce le VFO en service, celui de réception à l écoute et celui d émission en émission, ce qui décidait sur quelle fréquence un QSO en split était enregistré."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.4",
|
||||
"date": "",
|
||||
"en": [
|
||||
"DX cluster: an L badge next to a callsign marks a station that uploads to LoTW, with a matching LoTW users only filter, and a Spotter continent filter narrows the list by where the spot came FROM — a JA report on 20 m tells a European little about their own path. The filter panel has been tidied along one rule: a switch is a behaviour you turn on or off, chips pick any number from a set. Nothing appears in both shapes any more, the Lock buttons sit in the heading of the section they lock, every section can be cleared the same way, and the whole panel is finally translated.",
|
||||
"DX cluster: the Spotter continent filter now actually matches. RBN skimmers report as VU2OY-# and cluster nodes as DL1ABC-2, and the suffix was passed straight to the prefix lookup, so every spot came back with no continent and the filter silently selected nothing.",
|
||||
"A spot now stops being NEW the moment you log it. Logging announced the QSO but never dropped the cluster worked-index snapshot, so the refresh that follows re-read the answer computed BEFORE the contact — a station stayed yellow on the band map and in the cluster with the QSO plainly in the log, until something else happened to rebuild the index.",
|
||||
"Station information gains an IOTA field (ADIF MY_IOTA, e.g. EU-005), stamped on every QSO like the SOTA and POTA references beside it. The QSO table has carried the field since the first release and both ADIF import and export already handled it — only the station profile could not supply it, so an island activation meant typing the reference on every contact.",
|
||||
"PowerGenius XL: fixed the amplifier link dropping and reconnecting every few seconds, and the stall while transmitting. The amp pushes status frames on the same socket it answers commands on, and it pushes them constantly once in OPERATE; OpsLog read one line per command and took whatever arrived first as its answer, so the stream slipped permanently one reply behind until a command timed out and the connection was dropped. Replies are now matched to the command that asked for them. Only ever visible over a remote link with the amplifier in OPERATE.",
|
||||
"No colour on worked stations now does only that: it removes the blue already-worked mark and leaves everything else alone. It used to blank the spot status as well, and the status is what dims a quiet row — so turning the option on made every grey row bright white, which is the opposite of what it is for.",
|
||||
"Grid squares in the cluster. Every CQ decoded over the WSJT-X UDP link carries the sender grid, and OpsLog now keeps it: a Grid column shows the square and NEW GRID flags one never worked, as a badge, a filled cell and a filter of its own. Whether a grid counts as new follows the group digital modes setting — with it on, a square worked on FT8 is no longer new on FT4; with it off the two are separate. Only stations your own receiver decodes have a grid: a cluster line carries the spotter grid at best, never the DX one. Turn the column on in Columns."
|
||||
],
|
||||
"fr": [
|
||||
"Cluster DX : un badge L à côté de l indicatif signale une station qui utilise LoTW, avec le filtre Utilisateurs LoTW seulement qui va avec, et un filtre Continent du spotter restreint selon l origine du spot — un report JA sur 20 m dit peu de chose à un Européen sur son propre chemin. Le panneau de filtres a été remis d aplomb selon une seule règle : un interrupteur est un comportement qu on active ou non, les pastilles choisissent dans un ensemble. Plus rien n existe sous les deux formes, les boutons de verrouillage sont dans le titre de la section qu ils verrouillent, chaque section s efface de la même façon, et le panneau est enfin traduit.",
|
||||
"Cluster DX : le filtre Continent du spotter fonctionne enfin. Les skimmers RBN s annoncent en VU2OY-# et les nœuds cluster en DL1ABC-2, et ce suffixe partait tel quel dans la recherche de préfixe — tous les spots revenaient sans continent et le filtre ne sélectionnait rien.",
|
||||
"Un spot cesse enfin d être NOUVEAU dès que tu l enregistres. La journalisation annonçait le QSO mais ne vidait jamais l instantané de l index des contacts, donc le rafraîchissement qui suit relisait la réponse calculée AVANT le contact — une station restait jaune sur le bandmap et dans le cluster alors que le QSO était bien au log, jusqu à ce qu autre chose reconstruise l index.",
|
||||
"Les informations station gagnent un champ IOTA (MY_IOTA en ADIF, par exemple EU-005), estampillé sur chaque QSO comme les références SOTA et POTA à côté. La table des QSO portait le champ depuis la première version et l import comme l export ADIF le géraient déjà — seul le profil station ne savait pas le fournir, donc une activation d île obligeait à retaper la référence à chaque contact.",
|
||||
"PowerGenius XL : corrigé le lien avec l ampli qui tombait et se reconnectait toutes les quelques secondes, et le blocage en émission. L ampli pousse des trames d état sur la socket même où il répond aux commandes, et il en pousse en permanence dès qu il est en OPERATE ; OpsLog lisait une ligne par commande et prenait la première arrivée pour sa réponse, donc le flux glissait définitivement d une réponse de retard jusqu à expiration et fermeture du lien. Les réponses sont désormais appariées à la commande qui les a demandées. Visible uniquement en liaison distante avec l ampli en OPERATE.",
|
||||
"Aucune couleur sur les stations déjà contactées ne fait plus que ça : la marque bleue disparaît, le reste ne bouge pas. L option vidait aussi le statut du spot, or c est le statut qui estompe une ligne sans intérêt — l activer rendait donc toutes les lignes grises blanches et éclatantes, soit l inverse du but recherché.",
|
||||
"Les carrés locator dans le cluster. Chaque CQ décodé sur le lien UDP WSJT-X porte le grid de l émetteur, et OpsLog le conserve désormais : une colonne Grid affiche le carré et NOUV GRID signale celui jamais contacté, en badge, en cellule remplie et avec son propre filtre. Ce qui compte comme nouveau suit le réglage de regroupement des modes digitaux — activé, un carré fait en FT8 n est plus neuf en FT4 ; désactivé, les deux sont distincts. Seules les stations décodées par ton propre récepteur ont un grid : une ligne de cluster porte le grid du spotter au mieux, jamais celui du DX. Colonne à activer dans Colonnes."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.3",
|
||||
"date": "",
|
||||
@@ -1029,4 +1169,4 @@
|
||||
"Ce résumé « Nouveautés » s'affiche désormais au premier lancement après chaque mise à jour."
|
||||
]
|
||||
}
|
||||
]
|
||||
]
|
||||
@@ -0,0 +1,160 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"hamlog/internal/gridcache"
|
||||
)
|
||||
|
||||
// The grid cache used to drop EVERYTHING at its ceiling. That was survivable
|
||||
// while the only feed was this station's own decodes, which never reached it.
|
||||
// Fed by anything larger it is a cliff: every locator in the cluster list
|
||||
// disappears at once, periodically, and the operator sees the column empty
|
||||
// itself for no reason.
|
||||
//
|
||||
// Rotation keeps the previous generation, so a full cache costs the older half
|
||||
// and nothing more.
|
||||
func TestDecodeGridRotationKeepsThePreviousGeneration(t *testing.T) {
|
||||
a := &App{}
|
||||
|
||||
// Fill exactly one generation.
|
||||
for i := 0; i < decodeGridsCap; i++ {
|
||||
a.rememberDecodeGrid(fmt.Sprintf("CALL%06d", i), "JN36", gridcache.SourceDecode)
|
||||
}
|
||||
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||
t.Fatalf("first entry lost before any rotation: %q", got)
|
||||
}
|
||||
if a.decodeGridsOld != nil {
|
||||
t.Fatal("rotated early — the cap is the ceiling of ONE generation")
|
||||
}
|
||||
|
||||
// One more entry rotates.
|
||||
a.rememberDecodeGrid("NEWCALL", "IO91", gridcache.SourceDecode)
|
||||
if a.decodeGridsOld == nil {
|
||||
t.Fatal("did not rotate at the cap")
|
||||
}
|
||||
if got := a.lookupDecodeGrid("NEWCALL"); got != "IO91" {
|
||||
t.Errorf("the entry that caused the rotation was lost: %q", got)
|
||||
}
|
||||
// The whole previous generation is still readable — this is the point.
|
||||
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||
t.Errorf("a locator from the previous generation was dropped: %q — that is the cliff again", got)
|
||||
}
|
||||
if got := a.lookupDecodeGrid("CALL099999"); got != "JN36" {
|
||||
t.Errorf("previous generation incomplete: %q", got)
|
||||
}
|
||||
|
||||
// A second rotation is what finally retires the oldest half.
|
||||
for i := 0; i < decodeGridsCap; i++ {
|
||||
a.rememberDecodeGrid(fmt.Sprintf("SECOND%06d", i), "KP20", gridcache.SourceDecode)
|
||||
}
|
||||
if got := a.lookupDecodeGrid("CALL000000"); got != "" {
|
||||
t.Errorf("the cache is unbounded: %q survived two rotations", got)
|
||||
}
|
||||
if got := a.lookupDecodeGrid("NEWCALL"); got != "IO91" {
|
||||
t.Errorf("an entry one generation old was retired too early: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// Callsigns are normalised on the way in AND on the way out, or a spot for
|
||||
// "f4bpo" would miss a grid learnt as "F4BPO".
|
||||
func TestDecodeGridCaseAndBlanks(t *testing.T) {
|
||||
a := &App{}
|
||||
a.rememberDecodeGrid(" f4bpo ", "JN36", gridcache.SourceDecode)
|
||||
if got := a.lookupDecodeGrid("F4BPO"); got != "JN36" {
|
||||
t.Errorf("lookup of the upper-case form failed: %q", got)
|
||||
}
|
||||
a.rememberDecodeGrid("", "JN36", gridcache.SourceDecode)
|
||||
a.rememberDecodeGrid("K1ABC", "", gridcache.SourceDecode)
|
||||
if got := a.lookupDecodeGrid("K1ABC"); got != "" {
|
||||
t.Errorf("stored an empty grid: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// The write path runs on the decode goroutine while the cluster status builder
|
||||
// reads. Rotation swaps the map headers, so an unguarded read is a data race
|
||||
// rather than a stale value.
|
||||
//
|
||||
// This build is CGO-free, so -race is not available here; the test exercises the
|
||||
// interleaving and would fault on a concurrent map access even without it.
|
||||
func TestDecodeGridConcurrentAccess(t *testing.T) {
|
||||
a := &App{}
|
||||
var wg sync.WaitGroup
|
||||
wg.Add(2)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
for i := 0; i < 20000; i++ {
|
||||
a.rememberDecodeGrid(fmt.Sprintf("W%05d", i), "FN31", gridcache.SourceDecode)
|
||||
}
|
||||
}()
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
for i := 0; i < 20000; i++ {
|
||||
_ = a.lookupDecodeGrid(fmt.Sprintf("W%05d", i))
|
||||
}
|
||||
}()
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
// Only a CHANGE may reach the write batch.
|
||||
//
|
||||
// The feeds repeat themselves — the same station is reported by dozens of
|
||||
// receivers a minute — so queueing every report would put the whole stream in
|
||||
// the batch instead of the news in it, and turn a cache into a write amplifier.
|
||||
func TestOnlyChangesAreQueued(t *testing.T) {
|
||||
st, err := gridcache.Open(filepath.Join(t.TempDir(), "grids.db"), nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer st.Close()
|
||||
a := &App{gridStore: st}
|
||||
|
||||
a.rememberDecodeGrid("F4BPO", "JN36", gridcache.SourceDecode)
|
||||
if n := st.Pending(); n != 1 {
|
||||
t.Fatalf("a new locator queued %d writes, want 1", n)
|
||||
}
|
||||
if err := st.Flush(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// The same report, a hundred times over, is not news.
|
||||
for i := 0; i < 100; i++ {
|
||||
a.rememberDecodeGrid("F4BPO", "JN36", gridcache.SourceDecode)
|
||||
}
|
||||
if n := st.Pending(); n != 0 {
|
||||
t.Errorf("unchanged reports queued %d writes — the batch would carry the whole feed", n)
|
||||
}
|
||||
|
||||
// A station that moved is.
|
||||
a.rememberDecodeGrid("F4BPO", "KP30", gridcache.SourceDecode)
|
||||
if n := st.Pending(); n != 1 {
|
||||
t.Errorf("a changed locator queued %d writes, want 1", n)
|
||||
}
|
||||
if got := a.lookupDecodeGrid("F4BPO"); got != "KP30" {
|
||||
t.Errorf("the map kept the old locator: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// Rotation must be OFF while a store is attached: it would discard callsigns the
|
||||
// database still holds, and the lookup would then miss something we know.
|
||||
func TestNoRotationWhilePersisting(t *testing.T) {
|
||||
st, err := gridcache.Open(filepath.Join(t.TempDir(), "grids.db"), nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer st.Close()
|
||||
a := &App{gridStore: st}
|
||||
|
||||
for i := 0; i < decodeGridsCap+10; i++ {
|
||||
a.rememberDecodeGrid(fmt.Sprintf("CALL%06d", i), "JN36", gridcache.SourceDecode)
|
||||
}
|
||||
if a.decodeGridsOld != nil {
|
||||
t.Error("rotated while a store was attached — locators the database holds would go missing")
|
||||
}
|
||||
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||
t.Errorf("the first entry was dropped: %q", got)
|
||||
}
|
||||
}
|
||||
+286
-120
@@ -51,6 +51,7 @@ import {
|
||||
ReportLiveActivity, LiveLastQSOAgeSec,
|
||||
GetAmpStatuses, AmpOperate,
|
||||
GetFlexState, FlexAmpOperate,
|
||||
GetPSKReporterStatus, GetLiveOpenings,
|
||||
} from '../wailsjs/go/main/App';
|
||||
import { Combobox } from '@/components/ui/combobox';
|
||||
import { applyAwardRefs } from '@/lib/awardRefs';
|
||||
@@ -89,7 +90,8 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
|
||||
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
||||
import { ClusterGrid } from '@/components/ClusterGrid';
|
||||
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
||||
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||
import { applySpotDisplay, readSpotDisplayOptions, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||
import { GetRowColors } from '../wailsjs/go/main/App';
|
||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||
import { NetControlPanel } from '@/components/NetControlPanel';
|
||||
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
||||
@@ -1487,12 +1489,20 @@ export default function App() {
|
||||
// is an OR across all of them, as it already was for a worked callsign.
|
||||
// 'new-call' is a DISPLAY status, produced by the slot-highlight option rather
|
||||
// than by the backend, so it is named here and not in SpotStatusKey.
|
||||
type SpotFilterKey = SpotStatusKey | 'new-pota' | 'new-county' | 'new-pfx' | 'new-call';
|
||||
type SpotFilterKey = SpotStatusKey | 'new-pota' | 'new-county' | 'new-pfx' | 'new-call' | 'new-grid';
|
||||
// Display options, shared with the band map through lib/spotDisplay. Kept in
|
||||
// localStorage (mirrored to settings by writeUiPref) so both panels and the
|
||||
// filter predicate read one source without prop-drilling through three levels.
|
||||
const [clusterMuteWorked, setClusterMuteWorked] = useState(() => localStorage.getItem('opslog.clusterMuteWorked') === '1');
|
||||
const [clusterSlotHighlight, setClusterSlotHighlight] = useState(() => localStorage.getItem('opslog.clusterSlotHighlight') === '1');
|
||||
// LoTW-only, and the spotter's continent. Both narrow the list by a property
|
||||
// of the station rather than by what the spot is worth, which is why they sit
|
||||
// beside Hide worked and not among the status chips.
|
||||
const [clusterLotwOnly, setClusterLotwOnly] = useState(() => localStorage.getItem('opslog.clusterLotwOnly') === '1');
|
||||
const [clusterSpotterConts, setClusterSpotterConts] = useState<Set<string>>(() => lsSet<string>('opslog.clusterSpotterCont'));
|
||||
// Read through lib/spotDisplay, not straight from localStorage: while the two
|
||||
// options are withdrawn it answers false, so the cluster list cannot end up
|
||||
// applying an option the operator can no longer see or switch off.
|
||||
const [clusterMuteWorked, setClusterMuteWorked] = useState(() => readSpotDisplayOptions().muteWorked);
|
||||
const [clusterSlotHighlight, setClusterSlotHighlight] = useState(() => readSpotDisplayOptions().slotHighlight);
|
||||
const [clusterStatusFilter, setClusterStatusFilter] = useState<Set<SpotFilterKey>>(() => lsSet<SpotFilterKey>('opslog.clusterStatusFilter'));
|
||||
// Mode filter chips. Empty set = show every mode. Categories map the
|
||||
// inferred per-spot mode onto SSB (phone) / CW / DATA (digital).
|
||||
@@ -1511,11 +1521,13 @@ export default function App() {
|
||||
writeUiPref('opslog.clusterLockBand', clusterLockBand ? '1' : '0');
|
||||
writeUiPref('opslog.clusterLockMode', clusterLockMode ? '1' : '0');
|
||||
writeUiPref('opslog.clusterStatusFilter', JSON.stringify([...clusterStatusFilter]));
|
||||
writeUiPref('opslog.clusterSpotterCont', JSON.stringify([...clusterSpotterConts]));
|
||||
writeUiPref('opslog.clusterModeFilter', JSON.stringify([...clusterModeFilter]));
|
||||
writeUiPref('opslog.clusterSearch', clusterSearch);
|
||||
writeUiPref('opslog.clusterHideWorked', clusterHideWorked ? '1' : '0');
|
||||
}, [clusterFilterSource, clusterGroup, clusterBands, clusterLockBand, clusterLockMode,
|
||||
clusterStatusFilter, clusterModeFilter, clusterSearch, clusterHideWorked]);
|
||||
clusterStatusFilter, clusterModeFilter, clusterSearch, clusterHideWorked,
|
||||
clusterLotwOnly, clusterSpotterConts]);
|
||||
// Bands shown side-by-side in the Band Map tab (portable).
|
||||
const [bandMapBands, setBandMapBands] = useState<string[]>(() => {
|
||||
try { const v = JSON.parse(localStorage.getItem('opslog.bandMapBands') || '[]'); return Array.isArray(v) ? v : []; }
|
||||
@@ -1591,7 +1603,7 @@ export default function App() {
|
||||
// worked_slot must be carried explicitly like every other field: this map is
|
||||
// assembled field by field, so a backend flag that nobody copies here simply
|
||||
// never reaches the panels — silently, since the extra key is just dropped.
|
||||
const [spotStatus, setSpotStatus] = useState<Record<string, { status: string; country?: string; continent?: string; worked_call?: boolean; worked_slot?: boolean; new_county?: boolean; county?: string; state?: string; new_pota?: boolean; new_pfx?: boolean; pfx?: string }>>({});
|
||||
const [spotStatus, setSpotStatus] = useState<Record<string, { status: string; country?: string; continent?: string; worked_call?: boolean; worked_slot?: boolean; new_county?: boolean; county?: string; state?: string; lotw?: boolean; spotter_continent?: string; grid?: string; new_grid?: boolean; new_pota?: boolean; new_pfx?: boolean; pfx?: string }>>({});
|
||||
// Live mirror of spotStatus so the incoming-spot buffer can tell which slots
|
||||
// still need resolving without re-subscribing the cluster:spot listener.
|
||||
const spotStatusRef = useRef(spotStatus);
|
||||
@@ -1624,13 +1636,13 @@ export default function App() {
|
||||
const refreshSpotStatuses = useCallback(async () => {
|
||||
const cur = spotsRef.current;
|
||||
if (!cur.length) return;
|
||||
const queries: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
||||
const queries: { call: string; band: string; mode: string; pota_ref: string; spotter: string }[] = [];
|
||||
const seen = new Set<string>();
|
||||
for (const s of cur) {
|
||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||
if (seen.has(k)) continue;
|
||||
seen.add(k);
|
||||
queries.push({ call: s.dx_call, band: s.band ?? '', mode: inferSpotMode(s.comment ?? '', s.freq_hz), pota_ref: (s as any).pota_ref ?? '' });
|
||||
queries.push({ call: s.dx_call, band: s.band ?? '', mode: inferSpotMode(s.comment ?? '', s.freq_hz), pota_ref: (s as any).pota_ref ?? '', spotter: s.spotter ?? '' });
|
||||
}
|
||||
if (!queries.length) return;
|
||||
try {
|
||||
@@ -1641,7 +1653,7 @@ export default function App() {
|
||||
const k = `${r.call}|${r.band ?? ''}|${(r.mode ?? '').toUpperCase()}`;
|
||||
next[k] = {
|
||||
status: r.status ?? '', country: r.country, continent: (r as any).continent,
|
||||
worked_call: !!(r as any).worked_call, worked_slot: !!(r as any).worked_slot, new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||
worked_call: !!(r as any).worked_call, worked_slot: !!(r as any).worked_slot, new_county: !!(r as any).new_county, lotw: !!(r as any).lotw, spotter_continent: (r as any).spotter_continent, grid: (r as any).grid, new_grid: !!(r as any).new_grid, county: (r as any).county, state: (r as any).state,
|
||||
new_pota: !!(r as any).new_pota, new_pfx: !!(r as any).new_pfx, pfx: (r as any).pfx,
|
||||
};
|
||||
}
|
||||
@@ -1702,6 +1714,27 @@ export default function App() {
|
||||
const [showSettings, setShowSettings] = useState(false);
|
||||
// Re-read the "beam on map" toggle when Preferences closes (it's edited there).
|
||||
useEffect(() => { if (!showSettings) setShowBeamOnMap(localStorage.getItem('opslog.showBeamOnMap') !== '0'); }, [showSettings]);
|
||||
// Openings under way, for the blinking status-bar badge. Polled rather than
|
||||
// event-driven: the badge also has to go OUT when a band goes quiet, and
|
||||
// nothing emits an event for something that stopped happening.
|
||||
const [liveOpenings, setLiveOpenings] = useState<any[]>([]);
|
||||
useEffect(() => {
|
||||
const load = () => { GetLiveOpenings().then((v: any) => setLiveOpenings(v ?? [])).catch(() => {}); };
|
||||
load();
|
||||
const t = window.setInterval(load, 20000);
|
||||
return () => window.clearInterval(t);
|
||||
}, []);
|
||||
|
||||
// PSK Reporter feed, for the status-bar chip. Polled slowly: the chip only
|
||||
// says up or down, and the count behind it is a tooltip.
|
||||
const [pskr, setPskr] = useState<any>(null);
|
||||
useEffect(() => {
|
||||
const load = () => { GetPSKReporterStatus().then(setPskr).catch(() => {}); };
|
||||
load();
|
||||
const t = window.setInterval(load, 10000);
|
||||
return () => window.clearInterval(t);
|
||||
}, []);
|
||||
|
||||
// "ON AIR" status-bar badge: mirrors the multi-op live status this operator
|
||||
// publishes — online (blinking) when a QSO was logged in the last 5 min, else
|
||||
// offline. Publishing is always on for a shared MySQL logbook (no user toggle:
|
||||
@@ -1891,6 +1924,10 @@ export default function App() {
|
||||
// change). The grid reads them straight from the row — no per-page backend
|
||||
// recompute — so here we just parse the stored JSON string into the code→ref
|
||||
// object the award columns expect (keys are already upper-case).
|
||||
// Row colouring by QSL status (Settings → Appearance). Reloaded when the
|
||||
// settings dialog closes, which is the only place it changes.
|
||||
const [rowColors, setRowColors] = useState<any>(null);
|
||||
useEffect(() => { GetRowColors().then(setRowColors).catch(() => {}); }, [showSettings]);
|
||||
const qsosWithAwards = useMemo(
|
||||
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
|
||||
[qsos],
|
||||
@@ -1926,7 +1963,7 @@ export default function App() {
|
||||
// === Station ===
|
||||
const [station, setStation] = useState<StationSettings>({
|
||||
callsign: '', operator: '',
|
||||
my_grid: '', my_country: '', my_sota_ref: '', my_pota_ref: '',
|
||||
my_grid: '', my_country: '', my_sota_ref: '', my_pota_ref: '', my_iota: '',
|
||||
});
|
||||
const [showFirstRun, setShowFirstRun] = useState(false);
|
||||
myCallRef.current = (station.callsign || '').toUpperCase();
|
||||
@@ -2097,13 +2134,18 @@ export default function App() {
|
||||
useEffect(() => {
|
||||
const off = EventsOn('bandopen:detected', (o: any) => {
|
||||
if (!o?.band) return;
|
||||
const season = o.in_season ? '' : ` — ${t('bmp.openUnusual')}`;
|
||||
showToast(`📡 ${t('bmp.openToast', {
|
||||
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km,
|
||||
})}${season}`);
|
||||
// The badge appears on the EVENT, not on the next poll. It used to wait for
|
||||
// one, so the announcement and the badge were up to twenty seconds apart and
|
||||
// read as two unrelated things happening to mention the same band.
|
||||
//
|
||||
// No toast any more: the badge says the same thing and does not vanish after
|
||||
// five seconds. An operator who was tuning when the toast passed had no way
|
||||
// back to it, which is exactly what the badge was built to fix — keeping
|
||||
// both meant announcing an opening twice and still losing it once.
|
||||
setLiveOpenings((cur) => [...cur.filter((x: any) => x.band !== o.band), o]);
|
||||
});
|
||||
return () => { off(); };
|
||||
}, [showToast, t]);
|
||||
}, []);
|
||||
|
||||
// DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no
|
||||
// asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions.
|
||||
@@ -2717,7 +2759,7 @@ export default function App() {
|
||||
// Resolve unknown statuses before the rows go in.
|
||||
try {
|
||||
const known = spotStatusRef.current;
|
||||
const unknown: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
||||
const unknown: { call: string; band: string; mode: string; pota_ref: string; spotter: string }[] = [];
|
||||
const seen = new Set<string>();
|
||||
for (const s of batch) {
|
||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||
@@ -2727,6 +2769,7 @@ export default function App() {
|
||||
call: s.dx_call, band: s.band ?? '',
|
||||
mode: inferSpotMode(s.comment ?? '', s.freq_hz),
|
||||
pota_ref: (s as any).pota_ref ?? '',
|
||||
spotter: s.spotter ?? '',
|
||||
});
|
||||
}
|
||||
if (unknown.length > 0) {
|
||||
@@ -2741,7 +2784,7 @@ export default function App() {
|
||||
continent: (r as any).continent,
|
||||
worked_call: !!(r as any).worked_call,
|
||||
worked_slot: !!(r as any).worked_slot,
|
||||
new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||
new_county: !!(r as any).new_county, lotw: !!(r as any).lotw, spotter_continent: (r as any).spotter_continent, grid: (r as any).grid, new_grid: !!(r as any).new_grid, county: (r as any).county, state: (r as any).state,
|
||||
new_pota: !!(r as any).new_pota,
|
||||
new_pfx: !!(r as any).new_pfx,
|
||||
pfx: (r as any).pfx,
|
||||
@@ -3187,14 +3230,14 @@ export default function App() {
|
||||
// "new-slot" because the lookup key carried mode="".
|
||||
useEffect(() => {
|
||||
const t = window.setTimeout(async () => {
|
||||
const unknown: { call: string; band: string; mode: string; pota_ref: string }[] = [];
|
||||
const unknown: { call: string; band: string; mode: string; pota_ref: string; spotter: string }[] = [];
|
||||
const seen = new Set<string>();
|
||||
for (const s of spots) {
|
||||
const mode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||
if (seen.has(k) || spotStatus[k]) continue;
|
||||
seen.add(k);
|
||||
unknown.push({ call: s.dx_call, band: s.band ?? '', mode, pota_ref: (s as any).pota_ref ?? '' });
|
||||
unknown.push({ call: s.dx_call, band: s.band ?? '', mode, pota_ref: (s as any).pota_ref ?? '', spotter: s.spotter ?? '' });
|
||||
}
|
||||
if (unknown.length === 0) return;
|
||||
try {
|
||||
@@ -3209,7 +3252,7 @@ export default function App() {
|
||||
continent: (r as any).continent,
|
||||
worked_call: !!(r as any).worked_call,
|
||||
worked_slot: !!(r as any).worked_slot,
|
||||
new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||
new_county: !!(r as any).new_county, lotw: !!(r as any).lotw, spotter_continent: (r as any).spotter_continent, grid: (r as any).grid, new_grid: !!(r as any).new_grid, county: (r as any).county, state: (r as any).state,
|
||||
new_pota: !!(r as any).new_pota,
|
||||
new_pfx: !!(r as any).new_pfx,
|
||||
pfx: (r as any).pfx,
|
||||
@@ -3265,7 +3308,7 @@ export default function App() {
|
||||
sat_name: details.sat_name, sat_mode: details.sat_mode,
|
||||
contest_id: details.contest_id,
|
||||
srx: srxE.num, stx: stxE.num, srx_string: srxE.str, stx_string: stxE.str,
|
||||
email: details.email,
|
||||
email: details.email, web: details.web,
|
||||
};
|
||||
applyAwardRefs(payload, details.award_refs ?? '', awardFieldRef.current);
|
||||
// Contest mode overrides the exchange fields: CONTEST_ID, the sent
|
||||
@@ -3628,6 +3671,7 @@ export default function App() {
|
||||
ituz: d.ituz ?? (last.ituz || undefined),
|
||||
cont: d.cont || last.cont || '',
|
||||
email: d.email || last.email || '',
|
||||
web: d.web || last.web || '',
|
||||
qsl_via: d.qsl_via || last.qsl_via || '',
|
||||
};
|
||||
});
|
||||
@@ -3690,6 +3734,7 @@ export default function App() {
|
||||
ituz: d.ituz ?? (r.ituz || undefined),
|
||||
cont: d.cont || (r.cont ?? ''),
|
||||
email: d.email || (r.email ?? ''),
|
||||
web: d.web || (r.web ?? ''),
|
||||
qsl_via: d.qsl_via || (r.qsl_via ?? ''),
|
||||
}));
|
||||
// Backfill anything the provider didn't supply from the last time we worked
|
||||
@@ -4672,12 +4717,21 @@ export default function App() {
|
||||
// Cluster spots after every active filter (band / mode / status / search /
|
||||
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
|
||||
// pane so both show exactly the same list.
|
||||
const clusterRenderedRows = useMemo(() => {
|
||||
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
||||
// Everything the operator has said about WHICH STATIONS they care about —
|
||||
// LoTW only, the spotter's continent, hide worked, the status and mode chips,
|
||||
// the search box, the source node.
|
||||
//
|
||||
// Shared with the band map, which used to receive the raw stream filtered by
|
||||
// band alone: switching on "LoTW users only" changed the cluster list and left
|
||||
// the panadapter showing everyone. Two views of one spot stream disagreeing
|
||||
// about the same spot is the fault lib/spotDisplay already exists to prevent.
|
||||
//
|
||||
// The BAND filter is deliberately not in here: a band map's band IS its
|
||||
// filter, and applying the cluster's would empty every map but one.
|
||||
const spotPassesStationFilters = useCallback((s: ClusterSpot): boolean => {
|
||||
const search = clusterSearch.trim().toUpperCase();
|
||||
const list = spots.filter((s) => {
|
||||
{
|
||||
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
|
||||
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
||||
if (search && !s.dx_call.includes(search)) return false;
|
||||
if (clusterLockMode) {
|
||||
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||
@@ -4705,9 +4759,23 @@ export default function App() {
|
||||
|| (!!e?.worked_call && clusterStatusFilter.has('worked'))
|
||||
|| (!!e?.new_pota && clusterStatusFilter.has('new-pota'))
|
||||
|| (!!e?.new_county && clusterStatusFilter.has('new-county'))
|
||||
|| (!!e?.new_pfx && clusterStatusFilter.has('new-pfx'));
|
||||
|| (!!e?.new_pfx && clusterStatusFilter.has('new-pfx'))
|
||||
|| (!!e?.new_grid && clusterStatusFilter.has('new-grid'));
|
||||
if (!matches) return false;
|
||||
}
|
||||
// LoTW only, and the spotter's continent. Both are properties of the
|
||||
// station rather than judgements about the spot, so they AND with the
|
||||
// status chips instead of joining that OR: "a new band, and from Europe".
|
||||
if (clusterLotwOnly || clusterSpotterConts.size > 0) {
|
||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||
const e = spotStatus[k];
|
||||
// An unresolved spot is not filtered out. The status arrives a moment
|
||||
// after the row does, and dropping it meanwhile made the list flicker.
|
||||
if (e) {
|
||||
if (clusterLotwOnly && !e.lotw) return false;
|
||||
if (clusterSpotterConts.size > 0 && e.spotter_continent && !clusterSpotterConts.has(e.spotter_continent)) return false;
|
||||
}
|
||||
}
|
||||
if (clusterHideWorked) {
|
||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||
const e = spotStatus[k];
|
||||
@@ -4715,6 +4783,15 @@ export default function App() {
|
||||
if (e.worked_call || e.status === 'worked') return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}, [clusterFilterSource, clusterSearch, clusterLockMode, mode, clusterModeFilter,
|
||||
clusterStatusFilter, spotStatus, clusterLotwOnly, clusterSpotterConts, clusterHideWorked]);
|
||||
|
||||
const clusterRenderedRows = useMemo(() => {
|
||||
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
||||
const list = spots.filter((s) => {
|
||||
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
||||
return spotPassesStationFilters(s);
|
||||
});
|
||||
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
||||
if (clusterGroup) {
|
||||
@@ -4734,11 +4811,46 @@ export default function App() {
|
||||
// The Log4OM-style cluster filter sidebar (callsign search, hide-worked,
|
||||
// group, band/mode/status/source). Rendered both in the Cluster tab and the
|
||||
// Main-view cluster pane; toggled by clusterShowFilters.
|
||||
// One rule for the whole panel, because two shapes for the same kind of choice
|
||||
// is what made it unreadable:
|
||||
//
|
||||
// SWITCH — a behaviour that is on or off (hide worked, group duplicates).
|
||||
// CHIPS — pick any number from a set; none picked means all (status, mode,
|
||||
// continent). Selected is solid, unselected is the same chip faded,
|
||||
// so the palette teaches the colour code even while switched off.
|
||||
//
|
||||
// Nothing appears in both shapes. A control that exists twice is not more
|
||||
// discoverable, it is one control the operator has to recognise twice.
|
||||
const fSection = (label: string, children: any, right?: any) => (
|
||||
<div>
|
||||
<div className="flex items-center justify-between mb-1 min-h-[16px]">
|
||||
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">{label}</span>
|
||||
{right}
|
||||
</div>
|
||||
{children}
|
||||
</div>
|
||||
);
|
||||
|
||||
const fSwitch = (label: string, on: boolean, set: (v: boolean) => void) => (
|
||||
<label className="flex items-center gap-2 cursor-pointer rounded px-1 py-1 -mx-1 hover:bg-accent/40">
|
||||
<Checkbox checked={on} onCheckedChange={(c) => set(!!c)} />
|
||||
<span className="leading-none">{label}</span>
|
||||
</label>
|
||||
);
|
||||
|
||||
const F_CHIP = 'px-1.5 py-[3px] rounded-md border text-[10px] font-bold tracking-wider transition-opacity';
|
||||
const fChip = (key: string, label: string, cls: string, on: boolean, toggle: () => void) => (
|
||||
<button key={key} type="button" onClick={toggle}
|
||||
className={cn(F_CHIP, on ? cls : `${cls} opacity-40 hover:opacity-80`)}>
|
||||
{label}
|
||||
</button>
|
||||
);
|
||||
|
||||
const renderClusterFilters = () => (
|
||||
<div className="w-56 shrink-0 border-l border-border/60 flex flex-col min-h-0 bg-muted/10">
|
||||
<div className="px-2.5 py-2 border-b border-border/60 flex items-center justify-between">
|
||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">Filters</span>
|
||||
<button type="button" onClick={toggleClusterFilters} title="Hide filters"
|
||||
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">{t('clu.filters')}</span>
|
||||
<button type="button" onClick={toggleClusterFilters} title={t('clu.hideFilters')}
|
||||
className="text-muted-foreground hover:text-foreground">
|
||||
<X className="size-3.5" />
|
||||
</button>
|
||||
@@ -4747,56 +4859,51 @@ export default function App() {
|
||||
{/* Callsign search */}
|
||||
<Input
|
||||
className="h-7 text-xs font-mono uppercase"
|
||||
placeholder="Search call…"
|
||||
placeholder={t('clu.searchCall')}
|
||||
value={clusterSearch}
|
||||
onChange={(e) => setClusterSearch(e.target.value.toUpperCase())}
|
||||
/>
|
||||
|
||||
{/* Toggles */}
|
||||
<div className="space-y-1.5">
|
||||
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||
<Checkbox checked={clusterHideWorked} onCheckedChange={(c) => setClusterHideWorked(!!c)} />
|
||||
Hide worked
|
||||
</label>
|
||||
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||
<Checkbox checked={clusterGroup} onCheckedChange={(c) => setClusterGroup(!!c)} />
|
||||
Group duplicates
|
||||
</label>
|
||||
{/* Two ways to cut through a busy cluster, and they compose: mute what
|
||||
is done, light up what is not. They sit HERE, with the other things
|
||||
an operator changes mid-run, and not in the preferences dialog.
|
||||
Both drive the band map as well, through lib/spotDisplay. */}
|
||||
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||
<Checkbox checked={clusterMuteWorked}
|
||||
onCheckedChange={(c) => { const v = !!c; setClusterMuteWorked(v); writeUiPref('opslog.clusterMuteWorked', v ? '1' : '0'); }} />
|
||||
{t('clu.muteWorkedShort')}
|
||||
</label>
|
||||
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||
<Checkbox checked={clusterSlotHighlight}
|
||||
onCheckedChange={(c) => { const v = !!c; setClusterSlotHighlight(v); writeUiPref('opslog.clusterSlotHighlight', v ? '1' : '0'); }} />
|
||||
{t('clu.slotHighlightShort')}
|
||||
</label>
|
||||
{/* Behaviours: each is on or off, and none of them narrows by a property
|
||||
of the station. The last two also drive the band map, via
|
||||
lib/spotDisplay — they live here rather than in Preferences because
|
||||
they are changed while working a run. */}
|
||||
<div className="space-y-0.5">
|
||||
{fSwitch(t('clu.hideWorked'), clusterHideWorked, setClusterHideWorked)}
|
||||
{fSwitch(t('clu.groupDup'), clusterGroup, setClusterGroup)}
|
||||
{/* The two display options are withdrawn for now — the flag is in
|
||||
lib/spotDisplay, and it also forces them off for the band map, so
|
||||
there is one place to flip when they come back. */}
|
||||
{SPOT_DISPLAY_OPTIONS_EXPOSED && fSwitch(t('clu.muteWorkedShort'), clusterMuteWorked, (v) => { setClusterMuteWorked(v); writeUiPref('opslog.clusterMuteWorked', v ? '1' : '0'); })}
|
||||
{SPOT_DISPLAY_OPTIONS_EXPOSED && fSwitch(t('clu.slotHighlightShort'), clusterSlotHighlight, (v) => { setClusterSlotHighlight(v); writeUiPref('opslog.clusterSlotHighlight', v ? '1' : '0'); })}
|
||||
{fSwitch(t('clu.lotwOnly'), clusterLotwOnly, (v) => { setClusterLotwOnly(v); writeUiPref('opslog.clusterLotwOnly', v ? '1' : '0'); })}
|
||||
</div>
|
||||
|
||||
{/* The SPOTTER's continent, not the DX's: this asks whether anyone near
|
||||
you is hearing the band at all. Chips rather than a dropdown — seven
|
||||
two-letter codes fit on two lines, they read as a set the way Status
|
||||
and Mode do, and several can be picked at once, which "EU or NA" needs
|
||||
and a dropdown cannot express. */}
|
||||
{fSection(t('clu.spotterCont'),
|
||||
<div className="flex flex-wrap gap-1">
|
||||
{['AF', 'AN', 'AS', 'EU', 'NA', 'OC', 'SA'].map((c) => fChip(
|
||||
c, c, 'bg-muted text-foreground border-border',
|
||||
clusterSpotterConts.has(c),
|
||||
() => setClusterSpotterConts((cur) => {
|
||||
const n = new Set(cur);
|
||||
if (n.has(c)) n.delete(c); else n.add(c);
|
||||
return n;
|
||||
}),
|
||||
))}
|
||||
</div>,
|
||||
clusterSpotterConts.size > 0 ? (
|
||||
<button type="button" onClick={() => setClusterSpotterConts(new Set())}
|
||||
className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
|
||||
) : undefined,
|
||||
)}
|
||||
|
||||
{/* Band filter — multi-select listbox */}
|
||||
<div>
|
||||
<div className="flex items-center justify-between mb-1">
|
||||
<span className="text-[10px] uppercase tracking-wider text-muted-foreground">Bands</span>
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setClusterLockBand((v) => !v)}
|
||||
className={cn('inline-flex items-center gap-0.5 text-[10px] px-1 py-0.5 rounded border',
|
||||
clusterLockBand ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
||||
title="Lock to the entry strip's current band"
|
||||
>
|
||||
{clusterLockBand ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {band}
|
||||
</button>
|
||||
{clusterBands.size > 0 && (
|
||||
<button type="button" onClick={() => setClusterBands(new Set())} className="text-[10px] text-muted-foreground hover:text-foreground underline">clear</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
{fSection(t('clu.bands'),
|
||||
<div className={cn('rounded border border-border max-h-36 overflow-auto bg-background', clusterLockBand && 'opacity-40 pointer-events-none')}>
|
||||
{bands.map((b) => {
|
||||
const on = clusterBands.has(b);
|
||||
@@ -4812,23 +4919,25 @@ export default function App() {
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Mode lock */}
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setClusterLockMode((v) => !v)}
|
||||
className={cn('inline-flex items-center gap-1 px-1.5 py-0.5 rounded border text-[10px]',
|
||||
clusterLockMode ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
||||
title="Only show spots whose mode matches the entry strip"
|
||||
>
|
||||
{clusterLockMode ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} Lock mode ({mode})
|
||||
</button>
|
||||
</div>,
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setClusterLockBand((v) => !v)}
|
||||
className={cn('inline-flex items-center gap-0.5 text-[10px] px-1 py-0.5 rounded border',
|
||||
clusterLockBand ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
||||
title={t('clu.lockBandTitle')}
|
||||
>
|
||||
{clusterLockBand ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {band}
|
||||
</button>
|
||||
{clusterBands.size > 0 && (
|
||||
<button type="button" onClick={() => setClusterBands(new Set())} className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
|
||||
)}
|
||||
</div>,
|
||||
)}
|
||||
|
||||
{/* Status filter */}
|
||||
<div>
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Status</div>
|
||||
{fSection(t('clu.status'),
|
||||
<div className="flex flex-wrap gap-1">
|
||||
{([
|
||||
{ k: 'new' as SpotFilterKey, label: 'NEW', cls: 'bg-danger-muted text-danger-muted-foreground border-danger-border' },
|
||||
@@ -4843,55 +4952,49 @@ export default function App() {
|
||||
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||
{ k: 'new-county' as SpotFilterKey, label: 'NEW COUNTY', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||
{ k: 'new-pfx' as SpotFilterKey, label: 'NEW PFX', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||
// Only ever set for a station this receiver decoded over the UDP link.
|
||||
{ k: 'new-grid' as SpotFilterKey, label: 'NEW GRID', cls: 'bg-muted text-foreground border-border' },
|
||||
// Blue, like the already-worked call in the grid. Selecting it keeps
|
||||
// worked spots; the separate "Hide worked" checkbox drops them — they
|
||||
// are opposite controls, so don't use both at once.
|
||||
{ k: 'worked' as SpotFilterKey, label: 'WORKED', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||
]).map((s) => {
|
||||
const on = clusterStatusFilter.has(s.k);
|
||||
return (
|
||||
<button key={s.k} type="button"
|
||||
onClick={() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })}
|
||||
className={cn('px-1.5 py-0.5 rounded border text-[10px] font-bold tracking-wider transition-opacity', on ? s.cls : `${s.cls} opacity-40 hover:opacity-100`)}>
|
||||
{s.label}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
]).map((s) => fChip(s.k, s.label, s.cls, clusterStatusFilter.has(s.k),
|
||||
() => setClusterStatusFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })))}
|
||||
</div>,
|
||||
clusterStatusFilter.size > 0 ? (
|
||||
<button type="button" onClick={() => setClusterStatusFilter(new Set())}
|
||||
className="text-[10px] text-muted-foreground hover:text-foreground underline">{t('clu.clear')}</button>
|
||||
) : undefined,
|
||||
)}
|
||||
|
||||
{/* Mode filter */}
|
||||
<div>
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Mode</div>
|
||||
{fSection(t('clu.mode'),
|
||||
<div className="flex flex-wrap gap-1">
|
||||
{([
|
||||
{ k: 'SSB' as SpotModeCat, label: 'SSB', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||
{ k: 'CW' as SpotModeCat, label: 'CW', cls: 'bg-info-muted text-info-muted-foreground border-info-border' },
|
||||
{ k: 'DATA' as SpotModeCat, label: 'DATA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||
]).map((s) => {
|
||||
const on = clusterModeFilter.has(s.k);
|
||||
return (
|
||||
<button key={s.k} type="button"
|
||||
onClick={() => setClusterModeFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })}
|
||||
className={cn('px-1.5 py-0.5 rounded border text-[10px] font-bold tracking-wider transition-opacity', on ? s.cls : `${s.cls} opacity-40 hover:opacity-100`)}>
|
||||
{s.label}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
]).map((s) => fChip(s.k, s.label, s.cls, clusterModeFilter.has(s.k),
|
||||
() => setClusterModeFilter((cur) => { const n = new Set(cur); if (n.has(s.k)) n.delete(s.k); else n.add(s.k); return n; })))}
|
||||
</div>,
|
||||
<button type="button" onClick={() => setClusterLockMode((v) => !v)}
|
||||
className={cn('inline-flex items-center gap-0.5 text-[10px] px-1 py-0.5 rounded border',
|
||||
clusterLockMode ? 'bg-warning-muted text-warning-muted-foreground border-warning-border' : 'text-muted-foreground border-border hover:bg-muted')}
|
||||
title={t('clu.lockModeTitle')}>
|
||||
{clusterLockMode ? <Lock className="size-2.5" /> : <Unlock className="size-2.5" />} {mode}
|
||||
</button>,
|
||||
)}
|
||||
|
||||
{/* Source */}
|
||||
<div>
|
||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-1">Source</div>
|
||||
{fSection(t('clu.source'),
|
||||
<Select value={String(clusterFilterSource || '_')} onValueChange={(v) => setClusterFilterSource(v === '_' ? '' : parseInt(v, 10))}>
|
||||
<SelectTrigger className="w-full h-7 text-xs"><SelectValue placeholder="All sources" /></SelectTrigger>
|
||||
<SelectTrigger className="w-full h-7 text-xs"><SelectValue placeholder={t('clu.allSources')} /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="_">All sources</SelectItem>
|
||||
<SelectItem value="_">{t('clu.allSources')}</SelectItem>
|
||||
{clusterServers.map((s) => <SelectItem key={s.id} value={String(s.id)}>{s.name}</SelectItem>)}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
</Select>,
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -4990,6 +5093,7 @@ export default function App() {
|
||||
// rewrote the other's widths.
|
||||
storageKey="mainpane"
|
||||
rows={qsosWithAwards as any}
|
||||
rowColors={rowColors}
|
||||
myGrid={station.my_grid}
|
||||
total={total}
|
||||
awardCols={awardCols}
|
||||
@@ -6273,6 +6377,7 @@ export default function App() {
|
||||
<RecentQSOsGrid
|
||||
key={`rqg2-${activeProfileId ?? 'x'}`}
|
||||
rows={qsosWithAwards as any}
|
||||
rowColors={rowColors}
|
||||
myGrid={station.my_grid}
|
||||
total={total}
|
||||
awardCols={awardCols}
|
||||
@@ -6688,13 +6793,14 @@ export default function App() {
|
||||
</div>
|
||||
<BandMap
|
||||
band={b}
|
||||
spots={spots.filter((s) => s.band === b)}
|
||||
spots={spots.filter((s) => s.band === b && spotPassesStationFilters(s))}
|
||||
spotStatus={spotStatus}
|
||||
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||
onSpotClick={handleSpotClick}
|
||||
onClose={() => toggleBandMapBand(b)}
|
||||
hideDigital={bandMapHideFt}
|
||||
fitToBand={bandMapFit}
|
||||
showLotw={!!rowColors?.bandmap_lotw}
|
||||
/>
|
||||
</div>
|
||||
))}
|
||||
@@ -6724,11 +6830,12 @@ export default function App() {
|
||||
side={bandMapSide}
|
||||
onToggleSide={toggleBandMapSide}
|
||||
band={band}
|
||||
spots={spots.filter((s) => s.band === band)}
|
||||
spots={spots.filter((s) => s.band === band && spotPassesStationFilters(s))}
|
||||
spotStatus={spotStatus}
|
||||
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||
onSpotClick={handleSpotClick}
|
||||
onClose={() => setBandMapShown(false)}
|
||||
showLotw={!!rowColors?.bandmap_lotw}
|
||||
keyNav
|
||||
/>
|
||||
</div>
|
||||
@@ -6809,6 +6916,26 @@ export default function App() {
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
{/* PSK Reporter, next to the hardware chips because it is the same
|
||||
kind of fact: a link that is either up or it is not. Shown ONLY
|
||||
when the opening watch is on — a permanently grey chip for a
|
||||
feature nobody enabled is clutter, and the bar is 28 px.
|
||||
|
||||
The decode count is in the tooltip rather than the chip: it moves
|
||||
several times a second on an open band, and a number flickering in
|
||||
the corner of the eye is not information, it is a distraction. */}
|
||||
{pskr?.running && (
|
||||
<button
|
||||
type="button"
|
||||
title={t('pskr.tip', { n: pskr.received ?? 0, bands: (pskr.bands ?? []).join(' ') })}
|
||||
onClick={() => { setSettingsSection('cluster'); setShowSettings(true); }}
|
||||
className="inline-flex items-center gap-1.5 px-2 h-5 rounded border text-[11px] transition-colors border-border hover:bg-muted cursor-pointer shrink-0"
|
||||
>
|
||||
<span className={cn('size-2 rounded-full',
|
||||
(pskr.received ?? 0) > 0 ? 'bg-success' : 'bg-warning')} />
|
||||
MQTT
|
||||
</button>
|
||||
)}
|
||||
{/* ON AIR badge: "did I log a QSO in the last 5 min" — meaningful on ANY
|
||||
logbook backend (only the live_status PUBLISHING is MySQL-specific),
|
||||
so it is always shown. Gating it on MySQL made it vanish for
|
||||
@@ -6866,6 +6993,45 @@ export default function App() {
|
||||
{/* UTC clock — moved out of the header, where it competed with the
|
||||
frequency for the eye. It belongs with the other passive
|
||||
indicators. */}
|
||||
{/* Openings under way. Right-hand end, before the clock, because it is
|
||||
a state of the world rather than a state of this station — the
|
||||
same side as the time and the logbook.
|
||||
|
||||
It BLINKS and it stays. The toast that announces an opening is
|
||||
gone in seconds, and an operator who was tuning at that moment
|
||||
had no way back to it; a band opening lasts hours and deserves
|
||||
something that lasts with it. It goes out by itself when the
|
||||
spots stop arriving. */}
|
||||
{liveOpenings.map((o: any) => (
|
||||
<button
|
||||
key={o.band}
|
||||
type="button"
|
||||
onClick={() => { setActiveTab('bandmap'); }}
|
||||
title={t('bo.liveTip', {
|
||||
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km,
|
||||
sector: `${o.compass ?? ''} ${o.bearing_min}–${o.bearing_max}°`,
|
||||
season: o.in_season ? '' : ' — ' + t('bmp.openUnusual'),
|
||||
})}
|
||||
className="inline-flex items-center gap-1.5 rounded-md border px-2 py-0.5 text-[11px] font-bold uppercase tracking-wider shrink-0
|
||||
border-warning-border bg-warning-muted text-warning-muted-foreground hover:bg-warning-muted/70 animate-pulse"
|
||||
>
|
||||
<Radio className="size-3 shrink-0" />
|
||||
{/* The three facts that decide whether to act: which band, which
|
||||
way to point, how far it reaches. They were in a tooltip
|
||||
nobody hovers, which made the badge an alarm with no content —
|
||||
it said something was happening and refused to say what. */}
|
||||
<span>{String(o.band).toUpperCase()}</span>
|
||||
<span className="font-mono">{o.compass}</span>
|
||||
{/* Plain kilometres. An earlier attempt abbreviated 1500 to
|
||||
"1.5k" and then appended the unit, giving "1.5kkm" — and even
|
||||
written correctly, "1.5k km" makes a reader do arithmetic to
|
||||
recover a number that was four characters long to begin with. */}
|
||||
<span className="font-mono opacity-80">{o.median_km} km</span>
|
||||
{/* Out of season is the one an operator must not learn last, so it
|
||||
earns a mark on the badge rather than a line in the tooltip. */}
|
||||
{!o.in_season && <span className="opacity-90">!</span>}
|
||||
</button>
|
||||
))}
|
||||
<span className="inline-flex items-center gap-1 font-mono text-[11px] text-muted-foreground shrink-0" title="UTC">
|
||||
<Clock className="size-3" />
|
||||
{utcNow}<span className="text-[9px]">Z</span>
|
||||
|
||||
@@ -174,6 +174,45 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
||||
const operate = viaFlex ? !!flex?.amp_operate : !!pg.operate;
|
||||
const connected = !!pg.connected || viaFlex;
|
||||
const fault = flex?.amp_fault;
|
||||
|
||||
// Meters built from the amplifier's own GSCP status frame, for when the radio
|
||||
// is not feeding a meter stream.
|
||||
//
|
||||
// Whether there is power is the amp's state field; how much is the plain
|
||||
// forward figure. NOT "peakfwd" — that is a latched maximum which is never
|
||||
// reset and survives in the last-known status after the amp disconnects, so it
|
||||
// once claimed 1350 W from an old transmission while 10 W was going out. Same
|
||||
// reason peak_id is left alone. Both readings are gated on transmit so they
|
||||
// fall back to zero between overs instead of freezing on the last one.
|
||||
const pgxlMeters = () => {
|
||||
if (!pg.connected) return null;
|
||||
const txing = typeof flex?.transmitting === 'boolean' ? flex.transmitting : /TRANSMIT/i.test(pg.state || '');
|
||||
const fwdW = peakHold('pgfwd', txing ? Number(pg.fwd_w) || 0 : 0);
|
||||
const idA = peakHold('pgid', txing ? Number(pg.id) || 0 : 0);
|
||||
const swr = peakHold('pgswr', txing ? Number(pg.vswr) || 0 : 0);
|
||||
const tempC = Number(pg.temperature) || 0;
|
||||
// Two columns, not four. The card sits beside a tall neighbour in Station
|
||||
// Control, so a single row of four leaves the height empty and squeezes each
|
||||
// bar into a quarter width — two rows of two use the room that is already
|
||||
// there and give every bar twice the resolution.
|
||||
return (
|
||||
<div className="grid grid-cols-2 gap-2 mt-2 pt-2 border-t border-border/50">
|
||||
<MeterBar label={t('flxp.outputPower')} value={fwdW} unit="W" lo={0} hi={2000}
|
||||
display={`${Math.round(fwdW)} W`}
|
||||
segColor={(f) => (f > 0.9 ? '#dc2626' : f > 0.75 ? '#f59e0b' : '#ea580c')} />
|
||||
<MeterBar label={t('ampw.id')} value={idA} lo={0} hi={25} display={`${idA.toFixed(1)} A`} accent="#16a34a" />
|
||||
{/* Below 1:1 the reading is meaningless, so an idle amp shows a flat bar
|
||||
rather than a zero that looks like a perfect match. */}
|
||||
<MeterBar label={t('ampw.swr')} value={swr >= 1 ? swr : 1} lo={1} hi={3}
|
||||
display={swr >= 1 ? swr.toFixed(1) : '—'}
|
||||
segColor={(f) => (f > 0.75 ? '#dc2626' : f > 0.4 ? '#f59e0b' : '#16a34a')} />
|
||||
<MeterBar label={t('ampw.temp')} value={tempC} unit="°C" lo={0} hi={100}
|
||||
display={tempC > 0 ? `${Math.round(tempC)} °C` : '—'}
|
||||
segColor={(f) => (f > 0.8 ? '#dc2626' : f > 0.6 ? '#f59e0b' : '#ea580c')} />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<Card icon={Flame} ckey="amplifier" title={`${t('flxp.amplifier')}${flex?.amp_model ? ' · ' + flex.amp_model : (pg.model ? ' · ' + pg.model : '')} · ${amp.name}`} accent="#ea580c">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
@@ -204,13 +243,20 @@ export function AmpCard({ amp, flex, t }: { amp: Amp; flex: any; t: (k: string,
|
||||
<span className="px-2 py-1 rounded bg-danger-muted text-danger-muted-foreground text-xs font-bold">{t('flxp.fault')}: {fault}</span>
|
||||
)}
|
||||
</div>
|
||||
{/* Amplifier meters (FWD / ID / TEMP …) from the FlexRadio UDP stream. */}
|
||||
{viaFlex && (() => {
|
||||
{/* Amplifier meters (FWD / ID / TEMP …).
|
||||
The FlexRadio UDP stream is the preferred source — it is fast and reads
|
||||
the same as SmartSDR. When there is no Flex, or it is not streaming,
|
||||
the amplifier's OWN link carries the same figures; falling back to them
|
||||
is what the docked widget already does. Without that fallback this card
|
||||
showed an operator on a Kenwood nothing but OPERATE and the fan mode,
|
||||
while the amplifier was reporting power, current and temperature all
|
||||
along. */}
|
||||
{(() => {
|
||||
const meters = (flex?.meters as any[]) || [];
|
||||
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
||||
const amps = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
||||
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
||||
if (amps.length === 0) return null;
|
||||
if (!viaFlex || amps.length === 0) return pgxlMeters();
|
||||
// Power comes from the radio's meter stream and nothing else. The
|
||||
// amplifier also reports a "peakfwd", and using it was a mistake twice
|
||||
// over: it is a latched maximum that is never reset, and it survives in
|
||||
|
||||
@@ -0,0 +1,153 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { GetRowColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { cn } from '@/lib/utils';
|
||||
import type { RowColorSettings } from '@/lib/rowColors';
|
||||
|
||||
// A fixed palette plus a free picker. Muted values on purpose: they are
|
||||
// composited at low opacity over a dark grid, where a saturated colour reads as
|
||||
// an error state rather than a status.
|
||||
const PALETTE = [
|
||||
'#16a34a', '#0ea5e9', '#f59e0b', '#a855f7',
|
||||
'#dc2626', '#14b8a6', '#eab308', '#ec4899',
|
||||
'#64748b', '#84cc16', '#6366f1', '#f97316',
|
||||
];
|
||||
|
||||
// The rule ids the backend orders; the labels live here so a translation never
|
||||
// travels through the settings row.
|
||||
const LABELS: Record<string, string> = {
|
||||
to_send: 'appr.ruleToSend',
|
||||
confirmed: 'appr.ruleConfirmed',
|
||||
sent: 'appr.ruleSent',
|
||||
worked: 'appr.ruleWorked',
|
||||
};
|
||||
|
||||
// The channels a rule can be scoped to. "worked" is the catch-all — it means
|
||||
// nothing on ANY channel — so narrowing it would say nothing.
|
||||
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||
const CHANNEL_LABELS: Record<string, string> = {
|
||||
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
||||
};
|
||||
|
||||
export function AppearancePanel() {
|
||||
const { t } = useI18n();
|
||||
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
try { setCfg((await GetRowColors()) as any); } catch { /* defaults on the backend */ }
|
||||
})();
|
||||
}, []);
|
||||
|
||||
const save = (next: RowColorSettings) => {
|
||||
setCfg(next);
|
||||
SaveRowColors(next as any).catch(() => {});
|
||||
};
|
||||
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean; channels: string[] }>) => {
|
||||
if (!cfg) return;
|
||||
save({ ...cfg, rules: cfg.rules.map((r) => (r.id === id ? { ...r, ...patch } : r)) });
|
||||
};
|
||||
|
||||
// The rule card shows the row exactly as the grid will draw it, so the choice
|
||||
// is made by looking rather than by imagining.
|
||||
const preview = (color: string): Record<string, string> => {
|
||||
const st = cfg?.style ?? 'bar';
|
||||
const pct = cfg?.intensity ?? 12;
|
||||
const out: Record<string, string> = {};
|
||||
if (st === 'tint' || st === 'both') out.backgroundColor = `color-mix(in srgb, ${color} ${pct}%, transparent)`;
|
||||
if (st === 'bar' || st === 'both') out.boxShadow = `inset 3px 0 0 ${color}`;
|
||||
return out;
|
||||
};
|
||||
|
||||
if (!cfg) return <div className="p-1 text-sm text-muted-foreground">…</div>;
|
||||
|
||||
return (
|
||||
<div className="space-y-4">
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={!!cfg.bandmap_lotw} className="mt-0.5"
|
||||
onCheckedChange={(c) => save({ ...cfg, bandmap_lotw: !!c } as any)} />
|
||||
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
||||
</label>
|
||||
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
||||
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||
<span>{t('appr.enable')} <span className="text-xs text-muted-foreground">{t('appr.enableHint')}</span></span>
|
||||
</label>
|
||||
|
||||
{cfg.enabled && (
|
||||
<div className="space-y-3">
|
||||
{/* Style first: it decides whether the colours below are a signal or a
|
||||
wallpaper, which matters more than which hue they are. */}
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<span className="text-sm">{t('appr.style')}</span>
|
||||
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||
{(['bar', 'tint', 'both'] as const).map((v) => (
|
||||
<button key={v} type="button" onClick={() => save({ ...cfg, style: v })}
|
||||
className={cn('px-3 py-1.5 font-medium', (cfg.style ?? 'bar') === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||
{t('appr.style' + v[0].toUpperCase() + v.slice(1))}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
{(cfg.style ?? 'bar') !== 'bar' && (
|
||||
<label className="flex items-center gap-2 text-sm">
|
||||
{t('appr.intensity')}
|
||||
<input type="range" min={5} max={45} step={1} value={cfg.intensity ?? 12}
|
||||
onChange={(e) => save({ ...cfg, intensity: parseInt(e.target.value, 10) })}
|
||||
className="w-32 accent-[var(--primary)]" />
|
||||
<span className="font-mono text-xs text-muted-foreground w-8">{cfg.intensity ?? 12}%</span>
|
||||
</label>
|
||||
)}
|
||||
</div>
|
||||
{/* Order matters and is shown: a contact is usually several of these at
|
||||
once, and the first match wins. */}
|
||||
<p className="text-xs text-muted-foreground">{t('appr.orderHint')}</p>
|
||||
{cfg.rules.map((r, i) => (
|
||||
<div key={r.id} className="rounded-lg border border-border/60 p-2.5 space-y-2"
|
||||
style={r.enabled ? preview(r.color) : undefined}>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={r.enabled} onCheckedChange={(c) => patchRule(r.id, { enabled: !!c })} />
|
||||
<span className="font-mono text-xs text-muted-foreground">{i + 1}.</span>
|
||||
<span className="font-medium">{t(LABELS[r.id] ?? r.id)}</span>
|
||||
</label>
|
||||
{/* Which channels this category looks at. None ticked = all of
|
||||
them, which is what an unnarrowed rule should mean. */}
|
||||
{r.enabled && r.id !== 'worked' && (
|
||||
<div className="flex items-center gap-3 flex-wrap pl-6 text-xs">
|
||||
{CHANNELS.map((c) => {
|
||||
const on = !r.channels?.length || r.channels.includes(c);
|
||||
return (
|
||||
<label key={c} className="flex items-center gap-1.5 cursor-pointer">
|
||||
<Checkbox checked={on} onCheckedChange={(v) => {
|
||||
const cur = r.channels?.length ? r.channels : [...CHANNELS];
|
||||
const next = v ? [...new Set([...cur, c])] : cur.filter((x) => x !== c);
|
||||
patchRule(r.id, { channels: next });
|
||||
}} />
|
||||
{CHANNEL_LABELS[c]?.startsWith('appr.') ? t(CHANNEL_LABELS[c]) : CHANNEL_LABELS[c]}
|
||||
</label>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{r.enabled && (
|
||||
<div className="flex items-center gap-1.5 flex-wrap pl-6">
|
||||
{PALETTE.map((c) => (
|
||||
<button key={c} type="button" title={c}
|
||||
onClick={() => patchRule(r.id, { color: c })}
|
||||
className={cn('size-6 rounded-md border-2 transition-transform hover:scale-110',
|
||||
r.color.toLowerCase() === c ? 'border-foreground' : 'border-transparent')}
|
||||
style={{ backgroundColor: c }} />
|
||||
))}
|
||||
<input type="color" value={r.color} title={t('appr.custom')}
|
||||
onChange={(e) => patchRule(r.id, { color: e.target.value })}
|
||||
className="size-6 rounded-md border border-border bg-transparent p-0 cursor-pointer" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { Plus, Trash2, RotateCcw, Save, Download, Upload, Loader2, Search, FolderOpen, ArrowUpCircle } from 'lucide-react';
|
||||
import { Plus, Trash2, RotateCcw, Save, Download, Upload, Loader2, Search, FolderOpen, ArrowUpCircle, Share2 } from 'lucide-react';
|
||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
@@ -19,7 +19,7 @@ import {
|
||||
ListCountries, DXCCForCountry, DXCCName,
|
||||
PopulateBuiltinReferences, HasBuiltinReferences,
|
||||
ExportAwards, ImportAwards, InspectAwardImport, ApplyAwardImport, GetCatalogCodes, OpenAwardsFolder,
|
||||
ExportAwardForCatalog,
|
||||
ExportAwardForCatalog, ExportAward,
|
||||
GetAwardUpdates, ApplyAwardUpdate, DismissAwardUpdate, ExplainAward,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
|
||||
@@ -97,6 +97,13 @@ function Chips({ all, value, onToggle }: { all: string[]; value: string[]; onTog
|
||||
);
|
||||
}
|
||||
|
||||
// Awards use a far-future date as "no end" (RDA carries 9999-12-31). Printing it
|
||||
// back at the operator reads like a real deadline, so show it as open-ended.
|
||||
function openEnded(d?: string): string {
|
||||
if (!d) return '—';
|
||||
return /^9\d{3}-/.test(d) ? '—' : d;
|
||||
}
|
||||
|
||||
function Field2({ label, children }: { label: string; children: React.ReactNode }) {
|
||||
return (
|
||||
<div className="grid grid-cols-[120px_1fr] items-center gap-2">
|
||||
@@ -307,6 +314,23 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
if (p) setErr(t('awed.exportedTo', { path: p }));
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
// Export the SELECTED award on its own — the unit you actually share. The
|
||||
// bundle above is a backup: sending it to someone hands over your whole
|
||||
// catalogue when they asked for one award.
|
||||
//
|
||||
// Distinct from the catalog publish below, which is for shipping an award INTO
|
||||
// OpsLog: that one stamps a version and clears user_edited. This one is a plain
|
||||
// share and leaves both alone, so the recipient's copy is correctly marked as
|
||||
// someone else's work rather than as a pristine built-in.
|
||||
async function exportOne() {
|
||||
setErr('');
|
||||
if (!cur) return;
|
||||
try {
|
||||
const code = cur.code.trim().toUpperCase();
|
||||
const p = await ExportAward(code);
|
||||
if (p) setErr(t('awed.exportedOneTo', { code, path: p }));
|
||||
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||
}
|
||||
// Export the SELECTED award as a catalog-ready JSON, stamped with a version, to
|
||||
// paste over internal/award/catalog/<code>.json. A new release then ships it to
|
||||
// the whole team (unedited copies auto-upgrade; edited ones are offered it).
|
||||
@@ -761,6 +785,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
<TabsContent value="refs" className="mt-0">
|
||||
<ReferencesPanel
|
||||
code={cur.code.trim().toUpperCase()} presets={presets} meta={meta[cur.code.toUpperCase()]}
|
||||
awardValidFrom={cur.valid_from} awardValidTo={cur.valid_to}
|
||||
onUpdateOnline={() => updateList(cur.code.toUpperCase())} updating={updating === cur.code.toUpperCase()}
|
||||
onChanged={loadMeta} setErr={setErr}
|
||||
/>
|
||||
@@ -780,6 +805,14 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
<Button variant="outline" onClick={exportAwards} title={t('awed.exportTitle')}>
|
||||
<Download className="size-3.5 mr-1" /> {t('awed.export')}
|
||||
</Button>
|
||||
{/* Share just the selected one. Sitting next to the whole-catalogue
|
||||
export because that is where an operator looks for it, and labelled
|
||||
with the code so the two are never confused at a glance. */}
|
||||
{cur && (
|
||||
<Button variant="outline" onClick={exportOne} title={t('awed.exportOneTitle')}>
|
||||
<Share2 className="size-3.5 mr-1" /> {t('awed.exportOne', { code: cur.code.trim().toUpperCase() })}
|
||||
</Button>
|
||||
)}
|
||||
<Button variant="outline" onClick={importAwards} title={t('awed.importTitle')}>
|
||||
<Upload className="size-3.5 mr-1" /> {t('awed.import')}
|
||||
</Button>
|
||||
@@ -874,8 +907,8 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
||||
// ReferencesPanel — manage the reference list of one award: search/list on the
|
||||
// left, a per-reference editor on the right, plus bulk paste/CSV, presets and
|
||||
// the online updater (POTA/SOTA/WWFF).
|
||||
function ReferencesPanel({ code, presets, meta, onUpdateOnline, updating, onChanged, setErr }: {
|
||||
code: string; presets: Preset[]; meta?: RefMeta;
|
||||
function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, onUpdateOnline, updating, onChanged, setErr }: {
|
||||
code: string; presets: Preset[]; meta?: RefMeta; awardValidFrom?: string; awardValidTo?: string;
|
||||
onUpdateOnline: () => void; updating: boolean; onChanged: () => void; setErr: (s: string) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
@@ -1031,6 +1064,26 @@ function ReferencesPanel({ code, presets, meta, onUpdateOnline, updating, onChan
|
||||
third-party list may carry the values — but they are not offered
|
||||
for editing until something actually reads them. */}
|
||||
<Field2 label={t('awed.grid')}><Input className="h-8 font-mono" value={sel.gridsquare ?? ''} onChange={(e) => patchSel({ gridsquare: e.target.value })} /></Field2>
|
||||
{/* This reference's own validity window. A reference is not forever:
|
||||
a park is delisted, a district merged. A QSO made while it
|
||||
existed still counts — it was a valid contact on the day — and
|
||||
one made afterwards does not.
|
||||
Left empty the award's own dates govern, which is why they show
|
||||
as the placeholder: the operator can see what "empty" inherits
|
||||
instead of having to remember. */}
|
||||
<Field2 label={t('awed.refValidFrom')}>
|
||||
<Input type="date" className="h-8 w-44" value={sel.valid_from ?? ''}
|
||||
onChange={(e) => patchSel({ valid_from: e.target.value })} />
|
||||
</Field2>
|
||||
<Field2 label={t('awed.refValidTo')}>
|
||||
<Input type="date" className="h-8 w-44" value={sel.valid_to ?? ''}
|
||||
onChange={(e) => patchSel({ valid_to: e.target.value })} />
|
||||
</Field2>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{(awardValidFrom || awardValidTo)
|
||||
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
|
||||
: t('awed.refValidHint')}
|
||||
</p>
|
||||
<div className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveRef(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -38,9 +38,9 @@ type SpotStatusEntry = {
|
||||
new_county?: boolean;
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
// muted: the status was emptied on purpose by the "no colour on worked
|
||||
// stations" option, so an empty status here is a choice, not an unknown.
|
||||
muted?: boolean;
|
||||
// Whether the station uploads to LoTW. Not a status — it says nothing about
|
||||
// whether the spot is worth chasing — so it is drawn as a badge, never a colour.
|
||||
lotw?: boolean;
|
||||
};
|
||||
|
||||
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||
@@ -51,12 +51,13 @@ type SpotStatusEntry = {
|
||||
//
|
||||
// Their colours come from lib/spotMarkers, shared with the cluster list: the
|
||||
// same fact must not be violet in one panel and green in the next.
|
||||
// The map shows three of the four. A new PREFIX is left to the cluster list: the
|
||||
// The map shows three of the five. A new PREFIX and a new GRID are left to the
|
||||
// cluster list, which has the width to name them: the
|
||||
// pill is 22 px tall, and a fourth segment turns the strip into a colour code
|
||||
// nobody can read at a glance. Add it here the day the strip earns more room.
|
||||
const BMP_MARKERS = SPOT_MARKERS.filter((m) => m.key !== 'new_pfx');
|
||||
const BMP_MARKERS = SPOT_MARKERS.filter((m) => m.key !== 'new_pfx' && m.key !== 'new_grid');
|
||||
const markersFor = (e: SpotStatusEntry | undefined) =>
|
||||
activeMarkers(e).filter((m) => m.key !== 'new_pfx');
|
||||
activeMarkers(e).filter((m) => m.key !== 'new_pfx' && m.key !== 'new_grid');
|
||||
|
||||
// The legend spells the markers out; the cluster list's badges are abbreviated
|
||||
// ("NEW CTY") because they sit in a narrow cell, and there is room here.
|
||||
@@ -81,6 +82,8 @@ interface Props {
|
||||
// globally from the band-map tab toolbar.
|
||||
hideDigital?: boolean;
|
||||
fitToBand?: boolean;
|
||||
// Mark stations that upload to LoTW (Settings → Appearance).
|
||||
showLotw?: boolean;
|
||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
||||
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
||||
@@ -152,7 +155,7 @@ function LegendDot({ cls, colour, label }: { cls?: string; colour?: string; labe
|
||||
|
||||
// Human-readable label for a spot status — used in the pill hover tooltip
|
||||
// so the operator can see WHY a spot is coloured the way it is.
|
||||
function statusLabel(s: string, t: (k: string) => string, muted = false): string {
|
||||
function statusLabel(s: string, t: (k: string) => string): string {
|
||||
switch (s) {
|
||||
case 'new': return t('bmp.statusNew');
|
||||
case 'new-band': return t('bmp.statusNewBand');
|
||||
@@ -160,11 +163,10 @@ function statusLabel(s: string, t: (k: string) => string, muted = false): string
|
||||
case 'new-slot': return t('bmp.statusNewSlot');
|
||||
case 'new-call': return t('bmp.statusNewCall');
|
||||
case 'worked': return t('bmp.statusWorked');
|
||||
// An empty status means the entity could not be resolved — EXCEPT when the
|
||||
// "no colour on worked stations" option emptied it on purpose. Saying
|
||||
// "entity not resolved" there was a flat contradiction of the country
|
||||
// printed two words earlier in the same tooltip.
|
||||
default: return muted ? t('bmp.statusMuted') : t('bmp.statusUnresolved');
|
||||
// An empty status means the entity could not be resolved. Nothing else
|
||||
// empties it: the mute option leaves the status alone and takes only the
|
||||
// already-worked-callsign mark.
|
||||
default: return t('bmp.statusUnresolved');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -177,14 +179,7 @@ const QUIET_STYLE = {
|
||||
dot: 'fill-border',
|
||||
};
|
||||
|
||||
function statusStyle(s: string, muted = false): { pill: string; bar: string; line: string; dot: string } {
|
||||
// A muted spot must land on QUIET, never on the default branch below. That
|
||||
// default paints bg-primary/60 — the theme's burnt orange at 60 % over a dark
|
||||
// card, i.e. brown — because it was written for the rare unresolved entity and
|
||||
// orange is this app's "look here" colour. With the mute option on, most of
|
||||
// the map is muted, so the whole band map turned brown and the quietest spots
|
||||
// shouted the loudest.
|
||||
if (muted) return QUIET_STYLE;
|
||||
function statusStyle(s: string): { pill: string; bar: string; line: string; dot: string } {
|
||||
// pill = full pill background+text+border
|
||||
// bar = thick left accent inside the pill
|
||||
// line = SVG leader stroke (visible on hover)
|
||||
@@ -237,7 +232,7 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
||||
// last; ties broken by closeness to the rig freq).
|
||||
const MAX_VISIBLE_SPOTS = 30;
|
||||
|
||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false, showLotw = false }: Props) {
|
||||
const { t } = useI18n();
|
||||
|
||||
// The two display options are applied ONCE here, on the whole map, so the
|
||||
@@ -581,7 +576,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
{placed.map((p, i) => {
|
||||
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
||||
const st = spotStatus[k]?.status ?? '';
|
||||
const style = statusStyle(st, spotStatus[k]?.muted);
|
||||
const style = statusStyle(st);
|
||||
const labelMidY = p.labelY + PILL_H / 2;
|
||||
const bumped = Math.abs(p.freqY - labelMidY) > 0.5;
|
||||
return (
|
||||
@@ -629,7 +624,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
||||
const entry = spotStatus[k];
|
||||
const st = entry?.status ?? '';
|
||||
const style = statusStyle(st, entry?.muted);
|
||||
const style = statusStyle(st);
|
||||
const mode = inferSpotMode(p.spot.comment ?? '', p.spot.freq_hz);
|
||||
return (
|
||||
<button
|
||||
@@ -642,7 +637,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
'hover:translate-x-0.5 hover:shadow',
|
||||
style.pill,
|
||||
)}
|
||||
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t, entry?.muted)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||
>
|
||||
{/* Left accent strip. With no extra marker it repeats the status
|
||||
colour, exactly as before; otherwise it splits into one
|
||||
@@ -659,6 +654,15 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
||||
})()}
|
||||
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
||||
<span>{p.spot.dx_call}</span>
|
||||
{/* Same badge the cluster list draws, for the same reason: the
|
||||
muted-blue of a confirmation, never a status colour —
|
||||
whether a station uploads to LoTW says nothing about
|
||||
whether the spot is worth chasing. A glyph rather than a
|
||||
colour also keeps it off the channel the statuses use. */}
|
||||
{showLotw && entry?.lotw && (
|
||||
<span title={t('clu.lotwBadge')} className="text-[9px] font-normal rounded px-1 py-px"
|
||||
style={{ background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)' }}>L</span>
|
||||
)}
|
||||
{mode && (
|
||||
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
|
||||
{mode}
|
||||
|
||||
@@ -172,8 +172,17 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
() => (lat == null || lon == null ? null : sunTimes(new Date(), lat, lon)),
|
||||
[lat, lon],
|
||||
);
|
||||
// Stacked, not side by side. Laid out in a row this cost about 150 px of a
|
||||
// header that has to hold the callsign, the badges and the band grid, and it
|
||||
// was what pushed the whole row onto a second line. Two short times one above
|
||||
// the other take a fraction of that and no extra height: the row is already
|
||||
// taller than one line of text.
|
||||
//
|
||||
// "UTC" moves into the tooltip with them — the times are monospaced and always
|
||||
// UTC everywhere in OpsLog, so the label was spending width to repeat a
|
||||
// convention the operator already lives by.
|
||||
const sunBlock = sun ? (
|
||||
<div className="ml-auto flex items-center gap-3 text-xs shrink-0"
|
||||
<div className="ml-auto flex flex-col items-end leading-tight text-xs shrink-0"
|
||||
title="Sunrise / sunset at the DX station (UTC)">
|
||||
{sun.polarDay ? (
|
||||
<span className="font-semibold text-warning">midnight sun</span>
|
||||
@@ -182,14 +191,13 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
||||
) : (
|
||||
<>
|
||||
<span className="flex items-center gap-1">
|
||||
<Sunrise className="size-3.5 text-warning" />
|
||||
<Sunrise className="size-3 text-warning" />
|
||||
<span className="font-mono tabular-nums">{sun.rise || '—'}</span>
|
||||
</span>
|
||||
<span className="flex items-center gap-1">
|
||||
<Sunset className="size-3.5 text-info" />
|
||||
<Sunset className="size-3 text-info" />
|
||||
<span className="font-mono tabular-nums">{sun.set || '—'}</span>
|
||||
</span>
|
||||
<span className="text-muted-foreground">UTC</span>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -91,6 +91,17 @@ const FIELDS: FieldDef[] = [
|
||||
{ id: 'iota', label: 'bulk.fIota', group: 'Contacted station', kind: 'text', upper: true },
|
||||
{ id: 'sig', label: 'bulk.fSig', group: 'Contacted station', kind: 'text' },
|
||||
{ id: 'sig_info', label: 'bulk.fSigInfo', group: 'Contacted station', kind: 'text' },
|
||||
// The contact itself — repair fields, not description fields. An import that
|
||||
// mapped every QSO to SSB, or an ADIF with no MODE at all, is fixed here
|
||||
// instead of one row at a time.
|
||||
//
|
||||
// Band is deliberately absent: it travels with the frequency below, because a
|
||||
// band contradicting its own frequency is invalid ADIF and every export would
|
||||
// carry the contradiction.
|
||||
{ id: 'mode', label: 'bulk.fMode', group: 'The contact', kind: 'text', upper: true },
|
||||
{ id: 'submode', label: 'bulk.fSubmode', group: 'The contact', kind: 'text', upper: true },
|
||||
{ id: 'rst_sent', label: 'bulk.fRstSent', group: 'The contact', kind: 'text' },
|
||||
{ id: 'rst_rcvd', label: 'bulk.fRstRcvd', group: 'The contact', kind: 'text' },
|
||||
// Misc
|
||||
// Frequency (MHz) — sets freq_hz AND recomputes band. Main use: fixing a batch
|
||||
// logged on a stale/default frequency after CAT dropped.
|
||||
@@ -110,7 +121,12 @@ const STATUS_VALUES: { v: string; label: string }[] = [
|
||||
{ v: '_', label: 'bulk.statusBlank' },
|
||||
];
|
||||
|
||||
const GROUPS = ['QSL / upload', 'My station', 'Contacted station', 'Contest', 'Propagation', 'Misc'];
|
||||
// Derived from the fields themselves, in the order they are declared.
|
||||
//
|
||||
// This used to be a hand-written list, and a group added to FIELDS but not to it
|
||||
// simply never rendered — the fields existed, passed every check, and could not
|
||||
// be picked. Two lists that must agree, with nothing to make them.
|
||||
const GROUPS = [...new Set(FIELDS.map((f) => f.group))];
|
||||
// Maps the internal group key → its i18n label key.
|
||||
const GROUP_LABELS: Record<string, string> = {
|
||||
'QSL / upload': 'bulk.groupQsl',
|
||||
@@ -119,6 +135,7 @@ const GROUP_LABELS: Record<string, string> = {
|
||||
'Contest': 'bulk.groupContest',
|
||||
'Propagation': 'bulk.groupPropagation',
|
||||
'Misc': 'bulk.groupMisc',
|
||||
'The contact': 'bulk.groupContact',
|
||||
};
|
||||
|
||||
type Props = {
|
||||
@@ -177,7 +194,7 @@ export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
|
||||
<SelectContent>
|
||||
{GROUPS.map((g) => (
|
||||
<div key={g}>
|
||||
<div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{t(GROUP_LABELS[g])}</div>
|
||||
<div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{GROUP_LABELS[g] ? t(GROUP_LABELS[g]) : g}</div>
|
||||
{FIELDS.filter((f) => f.group === g)
|
||||
.map((f) => ({ f, txt: t(f.label) }))
|
||||
.sort((a, b) => a.txt.localeCompare(b.txt))
|
||||
|
||||
@@ -64,6 +64,11 @@ export type SpotStatusEntry = {
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
pfx?: string;
|
||||
// lotw: the DX uploads to LoTW, per ARRL user list. Inert until downloaded.
|
||||
lotw?: boolean;
|
||||
spotter_continent?: string;
|
||||
grid?: string;
|
||||
new_grid?: boolean;
|
||||
};
|
||||
|
||||
type Props = {
|
||||
@@ -188,7 +193,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
||||
function isDull(s: SpotStatusEntry | undefined): boolean {
|
||||
if (!s || !s.status) return false;
|
||||
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
|
||||
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx || s.new_grid);
|
||||
}
|
||||
|
||||
const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
@@ -220,7 +225,21 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
cellRenderer: (p: any) => {
|
||||
const s = statusFor(p);
|
||||
const color = s?.status === 'new' ? null : s?.worked_call ? WKD : null;
|
||||
return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
|
||||
return (
|
||||
<span style={{ color: color ?? undefined, fontWeight: 700 }}>
|
||||
{p.value ?? ''}
|
||||
{/* A single letter rather than a word: the column is 120 px and holds a
|
||||
callsign. It stays the muted-blue of a confirmation, never a status
|
||||
colour — whether a station uploads to LoTW says nothing about
|
||||
whether the spot is worth chasing. */}
|
||||
{s?.lotw ? (
|
||||
<span title={t('clu.lotwBadge')} style={{
|
||||
marginLeft: 4, padding: '0 3px', borderRadius: 3, fontSize: 9, verticalAlign: 'middle',
|
||||
background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)',
|
||||
}}>L</span>
|
||||
) : null}
|
||||
</span>
|
||||
);
|
||||
},
|
||||
tooltipValueGetter: (p: any) => {
|
||||
const s = statusFor(p);
|
||||
@@ -247,6 +266,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
||||
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
||||
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
||||
if (s?.new_grid) parts.push(t('clg2.newGrid'));
|
||||
return parts.join(' ');
|
||||
},
|
||||
cellRenderer: (p: any) => {
|
||||
@@ -267,6 +287,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: markerColour('new_county') });
|
||||
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: markerColour('new_pota') });
|
||||
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: markerColour('new_pfx') });
|
||||
if (s?.new_grid) parts.push({ text: t('clg2.newGrid'), color: markerColour('new_grid') });
|
||||
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
||||
return (
|
||||
<span style={{ whiteSpace: 'nowrap' }}>
|
||||
@@ -343,6 +364,18 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
||||
: { color: 'var(--muted-foreground)' }) as any,
|
||||
tooltipValueGetter: (p: any) => (statusFor(p)?.new_pfx ? t('clg2.tipNewPfx') : undefined),
|
||||
},
|
||||
{
|
||||
group: 'Geo', label: t('clg2.c.grid'), colId: 'grid',
|
||||
headerName: t('clg2.c.grid'), width: 70, cellClass: 'font-mono',
|
||||
// Not on the spot: the square a station announced in a CQ that THIS receiver
|
||||
// decoded over the WSJT-X link, so it is filled for the digital watering
|
||||
// hole being monitored and empty everywhere else. A cluster line carries the
|
||||
// spotter's grid at best, never the DX's.
|
||||
valueGetter: (p: any) => statusFor(p)?.grid ?? '',
|
||||
cellStyle: (p: any) => (statusFor(p)?.new_grid ? fillStyle(markerColour('new_grid')) : null) as any,
|
||||
cellRenderer: (p: any) => cellText(p.value, null),
|
||||
tooltipValueGetter: (p: any) => (statusFor(p)?.new_grid ? t('clg2.tipNewGrid') : undefined),
|
||||
},
|
||||
{
|
||||
group: 'Geo', label: t('clg2.c.county'), colId: 'county',
|
||||
headerName: t('clg2.c.county'), width: 130, cellClass: 'font-mono',
|
||||
|
||||
@@ -42,6 +42,7 @@ export interface DetailsState {
|
||||
srx_string?: string;
|
||||
stx_string?: string;
|
||||
email: string;
|
||||
web?: string;
|
||||
// Award references for the contacted station (set via the Awards tab picker).
|
||||
// Semicolon-delimited "AWARD@REF" entries, e.g. "POTA@FR-11553;IOTA@EU-064".
|
||||
// App.tsx maps these back to pota_ref/sota_ref/iota when saving the QSO.
|
||||
@@ -373,12 +374,16 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
||||
<Input value={details.address} onChange={(e) => onChange({ address: e.target.value })} />
|
||||
</Field>
|
||||
</div>
|
||||
<Field label={t('detp.qslMessage')} span={7}>
|
||||
<Input value={details.qsl_msg} onChange={(e) => onChange({ qsl_msg: e.target.value })} />
|
||||
</Field>
|
||||
<Field label={t('detp.qslVia')} span={5}>
|
||||
{/* QSL via gets the room, not the message. Width should follow use, and
|
||||
these two are nowhere near equal: a manager's callsign is filled in
|
||||
constantly and a QSL message almost never. The message had 7 columns
|
||||
of 12 for text most operators never type. */}
|
||||
<Field label={t('detp.qslVia')} span={7}>
|
||||
<Input value={details.qsl_via} onChange={(e) => onChange({ qsl_via: e.target.value })} />
|
||||
</Field>
|
||||
<Field label={t('detp.qslMessage')} span={5}>
|
||||
<Input value={details.qsl_msg} onChange={(e) => onChange({ qsl_msg: e.target.value })} />
|
||||
</Field>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -494,8 +499,14 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
||||
<Field label="STX">
|
||||
<Input value={details.stx_string ?? ''} placeholder={t('detp.sentExchangePh')} onChange={(e) => onChange({ stx_string: e.target.value })} />
|
||||
</Field>
|
||||
<Field label={t('detp.contactedEmail')} span={3}>
|
||||
<Input value={details.email} placeholder="[email protected]" onChange={(e) => onChange({ email: e.target.value })} />
|
||||
{/* No placeholder: a greyed-out sample address in an empty field reads
|
||||
as a value the lookup found, and that is exactly the field an
|
||||
operator checks to see whether it found one. */}
|
||||
<Field label={t('detp.contactedEmail')} span={2}>
|
||||
<Input value={details.email} onChange={(e) => onChange({ email: e.target.value })} />
|
||||
</Field>
|
||||
<Field label={t('detp.contactedWeb')}>
|
||||
<Input value={details.web ?? ''} onChange={(e) => onChange({ web: e.target.value })} />
|
||||
</Field>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -13,7 +13,8 @@ import { useI18n } from '@/lib/i18n';
|
||||
|
||||
export type FilterOp =
|
||||
| 'eq' | 'ne' | 'gt' | 'lt' | 'ge' | 'le'
|
||||
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty';
|
||||
| 'contains' | 'startswith' | 'endswith' | 'empty' | 'notempty'
|
||||
| 'in' | 'notin';
|
||||
|
||||
export interface FilterCondition { field: string; op: FilterOp; value: string }
|
||||
export interface QueryFilter {
|
||||
@@ -121,9 +122,15 @@ const OPS: { value: FilterOp; label: string }[] = [
|
||||
{ value: 'le', label: 'fltb.opLe' },
|
||||
{ value: 'empty', label: 'fltb.opEmpty' },
|
||||
{ value: 'notempty', label: 'fltb.opNotEmpty' },
|
||||
// 'in' is what makes a real question askable. Every condition is joined by ONE
|
||||
// AND or OR, so "2 m or 70 cm, in FT8, since January" had no expression: AND
|
||||
// killed the two bands, OR let every FT8 QSO through. The OR lives inside the
|
||||
// condition instead, and the rest keeps ANDing.
|
||||
{ value: 'in', label: 'fltb.opIn' },
|
||||
{ value: 'notin', label: 'fltb.opNotIn' },
|
||||
];
|
||||
|
||||
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'empty', 'notempty'];
|
||||
const TEXT_OPS: FilterOp[] = ['contains', 'startswith', 'endswith', 'eq', 'ne', 'in', 'notin', 'empty', 'notempty'];
|
||||
const NUM_OPS: FilterOp[] = ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'empty', 'notempty'];
|
||||
|
||||
function opsFor(field: string): { value: FilterOp; label: string }[] {
|
||||
@@ -257,6 +264,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
)}
|
||||
{conditions.map((c, i) => {
|
||||
const needsValue = c.op !== 'empty' && c.op !== 'notempty';
|
||||
const isList = c.op === 'in' || c.op === 'notin';
|
||||
const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text';
|
||||
return (
|
||||
<div key={i} className="flex items-center gap-2">
|
||||
@@ -281,19 +289,28 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
||||
// An ADIF date is picked with a calendar but STORED as the
|
||||
// 8-digit form the column holds, so the comparison stays a
|
||||
// plain string one on both sides.
|
||||
type={fieldType === 'date' || fieldType === 'adifdate' ? 'date' : fieldType === 'number' ? 'number' : 'text'}
|
||||
// A list is typed by hand, commas and all, so it stays a text
|
||||
// box even on a date or number field: a calendar cannot express
|
||||
// "any one of these".
|
||||
type={isList ? 'text'
|
||||
: fieldType === 'date' || fieldType === 'adifdate' ? 'date'
|
||||
: fieldType === 'number' ? 'number' : 'text'}
|
||||
className="h-8 flex-1 text-xs"
|
||||
disabled={!needsValue}
|
||||
placeholder={needsValue ? (fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')) : '—'}
|
||||
placeholder={!needsValue ? '—'
|
||||
: isList ? t('fltb.listPh')
|
||||
: fieldType === 'date' ? 'YYYY-MM-DD' : t('fltb.valuePh')}
|
||||
// \d, not d: the escape was missing, so the test never matched
|
||||
// an 8-digit ADIF date and the calendar input was handed
|
||||
// "20260728" — which type=date rejects, showing an empty box
|
||||
// over a value that was really there.
|
||||
value={fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
|
||||
// The ADIF reshaping is skipped for a list: it would eat the
|
||||
// commas and leave one unreadable run of digits.
|
||||
value={!isList && fieldType === 'adifdate' && /^\d{8}$/.test(c.value)
|
||||
? `${c.value.slice(0, 4)}-${c.value.slice(4, 6)}-${c.value.slice(6, 8)}`
|
||||
: c.value}
|
||||
onChange={(e) => setCond(i, {
|
||||
value: fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
|
||||
value: !isList && fieldType === 'adifdate' ? e.target.value.replace(/-/g, '') : e.target.value,
|
||||
})}
|
||||
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
|
||||
/>
|
||||
|
||||
@@ -18,6 +18,7 @@ import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { loadLocal, loadRemote, saveState, seedLocal } from '@/lib/gridPrefs';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { gridToLatLon, pathBetweenLatLon } from '@/lib/maidenhead';
|
||||
import { rowStyleFor, type RowColorSettings } from '@/lib/rowColors';
|
||||
|
||||
// Register every Community feature once. v32+ requires explicit registration;
|
||||
// AllCommunityModule keeps it simple and pulls in sort/filter/resize/reorder/
|
||||
@@ -80,6 +81,8 @@ type Props = {
|
||||
// One column per defined award; the cell shows the reference this QSO counts
|
||||
// for (from row.award_refs[CODE], attached by the parent). Hidden by default.
|
||||
awardCols?: { code: string; name: string }[];
|
||||
// Whole-row colouring by QSL / LoTW status (Settings → Appearance).
|
||||
rowColors?: RowColorSettings | null;
|
||||
};
|
||||
|
||||
const BASE_COLSTATE_KEY = 'hamlog.qsoColState.v2';
|
||||
@@ -132,6 +135,10 @@ function qsoDistanceKm(d: any, myGrid?: string): number | undefined {
|
||||
|
||||
export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
||||
// ── QSO basics ──
|
||||
// Position in the log, oldest = 1. Filled by the backend over the WHOLE log,
|
||||
// so it does not change when a filter narrows what is shown.
|
||||
{ group: 'QSO', label: t('rqg.c.number'), colId: 'number', headerName: t('rqg.h.number'), field: 'number' as any, width: 80, type: 'rightAligned', cellClass: 'font-mono',
|
||||
comparator: (a, b) => (a ?? 0) - (b ?? 0) },
|
||||
{ group: 'QSO', label: t('rqg.c.qso_date'), colId: 'qso_date', headerName: t('rqg.c.qso_date'), field: 'qso_date' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value), sort: 'desc', defaultVisible: true },
|
||||
{ group: 'QSO', label: t('rqg.c.qso_date_off'), colId: 'qso_date_off', headerName: t('rqg.c.qso_date_off'), field: 'qso_date_off' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value) },
|
||||
{ group: 'QSO', label: t('rqg.c.callsign'), colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', defaultVisible: true },
|
||||
@@ -299,7 +306,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
|
||||
return rest;
|
||||
});
|
||||
|
||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
||||
const { t } = useI18n();
|
||||
const gridRef = useRef<any>(null);
|
||||
const [pickerOpen, setPickerOpen] = useState(false);
|
||||
@@ -696,6 +703,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
animateRows={false}
|
||||
suppressCellFocus
|
||||
getRowId={(p) => String((p.data as any).id)}
|
||||
getRowStyle={(p) => rowStyleFor(p.data, rowColors ?? null)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -52,6 +52,7 @@ import {
|
||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetGridCacheStatus,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||
@@ -76,6 +77,7 @@ import { getDateFormat, setDateFormat, type DateFormat } from '@/lib/dateFormat'
|
||||
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
|
||||
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
|
||||
import { OperatingPanel } from '@/components/OperatingPanel';
|
||||
import { AppearancePanel } from '@/components/AppearancePanel';
|
||||
import { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
||||
|
||||
type LookupSettings = LookupSettingsForm;
|
||||
@@ -144,7 +146,7 @@ const emptyProfile = (): Profile => ({
|
||||
my_grid: '', my_country: '',
|
||||
my_state: '', my_cnty: '',
|
||||
my_street: '', my_city: '', my_postal_code: '',
|
||||
my_sota_ref: '', my_pota_ref: '',
|
||||
my_sota_ref: '', my_pota_ref: '', my_iota: '',
|
||||
my_rig: '', my_antenna: '',
|
||||
tx_pwr: undefined,
|
||||
is_active: false,
|
||||
@@ -175,6 +177,7 @@ interface Props {
|
||||
`disabled: true` greys them out and shows the "coming soon" placeholder. */
|
||||
type SectionId =
|
||||
| 'general'
|
||||
| 'appearance'
|
||||
| 'email'
|
||||
| 'station'
|
||||
| 'profiles'
|
||||
@@ -265,6 +268,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
||||
{
|
||||
kind: 'group', label: t('nav.software'), icon: Cog, defaultOpen: true, children: [
|
||||
{ kind: 'item', label: t('sec.general'), id: 'general' },
|
||||
{ kind: 'item', label: t('sec.appearance'), id: 'appearance' },
|
||||
{ kind: 'item', label: t('sec.email'), id: 'email' },
|
||||
{ kind: 'item', label: t('sec.lookup'), id: 'lookup' },
|
||||
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
||||
@@ -289,7 +293,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
||||
// Map section id → i18n key (breadcrumb / placeholders).
|
||||
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
||||
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
||||
'external-services': 'sec.external', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
||||
'external-services': 'sec.external', appearance: 'sec.appearance', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
||||
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||
adifmon: 'sec.adifmon',
|
||||
webpublish: 'sec.webpublish',
|
||||
@@ -688,6 +692,13 @@ const RELAY_BANDS = ['160m', '80m', '60m', '40m', '30m', '20m', '17m', '15m', '1
|
||||
// Bands a motorized HF/6 m antenna (Ultrabeam / SteppIR) can cover — the follow
|
||||
// filter is a subset of these. Must match motorBands in app.go, low → high.
|
||||
const MOTOR_BANDS = ['40m', '30m', '20m', '17m', '15m', '12m', '10m', '6m'];
|
||||
// Shown as placeholders only — the backend owns these values (motorBands in
|
||||
// app.go) and resolves what a band button actually commands. Duplicated here
|
||||
// purely so an empty box can say what leaving it empty will do.
|
||||
const MOTOR_BAND_DEFAULT_KHZ: Record<string, number> = {
|
||||
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
||||
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
||||
};
|
||||
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
||||
|
||||
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
||||
@@ -1249,8 +1260,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||
|
||||
// Motorized antenna (Ultrabeam TCP or SteppIR TCP/serial) settings.
|
||||
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; tx_inhibit: boolean; bands: string[]; freq_min_mhz: number; freq_max_mhz: number }>({
|
||||
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, tx_inhibit: false, bands: [], freq_min_mhz: 13, freq_max_mhz: 54,
|
||||
const [ultrabeam, setUltrabeam] = useState<{ enabled: boolean; type: string; transport: string; host: string; port: number; com: string; baud: number; follow: boolean; step_khz: number; track_mode: string; band_freqs: Record<string, number>; tx_inhibit: boolean; bands: string[]; freq_min_mhz: number; freq_max_mhz: number }>({
|
||||
enabled: false, type: 'ultrabeam', transport: 'tcp', host: '', port: 23, com: '', baud: 9600, follow: false, step_khz: 50, track_mode: 'step', band_freqs: {}, tx_inhibit: false, bands: [], freq_min_mhz: 13, freq_max_mhz: 54,
|
||||
});
|
||||
const [ubTesting, setUbTesting] = useState(false);
|
||||
const [ubTest, setUbTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||
@@ -1540,6 +1551,30 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
|
||||
// the "1" landed and the field would fight the operator.
|
||||
const SELF_SPOT_MIN_MIN = 5;
|
||||
// Band-opening watch. Saved through the backend rather than as a UI pref: it
|
||||
// has side effects there — adding the RBN nodes, bringing the PSK Reporter
|
||||
// feed up or down — so the write has to go where those live.
|
||||
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
|
||||
const [chaseGrids, setChaseGrids] = useState(false);
|
||||
const [gridStat, setGridStat] = useState<any>(null);
|
||||
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
||||
const saveBandOpen = async (next: any) => {
|
||||
setBandOpen(next);
|
||||
try { await SaveBandOpenSettings(next); } catch { /* the status line shows the result */ }
|
||||
};
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
|
||||
try { setChaseGrids(await GetChaseNewGrids()); } catch { /* defaults stand */ }
|
||||
})();
|
||||
// Poll the feed while the panel is open: a live count is the only thing that
|
||||
// distinguishes "connected" from "connected and receiving nothing".
|
||||
const t = window.setInterval(async () => {
|
||||
try { setPskrStatus(await GetPSKReporterStatus()); } catch { /* ignore */ }
|
||||
try { setGridStat(await GetGridCacheStatus()); } catch { /* ignore */ }
|
||||
}, 3000);
|
||||
return () => window.clearInterval(t);
|
||||
}, []);
|
||||
const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN });
|
||||
const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN));
|
||||
const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]);
|
||||
@@ -1854,6 +1889,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
my_grid: (activeProfile.my_grid ?? '').trim().toUpperCase(),
|
||||
my_sota_ref: (activeProfile.my_sota_ref ?? '').trim().toUpperCase(),
|
||||
my_pota_ref: (activeProfile.my_pota_ref ?? '').trim().toUpperCase(),
|
||||
my_iota: (activeProfile.my_iota ?? '').trim().toUpperCase(),
|
||||
} as any);
|
||||
}
|
||||
await SaveLookupSettings(lookup as any);
|
||||
@@ -2013,6 +2049,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<Label>{t('station.pota')}</Label>
|
||||
<Input className="font-mono uppercase" value={p.my_pota_ref ?? ''} onChange={(e) => updateActive({ my_pota_ref: e.target.value })} placeholder="FF-1234" />
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('station.iota')}</Label>
|
||||
<Input className="font-mono uppercase" value={p.my_iota ?? ''} onChange={(e) => updateActive({ my_iota: e.target.value })} placeholder="EU-005" />
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
@@ -3114,45 +3154,96 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={ultrabeam.follow} onCheckedChange={(c) => setUltrabeam((s) => ({ ...s, follow: !!c }))} />
|
||||
Follow rig frequency (auto-tune the antenna)
|
||||
{t('hw.motorFollow')}
|
||||
</label>
|
||||
{ultrabeam.follow && (
|
||||
<div className="flex items-center gap-3 pl-6">
|
||||
<Label className="text-sm">Re-tune step</Label>
|
||||
<Select value={String(ultrabeam.step_khz)} onValueChange={(v) => setUltrabeam((s) => ({ ...s, step_khz: parseInt(v, 10) || 50 }))}>
|
||||
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="25">25 kHz</SelectItem>
|
||||
<SelectItem value="50">50 kHz</SelectItem>
|
||||
<SelectItem value="100">100 kHz</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<span className="text-xs text-muted-foreground">re-tune only when the frequency moves this far</span>
|
||||
<div className="space-y-2 pl-6">
|
||||
<div className="flex items-center gap-3">
|
||||
<Label className="text-sm">{t('station.trackModeTip')}</Label>
|
||||
<Select value={ultrabeam.track_mode || 'step'} onValueChange={(v) => setUltrabeam((s) => ({ ...s, track_mode: v }))}>
|
||||
<SelectTrigger className="h-8 w-52"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="always">{t('station.trackAlways')}</SelectItem>
|
||||
<SelectItem value="step">{t('station.trackStep')}</SelectItem>
|
||||
<SelectItem value="band">{t('station.trackBand')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
{/* The step is only a question in step mode — the other two modes
|
||||
have nothing to threshold. */}
|
||||
{(ultrabeam.track_mode || 'step') === 'step' && (
|
||||
<div className="flex items-center gap-3">
|
||||
<Label className="text-sm">{t('hw.motorStep')}</Label>
|
||||
<Select value={String(ultrabeam.step_khz)} onValueChange={(v) => setUltrabeam((s) => ({ ...s, step_khz: parseInt(v, 10) || 50 }))}>
|
||||
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="25">25 kHz</SelectItem>
|
||||
<SelectItem value="50">50 kHz</SelectItem>
|
||||
<SelectItem value="100">100 kHz</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
)}
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{(ultrabeam.track_mode || 'step') === 'always' ? t('station.trackAlwaysTip')
|
||||
: (ultrabeam.track_mode || 'step') === 'band' ? t('station.trackBandTip')
|
||||
: t('station.trackStepTipMode')}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{(isSteppir || ultrabeam.type === 'ultrabeam') && (
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<Label className="text-sm">{t('hw.motorBands')}</Label>
|
||||
<div className="flex items-center gap-1.5 flex-wrap">
|
||||
{/* Band, and under it the frequency its button tunes to — the
|
||||
layout of the SteppIR controller's own Bands and Frequencies
|
||||
table, which is where operators expect to find this. The box
|
||||
only appears on a selected band: a tune frequency for a band the
|
||||
antenna is not allowed on is a setting with no effect. Left
|
||||
empty it shows the default as placeholder, so the field is
|
||||
self-documenting and clearing it is how you go back. */}
|
||||
<div className="flex items-start gap-1.5 flex-wrap">
|
||||
{MOTOR_BANDS.map((b) => {
|
||||
const on = ultrabeam.bands.includes(b);
|
||||
return (
|
||||
<button key={b} type="button"
|
||||
onClick={() => setUltrabeam((s) => ({
|
||||
...s,
|
||||
bands: on ? s.bands.filter((x) => x !== b) : [...s.bands, b],
|
||||
}))}
|
||||
className={`h-8 min-w-[3rem] rounded-md border px-2 text-sm font-medium transition-colors ${
|
||||
on
|
||||
? 'border-primary bg-primary/15 text-primary'
|
||||
: 'border-input bg-background text-muted-foreground hover:bg-muted'
|
||||
}`}>
|
||||
{b}
|
||||
</button>
|
||||
<div key={b} className="flex flex-col gap-1">
|
||||
<button type="button"
|
||||
onClick={() => setUltrabeam((s) => ({
|
||||
...s,
|
||||
bands: on ? s.bands.filter((x) => x !== b) : [...s.bands, b],
|
||||
}))}
|
||||
className={`h-8 w-[4.5rem] rounded-md border px-2 text-sm font-medium transition-colors ${
|
||||
on
|
||||
? 'border-primary bg-primary/15 text-primary'
|
||||
: 'border-input bg-background text-muted-foreground hover:bg-muted'
|
||||
}`}>
|
||||
{b}
|
||||
</button>
|
||||
{on && (
|
||||
<input
|
||||
type="text" inputMode="numeric"
|
||||
value={ultrabeam.band_freqs?.[b] ? String(ultrabeam.band_freqs[b]) : ''}
|
||||
placeholder={String(MOTOR_BAND_DEFAULT_KHZ[b] ?? '')}
|
||||
title={t('hw.motorBandFreqHint')}
|
||||
onChange={(e) => {
|
||||
// Keep only digits, and store nothing for an empty box
|
||||
// so it round-trips to "use the default" rather than
|
||||
// to a zero the backend would have to interpret.
|
||||
const digits = e.target.value.replace(/[^0-9]/g, '');
|
||||
setUltrabeam((s) => {
|
||||
const next = { ...(s.band_freqs || {}) };
|
||||
if (digits === '') delete next[b]; else next[b] = parseInt(digits, 10);
|
||||
return { ...s, band_freqs: next };
|
||||
});
|
||||
}}
|
||||
className="h-7 w-[4.5rem] rounded-md border border-input bg-background px-1.5 text-center text-xs font-mono outline-none focus:border-primary"
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<p className="text-xs text-muted-foreground">{t('hw.motorBandFreqHint')}</p>
|
||||
</div>
|
||||
)}
|
||||
<div className="border-t border-border/60 pt-3 space-y-1">
|
||||
@@ -4143,6 +4234,61 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
things set up once. A preferences dialog you reopen every ten minutes
|
||||
is a filter in the wrong place. */}
|
||||
|
||||
{/* Grid chasing. Here rather than in the filter panel because it is set
|
||||
up once: it decides whether locators learnt from decodes are KEPT
|
||||
across restarts, not what the list shows right now. */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={chaseGrids} className="mt-0.5"
|
||||
onCheckedChange={(c) => { setChaseGrids(!!c); SetChaseNewGrids(!!c).catch(() => {}); }} />
|
||||
<span>{t('clu.chaseGrids')} <span className="text-xs text-muted-foreground">{t('clu.chaseGridsHint')}</span></span>
|
||||
</label>
|
||||
{chaseGrids && (
|
||||
<p className="pl-6 text-xs text-muted-foreground">
|
||||
{t('clu.chaseGridsStat', { n: gridStat?.known ?? 0, p: gridStat?.pending ?? 0 })}
|
||||
{pskrStatus?.running ? ` · ${t('bo.feedUp', { n: pskrStatus.received ?? 0 })}` : ''}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
|
||||
switching it on adds two of them — the operator should see that
|
||||
happen where it happens rather than find nodes they did not add. */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={bandOpen.enabled} className="mt-0.5"
|
||||
onCheckedChange={(c) => saveBandOpen({ ...bandOpen, enabled: !!c })} />
|
||||
<span>{t('bo.enable')} <span className="text-xs text-muted-foreground">{t('bo.enableHint')}</span></span>
|
||||
</label>
|
||||
{bandOpen.enabled && (
|
||||
<div className="pl-6 space-y-2">
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{(bandOpen.available ?? []).map((b: string) => {
|
||||
const on = (bandOpen.bands ?? []).includes(b);
|
||||
return (
|
||||
<button key={b} type="button"
|
||||
onClick={() => saveBandOpen({
|
||||
...bandOpen,
|
||||
bands: on ? bandOpen.bands.filter((x: string) => x !== b) : [...(bandOpen.bands ?? []), b],
|
||||
})}
|
||||
className={cn('px-2 py-0.5 rounded-md border text-[11px] font-bold tracking-wider font-mono',
|
||||
on ? 'bg-primary text-primary-foreground border-primary' : 'text-muted-foreground border-border hover:bg-muted')}>
|
||||
{b}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
{/* A live count, because a feed that is connected but silent looks
|
||||
exactly like one that is broken until a number moves. */}
|
||||
<p className="text-xs text-muted-foreground">
|
||||
{pskrStatus?.running
|
||||
? t('bo.feedUp', { n: pskrStatus.received ?? 0 })
|
||||
: t('bo.feedDown')}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Self-spot. The interval only shows once it's on — an interval for
|
||||
something switched off is just a question the operator can't act on. */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
@@ -6020,6 +6166,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
// Map sections to their content + icon (for placeholder).
|
||||
const PANELS: Record<SectionId, () => JSX.Element> = {
|
||||
general: GeneralPanel,
|
||||
appearance: () => <AppearancePanel />,
|
||||
email: EmailPanel,
|
||||
station: StationPanel,
|
||||
profiles: ProfilesPanel,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
|
||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical } from 'lucide-react';
|
||||
import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Square, Antenna as AntennaIcon, ArrowDownToLine, Minus, RefreshCw, GripVertical, ChevronUp, ChevronDown } from 'lucide-react';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
GetStationDevices, SaveStationDevices, GetStationStatus, StationSetRelay,
|
||||
GetRotatorHeading, RotatorGoTo, RotatorStop, SetActiveRotor,
|
||||
GetUltrabeamStatus, SetUltrabeamDirection, UltrabeamRetract, MotorSetElement, MotorReadElements,
|
||||
MotorTuneKHz, MotorNudgeKHz, SetMotorFollow,
|
||||
ListDenkoviDevices, ListSerialPorts, TestStationDevice,
|
||||
GetAmpStatuses, GetFlexState,
|
||||
GetTunerGeniusStatus, GetTunerGeniusSettings,
|
||||
@@ -115,7 +116,37 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
||||
);
|
||||
}
|
||||
|
||||
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[] };
|
||||
type AntStatus = { enabled: boolean; type: string; connected: boolean; direction: number; frequency: number; moving: boolean; elements: number[]; follow?: boolean; step_khz?: number; track_mode?: string; bands?: string[]; band_freqs?: Record<string, number> };
|
||||
|
||||
// Where each band button points the antenna.
|
||||
//
|
||||
// Not the arithmetic centre of the band. An antenna is tuned for where people
|
||||
// actually work: 20 m centres on 14175 but nobody lives there, and 10 m spans
|
||||
// 1.7 MHz of which the top half is empty. These are the points that leave the
|
||||
// elements closest to right for the whole band, and one nudge away from the rest.
|
||||
const ANT_BAND_KHZ: Record<string, number> = {
|
||||
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
||||
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
||||
};
|
||||
|
||||
// NUDGE_KHZ is the up/down step. 25 kHz because that is also the finest tracking
|
||||
// threshold: a nudge smaller than the tracking step would be undone by the next
|
||||
// poll while tracking is on.
|
||||
const NUDGE_KHZ = 25;
|
||||
|
||||
// bandOfKHz names the band a frequency sits in, so a band button can light up
|
||||
// when the ANTENNA is already there. Deliberately generous at the edges: the
|
||||
// antenna's reported frequency is where it was commanded, which can sit slightly
|
||||
// outside the allocation.
|
||||
function bandOfKHz(khz: number): string {
|
||||
const edges: [number, number, string][] = [
|
||||
[6900, 7300, '40m'], [10050, 10200, '30m'], [13900, 14400, '20m'],
|
||||
[18000, 18200, '17m'], [20900, 21500, '15m'], [24800, 25000, '12m'],
|
||||
[27900, 29800, '10m'], [49900, 50600, '6m'],
|
||||
];
|
||||
for (const [lo, hi, b] of edges) if (khz >= lo && khz <= hi) return b;
|
||||
return '';
|
||||
}
|
||||
|
||||
// MotorAntennaWidget controls a motorized antenna (Ultrabeam / SteppIR) from the
|
||||
// Station Control tab: pattern (Normal / 180° / Bi), Retract, and — Ultrabeam
|
||||
@@ -203,6 +234,88 @@ function MotorAntennaWidget({ ant, refetch, t }: { ant: AntStatus; refetch: () =
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
{/* Bands, then a nudge, then tracking — in the order an operator uses
|
||||
them: get to the band, fine-tune inside it, decide whether the
|
||||
antenna should follow the rig from here. */}
|
||||
<div>
|
||||
<div className="text-[10px] font-semibold uppercase tracking-wider text-muted-foreground mb-1">{t('station.bands')}</div>
|
||||
<div className="grid grid-cols-5 gap-1">
|
||||
{(ant.bands ?? []).map((b: string) => {
|
||||
// Where this band tunes is resolved by the backend — the operator's
|
||||
// per-band choice from Settings, or the default. ANT_BAND_KHZ is only
|
||||
// the floor for a status poll that hasn't landed yet.
|
||||
const khz = ant.band_freqs?.[b] || ANT_BAND_KHZ[b];
|
||||
if (!khz) return null;
|
||||
// "On this band" from the antenna's own frequency, not the rig's:
|
||||
// the widget must show where the ANTENNA is, which is the whole
|
||||
// reason for tuning it by hand.
|
||||
const here = ant.frequency > 0 && bandOfKHz(ant.frequency) === b;
|
||||
return (
|
||||
<button key={b} type="button" disabled={!ant.connected}
|
||||
onClick={() => run(MotorTuneKHz(khz))}
|
||||
title={`${(khz / 1000).toFixed(3)} MHz`}
|
||||
className={cn('rounded-md border py-1 text-[11px] font-mono font-semibold transition-colors disabled:opacity-40',
|
||||
here ? 'bg-primary text-primary-foreground border-primary' : 'border-border hover:bg-muted')}>
|
||||
{b}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-1">
|
||||
<button type="button" disabled={!ant.connected}
|
||||
onClick={() => run(MotorNudgeKHz(-NUDGE_KHZ))}
|
||||
title={t('station.nudgeDown', { n: NUDGE_KHZ })}
|
||||
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
||||
<ChevronDown className="size-3.5" /> {NUDGE_KHZ}
|
||||
</button>
|
||||
<button type="button" disabled={!ant.connected}
|
||||
onClick={() => run(MotorNudgeKHz(NUDGE_KHZ))}
|
||||
title={t('station.nudgeUp', { n: NUDGE_KHZ })}
|
||||
className="flex-1 flex items-center justify-center gap-1 rounded-md border border-border py-1.5 text-xs font-semibold hover:bg-muted disabled:opacity-40">
|
||||
<ChevronUp className="size-3.5" /> {NUDGE_KHZ}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Tracking. Here rather than only in Settings because it is an operating
|
||||
decision — off to park the antenna, on to resume — not something set
|
||||
up once. Mode and step only show when tracking is on: settings for
|
||||
something switched off are questions the operator cannot act on. And
|
||||
the step only shows in step mode, where it is the one thing it means. */}
|
||||
<div className="space-y-1.5">
|
||||
<div className="flex items-center gap-2">
|
||||
<button type="button"
|
||||
onClick={() => run(SetMotorFollow(!ant.follow, 0, ''))}
|
||||
className={cn('flex-1 rounded-md border py-1.5 text-xs font-semibold transition-colors',
|
||||
ant.follow ? 'bg-success-muted text-success-muted-foreground border-success-border' : 'border-border hover:bg-muted')}>
|
||||
{ant.follow ? t('station.trackOn') : t('station.trackOff')}
|
||||
</button>
|
||||
{ant.follow && (ant.track_mode || 'step') === 'step' && (
|
||||
<select
|
||||
value={String(ant.step_khz || 50)}
|
||||
onChange={(e) => run(SetMotorFollow(true, parseInt(e.target.value, 10), ''))}
|
||||
className="h-[30px] rounded-md border border-border bg-background px-1 text-xs font-mono"
|
||||
title={t('station.trackStepTip')}
|
||||
>
|
||||
{[25, 50, 100].map((s) => <option key={s} value={s}>{s} kHz</option>)}
|
||||
</select>
|
||||
)}
|
||||
</div>
|
||||
{ant.follow && (
|
||||
<select
|
||||
value={ant.track_mode || 'step'}
|
||||
onChange={(e) => run(SetMotorFollow(true, 0, e.target.value))}
|
||||
className="w-full h-[30px] rounded-md border border-border bg-background px-1.5 text-xs"
|
||||
title={t('station.trackModeTip')}
|
||||
>
|
||||
<option value="always" title={t('station.trackAlwaysTip')}>{t('station.trackAlways')}</option>
|
||||
<option value="step" title={t('station.trackStepTipMode')}>{t('station.trackStep')}</option>
|
||||
<option value="band" title={t('station.trackBandTip')}>{t('station.trackBand')}</option>
|
||||
</select>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<button type="button" disabled={!ant.connected}
|
||||
onClick={() => run(UltrabeamRetract())}
|
||||
className="w-full flex items-center justify-center gap-1.5 rounded-md border border-warning-border bg-warning-muted text-warning-muted-foreground py-1.5 text-xs font-semibold hover:brightness-95 disabled:opacity-40">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Upload, FolderOpen, Loader2 } from 'lucide-react';
|
||||
import { Upload, FolderOpen, Loader2, ChevronsUpDown } from 'lucide-react';
|
||||
import {
|
||||
GetWebPublishConfig, SaveWebPublishConfig, WebPublishColumns,
|
||||
TestWebPublishFTP, PublishLogNow, GetWebPublishStatus, PickBackupFolder,
|
||||
@@ -9,6 +9,9 @@ import { Input } from '@/components/ui/input';
|
||||
import { Label } from '@/components/ui/label';
|
||||
import { Checkbox } from '@/components/ui/checkbox';
|
||||
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
|
||||
import {
|
||||
DropdownMenu, DropdownMenuTrigger, DropdownMenuContent, DropdownMenuCheckboxItem,
|
||||
} from '@/components/ui/dropdown-menu';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { cn } from '@/lib/utils';
|
||||
|
||||
@@ -18,12 +21,17 @@ type Cfg = {
|
||||
ftp_enabled: boolean; ftp_host: string; ftp_port: number; ftp_user: string;
|
||||
ftp_password: string; ftp_tls: boolean; ftp_folder: string; ftp_file_name: string;
|
||||
};
|
||||
type Col = { key: string; header: string };
|
||||
type Col = { key: string; header: string; group: string };
|
||||
|
||||
export function WebPublishPanel() {
|
||||
const { t } = useI18n();
|
||||
const [cfg, setCfg] = useState<Cfg | null>(null);
|
||||
const [cols, setCols] = useState<Col[]>([]);
|
||||
// The catalogue is 123 fields, so the picker is a dropdown with a search box
|
||||
// rather than anything laid out on the page. Chosen columns stay visible above
|
||||
// it, in publication order: after picking eight out of a hundred the question
|
||||
// stops being 'what exists' and becomes 'what did I pick, and how will it print'.
|
||||
const [colSearch, setColSearch] = useState('');
|
||||
const [busy, setBusy] = useState<'' | 'test' | 'publish'>('');
|
||||
const [msg, setMsg] = useState('');
|
||||
const [err, setErr] = useState('');
|
||||
@@ -137,19 +145,75 @@ export function WebPublishPanel() {
|
||||
|
||||
{/* ── Columns ── */}
|
||||
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||
<Label className="text-xs font-semibold">{t('wpub.columns')}</Label>
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{cols.map((c) => {
|
||||
const on = cfg.columns?.includes(c.key);
|
||||
return (
|
||||
<button key={c.key} type="button" onClick={() => toggleCol(c.key)}
|
||||
className={cn('px-2 py-0.5 rounded-full border text-[11px] font-medium transition-colors',
|
||||
on ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}>
|
||||
{c.header}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
<div className="flex items-center justify-between">
|
||||
<Label className="text-xs font-semibold">{t('wpub.columns')}</Label>
|
||||
<span className="text-[11px] text-muted-foreground">
|
||||
{t('wpub.columnsCount', { n: cfg.columns?.length ?? 0, total: cols.length })}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{/* CHOSEN, in publication order — this is the list that answers "what
|
||||
will the page look like", which a sectioned catalogue cannot. */}
|
||||
{(cfg.columns?.length ?? 0) > 0 && (
|
||||
<div className="flex flex-wrap gap-1.5">
|
||||
{cfg.columns.map((k) => {
|
||||
const c = cols.find((x) => x.key === k);
|
||||
return (
|
||||
<button key={k} type="button" onClick={() => toggleCol(k)}
|
||||
title={t('wpub.removeColumn')}
|
||||
className="px-2 py-0.5 rounded-full border border-primary bg-primary text-primary-foreground text-[11px] font-medium">
|
||||
{c?.header ?? k} ×
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* One dropdown, alphabetical, filtered as you type. The catalogue is
|
||||
123 fields: laid out on the page it buries every other setting, and
|
||||
sorting by anything but the alphabet means hunting. The menu stays
|
||||
open while ticking — picking eight columns should be one visit. */}
|
||||
<DropdownMenu>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button variant="outline" size="sm" className="w-full justify-between h-8 text-xs font-normal">
|
||||
{t('wpub.columnsPick')}
|
||||
<ChevronsUpDown className="size-3.5 opacity-60" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
{/* The search box is OUTSIDE the scrolling area, not sticky inside it.
|
||||
Sticky kept it in place but the rows scrolled over it: a menu item
|
||||
carries its own background and its own stacking, so it wins over a
|
||||
sticky sibling however high its z-index. A header that never
|
||||
scrolls has nothing to lose the fight with. */}
|
||||
<DropdownMenuContent align="start" className="w-72 p-0 flex flex-col max-h-80">
|
||||
<div className="p-1.5 border-b border-border/60 bg-popover shrink-0">
|
||||
<Input className="h-7 text-xs" placeholder={t('wpub.columnsSearch')}
|
||||
value={colSearch}
|
||||
onChange={(e) => setColSearch(e.target.value)}
|
||||
onKeyDown={(e) => e.stopPropagation()} />
|
||||
</div>
|
||||
<div className="overflow-y-auto p-1">
|
||||
{[...cols]
|
||||
.sort((a, b) => a.header.localeCompare(b.header))
|
||||
.filter((c) => {
|
||||
const q = colSearch.trim().toLowerCase();
|
||||
return !q || c.header.toLowerCase().includes(q) || c.key.toLowerCase().includes(q);
|
||||
})
|
||||
.map((c) => (
|
||||
<DropdownMenuCheckboxItem
|
||||
key={c.key}
|
||||
checked={cfg.columns?.includes(c.key) ?? false}
|
||||
onCheckedChange={() => toggleCol(c.key)}
|
||||
onSelect={(e) => e.preventDefault()}
|
||||
className="text-xs"
|
||||
>
|
||||
{c.header}
|
||||
<span className="ml-auto pl-2 text-[10px] text-muted-foreground font-mono">{c.group}</span>
|
||||
</DropdownMenuCheckboxItem>
|
||||
))}
|
||||
</div>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
<p className="text-[11px] text-muted-foreground">{t('wpub.columnsHint')}</p>
|
||||
</div>
|
||||
|
||||
|
||||
+32
-32
File diff suppressed because one or more lines are too long
@@ -0,0 +1,93 @@
|
||||
// Row colouring for the log grid, by QSL status.
|
||||
//
|
||||
// Four categories, each scoped to the channels the operator cares about —
|
||||
// paper QSL, LoTW, eQSL, QRZ.com. The rules are ORDERED and the first match
|
||||
// wins, because a contact is usually several of them at once.
|
||||
|
||||
export type RowColorRule = {
|
||||
id: string;
|
||||
color: string;
|
||||
enabled: boolean;
|
||||
channels?: string[]; // empty = every channel
|
||||
};
|
||||
export type RowColorSettings = {
|
||||
enabled: boolean;
|
||||
style?: 'bar' | 'tint' | 'both';
|
||||
intensity?: number;
|
||||
bandmap_lotw?: boolean;
|
||||
rules: RowColorRule[];
|
||||
};
|
||||
|
||||
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||
|
||||
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
|
||||
const FIELDS: Record<string, { sent: string; rcvd: string }> = {
|
||||
qsl: { sent: 'qsl_sent', rcvd: 'qsl_rcvd' },
|
||||
lotw: { sent: 'lotw_sent', rcvd: 'lotw_rcvd' },
|
||||
eqsl: { sent: 'eqsl_sent', rcvd: 'eqsl_rcvd' },
|
||||
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
|
||||
};
|
||||
|
||||
// ADIF QSL fields are single letters. Y is the only one that means "yes";
|
||||
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
|
||||
// and the one an operator looks for when deciding what to send.
|
||||
const yes = (v: any) => String(v ?? '').trim().toUpperCase() === 'Y';
|
||||
const owed = (v: any) => {
|
||||
const s = String(v ?? '').trim().toUpperCase();
|
||||
return s === 'R' || s === 'Q';
|
||||
};
|
||||
|
||||
const chansOf = (r: RowColorRule): readonly string[] =>
|
||||
r.channels && r.channels.length ? r.channels : CHANNELS;
|
||||
|
||||
function ruleMatches(q: any, r: RowColorRule): boolean {
|
||||
const cs = chansOf(r);
|
||||
switch (r.id) {
|
||||
case 'confirmed':
|
||||
return cs.some((c) => yes(q[FIELDS[c]?.rcvd]));
|
||||
case 'sent':
|
||||
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
|
||||
case 'to_send':
|
||||
return cs.some((c) => owed(q[FIELDS[c]?.sent]));
|
||||
case 'worked':
|
||||
// The catch-all: nothing sent, nothing asked for, nothing back.
|
||||
return !CHANNELS.some((c) => yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent]));
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Walks the rules IN ORDER — the order is the priority, and the settings panel
|
||||
// shows it numbered so it can be read rather than guessed.
|
||||
export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule | null {
|
||||
if (!q || !cfg?.rules) return null;
|
||||
for (const r of cfg.rules) {
|
||||
if (r.enabled && ruleMatches(q, r)) return r;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// The colour is never a fill by default.
|
||||
//
|
||||
// A log where nearly every contact has SOME QSL state ends up with every row
|
||||
// painted, and colour that is always present stops being information. The
|
||||
// default is a stripe down the left edge; a tint is offered at a chosen strength.
|
||||
export function rowStyleFor(q: any, cfg: RowColorSettings | null): Record<string, string> | undefined {
|
||||
if (!cfg?.enabled) return undefined;
|
||||
const rule = matchRowRule(q, cfg);
|
||||
if (!rule?.color) return undefined;
|
||||
|
||||
const style = cfg.style ?? 'bar';
|
||||
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
||||
const out: Record<string, string> = {};
|
||||
if (style === 'tint' || style === 'both') {
|
||||
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
||||
}
|
||||
if (style === 'bar' || style === 'both') {
|
||||
// inset shadow rather than a border: a border would shift the cells three
|
||||
// pixels on coloured rows only, and the columns would stop lining up.
|
||||
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
@@ -13,7 +13,17 @@
|
||||
|
||||
export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean };
|
||||
|
||||
// Both options are withdrawn from the filter panel for now. The machinery below
|
||||
// is deliberately kept whole — it is correct and hard-won — so putting the two
|
||||
// switches back is this one flag and the block they came from in App.tsx.
|
||||
//
|
||||
// The saved preferences are left untouched in localStorage rather than cleared:
|
||||
// an operator who had either turned on gets them back exactly as they were the
|
||||
// day the options return, instead of silently starting from off.
|
||||
export const SPOT_DISPLAY_OPTIONS_EXPOSED = false;
|
||||
|
||||
export function readSpotDisplayOptions(): SpotDisplayOptions {
|
||||
if (!SPOT_DISPLAY_OPTIONS_EXPOSED) return { muteWorked: false, slotHighlight: false };
|
||||
try {
|
||||
return {
|
||||
muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1',
|
||||
@@ -31,27 +41,9 @@ type Entry = {
|
||||
new_county?: boolean;
|
||||
new_pota?: boolean;
|
||||
new_pfx?: boolean;
|
||||
muted?: boolean;
|
||||
new_grid?: boolean;
|
||||
} | undefined;
|
||||
|
||||
// bringsNothingNew: the ENTITY is resolved and worked, and no other dimension
|
||||
// (county, park, prefix) is new. Same test the cluster list already used to dim
|
||||
// a row — muting reuses it rather than inventing a second notion of "done".
|
||||
//
|
||||
// Entity-level, NOT callsign-level: an operator can be on their 421st Bulgarian
|
||||
// and still have never worked that particular station. That spot is muted here
|
||||
// by design — it brings nothing to an award — and turning on the slot option is
|
||||
// what brings it back, which is why the promotion above runs first.
|
||||
//
|
||||
// Note what is NOT muted: a status of new-band / new-slot survives, because
|
||||
// having worked that callsign once on another band says nothing about the band
|
||||
// in front of you.
|
||||
function bringsNothingNew(s: Entry): boolean {
|
||||
if (!s || !s.status) return false; // unresolved — never hide, it would flicker
|
||||
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||
return !(s.new_pota || s.new_county || s.new_pfx);
|
||||
}
|
||||
|
||||
// applySpotDisplay rewrites a status entry per the options, so every consumer —
|
||||
// colour, badge, status text — follows from one decision instead of each panel
|
||||
// re-deriving it.
|
||||
@@ -59,27 +51,26 @@ export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions):
|
||||
if (!s) return s;
|
||||
let e = s;
|
||||
|
||||
// ORDER MATTERS, and it is the whole difference between the two options
|
||||
// composing and one cancelling the other.
|
||||
//
|
||||
// Slot promotion runs FIRST. A callsign not yet worked on this band and mode
|
||||
// is not "done", so it must never be swallowed by the mute below — yet the
|
||||
// mute test only looks at the entity, and an unworked callsign inside a worked
|
||||
// entity is precisely the spot the second option exists to surface. Promoting
|
||||
// first protects it for free: bringsNothingNew() returns false on new-slot.
|
||||
// Slot promotion runs first: a callsign not yet worked on this band and mode
|
||||
// is not done, whatever the entity says, so it earns a status before the mute
|
||||
// below can take its colour away.
|
||||
if (o.slotHighlight && e.worked_slot === false && (!e.status || e.status === 'worked')) {
|
||||
e = { ...e, status: 'new-call' } as NonNullable<T>;
|
||||
}
|
||||
|
||||
if (o.muteWorked && bringsNothingNew(e)) {
|
||||
// Strip everything that paints: the row keeps its data, loses its emphasis.
|
||||
//
|
||||
// muted says WHY the status went empty. An empty status already meant
|
||||
// "entity not resolved" in the band map, so without this flag every muted
|
||||
// spot claimed its entity was unknown — with the country printed right next
|
||||
// to it. Blanking is still what drives the colour, the badges and the
|
||||
// ranking; muted only lets the tooltip stay honest.
|
||||
return { ...e, status: '', worked_call: false, muted: true } as T;
|
||||
// Mute drops the blue already-worked-callsign mark, and NOTHING else.
|
||||
//
|
||||
// It used to blank the status as well, on the theory that a spot bringing no
|
||||
// novelty should stop painting entirely. That was wrong twice over. The status
|
||||
// is what the cluster list reads to DIM a row, so blanking it turned every
|
||||
// quiet grey row bright white — the option made the list louder, not quieter.
|
||||
// And an empty status means "entity not resolved" everywhere else, so muted
|
||||
// spots had to carry a flag saying they did not really mean that.
|
||||
//
|
||||
// Leaving the status alone costs nothing: a worked entity already renders with
|
||||
// no colour and gets dimmed, so removing the blue is the entire job.
|
||||
if (o.muteWorked) {
|
||||
e = { ...e, worked_call: false } as NonNullable<T>;
|
||||
}
|
||||
return e;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,10 @@
|
||||
// statuses, blue is "callsign worked", green is POTA
|
||||
// worked blue — matches the WKD-CALL badge the cluster list has always used
|
||||
// prefix yellow — unchanged
|
||||
export type SpotMarkerKey = 'new_pota' | 'new_county' | 'new_pfx' | 'worked_call';
|
||||
// grid magenta — the last hue in the categorical set that is not already
|
||||
// spoken for here and does not read as a status; a grid is
|
||||
// never urgent the way a new entity is
|
||||
export type SpotMarkerKey = 'new_pota' | 'new_county' | 'new_pfx' | 'worked_call' | 'new_grid';
|
||||
|
||||
export type SpotMarker = {
|
||||
key: SpotMarkerKey;
|
||||
@@ -28,6 +31,7 @@ export const SPOT_MARKERS: SpotMarker[] = [
|
||||
{ key: 'new_pota', colour: 'var(--success)', labelKey: 'clg2.newPota' },
|
||||
{ key: 'new_county', colour: 'var(--chart-5)', labelKey: 'clg2.newCounty' },
|
||||
{ key: 'new_pfx', colour: 'var(--caution)', labelKey: 'clg2.newPfx' },
|
||||
{ key: 'new_grid', colour: 'var(--chart-7)', labelKey: 'clg2.newGrid' },
|
||||
{ key: 'worked_call', colour: 'var(--info)', labelKey: 'clg2.wkdCall' },
|
||||
];
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.24.3';
|
||||
export const APP_VERSION = '0.24.9';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+27
@@ -14,6 +14,7 @@ import {bandopen} from '../models';
|
||||
import {cluster} from '../models';
|
||||
import {extsvc} from '../models';
|
||||
import {powergenius} from '../models';
|
||||
import {pskr} from '../models';
|
||||
import {spe} from '../models';
|
||||
import {solar} from '../models';
|
||||
import {tunergenius} from '../models';
|
||||
@@ -87,6 +88,8 @@ export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Reco
|
||||
|
||||
export function AwardsFolder():Promise<string>;
|
||||
|
||||
export function BackfillDistances():Promise<main.BackfillDistancesResult>;
|
||||
|
||||
export function BackfillUSCounties():Promise<main.BackfillUSCountiesResult>;
|
||||
|
||||
export function BandSlotQSOs(arg1:string,arg2:number,arg3:string,arg4:string):Promise<Array<qso.QSO>>;
|
||||
@@ -387,6 +390,8 @@ export function GetAwards():Promise<Array<award.Result>>;
|
||||
|
||||
export function GetBackupSettings():Promise<main.BackupSettings>;
|
||||
|
||||
export function GetBandOpenSettings():Promise<main.BandOpenSettings>;
|
||||
|
||||
export function GetBandOpenings():Promise<Array<bandopen.Opening>>;
|
||||
|
||||
export function GetCATSettings():Promise<main.CATSettings>;
|
||||
@@ -399,6 +404,8 @@ export function GetCatalogCodes():Promise<Array<string>>;
|
||||
|
||||
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
|
||||
|
||||
export function GetChaseNewGrids():Promise<boolean>;
|
||||
|
||||
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
||||
|
||||
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
||||
@@ -435,10 +442,14 @@ export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
||||
|
||||
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||
|
||||
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
||||
|
||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||
|
||||
export function GetListsSettings():Promise<main.ListsSettings>;
|
||||
|
||||
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
|
||||
|
||||
export function GetLiveStations():Promise<Array<main.LiveStation>>;
|
||||
|
||||
export function GetLoTWUsersStatus():Promise<main.LoTWUsersStatus>;
|
||||
@@ -465,6 +476,8 @@ export function GetPGXLStatus():Promise<powergenius.Status>;
|
||||
|
||||
export function GetPOTAToken():Promise<string>;
|
||||
|
||||
export function GetPSKReporterStatus():Promise<pskr.Status>;
|
||||
|
||||
export function GetPendingQSOs():Promise<Array<qso.QSO>>;
|
||||
|
||||
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
||||
@@ -479,6 +492,8 @@ export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
||||
|
||||
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
||||
|
||||
export function GetRowColors():Promise<main.RowColorSettings>;
|
||||
|
||||
export function GetSPEStatus():Promise<spe.Status>;
|
||||
|
||||
export function GetScpStatus():Promise<main.ScpStatus>;
|
||||
@@ -675,10 +690,14 @@ export function LookupCallsign(arg1:string):Promise<lookup.Result>;
|
||||
|
||||
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
|
||||
|
||||
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
||||
|
||||
export function MotorReadElements():Promise<Array<number>>;
|
||||
|
||||
export function MotorSetElement(arg1:number,arg2:number):Promise<void>;
|
||||
|
||||
export function MotorTuneKHz(arg1:number):Promise<void>;
|
||||
|
||||
export function MoveDatabase(arg1:string):Promise<void>;
|
||||
|
||||
export function NetActivate(arg1:string):Promise<qso.QSO>;
|
||||
@@ -873,6 +892,8 @@ export function SaveAwardReference(arg1:string,arg2:awardref.Ref):Promise<void>;
|
||||
|
||||
export function SaveBackupSettings(arg1:main.BackupSettings):Promise<void>;
|
||||
|
||||
export function SaveBandOpenSettings(arg1:main.BandOpenSettings):Promise<void>;
|
||||
|
||||
export function SaveCATSettings(arg1:main.CATSettings):Promise<void>;
|
||||
|
||||
export function SaveCabrilloFile():Promise<string>;
|
||||
@@ -909,6 +930,8 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
||||
|
||||
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
||||
|
||||
export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
||||
|
||||
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
||||
|
||||
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
||||
@@ -955,6 +978,8 @@ export function SetCIVTrace(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
||||
|
||||
export function SetChaseNewGrids(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
||||
@@ -967,6 +992,8 @@ export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||
|
||||
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
||||
|
||||
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
||||
|
||||
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
||||
|
||||
export function SetPassphrase(arg1:string):Promise<void>;
|
||||
|
||||
@@ -118,6 +118,10 @@ export function AwardsFolder() {
|
||||
return window['go']['main']['App']['AwardsFolder']();
|
||||
}
|
||||
|
||||
export function BackfillDistances() {
|
||||
return window['go']['main']['App']['BackfillDistances']();
|
||||
}
|
||||
|
||||
export function BackfillUSCounties() {
|
||||
return window['go']['main']['App']['BackfillUSCounties']();
|
||||
}
|
||||
@@ -718,6 +722,10 @@ export function GetBackupSettings() {
|
||||
return window['go']['main']['App']['GetBackupSettings']();
|
||||
}
|
||||
|
||||
export function GetBandOpenSettings() {
|
||||
return window['go']['main']['App']['GetBandOpenSettings']();
|
||||
}
|
||||
|
||||
export function GetBandOpenings() {
|
||||
return window['go']['main']['App']['GetBandOpenings']();
|
||||
}
|
||||
@@ -742,6 +750,10 @@ export function GetChangelog() {
|
||||
return window['go']['main']['App']['GetChangelog']();
|
||||
}
|
||||
|
||||
export function GetChaseNewGrids() {
|
||||
return window['go']['main']['App']['GetChaseNewGrids']();
|
||||
}
|
||||
|
||||
export function GetChatHistory(arg1) {
|
||||
return window['go']['main']['App']['GetChatHistory'](arg1);
|
||||
}
|
||||
@@ -814,6 +826,10 @@ export function GetFlexState() {
|
||||
return window['go']['main']['App']['GetFlexState']();
|
||||
}
|
||||
|
||||
export function GetGridCacheStatus() {
|
||||
return window['go']['main']['App']['GetGridCacheStatus']();
|
||||
}
|
||||
|
||||
export function GetIcomState() {
|
||||
return window['go']['main']['App']['GetIcomState']();
|
||||
}
|
||||
@@ -822,6 +838,10 @@ export function GetListsSettings() {
|
||||
return window['go']['main']['App']['GetListsSettings']();
|
||||
}
|
||||
|
||||
export function GetLiveOpenings() {
|
||||
return window['go']['main']['App']['GetLiveOpenings']();
|
||||
}
|
||||
|
||||
export function GetLiveStations() {
|
||||
return window['go']['main']['App']['GetLiveStations']();
|
||||
}
|
||||
@@ -874,6 +894,10 @@ export function GetPOTAToken() {
|
||||
return window['go']['main']['App']['GetPOTAToken']();
|
||||
}
|
||||
|
||||
export function GetPSKReporterStatus() {
|
||||
return window['go']['main']['App']['GetPSKReporterStatus']();
|
||||
}
|
||||
|
||||
export function GetPendingQSOs() {
|
||||
return window['go']['main']['App']['GetPendingQSOs']();
|
||||
}
|
||||
@@ -902,6 +926,10 @@ export function GetRotators() {
|
||||
return window['go']['main']['App']['GetRotators']();
|
||||
}
|
||||
|
||||
export function GetRowColors() {
|
||||
return window['go']['main']['App']['GetRowColors']();
|
||||
}
|
||||
|
||||
export function GetSPEStatus() {
|
||||
return window['go']['main']['App']['GetSPEStatus']();
|
||||
}
|
||||
@@ -1294,6 +1322,10 @@ export function LookupCallsignFresh(arg1) {
|
||||
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
|
||||
}
|
||||
|
||||
export function MotorNudgeKHz(arg1) {
|
||||
return window['go']['main']['App']['MotorNudgeKHz'](arg1);
|
||||
}
|
||||
|
||||
export function MotorReadElements() {
|
||||
return window['go']['main']['App']['MotorReadElements']();
|
||||
}
|
||||
@@ -1302,6 +1334,10 @@ export function MotorSetElement(arg1, arg2) {
|
||||
return window['go']['main']['App']['MotorSetElement'](arg1, arg2);
|
||||
}
|
||||
|
||||
export function MotorTuneKHz(arg1) {
|
||||
return window['go']['main']['App']['MotorTuneKHz'](arg1);
|
||||
}
|
||||
|
||||
export function MoveDatabase(arg1) {
|
||||
return window['go']['main']['App']['MoveDatabase'](arg1);
|
||||
}
|
||||
@@ -1690,6 +1726,10 @@ export function SaveBackupSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveBackupSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveBandOpenSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveBandOpenSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveCATSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveCATSettings'](arg1);
|
||||
}
|
||||
@@ -1762,6 +1802,10 @@ export function SaveRotators(arg1) {
|
||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||
}
|
||||
|
||||
export function SaveRowColors(arg1) {
|
||||
return window['go']['main']['App']['SaveRowColors'](arg1);
|
||||
}
|
||||
|
||||
export function SaveSelfSpotSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
||||
}
|
||||
@@ -1854,6 +1898,10 @@ export function SetCWDecoderPitch(arg1) {
|
||||
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
||||
}
|
||||
|
||||
export function SetChaseNewGrids(arg1) {
|
||||
return window['go']['main']['App']['SetChaseNewGrids'](arg1);
|
||||
}
|
||||
|
||||
export function SetClublogCtyEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
||||
}
|
||||
@@ -1878,6 +1926,10 @@ export function SetKenwoodKeySpeed(arg1) {
|
||||
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
||||
}
|
||||
|
||||
export function SetMotorFollow(arg1, arg2, arg3) {
|
||||
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2, arg3);
|
||||
}
|
||||
|
||||
export function SetOpsLogQSLReceived(arg1, arg2) {
|
||||
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
|
||||
}
|
||||
|
||||
@@ -685,6 +685,7 @@ export namespace bandopen {
|
||||
median_km: number;
|
||||
bearing_min: number;
|
||||
bearing_max: number;
|
||||
compass: string;
|
||||
in_season: boolean;
|
||||
// Go type: time
|
||||
at: any;
|
||||
@@ -701,6 +702,7 @@ export namespace bandopen {
|
||||
this.median_km = source["median_km"];
|
||||
this.bearing_min = source["bearing_min"];
|
||||
this.bearing_max = source["bearing_max"];
|
||||
this.compass = source["compass"];
|
||||
this.in_season = source["in_season"];
|
||||
this.at = this.convertValues(source["at"], null);
|
||||
this.examples = source["examples"];
|
||||
@@ -1439,6 +1441,8 @@ export namespace lookup {
|
||||
cont?: string;
|
||||
email?: string;
|
||||
qsl_via?: string;
|
||||
web?: string;
|
||||
zip?: string;
|
||||
image_url?: string;
|
||||
source: string;
|
||||
// Go type: time
|
||||
@@ -1466,6 +1470,8 @@ export namespace lookup {
|
||||
this.cont = source["cont"];
|
||||
this.email = source["email"];
|
||||
this.qsl_via = source["qsl_via"];
|
||||
this.web = source["web"];
|
||||
this.zip = source["zip"];
|
||||
this.image_url = source["image_url"];
|
||||
this.source = source["source"];
|
||||
this.fetched_at = this.convertValues(source["fetched_at"], null);
|
||||
@@ -1929,6 +1935,22 @@ export namespace main {
|
||||
this.to = source["to"];
|
||||
}
|
||||
}
|
||||
export class BackfillDistancesResult {
|
||||
scanned: number;
|
||||
filled: number;
|
||||
no_grid: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new BackfillDistancesResult(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.scanned = source["scanned"];
|
||||
this.filled = source["filled"];
|
||||
this.no_grid = source["no_grid"];
|
||||
}
|
||||
}
|
||||
export class BackfillUSCountiesResult {
|
||||
scanned: number;
|
||||
county: number;
|
||||
@@ -1971,6 +1993,22 @@ export namespace main {
|
||||
this.default_folder = source["default_folder"];
|
||||
}
|
||||
}
|
||||
export class BandOpenSettings {
|
||||
enabled: boolean;
|
||||
bands: string[];
|
||||
available: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new BandOpenSettings(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.bands = source["bands"];
|
||||
this.available = source["available"];
|
||||
}
|
||||
}
|
||||
export class CATSettings {
|
||||
enabled: boolean;
|
||||
backend: string;
|
||||
@@ -2385,6 +2423,22 @@ export namespace main {
|
||||
this.body = source["body"];
|
||||
}
|
||||
}
|
||||
export class GridCacheStatus {
|
||||
enabled: boolean;
|
||||
known: number;
|
||||
pending: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new GridCacheStatus(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.known = source["known"];
|
||||
this.pending = source["pending"];
|
||||
}
|
||||
}
|
||||
export class ModePreset {
|
||||
name: string;
|
||||
default_rst_sent?: string;
|
||||
@@ -2938,6 +2992,64 @@ export namespace main {
|
||||
this.motorized = source["motorized"];
|
||||
}
|
||||
}
|
||||
export class RowColorRule {
|
||||
id: string;
|
||||
color: string;
|
||||
enabled: boolean;
|
||||
channels: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new RowColorRule(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.color = source["color"];
|
||||
this.enabled = source["enabled"];
|
||||
this.channels = source["channels"];
|
||||
}
|
||||
}
|
||||
export class RowColorSettings {
|
||||
enabled: boolean;
|
||||
style: string;
|
||||
intensity: number;
|
||||
bandmap_lotw: boolean;
|
||||
configured: boolean;
|
||||
rules: RowColorRule[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new RowColorSettings(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.enabled = source["enabled"];
|
||||
this.style = source["style"];
|
||||
this.intensity = source["intensity"];
|
||||
this.bandmap_lotw = source["bandmap_lotw"];
|
||||
this.configured = source["configured"];
|
||||
this.rules = this.convertValues(source["rules"], RowColorRule);
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
export class ScpStatus {
|
||||
enabled: boolean;
|
||||
count: number;
|
||||
@@ -2987,6 +3099,7 @@ export namespace main {
|
||||
band: string;
|
||||
mode: string;
|
||||
pota_ref?: string;
|
||||
spotter?: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new SpotQuery(source);
|
||||
@@ -2998,6 +3111,7 @@ export namespace main {
|
||||
this.band = source["band"];
|
||||
this.mode = source["mode"];
|
||||
this.pota_ref = source["pota_ref"];
|
||||
this.spotter = source["spotter"];
|
||||
}
|
||||
}
|
||||
export class SpotStatus {
|
||||
@@ -3012,6 +3126,10 @@ export namespace main {
|
||||
county?: string;
|
||||
state?: string;
|
||||
new_pota: boolean;
|
||||
grid?: string;
|
||||
new_grid: boolean;
|
||||
spotter_continent?: string;
|
||||
lotw: boolean;
|
||||
new_pfx: boolean;
|
||||
pfx?: string;
|
||||
worked_slot: boolean;
|
||||
@@ -3033,6 +3151,10 @@ export namespace main {
|
||||
this.county = source["county"];
|
||||
this.state = source["state"];
|
||||
this.new_pota = source["new_pota"];
|
||||
this.grid = source["grid"];
|
||||
this.new_grid = source["new_grid"];
|
||||
this.spotter_continent = source["spotter_continent"];
|
||||
this.lotw = source["lotw"];
|
||||
this.new_pfx = source["new_pfx"];
|
||||
this.pfx = source["pfx"];
|
||||
this.worked_slot = source["worked_slot"];
|
||||
@@ -3166,6 +3288,7 @@ export namespace main {
|
||||
my_country: string;
|
||||
my_sota_ref: string;
|
||||
my_pota_ref: string;
|
||||
my_iota: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new StationSettings(source);
|
||||
@@ -3179,6 +3302,7 @@ export namespace main {
|
||||
this.my_country = source["my_country"];
|
||||
this.my_sota_ref = source["my_sota_ref"];
|
||||
this.my_pota_ref = source["my_pota_ref"];
|
||||
this.my_iota = source["my_iota"];
|
||||
}
|
||||
}
|
||||
export class StationTestResult {
|
||||
@@ -3237,8 +3361,10 @@ export namespace main {
|
||||
baud: number;
|
||||
follow: boolean;
|
||||
step_khz: number;
|
||||
track_mode: string;
|
||||
tx_inhibit: boolean;
|
||||
bands: string[];
|
||||
band_freqs: Record<string, number>;
|
||||
freq_min_mhz: number;
|
||||
freq_max_mhz: number;
|
||||
|
||||
@@ -3257,8 +3383,10 @@ export namespace main {
|
||||
this.baud = source["baud"];
|
||||
this.follow = source["follow"];
|
||||
this.step_khz = source["step_khz"];
|
||||
this.track_mode = source["track_mode"];
|
||||
this.tx_inhibit = source["tx_inhibit"];
|
||||
this.bands = source["bands"];
|
||||
this.band_freqs = source["band_freqs"];
|
||||
this.freq_min_mhz = source["freq_min_mhz"];
|
||||
this.freq_max_mhz = source["freq_max_mhz"];
|
||||
}
|
||||
@@ -3272,6 +3400,11 @@ export namespace main {
|
||||
band: number;
|
||||
moving: boolean;
|
||||
elements: number[];
|
||||
follow: boolean;
|
||||
step_khz: number;
|
||||
track_mode: string;
|
||||
bands: string[];
|
||||
band_freqs: Record<string, number>;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new UltrabeamStatusInfo(source);
|
||||
@@ -3287,6 +3420,11 @@ export namespace main {
|
||||
this.band = source["band"];
|
||||
this.moving = source["moving"];
|
||||
this.elements = source["elements"];
|
||||
this.follow = source["follow"];
|
||||
this.step_khz = source["step_khz"];
|
||||
this.track_mode = source["track_mode"];
|
||||
this.bands = source["bands"];
|
||||
this.band_freqs = source["band_freqs"];
|
||||
}
|
||||
}
|
||||
export class UpdateInfo {
|
||||
@@ -3703,6 +3841,7 @@ export namespace profile {
|
||||
my_city: string;
|
||||
my_postal_code: string;
|
||||
my_sota_ref: string;
|
||||
my_iota: string;
|
||||
my_pota_ref: string;
|
||||
my_rig: string;
|
||||
my_antenna: string;
|
||||
@@ -3740,6 +3879,7 @@ export namespace profile {
|
||||
this.my_city = source["my_city"];
|
||||
this.my_postal_code = source["my_postal_code"];
|
||||
this.my_sota_ref = source["my_sota_ref"];
|
||||
this.my_iota = source["my_iota"];
|
||||
this.my_pota_ref = source["my_pota_ref"];
|
||||
this.my_rig = source["my_rig"];
|
||||
this.my_antenna = source["my_antenna"];
|
||||
@@ -3777,6 +3917,52 @@ export namespace profile {
|
||||
|
||||
}
|
||||
|
||||
export namespace pskr {
|
||||
|
||||
export class Status {
|
||||
running: boolean;
|
||||
received: number;
|
||||
// Go type: time
|
||||
last_at: any;
|
||||
last_err?: string;
|
||||
broker: string;
|
||||
bands: string[];
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new Status(source);
|
||||
}
|
||||
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.running = source["running"];
|
||||
this.received = source["received"];
|
||||
this.last_at = this.convertValues(source["last_at"], null);
|
||||
this.last_err = source["last_err"];
|
||||
this.broker = source["broker"];
|
||||
this.bands = source["bands"];
|
||||
}
|
||||
|
||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||
if (!a) {
|
||||
return a;
|
||||
}
|
||||
if (a.slice && a.map) {
|
||||
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||
} else if ("object" === typeof a) {
|
||||
if (asMap) {
|
||||
for (const key of Object.keys(a)) {
|
||||
a[key] = new classs(a[key]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
return new classs(a);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export namespace qslcard {
|
||||
|
||||
export class Bevel {
|
||||
@@ -4078,6 +4264,7 @@ export namespace qso {
|
||||
}
|
||||
export class QSO {
|
||||
id: number;
|
||||
number?: number;
|
||||
callsign: string;
|
||||
// Go type: time
|
||||
qso_date: any;
|
||||
@@ -4218,6 +4405,7 @@ export namespace qso {
|
||||
constructor(source: any = {}) {
|
||||
if ('string' === typeof source) source = JSON.parse(source);
|
||||
this.id = source["id"];
|
||||
this.number = source["number"];
|
||||
this.callsign = source["callsign"];
|
||||
this.qso_date = this.convertValues(source["qso_date"], null);
|
||||
this.qso_date_off = this.convertValues(source["qso_date_off"], null);
|
||||
|
||||
@@ -4,6 +4,7 @@ go 1.25.0
|
||||
|
||||
require (
|
||||
github.com/braheezy/shine-mp3 v0.1.0
|
||||
github.com/eclipse/paho.mqtt.golang v1.5.1
|
||||
github.com/go-ole/go-ole v1.3.0
|
||||
github.com/go-sql-driver/mysql v1.10.0
|
||||
github.com/gorilla/websocket v1.5.3
|
||||
@@ -12,7 +13,7 @@ require (
|
||||
github.com/wailsapp/wails/v2 v2.11.0
|
||||
github.com/wneessen/go-mail v0.7.3
|
||||
go.bug.st/serial v1.7.1
|
||||
golang.org/x/net v0.35.0
|
||||
golang.org/x/net v0.44.0
|
||||
golang.org/x/sys v0.45.0
|
||||
golang.org/x/text v0.37.0
|
||||
modernc.org/sqlite v1.50.1
|
||||
@@ -44,7 +45,8 @@ require (
|
||||
github.com/valyala/fasttemplate v1.2.2 // indirect
|
||||
github.com/wailsapp/go-webview2 v1.0.22 // indirect
|
||||
github.com/wailsapp/mimetype v1.4.1 // indirect
|
||||
golang.org/x/crypto v0.33.0 // indirect
|
||||
golang.org/x/crypto v0.42.0 // indirect
|
||||
golang.org/x/sync v0.20.0 // indirect
|
||||
modernc.org/libc v1.72.3 // indirect
|
||||
modernc.org/mathutil v1.7.1 // indirect
|
||||
modernc.org/memory v1.11.0 // indirect
|
||||
|
||||
@@ -8,6 +8,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||
github.com/eclipse/paho.mqtt.golang v1.5.1 h1:/VSOv3oDLlpqR2Epjn1Q7b2bSTplJIeV2ISgCl2W7nE=
|
||||
github.com/eclipse/paho.mqtt.golang v1.5.1/go.mod h1:1/yJCneuyOoCOzKSsOTUc0AJfpsItBGWvYpBLimhArU=
|
||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
||||
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
||||
@@ -84,13 +86,13 @@ github.com/wneessen/go-mail v0.7.3 h1:g3DravXC5SMlVdboFrQA8Jx95A8sOzoBeS5F+vzNRK
|
||||
github.com/wneessen/go-mail v0.7.3/go.mod h1:QGhBX0yNbc1J+Mkjcu7z2rpj4B4l+BmDY8gYznPC9sk=
|
||||
go.bug.st/serial v1.7.1 h1:5aP8wYL0UjEYOVs3oPAGscjaSfRQLHtCvBFXNN/rwtc=
|
||||
go.bug.st/serial v1.7.1/go.mod h1:d0MmS16Qt9b1m06yoYRNUXhRRTJV5Qg2S5EKqQtnayQ=
|
||||
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
|
||||
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
|
||||
golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
|
||||
golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
|
||||
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
|
||||
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
|
||||
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
|
||||
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
|
||||
golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I=
|
||||
golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
|
||||
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
|
||||
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
|
||||
+50
-5
@@ -449,6 +449,34 @@ type RefMeta struct {
|
||||
Pattern string
|
||||
re *regexp.Regexp
|
||||
Valid bool
|
||||
// Per-reference validity window, ISO "2006-01-02". A reference is not
|
||||
// forever: a park is delisted, a county is merged, a castle loses its
|
||||
// reference number. A QSO made while it existed still counts — it was a valid
|
||||
// contact on the day — and one made after it stopped existing does not.
|
||||
//
|
||||
// Empty means "no window of its own", and the award's own ValidFrom/ValidTo
|
||||
// then govern, as they already do for every QSO in the award (see inScope).
|
||||
// That fallback is deliberately NOT duplicated here: two places enforcing the
|
||||
// same dates is two places for them to disagree.
|
||||
ValidFrom string
|
||||
ValidTo string
|
||||
}
|
||||
|
||||
// activeOn reports whether the reference existed on the day of the QSO.
|
||||
//
|
||||
// Compared as ISO date strings rather than parsed times on purpose: the stored
|
||||
// values are "2025-08-01"-shaped and lexical order on that shape IS
|
||||
// chronological order, so this cannot fail on a malformed date the way a parse
|
||||
// can — a reference with a typo in its window keeps counting instead of silently
|
||||
// vanishing from an operator's totals.
|
||||
func (m RefMeta) activeOn(day string) bool {
|
||||
if m.ValidFrom != "" && day < m.ValidFrom {
|
||||
return false
|
||||
}
|
||||
if m.ValidTo != "" && day > m.ValidTo {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// NewRefList builds the engine's reference view from (code, meta) pairs.
|
||||
@@ -956,11 +984,13 @@ func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool)
|
||||
// describes is worse than no trace, because it is believed.
|
||||
func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool, ex *Explanation) []string {
|
||||
predefined := hasList && !d.Dynamic
|
||||
// The day of the contact, for per-reference validity windows.
|
||||
day := q.QSODate.Format("2006-01-02")
|
||||
|
||||
// run executes one rule and, when tracing, records it.
|
||||
run := func(label, field, matchBy, pattern string, rex *regexp.Regexp, exact bool, leading, trailing, prefix string) []string {
|
||||
raw := searchOne(field, matchBy, rex, exact, leading, trailing, prefix, q, rl, predefined)
|
||||
kept := keepRefs(predefined, rl, raw)
|
||||
kept := keepRefs(predefined, rl, raw, day)
|
||||
if ex != nil {
|
||||
s := Step{Rule: label, Field: field, MatchBy: matchBy, Exact: exact, Pattern: pattern,
|
||||
FieldValue: strings.TrimSpace(stripAffix(fieldRaw(field, q), leading, trailing)),
|
||||
@@ -974,7 +1004,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
||||
if _, ok := keptSet[n]; ok {
|
||||
continue
|
||||
}
|
||||
s.Rejected = append(s.Rejected, rejection(predefined, rl, n))
|
||||
s.Rejected = append(s.Rejected, rejection(predefined, rl, n, day))
|
||||
}
|
||||
ex.Steps = append(ex.Steps, s)
|
||||
}
|
||||
@@ -1026,7 +1056,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
||||
// hand. Applied HERE (not just in MatchQSO) so Compute — which powers the
|
||||
// awards panel and the per-QSO refs editor — honours overrides too. For a
|
||||
// predefined award the ref is still validated against the list below.
|
||||
manual := keepRefs(predefined, rl, manualRefs(q, d.Code))
|
||||
manual := keepRefs(predefined, rl, manualRefs(q, d.Code), day)
|
||||
if ex != nil {
|
||||
ex.Manual = manual
|
||||
}
|
||||
@@ -1065,7 +1095,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
|
||||
// become a reference. "Nothing matched" is the least useful thing a matcher can
|
||||
// say; every one of this week's award bugs was a rejection with a plain reason
|
||||
// that nothing was printing.
|
||||
func rejection(predefined bool, rl refList, code string) Rejected {
|
||||
func rejection(predefined bool, rl refList, code, day string) Rejected {
|
||||
switch {
|
||||
case code == "":
|
||||
return Rejected{Candidate: code, Reason: "empty"}
|
||||
@@ -1076,6 +1106,17 @@ func rejection(predefined bool, rl refList, code string) Rejected {
|
||||
if !ok {
|
||||
return Rejected{Candidate: code, Reason: "not in the award's reference list"}
|
||||
}
|
||||
// Spell the dates out. "Did not count" on a contact the operator remembers
|
||||
// making is exactly the moment they need to be told it is the REFERENCE that
|
||||
// has a window, not their log that is wrong.
|
||||
if !m.activeOn(day) {
|
||||
switch {
|
||||
case m.ValidTo != "" && day > m.ValidTo:
|
||||
return Rejected{Candidate: code, Reason: fmt.Sprintf("the reference ceased to exist on %s, after this QSO of %s", m.ValidTo, day)}
|
||||
default:
|
||||
return Rejected{Candidate: code, Reason: fmt.Sprintf("the reference did not exist until %s, after this QSO of %s", m.ValidFrom, day)}
|
||||
}
|
||||
}
|
||||
if !m.Valid {
|
||||
return Rejected{Candidate: code, Reason: "listed but disabled"}
|
||||
}
|
||||
@@ -1088,7 +1129,7 @@ func rejection(predefined bool, rl refList, code string) Rejected {
|
||||
// so we do NOT additionally require the QSO's entity to match the reference's own
|
||||
// DXCC — that wrongly excluded e.g. WAS Alaska (state AK is DXCC entity 6, not
|
||||
// 291). Per-reference DXCC stays metadata for the picker.
|
||||
func keepRefs(predefined bool, rl refList, found []string) []string {
|
||||
func keepRefs(predefined bool, rl refList, found []string, day string) []string {
|
||||
if !predefined {
|
||||
out := make([]string, 0, len(found))
|
||||
for _, c := range found {
|
||||
@@ -1106,6 +1147,10 @@ func keepRefs(predefined bool, rl refList, found []string) []string {
|
||||
if !ok || !m.Valid {
|
||||
continue
|
||||
}
|
||||
// The reference has to have existed on the day of the contact.
|
||||
if !m.activeOn(day) {
|
||||
continue
|
||||
}
|
||||
if _, dup := seen[c]; dup {
|
||||
continue
|
||||
}
|
||||
|
||||
+1018
-1017
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,109 @@
|
||||
package award
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
func day(s string) time.Time {
|
||||
t, err := time.Parse("2006-01-02", s)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
// A reference is not forever. A park is delisted, a district is merged, a castle
|
||||
// loses its number. A contact made while it existed still counts — it was a
|
||||
// valid contact on the day — and one made after it stopped existing does not.
|
||||
func TestRefValidityWindow(t *testing.T) {
|
||||
m := RefMeta{Code: "KL-01", Valid: true, ValidTo: "2025-08-31"}
|
||||
for _, tc := range []struct {
|
||||
day string
|
||||
want bool
|
||||
}{
|
||||
{"2019-01-01", true},
|
||||
{"2025-08-31", true}, // the last day it existed still counts
|
||||
{"2025-09-01", false},
|
||||
{"2026-08-12", false},
|
||||
} {
|
||||
if got := m.activeOn(tc.day); got != tc.want {
|
||||
t.Errorf("KL-01 on %s: active=%v, want %v", tc.day, got, tc.want)
|
||||
}
|
||||
}
|
||||
|
||||
// A reference that only came into being partway through.
|
||||
n := RefMeta{Code: "KL-99", Valid: true, ValidFrom: "2025-01-15"}
|
||||
if n.activeOn("2025-01-14") {
|
||||
t.Error("counted a QSO from before the reference existed")
|
||||
}
|
||||
if !n.activeOn("2025-01-15") {
|
||||
t.Error("the first day it existed must count")
|
||||
}
|
||||
|
||||
// No window of its own: the award's own dates govern, as they already do for
|
||||
// every QSO in the award. Nothing here may narrow that.
|
||||
if !(RefMeta{Code: "X", Valid: true}).activeOn("1970-01-01") {
|
||||
t.Error("a reference with no window must count on any date")
|
||||
}
|
||||
}
|
||||
|
||||
// The whole point: the same QSO counts before the cutoff and does not after.
|
||||
func TestExpiredRefStopsCountingForLaterQSOs(t *testing.T) {
|
||||
d := &Def{
|
||||
Code: "RDA", Name: "Russian District Award", Valid: true,
|
||||
Type: TypeQSOFields, Field: "note", MatchBy: "code",
|
||||
Confirm: []string{"lotw"},
|
||||
}
|
||||
metas := []RefMeta{
|
||||
{Code: "KL-01", Name: "Petrozavodsk", Valid: true, ValidTo: "2025-08-31"},
|
||||
{Code: "KL-04", Name: "Kostomuksha", Valid: true},
|
||||
}
|
||||
|
||||
q := func(ref, on string) *qso.QSO {
|
||||
return &qso.QSO{Callsign: "RA1ABC", Band: "20m", Notes: ref, QSODate: day(on)}
|
||||
}
|
||||
|
||||
if got := MatchQSO(*d, metas, q("KL-01", "2025-06-01")); len(got) != 1 || got[0] != "KL-01" {
|
||||
t.Errorf("a QSO made while KL-01 existed must count: got %v", got)
|
||||
}
|
||||
if got := MatchQSO(*d, metas, q("KL-01", "2025-09-15")); len(got) != 0 {
|
||||
t.Errorf("a QSO made after KL-01 ceased to exist must not count: got %v", got)
|
||||
}
|
||||
if got := MatchQSO(*d, metas, q("KL-04", "2025-09-15")); len(got) != 1 || got[0] != "KL-04" {
|
||||
t.Errorf("a reference with no window is unaffected: got %v", got)
|
||||
}
|
||||
}
|
||||
|
||||
// The claim that an empty per-reference window "inherits the award's" has to be
|
||||
// a fact about the code, not a comment. Compute and MatchQSO both gate on
|
||||
// inScope, which enforces the award's own dates — so a reference with no window
|
||||
// of its own is already bounded by them, and duplicating the check per reference
|
||||
// would only create a second place for the same dates to disagree.
|
||||
func TestEmptyRefWindowInheritsTheAward(t *testing.T) {
|
||||
d := Def{
|
||||
Code: "RDA", Name: "Russian District Award", Valid: true,
|
||||
Type: TypeQSOFields, Field: "note", MatchBy: "code",
|
||||
Confirm: []string{"lotw"},
|
||||
ValidFrom: "1991-06-12", // the award itself starts here
|
||||
}
|
||||
metas := []RefMeta{{Code: "KL-04", Name: "Kostomuksha", Valid: true}} // no window of its own
|
||||
|
||||
q := func(on string) *qso.QSO {
|
||||
return &qso.QSO{Callsign: "RA1ABC", Band: "20m", Notes: "KL-04", QSODate: day(on)}
|
||||
}
|
||||
if got := MatchQSO(d, metas, q("1991-06-11")); len(got) != 0 {
|
||||
t.Errorf("a QSO before the AWARD's start counted for a reference with no window of its own: %v", got)
|
||||
}
|
||||
if got := MatchQSO(d, metas, q("1991-06-12")); len(got) != 1 {
|
||||
t.Errorf("a QSO on the award's first day must count: %v", got)
|
||||
}
|
||||
|
||||
// And a reference window NARROWER than the award's still applies on top.
|
||||
metas[0].ValidTo = "2025-08-31"
|
||||
if got := MatchQSO(d, metas, q("2025-09-01")); len(got) != 0 {
|
||||
t.Errorf("the reference's own end date was ignored: %v", got)
|
||||
}
|
||||
}
|
||||
+155
-25
@@ -36,46 +36,88 @@ type Spot struct {
|
||||
type Config struct {
|
||||
Window time.Duration // how far back a burst may span
|
||||
MinCalls int // distinct DX calls before it counts as an opening
|
||||
MinKm, MaxKm int // single-hop Es range
|
||||
MinKm, MaxKm int // path length accepted; MaxKm 0 = no ceiling
|
||||
BearingSpread int // widest arc (degrees) the spots may cover
|
||||
Requiet time.Duration // silence after announcing a band, so it is announced once
|
||||
}
|
||||
|
||||
// DefaultConfig is the single-hop Es envelope.
|
||||
// DefaultConfig is the Es envelope.
|
||||
//
|
||||
// 500–2400 km: below ~500 km a 6 m contact is ordinary tropo or ground wave and
|
||||
// says nothing about the ionosphere; beyond ~2400 km it is no longer one hop, so
|
||||
// the bearing test stops meaning anything. 90° of spread because a genuine Es
|
||||
// cloud illuminates a sector, not the whole horizon — the constraint that
|
||||
// separates an opening from a merely busy evening.
|
||||
// Below ~500 km a 6 m contact is ordinary tropo or ground wave and says nothing
|
||||
// about the ionosphere, so that floor stays.
|
||||
//
|
||||
// There is NO ceiling. There used to be one at 2400 km, on the reasoning that
|
||||
// past a single hop the bearing test stops meaning anything. That was wrong, and
|
||||
// it silently threw away exactly the openings worth hearing about: multi-hop Es
|
||||
// is ordinary on 6 m, 5000 km paths are common and 10000 km happens. Those are
|
||||
// still directional — a double hop leaves the same sector it entered — so the
|
||||
// bearing test holds perfectly well, and it is the test doing the real work here.
|
||||
//
|
||||
// 90° of spread because a genuine Es cloud illuminates a sector, not the whole
|
||||
// horizon: the constraint that separates an opening from a merely busy evening.
|
||||
func DefaultConfig() Config {
|
||||
return Config{
|
||||
Window: 12 * time.Minute,
|
||||
MinCalls: 4,
|
||||
MinKm: 500,
|
||||
MaxKm: 2400,
|
||||
MaxKm: 0, // no ceiling — see above
|
||||
BearingSpread: 90,
|
||||
Requiet: 45 * time.Minute,
|
||||
}
|
||||
}
|
||||
|
||||
// Bands watched. HF is deliberately absent: an "opening" on 20 m is the normal
|
||||
// state of the band and announcing it would be noise.
|
||||
var watched = map[string]bool{"6m": true, "4m": true, "2m": true}
|
||||
// Bands watched.
|
||||
//
|
||||
// 10 m is in, and it is HF. The line is not "HF versus VHF" but "is an opening
|
||||
// here an event": 20 m being open is the normal state of the band and saying so
|
||||
// is noise, while 10 m spends most of a solar cycle shut and opens sharply when
|
||||
// it goes — which is what an operator wants interrupting them for.
|
||||
//
|
||||
// 12 m was tried and dropped. It behaves too much like 20 m at this point in the
|
||||
// cycle: open often enough that announcing it is a notification rather than
|
||||
// news, and every band that cries wolf costs the ones that do not.
|
||||
var watched = map[string]bool{"10m": true, "6m": true, "4m": true, "2m": true}
|
||||
|
||||
// Watched reports whether a band is one the detector looks at.
|
||||
func Watched(band string) bool { return watched[strings.ToLower(strings.TrimSpace(band))] }
|
||||
|
||||
// maxTerrestrialKm is the longest path a band can carry through the atmosphere.
|
||||
// Zero means no limit.
|
||||
//
|
||||
// The flat 2400 km ceiling was removed because it threw away real multi-hop Es
|
||||
// on 6 m, and that was right — but "no limit anywhere" then let something else
|
||||
// through. A 2 m opening was announced at 9650 km towards Japan, on stations
|
||||
// that were unmistakably working EME: the moon is not an opening, and pointing
|
||||
// an antenna at that bearing would find nothing.
|
||||
//
|
||||
// So the limit is per band, and it is physics rather than a threshold. Two
|
||||
// metres reaches a few thousand kilometres by tropospheric duct or a chain of Es
|
||||
// clouds and no further; beyond that the path went via the moon or a satellite,
|
||||
// neither of which says anything about the band. Six and ten metres have no
|
||||
// ceiling at all — multi-hop Es and F2 genuinely go round the world.
|
||||
var maxTerrestrialKm = map[string]int{
|
||||
"2m": 3500,
|
||||
"4m": 4000,
|
||||
}
|
||||
|
||||
// MaxKmFor returns the plausibility ceiling for a band, 0 for none.
|
||||
func MaxKmFor(band string) int { return maxTerrestrialKm[strings.ToLower(strings.TrimSpace(band))] }
|
||||
|
||||
// Opening is a detected opening, ready to be announced.
|
||||
type Opening struct {
|
||||
Band string `json:"band"`
|
||||
Calls int `json:"calls"` // distinct DX stations seen
|
||||
MedianKm int `json:"median_km"` // typical hop length
|
||||
BearingMin int `json:"bearing_min"` // sector, degrees
|
||||
BearingMax int `json:"bearing_max"`
|
||||
InSeason bool `json:"in_season"` // false = unusual for the time of year
|
||||
At time.Time `json:"at"`
|
||||
Examples []string `json:"examples"` // a few callsigns, for the announcement
|
||||
Band string `json:"band"`
|
||||
Calls int `json:"calls"` // distinct DX stations seen
|
||||
MedianKm int `json:"median_km"` // typical hop length
|
||||
BearingMin int `json:"bearing_min"` // sector, degrees
|
||||
BearingMax int `json:"bearing_max"`
|
||||
// Compass is the sector as a point of the compass ("NE"), computed here so
|
||||
// the UI never has to redo the wrap-round-north arithmetic that Sector()
|
||||
// already gets right — two answers to that question is how a badge ends up
|
||||
// naming the opposite direction.
|
||||
Compass string `json:"compass"`
|
||||
InSeason bool `json:"in_season"` // false = unusual for the time of year
|
||||
At time.Time `json:"at"`
|
||||
Examples []string `json:"examples"` // a few callsigns, for the announcement
|
||||
}
|
||||
|
||||
// Detector keeps the rolling window and the per-band quiet period.
|
||||
@@ -107,7 +149,13 @@ func (d *Detector) Add(s Spot, lat float64) *Opening {
|
||||
}
|
||||
// Out-of-range spots are dropped rather than stored: they can never be part
|
||||
// of a single-hop detection, and keeping them only grows the window.
|
||||
if s.DistKm < d.cfg.MinKm || s.DistKm > d.cfg.MaxKm {
|
||||
if s.DistKm < d.cfg.MinKm || (d.cfg.MaxKm > 0 && s.DistKm > d.cfg.MaxKm) {
|
||||
return nil
|
||||
}
|
||||
// Past what the atmosphere can carry on this band, the path went via the moon
|
||||
// or a satellite. Those are real contacts and real reports; they are simply
|
||||
// not evidence about the band.
|
||||
if m := MaxKmFor(band); m > 0 && s.DistKm > m {
|
||||
return nil
|
||||
}
|
||||
d.recent = append(d.recent, s)
|
||||
@@ -169,23 +217,90 @@ func evaluate(band string, spots []Spot, cfg Config) *Opening {
|
||||
dists = append(dists, s.DistKm)
|
||||
calls = append(calls, c)
|
||||
}
|
||||
lo, hi, spread := arc(bearings)
|
||||
if spread > cfg.BearingSpread {
|
||||
return nil // spots all round the compass — a busy band, not an opening
|
||||
// The DENSEST sector, not the sector covering everything.
|
||||
//
|
||||
// This used to demand that EVERY station fit inside one 90° arc, which is the
|
||||
// right shape for a sporadic-E cloud and hopeless for anything else. With 10
|
||||
// and 12 m open on F2 the reports come from all round the compass, the arc is
|
||||
// 360°, and the test can never pass — so the busier the band, the less likely
|
||||
// an opening was announced. Backwards.
|
||||
//
|
||||
// Finding the busiest 90° instead keeps the Es signature intact — a cloud
|
||||
// still makes one direction dense — and lets an F2 opening toward South
|
||||
// America be seen through the handful of Europeans that are always there.
|
||||
lo, hi, n := densestSector(bearings, cfg.BearingSpread)
|
||||
if n < cfg.MinCalls {
|
||||
return nil // nothing concentrated anywhere: a busy band, not an opening
|
||||
}
|
||||
sort.Ints(dists)
|
||||
sort.Strings(calls)
|
||||
if len(calls) > 5 {
|
||||
calls = calls[:5]
|
||||
}
|
||||
return &Opening{
|
||||
op := &Opening{
|
||||
Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2],
|
||||
BearingMin: lo, BearingMax: hi, Examples: calls,
|
||||
}
|
||||
op.Compass = compass(midBearing(lo, hi))
|
||||
return op
|
||||
}
|
||||
|
||||
// arc returns the smallest compass sector containing every bearing, coping with
|
||||
// the wrap at north: 350° and 10° are 20° apart, not 340°.
|
||||
// densestSector returns the width-degree arc containing the most bearings, as
|
||||
// its start, end and count.
|
||||
//
|
||||
// Brute force over each bearing as a starting edge. n is at most a few hundred
|
||||
// distinct callsigns in a twelve-minute window, so n² is nothing, and it runs
|
||||
// once per accepted spot rather than once per decode.
|
||||
//
|
||||
// The arc STARTS on a real bearing rather than sweeping every degree: the
|
||||
// densest window can always be slid until its leading edge sits on a station, so
|
||||
// nothing is missed and there are 360 fewer positions to try.
|
||||
func densestSector(b []int, width int) (lo, hi, count int) {
|
||||
if len(b) == 0 {
|
||||
return 0, 0, 0
|
||||
}
|
||||
s := append([]int(nil), b...)
|
||||
sort.Ints(s)
|
||||
best, bestAt := 0, 0
|
||||
for i, start := range s {
|
||||
n := 0
|
||||
for _, x := range s {
|
||||
// Distance clockwise from start to x, so the wrap through 0° needs no
|
||||
// special case — which is where the old arc() logic earned its keep and
|
||||
// this one has to match it.
|
||||
d := x - start
|
||||
if d < 0 {
|
||||
d += 360
|
||||
}
|
||||
if d <= width {
|
||||
n++
|
||||
}
|
||||
}
|
||||
if n > best {
|
||||
best, bestAt = n, i
|
||||
}
|
||||
}
|
||||
lo = s[bestAt]
|
||||
// The end is the furthest station actually inside the window, not lo+width:
|
||||
// reporting an empty 90° when every station sits in the first 20° would
|
||||
// overstate the opening's width by four times.
|
||||
hi = lo
|
||||
for _, x := range s {
|
||||
d := x - lo
|
||||
if d < 0 {
|
||||
d += 360
|
||||
}
|
||||
if d <= width {
|
||||
if e := (lo + d) % 360; d >= ((hi-lo)+360)%360 {
|
||||
hi = e
|
||||
}
|
||||
}
|
||||
}
|
||||
return lo, hi, best
|
||||
}
|
||||
|
||||
func arc(b []int) (lo, hi, spread int) {
|
||||
if len(b) == 0 {
|
||||
return 0, 0, 0
|
||||
@@ -239,10 +354,25 @@ func InSeason(band string, t time.Time, lat float64) bool {
|
||||
|
||||
// Sector renders the bearing range for a human, e.g. "NE (35–75°)".
|
||||
func (o *Opening) Sector() string {
|
||||
return compass(float64(o.BearingMin+o.BearingMax)/2) +
|
||||
return compass(midBearing(o.BearingMin, o.BearingMax)) +
|
||||
" (" + strconv.Itoa(o.BearingMin) + "–" + strconv.Itoa(o.BearingMax) + "°)"
|
||||
}
|
||||
|
||||
// midBearing is the middle of the arc running CLOCKWISE from min to max.
|
||||
//
|
||||
// Not the arithmetic mean, which is wrong for every sector crossing north and
|
||||
// wrong by the worst possible amount: an opening reported as 353–61° averaged to
|
||||
// 207° and was announced as SW when it was NE — the exact opposite direction, to
|
||||
// an operator who might turn a beam on it. The detector itself has handled the
|
||||
// 0/360 wrap since it was written; only this label did not.
|
||||
func midBearing(min, max int) float64 {
|
||||
span := max - min
|
||||
if span < 0 {
|
||||
span += 360
|
||||
}
|
||||
return math.Mod(float64(min)+float64(span)/2, 360)
|
||||
}
|
||||
|
||||
func compass(deg float64) string {
|
||||
names := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"}
|
||||
i := int(math.Round(deg/45)) % 8
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package bandopen
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -182,3 +183,128 @@ func TestBearingArcWrapsAtNorth(t *testing.T) {
|
||||
t.Errorf("bearings on all four quadrants should span nearly the circle, got %d", s)
|
||||
}
|
||||
}
|
||||
|
||||
// Multi-hop must be detected, not thrown away.
|
||||
//
|
||||
// The detector used to cap paths at 2400 km, on the reasoning that past one hop
|
||||
// the bearing test stops meaning anything. Nexus flagged a 6 m opening at
|
||||
// 5477 km that OpsLog never saw: the spots were discarded before any test ran.
|
||||
// Multi-hop Es is directional — a second hop leaves the sector the first one
|
||||
// entered — so distance is not what tells an opening from noise. The sector is.
|
||||
func TestMultiHopOpeningIsDetected(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
|
||||
var got *Opening
|
||||
for i, call := range []string{"LU1AA", "PY2BB", "LU3CC", "PY4DD"} {
|
||||
if op := d.Add(Spot{
|
||||
Call: call, Band: "6m",
|
||||
DistKm: 5400 + i*40, // double hop, far past the old ceiling
|
||||
Bearing: +i * 5, // one sector, as a real cloud illuminates
|
||||
At: base.Add(time.Duration(i) * time.Minute),
|
||||
}, 47.0); op != nil {
|
||||
got = op
|
||||
}
|
||||
}
|
||||
if got == nil {
|
||||
t.Fatal("a four-station 5400 km burst in one sector was not reported as an opening")
|
||||
}
|
||||
if got.Band != "6m" {
|
||||
t.Errorf("band = %q, want 6m", got.Band)
|
||||
}
|
||||
}
|
||||
|
||||
// The floor stays: a short path says nothing about the ionosphere.
|
||||
func TestGroundWaveIsStillIgnored(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 6, 15, 18, 0, 0, 0, time.UTC)
|
||||
for i, call := range []string{"F1AA", "F2BB", "F3CC", "F4DD"} {
|
||||
if op := d.Add(Spot{
|
||||
Call: call, Band: "6m", DistKm: 120, Bearing: 90,
|
||||
At: base.Add(time.Duration(i) * time.Minute),
|
||||
}, 47.0); op != nil {
|
||||
t.Fatalf("a 120 km burst was reported as an opening: %+v", op)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A sector crossing north must not be labelled by its opposite.
|
||||
//
|
||||
// Sector() averaged the two bearings arithmetically, so 353–61° — plainly north
|
||||
// — came out as (353+61)/2 = 207°, announced as SW. The worst possible error:
|
||||
// not vague, but exactly reversed, to an operator who may turn a beam on it.
|
||||
func TestSectorAcrossNorth(t *testing.T) {
|
||||
cases := []struct {
|
||||
min, max int
|
||||
want string
|
||||
}{
|
||||
{353, 61, "NE"}, // the one seen in the field
|
||||
{303, 11, "NW"}, // the other one
|
||||
{35, 75, "NE"}, // no wrap, unchanged
|
||||
{170, 190, "S"}, // due south, no wrap
|
||||
{340, 20, "N"}, // straddling north evenly
|
||||
{260, 300, "W"}, // due west
|
||||
}
|
||||
for _, c := range cases {
|
||||
o := Opening{BearingMin: c.min, BearingMax: c.max}
|
||||
got := o.Sector()
|
||||
if !strings.HasPrefix(got, c.want+" ") {
|
||||
t.Errorf("Sector(%d–%d°) = %q, want it to start with %q", c.min, c.max, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A band open in one direction must be found THROUGH the everyday noise.
|
||||
//
|
||||
// The detector used to demand that every station fit inside one 90° arc. On 10
|
||||
// and 12 m with F2 open, reports arrive from all round the compass, the arc is
|
||||
// 360°, and the test could never pass: the busier the band, the less likely an
|
||||
// opening was announced. Reported from the field — 70 000 decodes, 10 and 12 m
|
||||
// plainly open, nothing said.
|
||||
func TestOpeningFoundThroughAllRoundNoise(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
|
||||
// Four stations concentrated to the south-west — the opening.
|
||||
south := []struct {
|
||||
call string
|
||||
deg int
|
||||
}{{"PY2AA", 220}, {"LU3BB", 228}, {"PY5CC", 235}, {"CX4DD", 240}}
|
||||
// And the usual Europeans scattered everywhere, which is what used to veto it.
|
||||
noise := []struct {
|
||||
call string
|
||||
deg int
|
||||
}{{"DL1XX", 40}, {"SM2YY", 20}, {"EA3ZZ", 190}, {"UA9QQ", 70}, {"G4WW", 320}}
|
||||
|
||||
var got *Opening
|
||||
for i, s := range noise {
|
||||
d.Add(Spot{Call: s.call, Band: "10m", DistKm: 1200, Bearing: s.deg,
|
||||
At: base.Add(time.Duration(i) * time.Second)}, 47.0)
|
||||
}
|
||||
for i, s := range south {
|
||||
if op := d.Add(Spot{Call: s.call, Band: "10m", DistKm: 9800, Bearing: s.deg,
|
||||
At: base.Add(time.Duration(10+i) * time.Second)}, 47.0); op != nil {
|
||||
got = op
|
||||
}
|
||||
}
|
||||
if got == nil {
|
||||
t.Fatal("an opening concentrated to the SW was not found among stations all round the compass")
|
||||
}
|
||||
mid := midBearing(got.BearingMin, got.BearingMax)
|
||||
if mid < 200 || mid > 260 {
|
||||
t.Errorf("sector middle %.0f° — the reported sector is not the busy one (%d–%d°)",
|
||||
mid, got.BearingMin, got.BearingMax)
|
||||
}
|
||||
}
|
||||
|
||||
// Stations evenly all round the compass and nothing concentrated: still nothing.
|
||||
// The point of the change was to stop requiring global agreement, not to start
|
||||
// calling every busy band an opening.
|
||||
func TestScatteredBandIsNotAnOpening(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 8, 11, 14, 0, 0, 0, time.UTC)
|
||||
for i, deg := range []int{0, 60, 120, 180, 240, 300} {
|
||||
if op := d.Add(Spot{Call: string(rune('A'+i)) + "1AAA", Band: "10m",
|
||||
DistKm: 3000, Bearing: deg, At: base.Add(time.Duration(i) * time.Second)}, 47.0); op != nil {
|
||||
t.Fatalf("evenly scattered stations were called an opening: %+v", op)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
package bandopen
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// A 2 m "opening" was announced at 9650 km towards Japan on stations that were
|
||||
// plainly working EME. The moon is not an opening: an operator pointing an
|
||||
// antenna at that bearing finds nothing.
|
||||
func TestEMEIsNotAnOpeningOnTwoMetres(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 8, 12, 6, 0, 0, 0, time.UTC)
|
||||
for i, call := range []string{"7M4RRM", "JA7RPC", "JF1AWC", "JK1TPA", "JH1JCQ"} {
|
||||
if op := d.Add(Spot{
|
||||
Call: call, Band: "2m", DistKm: 9650, Bearing: 40 + i*3,
|
||||
At: base.Add(time.Duration(i) * time.Minute),
|
||||
}, 47.0); op != nil {
|
||||
t.Fatalf("a 9650 km 2 m path was announced as an opening: %+v", op)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// But a real 2 m opening — an Es chain at a plausible distance — must survive.
|
||||
func TestLongButPlausibleTwoMetresStillCounts(t *testing.T) {
|
||||
d := New(DefaultConfig())
|
||||
base := time.Date(2026, 6, 20, 18, 0, 0, 0, time.UTC)
|
||||
var got *Opening
|
||||
for i, call := range []string{"EA1AA", "CT1BB", "EA7CC", "CT7DD"} {
|
||||
if op := d.Add(Spot{
|
||||
Call: call, Band: "2m", DistKm: 2000 + i*30, Bearing: 200 + i*4,
|
||||
At: base.Add(time.Duration(i) * time.Minute),
|
||||
}, 47.0); op != nil {
|
||||
got = op
|
||||
}
|
||||
}
|
||||
if got == nil {
|
||||
t.Fatal("a 2000 km 2 m burst in one sector was not reported")
|
||||
}
|
||||
}
|
||||
|
||||
// Six metres keeps no ceiling: multi-hop Es genuinely goes that far, which is
|
||||
// why the flat limit was removed in the first place.
|
||||
func TestSixMetresHasNoCeiling(t *testing.T) {
|
||||
if MaxKmFor("6m") != 0 || MaxKmFor("10m") != 0 {
|
||||
t.Error("6 m and 10 m must have no distance ceiling")
|
||||
}
|
||||
if MaxKmFor("2m") == 0 {
|
||||
t.Error("2 m must have one")
|
||||
}
|
||||
}
|
||||
@@ -200,6 +200,31 @@ func (m *Manager) SetPTT(on bool) error {
|
||||
return m.exec(func(b Backend) error { return b.SetPTT(on) })
|
||||
}
|
||||
|
||||
// splitSetter is implemented by the backends that can arm split AND place the
|
||||
// transmit frequency. Both together: arming without setting the dial transmits
|
||||
// on whatever the transmit VFO happened to hold, which is worse than refusing.
|
||||
type splitSetter interface {
|
||||
SetSplit(on bool, txHz int64) error
|
||||
}
|
||||
|
||||
// SetSplit arms or clears split on the rig, with the transmit frequency.
|
||||
//
|
||||
// Returns a plain error on a backend that cannot do it, and that is the point.
|
||||
// The shared-CAT server used to answer "done" to WSJT-X's split commands while
|
||||
// doing nothing at all — the software then believed it was transmitting up the
|
||||
// band when it was transmitting on the DX's own frequency. A refusal WSJT-X can
|
||||
// report is worth far more than a success it cannot check.
|
||||
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
||||
return m.exec(func(b Backend) error {
|
||||
s, ok := b.(splitSetter)
|
||||
if !ok {
|
||||
return fmt.Errorf("cat: this radio's backend cannot set split from software — " +
|
||||
"use Split Operating: Fake It in WSJT-X/JTDX, or set split on the radio itself")
|
||||
}
|
||||
return s.SetSplit(on, txHz)
|
||||
})
|
||||
}
|
||||
|
||||
// SpotInfo is one cluster spot to render on a backend that supports a spot
|
||||
// overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string;
|
||||
// the backend picks a default when it's empty. (Status-based colouring can be
|
||||
|
||||
@@ -59,15 +59,15 @@ type Flex struct {
|
||||
meterRawLogged bool // log the first raw meter-definition status once
|
||||
txRawLogged bool // log the first raw transmit status once (field-name audit)
|
||||
|
||||
spotsEnabled bool // push cluster spots + manage the panadapter overlay
|
||||
spotIdx map[int]bool // panadapter spot indices currently known to the radio
|
||||
spotsEnabled bool // push cluster spots + manage the panadapter overlay
|
||||
spotIdx map[int]bool // panadapter spot indices currently known to the radio
|
||||
pendingSpot map[int]string // seq → callsign, awaiting the spot index in the R response
|
||||
pendingSpotMode map[int]string // seq → ADIF mode, paired with pendingSpot
|
||||
pendingSplit map[int]bool // seq → awaiting the new TX slice's index (split create)
|
||||
spotCall map[int]string // spot index → callsign (to fill the call on a panadapter click)
|
||||
spotMode map[int]string // spot index → ADIF mode, so a click can also set the slice mode (SmartSDR tunes the spot's freq but not its mode)
|
||||
spotByCall map[string]int // callsign → live spot index, so re-spotting a call replaces its old spot (WSJT decodes re-fire every cycle)
|
||||
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
||||
sentCmds map[int]string // seq → command text, so an R<seq> error names the command
|
||||
|
||||
// OnSpotClick is called (off the reader goroutine's hot path) when the user
|
||||
// clicks one of our spots on the panadapter, with the spot's callsign and
|
||||
|
||||
+126
-6
@@ -130,8 +130,30 @@ type Kenwood struct {
|
||||
tx bool
|
||||
txAt time.Time
|
||||
lastState RigState
|
||||
// ifRejects counts consecutive "?;" answers to IF;. See State().
|
||||
ifRejects int
|
||||
}
|
||||
|
||||
// errRigRejected marks a "?;" — the rig understood the frame and declined it.
|
||||
// Distinct from a serial fault on purpose: one is "ask again in a moment", the
|
||||
// other is "the link is gone", and collapsing them is what dropped CAT sharing.
|
||||
var errRigRejected = errors.New("rejected by rig")
|
||||
|
||||
// ifRejectGrace is how many consecutive "?;" answers to IF; are ridden out
|
||||
// before the link is called dead.
|
||||
//
|
||||
// A Kenwood answers "?;" while it is busy — the tail of a transmission, a menu
|
||||
// open on the front panel. The TS-590SG does it for a moment after RX;, which is
|
||||
// exactly when the poll resumes: WSJT-X keyed through shared CAT, dropped PTT,
|
||||
// and the very next IF; came back "?;". One rejected poll then tore down the
|
||||
// whole link, WSJT-X lost the rig, and Hamlib went on to send an uninitialised
|
||||
// frequency (2^63) that OpsLog rightly refused — an alarming error message whose
|
||||
// real cause was three lines earlier in the log.
|
||||
//
|
||||
// Three at 250 ms is under a second of tolerance: long enough for the rig to
|
||||
// finish whatever it was doing, far too short to hide an unplugged cable.
|
||||
const ifRejectGrace = 3
|
||||
|
||||
// SetLowerLines chooses whether DTR and RTS are deasserted on connect. Set
|
||||
// before Connect.
|
||||
func (k *Kenwood) SetLowerLines(v bool) {
|
||||
@@ -281,8 +303,21 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
}
|
||||
raw, err := k.ask("IF;")
|
||||
if err != nil {
|
||||
// A "?;" is the rig saying "busy", not "gone". Ride out a few and keep
|
||||
// serving the last known state, so the CAT link the digital software keys
|
||||
// through survives the moment after a transmission. A serial fault is NOT
|
||||
// covered: that returns a different error and drops through at once.
|
||||
if errors.Is(err, errRigRejected) && k.lastState.Connected && k.ifRejects < ifRejectGrace {
|
||||
k.ifRejects++
|
||||
debugLog.Printf("kenwood: IF; rejected (%d/%d) — rig busy, keeping the link", k.ifRejects, ifRejectGrace)
|
||||
s := k.lastState
|
||||
s.Connected = true
|
||||
return s, nil
|
||||
}
|
||||
k.ifRejects = 0
|
||||
return RigState{}, err
|
||||
}
|
||||
k.ifRejects = 0
|
||||
f, ok := parseKenwoodIF(raw)
|
||||
if !ok {
|
||||
return RigState{}, fmt.Errorf("kenwood: unparsable IF frame %q", raw)
|
||||
@@ -342,16 +377,36 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
f.Split = split
|
||||
|
||||
if f.Split {
|
||||
// The transmit VFO is the other one. Read it rather than assume, and fall
|
||||
// back to simplex if it cannot be read: a wrong TX frequency is written
|
||||
// into the log, which is worse than showing no split at all.
|
||||
// The OTHER VFO is the one IF did not report. Read it rather than assume,
|
||||
// and fall back to simplex if it cannot be read: a wrong TX frequency is
|
||||
// written into the log, which is worse than showing no split at all.
|
||||
other := "FB;"
|
||||
if f.VFO == "B" {
|
||||
other = "FA;"
|
||||
}
|
||||
var otherHz int64
|
||||
if r, err := k.ask(other); err == nil {
|
||||
if hz, ok := parseKenwoodFreq(r, strings.TrimSuffix(other, ";")); ok && hz > 0 && hz != rx {
|
||||
tx = hz
|
||||
otherHz = hz
|
||||
}
|
||||
}
|
||||
if otherHz > 0 {
|
||||
// WHICH of the two is the transmit frequency depends on whether the rig
|
||||
// is transmitting RIGHT NOW.
|
||||
//
|
||||
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on
|
||||
// receive and the TRANSMIT VFO on transmit. The code took it as the
|
||||
// receive VFO always, so the moment the operator keyed up the two
|
||||
// frequencies swapped: correct on receive, reversed on transmit, which
|
||||
// is exactly how it was reported from a TS-590 on USB.
|
||||
//
|
||||
// It matters beyond the display. FreqHz is what a QSO is logged on, and
|
||||
// a contact made in split would have gone into the log on the DX's
|
||||
// frequency instead of the operator's.
|
||||
if f.TX {
|
||||
tx, rx = rx, otherHz
|
||||
} else {
|
||||
tx = otherHz
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -385,7 +440,31 @@ func (k *Kenwood) SetFrequency(hz int64) error {
|
||||
if k.curVFO == "B" {
|
||||
cmd = "FB"
|
||||
}
|
||||
return k.write(fmt.Sprintf("%s%011d;", cmd, hz))
|
||||
if err := k.write(fmt.Sprintf("%s%011d;", cmd, hz)); err != nil {
|
||||
return err
|
||||
}
|
||||
// Remember what we just commanded.
|
||||
//
|
||||
// While PTT is held the poll is skipped and State() hands back lastState — the
|
||||
// rig answers "?;" to IF; mid-transmission, and reading that as a fault used
|
||||
// to drop the whole link. But a frequency SET during that window then went
|
||||
// unrecorded, so the cache kept describing the dial as it was before.
|
||||
//
|
||||
// WSJT-X's "Fake It" is exactly that sequence: move the dial, key, transmit,
|
||||
// and afterwards put it back. Polling during the over, it was told the rig was
|
||||
// still on the receive frequency — so there was nothing to put back, and the
|
||||
// dial stayed on the transmit frequency for good. Every following over
|
||||
// started from there, which is the drift that was reported.
|
||||
//
|
||||
// Only simplex is updated here. Under split, FreqHz means the transmit
|
||||
// frequency while this write lands on whichever VFO the operator is on, and
|
||||
// guessing which side moved would be worse than a stale value the next poll
|
||||
// corrects on its own.
|
||||
if !k.lastState.Split {
|
||||
k.curFreq = hz
|
||||
k.lastState.FreqHz = hz
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (k *Kenwood) SetMode(mode string) error {
|
||||
@@ -458,6 +537,43 @@ func isKenwoodDataMode(mode string) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// SetSplit arms or clears split, and when arming puts txHz on the transmit VFO.
|
||||
//
|
||||
// Both halves in one call on purpose. WSJT-X sends "split on, VFO B" and "VFO B
|
||||
// to 14075300" as two commands, and honouring only the first is worse than
|
||||
// honouring neither: split would arm on whatever VFO B happened to hold, so the
|
||||
// operator transmits somewhere they never chose while the software reports
|
||||
// exactly what they asked for. Nothing is armed here until the frequency is on
|
||||
// the dial.
|
||||
//
|
||||
// FR selects the receive VFO, FT the transmit one — the same pair the poll loop
|
||||
// already reads to detect split, so this writes what State() knows how to read.
|
||||
func (k *Kenwood) SetSplit(on bool, txHz int64) error {
|
||||
k.mu.Lock()
|
||||
defer k.mu.Unlock()
|
||||
if k.port == nil {
|
||||
return fmt.Errorf("kenwood: not connected")
|
||||
}
|
||||
if !on {
|
||||
// Transmit follows receive again. FR is left alone: which VFO the operator
|
||||
// listens on is theirs to choose, and clearing split should not move them.
|
||||
return k.write("FT0;")
|
||||
}
|
||||
if txHz <= 0 || txHz > 99_999_999_999 {
|
||||
return fmt.Errorf("kenwood: split TX frequency %d out of the 11-digit CAT range", txHz)
|
||||
}
|
||||
// The transmit dial FIRST, then arm. Arming first would transmit on the old
|
||||
// contents of VFO B for however long the next command takes to arrive — brief,
|
||||
// but on the wrong frequency, and this runs the instant before a transmission.
|
||||
if err := k.write(fmt.Sprintf("FB%011d;", txHz)); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := k.write("FR0;"); err != nil { // receive on A
|
||||
return err
|
||||
}
|
||||
return k.write("FT1;") // transmit on B
|
||||
}
|
||||
|
||||
func (k *Kenwood) SetPTT(on bool) error {
|
||||
k.mu.Lock()
|
||||
defer k.mu.Unlock()
|
||||
@@ -524,6 +640,10 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
||||
k.rx = k.rx[i+1:]
|
||||
traceText("kenwood", "RX", frame)
|
||||
if frame == "?;" {
|
||||
// Sentinel-wrapped so the poll loop can tell "the rig said no" apart
|
||||
// from a serial fault. The two look identical as plain errors and must
|
||||
// not be handled the same way: one means try again in a moment, the
|
||||
// other means the link is gone.
|
||||
// IF; and ID; are universal on Kenwood/Elecraft — a "?;" to them is a
|
||||
// transient "busy" (typically mid-transmit, or a menu open on the rig),
|
||||
// NOT "unsupported". Latching them off would blind the poll loop for
|
||||
@@ -533,7 +653,7 @@ func (k *Kenwood) ask(cmd string) (string, error) {
|
||||
k.unsupported[want] = true
|
||||
debugLog.Printf("kenwood: this rig does not support %q — not asking again", cmd)
|
||||
}
|
||||
return "", fmt.Errorf("kenwood: %s rejected", want)
|
||||
return "", fmt.Errorf("kenwood: %s rejected: %w", want, errRigRejected)
|
||||
}
|
||||
if strings.HasPrefix(frame, want) {
|
||||
return frame, nil
|
||||
|
||||
@@ -29,7 +29,30 @@ const kenwoodCWChunk = 24
|
||||
|
||||
// kenwoodCWAllowed is what the keyer can send; anything else is dropped, since an
|
||||
// unsupported byte can abort the buffer and lose the rest of the message.
|
||||
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:;()"
|
||||
// The semicolon is deliberately absent: it TERMINATES a CAT frame. The TS-590
|
||||
// manual says so outright for P2, and one in a macro would close the command
|
||||
// early and leave the rest of the text to be read as commands of its own.
|
||||
const kenwoodCWAllowed = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 /?.,-=+:()"
|
||||
|
||||
// padCW pads a piece to the fixed 24-character P2 a Kenwood demands.
|
||||
//
|
||||
// This is where CW over CAT failed on a TS-590SG. The KY command was written
|
||||
// against Elecraft's, which takes a variable-length string, so "KY OH5CX;" went
|
||||
// out and the radio answered "?;" — read as "this rig refuses CW over CAT", and
|
||||
// the operator was told to go and buy a serial keyer.
|
||||
//
|
||||
// The TS-590 manual is explicit: P2 has a FIXED length of 24, and characters
|
||||
// left blank are filled with spaces which are NOT keyed. So the padding costs
|
||||
// nothing on air — it is simply the shape the command has to have.
|
||||
//
|
||||
// Elecraft is left variable-length: it accepts short strings, and padding there
|
||||
// would key the trailing spaces as word gaps.
|
||||
func (k *Kenwood) padCW(chunk string) string {
|
||||
if k.elecraft || len(chunk) >= kenwoodCWChunk {
|
||||
return chunk
|
||||
}
|
||||
return chunk + strings.Repeat(" ", kenwoodCWChunk-len(chunk))
|
||||
}
|
||||
|
||||
// SendCW queues a message on the rig's keyer, fed in 24-character pieces, waiting
|
||||
// for buffer room between pieces so a long macro doesn't lose its tail.
|
||||
@@ -51,7 +74,7 @@ func (k *Kenwood) SendCW(text string) error {
|
||||
chunk := msg[:n]
|
||||
msg = msg[n:]
|
||||
k.waitCWBuffer(3 * time.Second)
|
||||
if err := k.write("KY " + chunk + ";"); err != nil {
|
||||
if err := k.write("KY " + k.padCW(chunk) + ";"); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := k.afterKY(); err != nil {
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
package cat
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// The TS-590 wants a FIXED 24-character P2. Sending the bare text is what made
|
||||
// CW over CAT fail on a real TS-590SG: "KY OH5CX;" came back "?;", which OpsLog
|
||||
// reported as "this radio rejected CW over CAT" and sent the operator off to buy
|
||||
// a serial keyer he did not need.
|
||||
func TestKenwoodCWPadsToTheFixedWidth(t *testing.T) {
|
||||
k := &Kenwood{}
|
||||
got := k.padCW("OH5CX")
|
||||
if len(got) != kenwoodCWChunk {
|
||||
t.Errorf("padCW(%q) is %d chars, want exactly %d — the rig rejects anything else",
|
||||
"OH5CX", len(got), kenwoodCWChunk)
|
||||
}
|
||||
if got[:5] != "OH5CX" || strings.TrimRight(got, " ") != "OH5CX" {
|
||||
t.Errorf("padCW = %q — the text must be intact and the rest spaces", got)
|
||||
}
|
||||
// A full piece is already the right width and must not grow.
|
||||
full := strings.Repeat("A", kenwoodCWChunk)
|
||||
if k.padCW(full) != full {
|
||||
t.Error("a full 24-character piece was padded further")
|
||||
}
|
||||
|
||||
// Elecraft takes variable length, and padding there would key the trailing
|
||||
// spaces as word gaps.
|
||||
e := &Kenwood{elecraft: true}
|
||||
if e.padCW("OH5CX") != "OH5CX" {
|
||||
t.Errorf("Elecraft piece was padded: %q", e.padCW("OH5CX"))
|
||||
}
|
||||
}
|
||||
|
||||
// ";" terminates a CAT frame. The manual forbids it in P2, and one arriving in a
|
||||
// macro would close the command early and leave the rest to be read as commands.
|
||||
func TestKenwoodCWDropsTheSemicolon(t *testing.T) {
|
||||
if got := filterKenwoodCW("CQ; DE OH5CX"); strings.Contains(got, ";") {
|
||||
t.Errorf("filterKenwoodCW kept a semicolon: %q", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package cat
|
||||
|
||||
import "testing"
|
||||
|
||||
// WSJT-X "Fake It" against the transmit-window cache.
|
||||
//
|
||||
// Fake It keeps the radio on one dial frequency and shifts it only for the
|
||||
// duration of each over: set the transmit frequency, key, transmit, unkey, set
|
||||
// it back. The restore is not unconditional — WSJT-X reads the frequency back
|
||||
// and puts the dial where it believes it should be.
|
||||
//
|
||||
// That read lands inside the window where this backend deliberately stops
|
||||
// polling, because a Kenwood answers "?;" to IF; while it is transmitting and
|
||||
// treating that as a fault used to drop the whole shared link. The cache
|
||||
// answers instead. So the cache has to account for frequency SETS made during
|
||||
// the window, or it describes the dial as it was before the over — and WSJT-X,
|
||||
// told the radio is already on the receive frequency, has nothing to restore.
|
||||
//
|
||||
// This reproduces the sequence from a reported session: the dial stayed on the
|
||||
// transmit frequency after the first over and every later one started there.
|
||||
func TestKenwoodFakeItRestoresAfterTransmit(t *testing.T) {
|
||||
const (
|
||||
rxHz = 7074000 // where the operator is listening
|
||||
txHz = 7075500 // where Fake It moves the dial to transmit
|
||||
)
|
||||
|
||||
rig := &ts2000{vfoA: rxHz, mode: '2'}
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
k.dialPort = dialTo(rig)
|
||||
if err := k.Connect(); err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer k.Disconnect()
|
||||
|
||||
if s, err := k.ReadState(); err != nil || s.FreqHz != rxHz {
|
||||
t.Fatalf("before the over: %d (err %v) — want %d", s.FreqHz, err, rxHz)
|
||||
}
|
||||
|
||||
// The over: shift the dial, then key.
|
||||
if err := k.SetFrequency(txHz); err != nil {
|
||||
t.Fatalf("set transmit frequency: %v", err)
|
||||
}
|
||||
if err := k.SetPTT(true); err != nil {
|
||||
t.Fatalf("ptt on: %v", err)
|
||||
}
|
||||
|
||||
// WSJT-X reads back mid-over. The wire is not polled here — this is the
|
||||
// cache talking, and it must not still be saying rxHz.
|
||||
s, err := k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("read during the over: %v", err)
|
||||
}
|
||||
if s.FreqHz != txHz {
|
||||
t.Errorf("during the over the backend reported %d, want %d — "+
|
||||
"reporting the pre-over frequency is what stops Fake It restoring the dial", s.FreqHz, txHz)
|
||||
}
|
||||
|
||||
if err := k.SetPTT(false); err != nil {
|
||||
t.Fatalf("ptt off: %v", err)
|
||||
}
|
||||
|
||||
// The restore, once the over is done.
|
||||
if err := k.SetFrequency(rxHz); err != nil {
|
||||
t.Fatalf("restore: %v", err)
|
||||
}
|
||||
if rig.vfoA != rxHz {
|
||||
t.Errorf("dial left on %d after the over, want %d", rig.vfoA, rxHz)
|
||||
}
|
||||
if s, err := k.ReadState(); err != nil || s.FreqHz != rxHz {
|
||||
t.Errorf("after the over: %d (err %v) — want %d", s.FreqHz, err, rxHz)
|
||||
}
|
||||
}
|
||||
|
||||
// Under split the same write must NOT touch the cache: FreqHz means the
|
||||
// transmit frequency while the write lands on whichever VFO the operator is on,
|
||||
// so guessing which side moved would put a wrong number in front of the
|
||||
// operator. A stale one survives only until the next poll.
|
||||
func TestKenwoodSplitCacheLeftToThePoll(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14025000, vfoB: 14030000, mode: '3', split: true}
|
||||
k := NewKenwood("COM-TEST", 9600, "CW")
|
||||
k.dialPort = dialTo(rig)
|
||||
if err := k.Connect(); err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer k.Disconnect()
|
||||
|
||||
s, err := k.ReadState()
|
||||
if err != nil || !s.Split {
|
||||
t.Fatalf("split not seen: %+v (err %v)", s, err)
|
||||
}
|
||||
before := s.FreqHz
|
||||
|
||||
if err := k.SetFrequency(14026000); err != nil {
|
||||
t.Fatalf("set: %v", err)
|
||||
}
|
||||
if k.lastState.FreqHz != before {
|
||||
t.Errorf("split cache moved to %d on a VFO write, want it left at %d for the poll",
|
||||
k.lastState.FreqHz, before)
|
||||
}
|
||||
}
|
||||
@@ -108,6 +108,9 @@ type ts2000 struct {
|
||||
mode byte
|
||||
onB bool
|
||||
split bool
|
||||
// tx models the rig KEYED. On a real Kenwood in split, IF then reports the
|
||||
// TRANSMIT VFO as the one in use — which is the whole point of the test below.
|
||||
tx bool
|
||||
// lazyIF models a rig that answers FR/FT correctly but never fills IF's
|
||||
// split bit — the behaviour reported on a Flex through its Kenwood CAT
|
||||
// emulation, where the frequency reads perfectly and split never appears.
|
||||
@@ -138,8 +141,12 @@ func (r *ts2000) answer(cmd string) string {
|
||||
}
|
||||
// The catemu layout: IF | freq(11) | step(4) | RIT(±5) | 3 | mem(2) |
|
||||
// rx/tx | mode | VFO | scan | split | tone | tone#(2) | shift | ;
|
||||
txByte := 0
|
||||
if r.tx {
|
||||
txByte = 1
|
||||
}
|
||||
return fmt.Sprintf("IF%011d%04d%+06d%03d%02d%01d%c%c%01d%c%01d%02d%01d;",
|
||||
cur, 0, 0, 0, 0, 0, r.mode, vfoDigit, 0, split, 0, 0, 0)
|
||||
cur, 0, 0, 0, 0, txByte, r.mode, vfoDigit, 0, split, 0, 0, 0)
|
||||
case strings.HasPrefix(cmd, "FA") && len(cmd) > 3:
|
||||
fmt.Sscanf(cmd, "FA%d;", &r.vfoA)
|
||||
return ""
|
||||
@@ -174,6 +181,19 @@ func dialTo(rig *ts2000) func() (serial.Port, error) {
|
||||
}
|
||||
}
|
||||
|
||||
// dialToBusy is dialTo with a hook that makes the rig answer "?;" instead —
|
||||
// what a real Kenwood does while it is busy, rather than staying silent.
|
||||
func dialToBusy(rig *ts2000, busy func(cmd string) bool) func() (serial.Port, error) {
|
||||
return func() (serial.Port, error) {
|
||||
return &fakeSerial{toRig: &strings.Builder{}, answer: func(cmd string) string {
|
||||
if busy(cmd) {
|
||||
return "?;"
|
||||
}
|
||||
return rig.answer(cmd)
|
||||
}}, nil
|
||||
}
|
||||
}
|
||||
|
||||
func TestKenwoodAgainstEmulatedRig(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'} // 20 m USB
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
@@ -383,3 +403,103 @@ func TestKenwoodNoisyRigIsReportedAsNoiseNotSilence(t *testing.T) {
|
||||
t.Errorf("error was %q — it should say data arrived, and quote it", err)
|
||||
}
|
||||
}
|
||||
|
||||
// A "?;" to IF; must not tear the link down.
|
||||
//
|
||||
// The TS-590SG answers "?;" for a moment after coming out of transmit, which is
|
||||
// exactly when the poll resumes. In the field that single rejected poll dropped
|
||||
// the whole CAT link: WSJT-X, keying through shared CAT, lost the rig, and
|
||||
// Hamlib then sent an uninitialised frequency (2^63) that OpsLog refused — an
|
||||
// alarming error whose real cause was three lines earlier.
|
||||
func TestKenwoodBusyRigKeepsTheLink(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14250000, vfoB: 14260000, mode: '2'}
|
||||
busy := 0
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
k.dialPort = dialToBusy(rig, func(cmd string) bool {
|
||||
if strings.HasPrefix(cmd, "IF") && busy > 0 {
|
||||
busy--
|
||||
return true
|
||||
}
|
||||
return false
|
||||
})
|
||||
if err := k.Connect(); err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer k.Disconnect()
|
||||
|
||||
// One good read establishes the state the busy window will keep serving.
|
||||
first, err := k.ReadState()
|
||||
if err != nil || !first.Connected {
|
||||
t.Fatalf("first read: %+v err=%v", first, err)
|
||||
}
|
||||
|
||||
// Inside the grace: still connected, still reporting the last good frequency.
|
||||
busy = ifRejectGrace
|
||||
for i := 1; i <= ifRejectGrace; i++ {
|
||||
s, err := k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("reject %d dropped the link: %v", i, err)
|
||||
}
|
||||
if !s.Connected || s.FreqHz != first.FreqHz {
|
||||
t.Errorf("reject %d gave %+v — want the last good state, still connected", i, s)
|
||||
}
|
||||
}
|
||||
|
||||
// The rig answers again → the tolerance resets, so a later busy spell gets
|
||||
// the full allowance instead of inheriting the previous one.
|
||||
if s, err := k.ReadState(); err != nil || !s.Connected {
|
||||
t.Fatalf("recovery read failed: %+v err=%v", s, err)
|
||||
}
|
||||
|
||||
// Past the grace, a persistent refusal IS a fault and must surface.
|
||||
busy = ifRejectGrace + 1
|
||||
var lastErr error
|
||||
for i := 0; i <= ifRejectGrace; i++ {
|
||||
if _, lastErr = k.ReadState(); lastErr != nil {
|
||||
break
|
||||
}
|
||||
}
|
||||
if lastErr == nil {
|
||||
t.Error("a rig refusing IF; forever was still reported as healthy")
|
||||
}
|
||||
}
|
||||
|
||||
// In split, the two frequencies must not swap the moment the operator keys up.
|
||||
//
|
||||
// IF reports the VFO "in use", and in split that is the RECEIVE VFO on receive
|
||||
// and the TRANSMIT VFO on transmit. The backend took it as the receive VFO
|
||||
// always, so everything read correctly until the PTT closed and then reversed —
|
||||
// reported from a TS-590 on USB.
|
||||
//
|
||||
// It matters beyond the display: FreqHz is what a QSO is LOGGED on, so a split
|
||||
// contact would have been logged on the DX's frequency instead of the operator's.
|
||||
func TestKenwoodSplitDoesNotSwapOnTransmit(t *testing.T) {
|
||||
rig := &ts2000{vfoA: 14200000, vfoB: 14205000, mode: '2', split: true}
|
||||
k := NewKenwood("COM-TEST", 9600, "FT8")
|
||||
k.dialPort = dialTo(rig)
|
||||
if err := k.Connect(); err != nil {
|
||||
t.Fatalf("connect: %v", err)
|
||||
}
|
||||
defer k.Disconnect()
|
||||
|
||||
// Receiving: IF reports VFO A, the receive dial.
|
||||
s, err := k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("read on receive: %v", err)
|
||||
}
|
||||
if !s.Split || s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
|
||||
t.Fatalf("on receive: split=%v tx=%d rx=%d — want tx 14205000, rx 14200000",
|
||||
s.Split, s.FreqHz, s.RxFreqHz)
|
||||
}
|
||||
|
||||
// Keyed: the rig switches to the transmit VFO and sets IF's TX byte.
|
||||
rig.onB, rig.tx = true, true
|
||||
s, err = k.ReadState()
|
||||
if err != nil {
|
||||
t.Fatalf("read on transmit: %v", err)
|
||||
}
|
||||
if s.FreqHz != 14205000 || s.RxFreqHz != 14200000 {
|
||||
t.Errorf("on transmit: tx=%d rx=%d — the two swapped; want tx 14205000, rx 14200000",
|
||||
s.FreqHz, s.RxFreqHz)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ func TestKenwoodModeDigit(t *testing.T) {
|
||||
{"FM", 145000000, '4'},
|
||||
{"FT8", 7074000, '2'}, // data is ALWAYS USB, even below 10 MHz (K3 "DATA REV" otherwise)
|
||||
{"FT8", 14074000, '2'}, // …and above
|
||||
{"", 14074000, 0}, // nothing to set
|
||||
{"", 14074000, 0}, // nothing to set
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := kenwoodModeDigit(c.mode, c.hz); got != c.want {
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
-- MY_IOTA: the island reference the station operates FROM, e.g. "EU-005".
|
||||
--
|
||||
-- An official ADIF field, and the QSO table has carried my_iota since 0001 —
|
||||
-- only the station profile could not supply it, so an island activation had to
|
||||
-- have the reference typed on every contact or added afterwards. Blank by
|
||||
-- default: the overwhelming majority of stations are not on an island.
|
||||
ALTER TABLE station_profiles ADD COLUMN my_iota TEXT NOT NULL DEFAULT '';
|
||||
@@ -0,0 +1,7 @@
|
||||
-- The lookup cache gains the two fields the providers were already sending and
|
||||
-- nothing was reading: the operator's own site, and the postal code.
|
||||
--
|
||||
-- `web` matters beyond the cache: the qso table has had a `web` column since
|
||||
-- 0003 and no lookup ever filled it.
|
||||
ALTER TABLE callsign_cache ADD COLUMN web TEXT;
|
||||
ALTER TABLE callsign_cache ADD COLUMN zip TEXT;
|
||||
@@ -27,6 +27,19 @@ const clublogBatchURL = "https://clublog.org/putlogs.php"
|
||||
// must send a real, app-identifying User-Agent.
|
||||
const clublogUserAgent = "OpsLog/1.0 (+https://github.com/GregTroar/OpsLog)"
|
||||
|
||||
// looksLikeHTML reports a body that is a web page rather than an answer. Club
|
||||
// Log serves its normal site for refusals and blocks, so this is what separates
|
||||
// "here is what went wrong" from 4 KB of markup an operator cannot act on.
|
||||
func looksLikeHTML(s string) bool {
|
||||
l := strings.ToLower(strings.TrimSpace(s))
|
||||
return strings.HasPrefix(l, "<!doctype html") || strings.HasPrefix(l, "<html")
|
||||
}
|
||||
|
||||
// clublogDownloadURL is Club Log's ADIF export. Used ONLY to verify credentials
|
||||
// (see TestClublog): it is the one authenticated endpoint that cannot change
|
||||
// anything in the operator's log, which is what a test button must never do.
|
||||
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
||||
|
||||
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
||||
// requires an api parameter that identifies the client software (not the
|
||||
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
||||
@@ -204,17 +217,84 @@ func stripHTMLBrief(s string) string {
|
||||
// TestClublog validates the configured credentials by attempting a no-op
|
||||
// style check. Club Log has no dedicated status endpoint, so we report the
|
||||
// fields look complete; a real failure surfaces on the first upload.
|
||||
// TestClublog checks the credentials against Club Log, not against themselves.
|
||||
//
|
||||
// It used to verify that the three fields were non-empty and then report
|
||||
// "Ready — <call> via <email>". Nothing was sent anywhere, so a wrong password
|
||||
// produced exactly the same green message as a right one. That is worse than
|
||||
// having no button: it is confidence the test never earned, and it cost an
|
||||
// operator the one moment they were actually looking for the problem.
|
||||
//
|
||||
// The download endpoint is used because it is READ-ONLY: testing a password
|
||||
// must not put a record into someone's log. Club Log answers a rejected login
|
||||
// with 403 before sending any body, so the answer arrives immediately; on
|
||||
// success the body is a log, and we read a few bytes and hang up rather than
|
||||
// pull it down to prove a point.
|
||||
func TestClublog(ctx context.Context, cfg ServiceConfig) (string, error) {
|
||||
_ = ctx
|
||||
email := strings.TrimSpace(cfg.Email)
|
||||
call := strings.ToUpper(strings.TrimSpace(cfg.Callsign))
|
||||
switch {
|
||||
case strings.TrimSpace(cfg.Email) == "":
|
||||
case email == "":
|
||||
return "", fmt.Errorf("clublog: account email not set")
|
||||
case cfg.Password == "":
|
||||
return "", fmt.Errorf("clublog: password not set")
|
||||
case strings.TrimSpace(cfg.Callsign) == "":
|
||||
case call == "":
|
||||
return "", fmt.Errorf("clublog: logbook callsign not set")
|
||||
}
|
||||
return fmt.Sprintf("Ready — %s via %s", strings.ToUpper(strings.TrimSpace(cfg.Callsign)), strings.TrimSpace(cfg.Email)), nil
|
||||
|
||||
if ctx == nil {
|
||||
ctx = context.Background()
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||
defer cancel()
|
||||
|
||||
form := url.Values{}
|
||||
form.Set("email", email)
|
||||
form.Set("password", cfg.Password)
|
||||
form.Set("call", call)
|
||||
// No date filter. A "startyear=2099" was tried to keep the reply small, but
|
||||
// Club Log answers an unrecognised request with the SAME 403 it uses for a
|
||||
// refused login — so an unverified parameter would have made every correct
|
||||
// password look wrong, which is the failure this whole change exists to end.
|
||||
// The reply is capped at 4 KB and the body closed immediately instead; the
|
||||
// status code arrives before any of it.
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, clublogDownloadURL, strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("clublog: build request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("User-Agent", clublogUserAgent)
|
||||
|
||||
resp, err := (&http.Client{Timeout: 30 * time.Second}).Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("clublog: could not reach Club Log: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 4096))
|
||||
msg := strings.TrimSpace(string(body))
|
||||
|
||||
switch resp.StatusCode {
|
||||
case http.StatusOK:
|
||||
return fmt.Sprintf("Ready — %s via %s (Club Log accepted the login)", call, email), nil
|
||||
case http.StatusUnauthorized, http.StatusForbidden:
|
||||
// Club Log refuses with its ordinary web page, not an error string, so the
|
||||
// body is 4 KB of markup that says nothing to an operator. It goes to the
|
||||
// log — that is where a real diagnosis happens — and the message says the
|
||||
// one thing there is to do about it.
|
||||
LogSink("clublog: login refused (http %d), body: %s", resp.StatusCode, msg)
|
||||
return "", fmt.Errorf("Club Log refused the login — check the account e-mail, " +
|
||||
"the password and the logbook callsign. They are the Club Log website's own credentials")
|
||||
default:
|
||||
LogSink("clublog: unexpected http %d, body: %s", resp.StatusCode, msg)
|
||||
if looksLikeHTML(msg) {
|
||||
return "", fmt.Errorf("clublog: Club Log answered with a web page (http %d) instead of a log — see the log file", resp.StatusCode)
|
||||
}
|
||||
if len(msg) > 200 {
|
||||
msg = msg[:200] + "…"
|
||||
}
|
||||
return "", fmt.Errorf("clublog: http %d %s", resp.StatusCode, msg)
|
||||
}
|
||||
}
|
||||
|
||||
// clublogPost performs the form POST and maps the HTTP status to a result.
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package extsvc
|
||||
|
||||
import "testing"
|
||||
|
||||
// Club Log answers a refused login with its ordinary web page. The operator must
|
||||
// get a sentence they can act on, not four kilobytes of markup — that was the
|
||||
// first thing reported once the test started working at all.
|
||||
func TestLooksLikeHTML(t *testing.T) {
|
||||
cases := []struct {
|
||||
body string
|
||||
want bool
|
||||
}{
|
||||
{"<!DOCTYPE html>\n<html lang='en'>…403 - Access denied…", true},
|
||||
{" <html><head><title>403</title></head></html>", true},
|
||||
{"<HTML>", true},
|
||||
{"Invalid credentials", false},
|
||||
{"", false},
|
||||
// An ADIF answer must never be mistaken for a page.
|
||||
{"<eoh>\n<call:5>F4BPO <band:3>20m <eor>", false},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if got := looksLikeHTML(c.body); got != c.want {
|
||||
t.Errorf("looksLikeHTML(%.40q) = %v, want %v", c.body, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -142,4 +142,10 @@ type UploadResult struct {
|
||||
OK bool // the service accepted (or already had) the QSO
|
||||
LogID string // service-assigned record id, when provided
|
||||
Message string // human-readable detail (reason on failure)
|
||||
// Ignored is set when the service accepted the submission but left some or
|
||||
// all of the QSOs out of it. TQSL does this for contacts already uploaded
|
||||
// AND for contacts outside the certificate's date range, and reports both
|
||||
// with the same exit code — so the caller must show the message rather than
|
||||
// decide on its own that everything went through.
|
||||
Ignored bool
|
||||
}
|
||||
|
||||
+76
-6
@@ -178,8 +178,12 @@ func fileExists(p string) bool {
|
||||
//
|
||||
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
|
||||
//
|
||||
// Exit codes (TQSL): 0 = uploaded; 8 = nothing new (all duplicates/out of
|
||||
// range); 9 = some uploaded, some skipped; anything else = failure.
|
||||
// Exit codes are TQSL's own (see the table in its cmdline help). 8 and 9 are
|
||||
// the ones that matter and both used to be read as plain success: 8 means NO
|
||||
// QSOs were processed and 9 means some were left out — in each case because
|
||||
// they were already uploaded OR outside the callsign certificate's date range.
|
||||
// Reporting either as success is how a contact came to be stamped "uploaded"
|
||||
// while LoTW had never seen it.
|
||||
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
|
||||
tqsl := strings.TrimSpace(cfg.TQSLPath)
|
||||
loc := strings.TrimSpace(cfg.StationLocation)
|
||||
@@ -249,11 +253,31 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
||||
}
|
||||
}
|
||||
|
||||
// TQSL's exit codes, from its own cmdline documentation. Two of them used to
|
||||
// be read as plain success, and that is how contacts came to be stamped
|
||||
// "uploaded" while LoTW had never seen them:
|
||||
//
|
||||
// 8 NO QSOs were processed — already uploaded OR OUT OF DATE RANGE
|
||||
// 9 some processed, some ignored — same two reasons
|
||||
// 14 some already uploaded, the rest signed
|
||||
//
|
||||
// "Out of date range" is the one that bites: a contact older than the
|
||||
// callsign certificate's validity is silently left out, and reporting that as
|
||||
// success stamped it sent for ever. TQSL says which case it is in its output,
|
||||
// so the message is carried up rather than replaced with a guess.
|
||||
switch code {
|
||||
case 0, 9:
|
||||
case 0:
|
||||
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
|
||||
case 9, 14:
|
||||
return UploadResult{OK: true, Ignored: true, Message: tqslDetail(msg,
|
||||
"uploaded — but TQSL left some contacts out (already uploaded, or outside the certificate's date range)")}, nil
|
||||
case 8:
|
||||
return UploadResult{OK: true, Message: "already uploaded (duplicate)"}, nil
|
||||
// Nothing reached LoTW. NOT stamped as sent: a duplicate left at "R" is
|
||||
// harmless and will be refused again, while a contact wrongly marked sent
|
||||
// is one the operator will never think to look at again.
|
||||
return UploadResult{OK: false, Ignored: true, Message: tqslDetail(msg,
|
||||
"TQSL uploaded nothing — every contact was already uploaded, or outside the certificate's date range")},
|
||||
fmt.Errorf("lotw: no QSOs processed")
|
||||
default:
|
||||
if msg == "" {
|
||||
msg = fmt.Sprintf("tqsl exit code %d", code)
|
||||
@@ -262,6 +286,29 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
||||
}
|
||||
}
|
||||
|
||||
// tqslDetail keeps the lines of TQSL's own output that say what happened to the
|
||||
// contacts, and appends the summary.
|
||||
//
|
||||
// TQSL is explicit — "414 QSO records were already uploaded", "N QSO records
|
||||
// are out of date range" — and that sentence is the whole answer to "why is my
|
||||
// contact not on LoTW". It used to be captured and thrown away.
|
||||
func tqslDetail(out, summary string) string {
|
||||
var keep []string
|
||||
for _, ln := range strings.Split(out, "\n") {
|
||||
ln = strings.TrimSpace(ln)
|
||||
l := strings.ToLower(ln)
|
||||
if strings.Contains(l, "qso") && (strings.Contains(l, "already uploaded") ||
|
||||
strings.Contains(l, "date range") || strings.Contains(l, "ignored") ||
|
||||
strings.Contains(l, "duplicate")) {
|
||||
keep = append(keep, ln)
|
||||
}
|
||||
}
|
||||
if len(keep) == 0 {
|
||||
return summary
|
||||
}
|
||||
return summary + " — " + strings.Join(keep, "; ")
|
||||
}
|
||||
|
||||
// TestLoTW validates the LoTW config: tqsl present and the chosen station
|
||||
// location exists in station_data.
|
||||
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||
@@ -277,10 +324,33 @@ func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("lotw: can't read station locations: %w", err)
|
||||
}
|
||||
found := ""
|
||||
for _, l := range locs {
|
||||
if strings.EqualFold(l.Name, loc) {
|
||||
return fmt.Sprintf("Ready — TQSL found, location %q (%s)", l.Name, l.Call), nil
|
||||
found = l.Call
|
||||
break
|
||||
}
|
||||
}
|
||||
return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc)
|
||||
if found == "" {
|
||||
return "", fmt.Errorf("lotw: station location %q not found in TQSL", loc)
|
||||
}
|
||||
|
||||
// LoTW is TWO credentials doing two jobs, and the button used to report only
|
||||
// the first. Uploading goes through TQSL and is signed by the certificate —
|
||||
// the website password is never involved, so a wrong one breaks nothing until
|
||||
// the day confirmations are downloaded and nobody connects the two events.
|
||||
//
|
||||
// So the download login is tested separately, and said separately. A future
|
||||
// "since" date makes LoTW return an empty report rather than the whole
|
||||
// account: the credentials are what is being checked, not the log.
|
||||
up := fmt.Sprintf("Ready — TQSL found, location %q (%s)", loc, found)
|
||||
if strings.TrimSpace(cfg.Username) == "" || cfg.Password == "" {
|
||||
return up + ". Download login not set — confirmations cannot be fetched.", nil
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
||||
defer cancel()
|
||||
if _, err := DownloadLoTWConfirmations(ctx, nil, cfg, "2099-01-01", ""); err != nil {
|
||||
return "", fmt.Errorf("%s — but the DOWNLOAD login failed: %w", up, err)
|
||||
}
|
||||
return up + ". Download login accepted.", nil
|
||||
}
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
package extsvc
|
||||
|
||||
import "testing"
|
||||
|
||||
// TQSL's own exit codes, from its cmdline documentation:
|
||||
//
|
||||
// 0 success
|
||||
// 8 NO QSOs were processed — already uploaded OR out of date range
|
||||
// 9 some processed, some ignored — same two reasons
|
||||
// 14 some already uploaded, the rest signed
|
||||
//
|
||||
// 8 and 9 both used to be read as plain success, and that is how a contact came
|
||||
// to be stamped "uploaded to LoTW" while LoTW had never seen it. The one that
|
||||
// bites is "out of date range": a contact older than the callsign certificate's
|
||||
// validity is silently left out of the submission.
|
||||
func TestTQSLDetailKeepsTheReason(t *testing.T) {
|
||||
out := `13:22:01: Signing using Callsign G0ABC, DXCC Entity ENGLAND
|
||||
13:22:02: /tmp/x.adi: 20 QSO records are out of date range
|
||||
13:22:02: Final Status: No QSOs were processed (8)`
|
||||
got := tqslDetail(out, "summary")
|
||||
if got == "summary" {
|
||||
t.Fatal("threw away TQSL's explanation — that sentence is the whole answer to \"why is my contact not on LoTW\"")
|
||||
}
|
||||
if !contains(got, "out of date range") {
|
||||
t.Errorf("the reason was lost: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTQSLDetailFallsBackToTheSummary(t *testing.T) {
|
||||
if got := tqslDetail("nothing useful here", "summary"); got != "summary" {
|
||||
t.Errorf("got %q, want the plain summary when TQSL said nothing specific", got)
|
||||
}
|
||||
}
|
||||
|
||||
func contains(h, n string) bool {
|
||||
return len(h) >= len(n) && (func() bool {
|
||||
for i := 0; i+len(n) <= len(h); i++ {
|
||||
if h[i:i+len(n)] == n {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
})()
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
// Package geo is the one place that turns Maidenhead locators into positions,
|
||||
// and positions into distances and bearings.
|
||||
//
|
||||
// It exists because there were about to be three copies. These functions lived
|
||||
// in package main, which the internal packages cannot import, so the PSK
|
||||
// Reporter watcher had its geometry injected from main and the web publisher
|
||||
// was about to grow its own. A bearing that disagrees with itself between two
|
||||
// panels is the kind of fault nobody reports, because each screen looks
|
||||
// plausible on its own.
|
||||
package geo
|
||||
|
||||
import (
|
||||
"math"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// GridToLatLon parses a Maidenhead locator (4 or 6 characters) and returns the
|
||||
// centre of that square in degrees. ok=false on malformed input.
|
||||
func GridToLatLon(grid string) (lat, lon float64, ok bool) {
|
||||
g := strings.ToUpper(strings.TrimSpace(grid))
|
||||
if len(g) < 4 {
|
||||
return 0, 0, false
|
||||
}
|
||||
A := g[0] - 'A'
|
||||
B := g[1] - 'A'
|
||||
C := g[2] - '0'
|
||||
D := g[3] - '0'
|
||||
if A > 17 || B > 17 || C > 9 || D > 9 {
|
||||
return 0, 0, false
|
||||
}
|
||||
lon = -180 + float64(A)*20 + float64(C)*2
|
||||
lat = -90 + float64(B)*10 + float64(D)*1
|
||||
if len(g) >= 6 {
|
||||
E := g[4] - 'A'
|
||||
F := g[5] - 'A'
|
||||
if E <= 23 && F <= 23 {
|
||||
lon += float64(E)*(5.0/60.0) + 2.5/60.0
|
||||
lat += float64(F)*(2.5/60.0) + 1.25/60.0
|
||||
return lat, lon, true
|
||||
}
|
||||
}
|
||||
// 4-character locator: aim at the centre of the square.
|
||||
lon += 1
|
||||
lat += 0.5
|
||||
return lat, lon, true
|
||||
}
|
||||
|
||||
// HaversineKm returns the great-circle distance between two positions in
|
||||
// kilometres. Mean Earth radius 6371 km.
|
||||
func HaversineKm(lat1, lon1, lat2, lon2 float64) float64 {
|
||||
const R = 6371.0
|
||||
rad := math.Pi / 180.0
|
||||
dLat := (lat2 - lat1) * rad
|
||||
dLon := (lon2 - lon1) * rad
|
||||
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
|
||||
math.Cos(lat1*rad)*math.Cos(lat2*rad)*math.Sin(dLon/2)*math.Sin(dLon/2)
|
||||
return R * 2 * math.Atan2(math.Sqrt(a), math.Sqrt(1-a))
|
||||
}
|
||||
|
||||
// DistanceBetweenGrids is the distance in kilometres between two locators,
|
||||
// ok=false when either cannot be parsed.
|
||||
func DistanceBetweenGrids(a, b string) (km float64, ok bool) {
|
||||
lat1, lon1, ok1 := GridToLatLon(a)
|
||||
lat2, lon2, ok2 := GridToLatLon(b)
|
||||
if !ok1 || !ok2 {
|
||||
return 0, false
|
||||
}
|
||||
return HaversineKm(lat1, lon1, lat2, lon2), true
|
||||
}
|
||||
|
||||
// LatLonToGrid returns the 4-character Maidenhead square for a position.
|
||||
func LatLonToGrid(lat, lon float64) string {
|
||||
lon = math.Mod(lon+180, 360)
|
||||
if lon < 0 {
|
||||
lon += 360
|
||||
}
|
||||
lat = lat + 90
|
||||
if lat < 0 {
|
||||
lat = 0
|
||||
} else if lat > 180 {
|
||||
lat = 180
|
||||
}
|
||||
return string([]byte{
|
||||
byte('A' + int(lon/20)),
|
||||
byte('A' + int(lat/10)),
|
||||
byte('0' + int(math.Mod(lon, 20)/2)),
|
||||
byte('0' + int(math.Mod(lat, 10)/1)),
|
||||
})
|
||||
}
|
||||
|
||||
// NeighbourGrids returns the square holding (lat, lon) and the ring of squares
|
||||
// around it — 9 squares for ring 1, 25 for ring 2.
|
||||
//
|
||||
// Used to filter the PSK Reporter feed at the BROKER rather than in OpsLog. A
|
||||
// square is about 111 km tall and 150 km wide at mid latitudes, so one ring is
|
||||
// roughly the 300 km "around here" the feed already meant, and the traffic that
|
||||
// used to be received and discarded is never sent.
|
||||
func NeighbourGrids(lat, lon float64, ring int) []string {
|
||||
if ring < 0 {
|
||||
ring = 0
|
||||
}
|
||||
seen := map[string]bool{}
|
||||
out := []string{}
|
||||
for dLat := -ring; dLat <= ring; dLat++ {
|
||||
for dLon := -ring; dLon <= ring; dLon++ {
|
||||
// One square step: 1° of latitude, 2° of longitude.
|
||||
la := lat + float64(dLat)
|
||||
lo := lon + float64(dLon)*2
|
||||
if la > 90 || la < -90 {
|
||||
continue // past a pole there is no square, not a wrapped one
|
||||
}
|
||||
g := LatLonToGrid(la, lo)
|
||||
if !seen[g] {
|
||||
seen[g] = true
|
||||
out = append(out, g)
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package geo
|
||||
|
||||
import "testing"
|
||||
|
||||
// The squares the PSK Reporter feed is filtered on. A wrong ring means either
|
||||
// receiving the world again or hearing nothing.
|
||||
func TestNeighbourGrids(t *testing.T) {
|
||||
// JN36 is around 46.5N 5.5E.
|
||||
lat, lon, ok := GridToLatLon("JN36")
|
||||
if !ok {
|
||||
t.Fatal("JN36 did not resolve")
|
||||
}
|
||||
if got := LatLonToGrid(lat, lon); got != "JN36" {
|
||||
t.Fatalf("round trip gave %q, want JN36", got)
|
||||
}
|
||||
|
||||
ring := NeighbourGrids(lat, lon, 1)
|
||||
if len(ring) != 9 {
|
||||
t.Errorf("ring 1 has %d squares, want 9: %v", len(ring), ring)
|
||||
}
|
||||
found := false
|
||||
for _, g := range ring {
|
||||
if g == "JN36" {
|
||||
found = true
|
||||
}
|
||||
if len(g) != 4 {
|
||||
t.Errorf("not a 4-character square: %q", g)
|
||||
}
|
||||
}
|
||||
if !found {
|
||||
t.Errorf("the operator's own square is missing from %v", ring)
|
||||
}
|
||||
if n := len(NeighbourGrids(lat, lon, 0)); n != 1 {
|
||||
t.Errorf("ring 0 has %d squares, want just the operator's", n)
|
||||
}
|
||||
if n := len(NeighbourGrids(lat, lon, 2)); n != 25 {
|
||||
t.Errorf("ring 2 has %d squares, want 25", n)
|
||||
}
|
||||
}
|
||||
|
||||
// Near a pole a step north has nowhere to go; it must be dropped, not wrapped
|
||||
// onto a square on the far side of the world.
|
||||
func TestNeighbourGridsNearThePole(t *testing.T) {
|
||||
for _, g := range NeighbourGrids(89.5, 25, 1) {
|
||||
if len(g) != 4 {
|
||||
t.Errorf("bad square near the pole: %q", g)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,226 @@
|
||||
// Package gridcache is the long-term callsign→grid store behind grid chasing.
|
||||
//
|
||||
// Its own SQLite file, not a table in the settings database: that one sits
|
||||
// wherever the operator put it, often a synchronised folder, and this rewrites
|
||||
// itself every minute. Deleting the file costs a few days of listening.
|
||||
//
|
||||
// A callsign has one grid and the newest report wins — a stale locator reads as
|
||||
// a square already worked, which is worse than none.
|
||||
package gridcache
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
_ "modernc.org/sqlite"
|
||||
)
|
||||
|
||||
// Retention bounds a store that would otherwise only ever grow. Two years is
|
||||
// chosen to be far longer than any propagation interest and short enough that a
|
||||
// reassigned callsign eventually stops carrying its previous holder's square —
|
||||
// the one way this cache can be actively wrong rather than merely empty.
|
||||
const Retention = 2 * 365 * 24 * time.Hour
|
||||
|
||||
// FlushEvery is the batch interval. Long enough that a burst of reports costs
|
||||
// one transaction, short enough that a crash loses a minute of learning.
|
||||
const FlushEvery = 60 * time.Second
|
||||
|
||||
// Sources a locator can come from.
|
||||
const (
|
||||
SourceDecode = "decode" // a CQ this station's own receiver decoded
|
||||
SourceMQTT = "mqtt" // a PSK Reporter report
|
||||
)
|
||||
|
||||
// Entry is one locator and where it came from.
|
||||
type Entry struct {
|
||||
Grid string
|
||||
Source string
|
||||
}
|
||||
|
||||
type Store struct {
|
||||
db *sql.DB
|
||||
|
||||
mu sync.Mutex
|
||||
dirty map[string]Entry // call → what to write
|
||||
|
||||
stop chan struct{}
|
||||
stopOnce sync.Once
|
||||
wg sync.WaitGroup
|
||||
|
||||
logf func(string, ...any)
|
||||
}
|
||||
|
||||
// Open creates or opens the store at path and prunes what has aged out.
|
||||
func Open(path string, logf func(string, ...any)) (*Store, error) {
|
||||
if logf == nil {
|
||||
logf = func(string, ...any) {}
|
||||
}
|
||||
// WAL so a flush never blocks a read, and a busy timeout because the flush
|
||||
// goroutine and the startup load can overlap on a slow disk.
|
||||
db, err := sql.Open("sqlite", path+"?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("gridcache: open %s: %w", path, err)
|
||||
}
|
||||
if _, err := db.Exec("CREATE TABLE IF NOT EXISTS grids (" +
|
||||
"call TEXT PRIMARY KEY, grid TEXT NOT NULL, updated_at INTEGER NOT NULL, " +
|
||||
"source TEXT NOT NULL DEFAULT '')"); err != nil {
|
||||
db.Close()
|
||||
return nil, fmt.Errorf("gridcache: schema: %w", err)
|
||||
}
|
||||
// A file written before the column existed keeps its rows; this fails
|
||||
// harmlessly when the column is already there.
|
||||
db.Exec("ALTER TABLE grids ADD COLUMN source TEXT NOT NULL DEFAULT ''")
|
||||
s := &Store{db: db, dirty: map[string]Entry{}, stop: make(chan struct{}), logf: logf}
|
||||
if n, err := s.prune(); err != nil {
|
||||
s.logf("gridcache: prune failed: %v", err)
|
||||
} else if n > 0 {
|
||||
s.logf("gridcache: pruned %d locators not heard in %d days", n, int(Retention.Hours()/24))
|
||||
}
|
||||
return s, nil
|
||||
}
|
||||
|
||||
func (s *Store) prune() (int64, error) {
|
||||
cut := time.Now().Add(-Retention).Unix()
|
||||
res, err := s.db.Exec(`DELETE FROM grids WHERE updated_at < ?`, cut)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return res.RowsAffected()
|
||||
}
|
||||
|
||||
// LoadAll returns every stored locator, for seeding the in-memory map at
|
||||
// startup. One query and one map build — the point of the whole package is that
|
||||
// nothing afterwards has to ask the database anything.
|
||||
func (s *Store) LoadAll() (map[string]string, error) {
|
||||
rows, err := s.db.Query(`SELECT call, grid FROM grids`)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("gridcache: load: %w", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
out := make(map[string]string, 4096)
|
||||
for rows.Next() {
|
||||
var call, grid string
|
||||
if err := rows.Scan(&call, &grid); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out[call] = grid
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// Put queues a locator for writing. Callers pass only what CHANGED — an
|
||||
// unchanged report is the common case by a wide margin and must not reach here,
|
||||
// or the batch would carry the whole feed instead of the news in it.
|
||||
func (s *Store) Put(call, grid, source string) {
|
||||
call = strings.ToUpper(strings.TrimSpace(call))
|
||||
grid = strings.TrimSpace(grid)
|
||||
if call == "" || grid == "" {
|
||||
return
|
||||
}
|
||||
s.mu.Lock()
|
||||
s.dirty[call] = Entry{Grid: grid, Source: source}
|
||||
s.mu.Unlock()
|
||||
}
|
||||
|
||||
// Start runs the flush loop until Close.
|
||||
func (s *Store) Start(ctx context.Context) {
|
||||
s.wg.Add(1)
|
||||
go func() {
|
||||
defer s.wg.Done()
|
||||
t := time.NewTicker(FlushEvery)
|
||||
defer t.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-s.stop:
|
||||
return
|
||||
case <-ctx.Done():
|
||||
return
|
||||
case <-t.C:
|
||||
if err := s.Flush(); err != nil {
|
||||
s.logf("gridcache: flush failed: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
// Flush writes the pending batch in one transaction. Safe to call with nothing
|
||||
// pending, which is most of the time on a quiet band.
|
||||
func (s *Store) Flush() error {
|
||||
s.mu.Lock()
|
||||
if len(s.dirty) == 0 {
|
||||
s.mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
batch := s.dirty
|
||||
s.dirty = map[string]Entry{}
|
||||
s.mu.Unlock()
|
||||
|
||||
tx, err := s.db.Begin()
|
||||
if err != nil {
|
||||
s.requeue(batch)
|
||||
return err
|
||||
}
|
||||
st, err := tx.Prepare(`INSERT INTO grids (call, grid, updated_at, source) VALUES (?, ?, ?, ?)
|
||||
ON CONFLICT(call) DO UPDATE SET grid = excluded.grid, updated_at = excluded.updated_at,
|
||||
source = excluded.source`)
|
||||
if err != nil {
|
||||
tx.Rollback()
|
||||
s.requeue(batch)
|
||||
return err
|
||||
}
|
||||
defer st.Close()
|
||||
now := time.Now().Unix()
|
||||
for call, e := range batch {
|
||||
if _, err := st.Exec(call, e.Grid, now, e.Source); err != nil {
|
||||
tx.Rollback()
|
||||
s.requeue(batch)
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := tx.Commit(); err != nil {
|
||||
s.requeue(batch)
|
||||
return err
|
||||
}
|
||||
// Logged because a batch that never reaches the disk looks exactly like one
|
||||
// that does: the locators are in memory either way until the next restart,
|
||||
// which is the one moment the difference shows.
|
||||
s.logf("gridcache: wrote %d locators", len(batch))
|
||||
return nil
|
||||
}
|
||||
|
||||
// requeue puts a failed batch back, without overwriting anything learnt while it
|
||||
// was in flight — the newer value is the right one.
|
||||
func (s *Store) requeue(batch map[string]Entry) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
for call, e := range batch {
|
||||
if _, newer := s.dirty[call]; !newer {
|
||||
s.dirty[call] = e
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pending reports how many locators are waiting to be written.
|
||||
func (s *Store) Pending() int {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
return len(s.dirty)
|
||||
}
|
||||
|
||||
// Close stops the loop and writes whatever is pending. A restart is the moment
|
||||
// the cache is most valuable, so losing the last minute of learning to a clean
|
||||
// shutdown would be a poor trade.
|
||||
func (s *Store) Close() error {
|
||||
s.stopOnce.Do(func() { close(s.stop) })
|
||||
s.wg.Wait()
|
||||
err := s.Flush()
|
||||
if cerr := s.db.Close(); err == nil {
|
||||
err = cerr
|
||||
}
|
||||
return err
|
||||
}
|
||||
@@ -0,0 +1,153 @@
|
||||
package gridcache
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func open(t *testing.T) (*Store, string) {
|
||||
t.Helper()
|
||||
path := filepath.Join(t.TempDir(), "grids.db")
|
||||
s, err := Open(path, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("open: %v", err)
|
||||
}
|
||||
return s, path
|
||||
}
|
||||
|
||||
// The whole reason the store exists: what was learnt is still there after a
|
||||
// restart, so the cluster's locator column is full in the first second instead
|
||||
// of after an hour of listening.
|
||||
func TestSurvivesRestart(t *testing.T) {
|
||||
s, path := open(t)
|
||||
s.Put("F4BPO", "JN36", SourceDecode)
|
||||
s.Put("OH5CX", "KP30", SourceDecode)
|
||||
if err := s.Flush(); err != nil {
|
||||
t.Fatalf("flush: %v", err)
|
||||
}
|
||||
if err := s.Close(); err != nil {
|
||||
t.Fatalf("close: %v", err)
|
||||
}
|
||||
|
||||
again, err := Open(path, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("reopen: %v", err)
|
||||
}
|
||||
defer again.Close()
|
||||
got, err := again.LoadAll()
|
||||
if err != nil {
|
||||
t.Fatalf("load: %v", err)
|
||||
}
|
||||
if got["F4BPO"] != "JN36" || got["OH5CX"] != "KP30" {
|
||||
t.Errorf("locators lost across a restart: %v", got)
|
||||
}
|
||||
}
|
||||
|
||||
// A callsign has ONE grid and the newest report wins. Operators move, go
|
||||
// portable, go on expedition — and a stale locator is worse than none for grid
|
||||
// chasing, because it reads as a square already worked.
|
||||
func TestNewestReportWins(t *testing.T) {
|
||||
s, _ := open(t)
|
||||
defer s.Close()
|
||||
|
||||
s.Put("F4BPO", "JN36", SourceDecode)
|
||||
if err := s.Flush(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
s.Put("F4BPO", "KP30", SourceDecode) // moved
|
||||
if err := s.Flush(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
got, err := s.LoadAll()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got["F4BPO"] != "KP30" {
|
||||
t.Errorf("grid = %q, want the newer KP30", got["F4BPO"])
|
||||
}
|
||||
if len(got) != 1 {
|
||||
t.Errorf("a callsign must hold one row, got %d: %v", len(got), got)
|
||||
}
|
||||
}
|
||||
|
||||
// Nothing reaches the disk until a flush, and a flush with nothing pending is
|
||||
// not an error — that is most minutes on a quiet band.
|
||||
func TestBatching(t *testing.T) {
|
||||
s, _ := open(t)
|
||||
defer s.Close()
|
||||
|
||||
for _, c := range []string{"A1AA", "B2BB", "C3CC"} {
|
||||
s.Put(c, "JN36", SourceDecode)
|
||||
}
|
||||
if n := s.Pending(); n != 3 {
|
||||
t.Errorf("pending = %d, want 3 queued and unwritten", n)
|
||||
}
|
||||
if got, _ := s.LoadAll(); len(got) != 0 {
|
||||
t.Errorf("wrote before the flush: %v", got)
|
||||
}
|
||||
if err := s.Flush(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if n := s.Pending(); n != 0 {
|
||||
t.Errorf("pending = %d after a flush, want 0", n)
|
||||
}
|
||||
if got, _ := s.LoadAll(); len(got) != 3 {
|
||||
t.Errorf("flush wrote %d rows, want 3", len(got))
|
||||
}
|
||||
if err := s.Flush(); err != nil {
|
||||
t.Errorf("empty flush must be a no-op, got %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Age is what bounds a store that would otherwise only grow. A callsign not
|
||||
// heard in two years is likely reassigned, and carrying its previous holder's
|
||||
// square is the one way this cache can be actively wrong rather than empty.
|
||||
func TestPruneOnOpen(t *testing.T) {
|
||||
s, path := open(t)
|
||||
s.Put("FRESH", "JN36", SourceDecode)
|
||||
s.Put("STALE", "IO91", SourceDecode)
|
||||
if err := s.Flush(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Backdate one row past the retention window.
|
||||
old := time.Now().Add(-Retention - 24*time.Hour).Unix()
|
||||
if _, err := s.db.Exec(`UPDATE grids SET updated_at = ? WHERE call = 'STALE'`, old); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
s.Close()
|
||||
|
||||
again, err := Open(path, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer again.Close()
|
||||
got, _ := again.LoadAll()
|
||||
if _, ok := got["STALE"]; ok {
|
||||
t.Error("an entry past the retention window survived — the store is unbounded")
|
||||
}
|
||||
if got["FRESH"] != "JN36" {
|
||||
t.Error("pruning took a live entry with it")
|
||||
}
|
||||
}
|
||||
|
||||
// Close has to write what the last minute learnt: a restart is exactly when the
|
||||
// cache is worth the most, so losing it to a clean shutdown would be a poor
|
||||
// trade.
|
||||
func TestCloseFlushes(t *testing.T) {
|
||||
s, path := open(t)
|
||||
s.Put("LATE", "JN36", SourceDecode)
|
||||
if err := s.Close(); err != nil {
|
||||
t.Fatalf("close: %v", err)
|
||||
}
|
||||
again, err := Open(path, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer again.Close()
|
||||
got, _ := again.LoadAll()
|
||||
if got["LATE"] != "JN36" {
|
||||
t.Error("what was pending at shutdown was dropped")
|
||||
}
|
||||
}
|
||||
@@ -41,16 +41,16 @@ const (
|
||||
|
||||
// Config is one user-defined UDP connection.
|
||||
type Config struct {
|
||||
ID int64 `json:"id"`
|
||||
Direction Direction `json:"direction"`
|
||||
Name string `json:"name"`
|
||||
Port int `json:"port"`
|
||||
ID int64 `json:"id"`
|
||||
Direction Direction `json:"direction"`
|
||||
Name string `json:"name"`
|
||||
Port int `json:"port"`
|
||||
ServiceType ServiceType `json:"service_type"`
|
||||
Multicast bool `json:"multicast"`
|
||||
MulticastGroup string `json:"multicast_group"`
|
||||
DestinationIP string `json:"destination_ip"` // outbound only
|
||||
Enabled bool `json:"enabled"`
|
||||
SortOrder int `json:"sort_order"`
|
||||
Multicast bool `json:"multicast"`
|
||||
MulticastGroup string `json:"multicast_group"`
|
||||
DestinationIP string `json:"destination_ip"` // outbound only
|
||||
Enabled bool `json:"enabled"`
|
||||
SortOrder int `json:"sort_order"`
|
||||
}
|
||||
|
||||
// Repo is the persistence layer for UDP integration rows.
|
||||
|
||||
@@ -37,19 +37,19 @@ func TestParseN1MMContactInfo(t *testing.T) {
|
||||
t.Fatal("expected a loggable contact, got ok=false")
|
||||
}
|
||||
want := map[string]string{
|
||||
"<call:5>VE9AA": "callsign",
|
||||
"<call:5>VE9AA": "callsign",
|
||||
"<qso_date:8>20240315": "date",
|
||||
"<time_on:6>142530": "time",
|
||||
"<band:3>20m": "band",
|
||||
"<mode:2>CW": "mode",
|
||||
"<freq:9>14.025000": "freq",
|
||||
"<rst_sent:3>599": "rst sent",
|
||||
"<rst_rcvd:3>599": "rst rcvd",
|
||||
"<gridsquare:4>FN65": "grid",
|
||||
"<name:4>Mike": "name",
|
||||
"<stx:1>1": "stx serial",
|
||||
"<srx:2>42": "srx serial",
|
||||
"<eor>": "terminator",
|
||||
"<time_on:6>142530": "time",
|
||||
"<band:3>20m": "band",
|
||||
"<mode:2>CW": "mode",
|
||||
"<freq:9>14.025000": "freq",
|
||||
"<rst_sent:3>599": "rst sent",
|
||||
"<rst_rcvd:3>599": "rst rcvd",
|
||||
"<gridsquare:4>FN65": "grid",
|
||||
"<name:4>Mike": "name",
|
||||
"<stx:1>1": "stx serial",
|
||||
"<srx:2>42": "srx serial",
|
||||
"<eor>": "terminator",
|
||||
}
|
||||
for sub, label := range want {
|
||||
if !strings.Contains(adif, sub) {
|
||||
|
||||
@@ -47,18 +47,19 @@ func reusingListenConfig() net.ListenConfig {
|
||||
// Event is what a Server emits to its consumer for every parsed packet.
|
||||
// At most one of the fields is populated per event.
|
||||
type Event struct {
|
||||
ConfigID int64
|
||||
Service ServiceType
|
||||
Source string // remote addr that sent the packet, for diagnostics
|
||||
ConfigID int64
|
||||
Service ServiceType
|
||||
Source string // remote addr that sent the packet, for diagnostics
|
||||
|
||||
DXCall string // ServiceWSJT (Status) or ServiceRemoteCall
|
||||
DXGrid string // ServiceWSJT (Status)
|
||||
Mode string // ServiceWSJT (Status/Decode)
|
||||
FreqHz int64 // ServiceWSJT (Status)
|
||||
LoggedADIF string // ServiceWSJT (LoggedADIF), ServiceADIF or ServiceN1MM
|
||||
DXCall string // ServiceWSJT (Status) or ServiceRemoteCall
|
||||
DXGrid string // ServiceWSJT (Status)
|
||||
Mode string // ServiceWSJT (Status/Decode)
|
||||
FreqHz int64 // ServiceWSJT (Status)
|
||||
LoggedADIF string // ServiceWSJT (LoggedADIF), ServiceADIF or ServiceN1MM
|
||||
|
||||
// A WSJT-X Decode (heard station) to render on the panadapter.
|
||||
DecodeCall string // transmitting (DE) callsign
|
||||
DecodeGrid string // 4-char grid, CQ decodes only
|
||||
DecodeFreqHz int64 // RF frequency (dial + audio offset)
|
||||
DecodeSNR int // reported SNR (dB)
|
||||
DecodeCQ bool // the decode was a CQ
|
||||
@@ -93,7 +94,7 @@ type Server struct {
|
||||
// 50.400 panadapter. WSJT-X requires --rig-name for a second instance, so the
|
||||
// id is distinct whenever there is more than one.
|
||||
dialHz map[string]int64
|
||||
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
||||
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
||||
|
||||
// badPkts counts datagrams this listener could not parse, so the diagnostic
|
||||
// dump below stays bounded. A misconfigured port is not a one-off: the
|
||||
@@ -300,6 +301,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||
return
|
||||
}
|
||||
ev.DecodeCall = w.DecodeCall
|
||||
ev.DecodeGrid = w.DecodeGrid
|
||||
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
||||
ev.DecodeSNR = w.SNR
|
||||
ev.DecodeCQ = w.IsCQ
|
||||
|
||||
@@ -39,18 +39,19 @@ const (
|
||||
// WSJTEvent is the parsed, typed result of decoding a single packet.
|
||||
// One of (DXCall, LoggedADIF, DecodeCall) is non-empty depending on the message.
|
||||
type WSJTEvent struct {
|
||||
DXCall string // current "DX Call" field in the WSJT app (Status)
|
||||
DXGrid string // optional grid for that call (Status)
|
||||
Mode string // FT8 / FT4 / …
|
||||
FreqHz int64 // current dial freq when available (Status)
|
||||
LoggedADIF string // full ADIF text when message is LoggedADIF
|
||||
ProgramID string // "WSJT-X" / "JTDX" / "MSHV" — for diagnostics / dedup
|
||||
DXCall string // current "DX Call" field in the WSJT app (Status)
|
||||
DXGrid string // optional grid for that call (Status)
|
||||
Mode string // FT8 / FT4 / …
|
||||
FreqHz int64 // current dial freq when available (Status)
|
||||
LoggedADIF string // full ADIF text when message is LoggedADIF
|
||||
ProgramID string // "WSJT-X" / "JTDX" / "MSHV" — for diagnostics / dedup
|
||||
|
||||
// Decode (type 2): the transmitting station heard on the band. FreqHz is NOT
|
||||
// set here (Decode carries only the audio offset); the caller adds the last
|
||||
// known dial frequency (from Status) to DeltaFreqHz to get the RF frequency.
|
||||
IsDecode bool
|
||||
DecodeCall string // the sender (DE) callsign extracted from the message text
|
||||
DecodeGrid string // 4-char grid, CQ decodes only — the exchange carries none
|
||||
DeltaFreqHz int64 // audio offset within the passband (Hz)
|
||||
SNR int // reported signal-to-noise (dB)
|
||||
IsCQ bool // the decode was a CQ call
|
||||
@@ -239,13 +240,14 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
||||
if err != nil {
|
||||
return WSJTEvent{}, false, err
|
||||
}
|
||||
call, isCQ := wsjtSender(msg)
|
||||
call, isCQ, grid := wsjtSender(msg)
|
||||
if call == "" {
|
||||
return WSJTEvent{}, false, nil // free-text / telemetry / unparseable → ignore
|
||||
}
|
||||
ev.IsDecode = true
|
||||
ev.DecodeCall = call
|
||||
ev.IsCQ = isCQ
|
||||
ev.DecodeGrid = grid
|
||||
ev.DeltaFreqHz = int64(df)
|
||||
ev.SNR = int(snr)
|
||||
ev.Mode = strings.ToUpper(strings.TrimSpace(mode))
|
||||
@@ -263,17 +265,20 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
||||
return WSJTEvent{}, false, nil
|
||||
}
|
||||
|
||||
// wsjtSender extracts the transmitting (DE) callsign from a WSJT-X message and
|
||||
// whether it was a CQ. Grammar:
|
||||
// wsjtSender extracts the transmitting (DE) callsign from a WSJT-X message,
|
||||
// whether it was a CQ, and the grid when the message carries one. Grammar:
|
||||
//
|
||||
// CQ [modifier] <de_call> [grid] → de_call, isCQ=true
|
||||
// CQ [modifier] <de_call> [grid] → de_call, isCQ=true, grid
|
||||
// <to_call> <de_call> [report|…] → de_call, isCQ=false
|
||||
//
|
||||
// Only a CQ carries a grid: the standard exchange puts a signal report in that
|
||||
// third slot, never a locator.
|
||||
//
|
||||
// Returns "" for free-text / telemetry / hashed-call messages we can't resolve.
|
||||
func wsjtSender(message string) (call string, isCQ bool) {
|
||||
func wsjtSender(message string) (call string, isCQ bool, grid string) {
|
||||
f := strings.Fields(strings.ToUpper(strings.TrimSpace(message)))
|
||||
if len(f) == 0 {
|
||||
return "", false
|
||||
return "", false, ""
|
||||
}
|
||||
if f[0] == "CQ" {
|
||||
// Skip an optional modifier after CQ (DX / a region like NA / a zone like
|
||||
@@ -282,16 +287,41 @@ func wsjtSender(message string) (call string, isCQ bool) {
|
||||
if len(f) > 2 && !looksLikeCall(f[1]) {
|
||||
idx = 2
|
||||
}
|
||||
if idx < len(f) && looksLikeCall(f[idx]) {
|
||||
return f[idx], true
|
||||
if idx < len(f) {
|
||||
c := f[idx]
|
||||
// A GRID sitting in the callsign slot means the real call was
|
||||
// unparseable and the skip above went one word too far. JN36 has letters
|
||||
// and digits and passes every shape test there is, so without this the
|
||||
// station's grid gets logged, spotted and coloured as its callsign.
|
||||
if looksLikeCall(c) && !isGridField(c) {
|
||||
if idx+1 < len(f) && isGridField(f[idx+1]) {
|
||||
grid = f[idx+1]
|
||||
}
|
||||
return c, true, grid
|
||||
}
|
||||
}
|
||||
return "", true
|
||||
return "", true, ""
|
||||
}
|
||||
// Standard exchange: the DE (sender) call is the second token.
|
||||
if len(f) >= 2 && looksLikeCall(f[1]) {
|
||||
return f[1], false
|
||||
return f[1], false, ""
|
||||
}
|
||||
return "", false
|
||||
return "", false, ""
|
||||
}
|
||||
|
||||
// isGridField reports a 4-character Maidenhead field+square (JN36).
|
||||
//
|
||||
// RR73 is the reason this is not a bare pattern match: it is a sign-off, not a
|
||||
// locator, yet R falls inside A–R and 73 inside 00–99, so it satisfies the
|
||||
// Maidenhead shape exactly. WSJT-X never puts it in the slot after a CQ call,
|
||||
// but a station sending "CQ RR73" style free text would silently plant a
|
||||
// nonexistent grid in the log's grid index, and nothing downstream could tell.
|
||||
func isGridField(s string) bool {
|
||||
if len(s) != 4 || s == "RR73" {
|
||||
return false
|
||||
}
|
||||
return s[0] >= 'A' && s[0] <= 'R' && s[1] >= 'A' && s[1] <= 'R' &&
|
||||
s[2] >= '0' && s[2] <= '9' && s[3] >= '0' && s[3] <= '9'
|
||||
}
|
||||
|
||||
// looksLikeCall is a loose callsign test: 3–12 chars of A–Z/0–9//, with at least
|
||||
|
||||
@@ -7,26 +7,37 @@ func TestWSJTSender(t *testing.T) {
|
||||
msg string
|
||||
wantCall string
|
||||
wantCQ bool
|
||||
wantGrid string
|
||||
}{
|
||||
{"CQ K1ABC FN42", "K1ABC", true},
|
||||
{"CQ DX W2XYZ EM12", "W2XYZ", true}, // modifier "DX" skipped
|
||||
{"CQ NA VE3ABC FN03", "VE3ABC", true}, // region modifier skipped
|
||||
{"CQ 020 JA1XYZ PM95", "JA1XYZ", true},// zone modifier skipped
|
||||
{"W2XYZ K1ABC -10", "K1ABC", false}, // exchange → sender is 2nd call
|
||||
{"W2XYZ K1ABC R-10", "K1ABC", false},
|
||||
{"W2XYZ K1ABC RR73", "K1ABC", false},
|
||||
{"F4BPO K1ABC/P 73", "K1ABC/P", false},// portable call kept
|
||||
{"CQ F/DL1ABC JO31", "F/DL1ABC", true},// compound prefix
|
||||
{"CQ K1ABC FN42", "K1ABC", true, "FN42"},
|
||||
{"CQ DX W2XYZ EM12", "W2XYZ", true, "EM12"}, // modifier "DX" skipped
|
||||
{"CQ NA VE3ABC FN03", "VE3ABC", true, "FN03"}, // region modifier skipped
|
||||
{"CQ 020 JA1XYZ PM95", "JA1XYZ", true, "PM95"}, // zone modifier skipped
|
||||
{"W2XYZ K1ABC -10", "K1ABC", false, ""}, // exchange → sender is 2nd call
|
||||
{"W2XYZ K1ABC R-10", "K1ABC", false, ""},
|
||||
{"W2XYZ K1ABC RR73", "K1ABC", false, ""},
|
||||
{"F4BPO K1ABC/P 73", "K1ABC/P", false, ""}, // portable call kept
|
||||
{"CQ F/DL1ABC JO31", "F/DL1ABC", true, "JO31"}, // compound prefix, grid still valid
|
||||
{"CQ K1ABC", "K1ABC", true, ""}, // CQ without a grid
|
||||
{"CQ K1ABC RR73", "K1ABC", true, ""}, // RR73 is a sign-off, NOT grid RR73
|
||||
{"CQ K1ABC FN4", "K1ABC", true, ""}, // 3 chars is not a field+square
|
||||
{"CQ K1ABC FN42AB", "K1ABC", true, ""}, // 6-char: WSJT-X never sends it here
|
||||
{"CQ K1ABC 73", "K1ABC", true, ""}, // bare sign-off
|
||||
{"CQ K1ABC SS42", "K1ABC", true, ""}, // S is past R — no such field
|
||||
// An unknown word after CQ made the parser skip a slot; a grid passes every
|
||||
// shape test a callsign does, so it came back AS the callsign.
|
||||
{"CQ FOO JN36", "", true, ""},
|
||||
// Non-callsign / free text → no sender.
|
||||
{"TNX 73 GL", "", false},
|
||||
{"K1ABC RR73", "", false}, // only one call + a token → 2nd token not a call
|
||||
{"", "", false},
|
||||
{"CQ CQ CQ", "", true}, // CQ but no resolvable call
|
||||
{"TNX 73 GL", "", false, ""},
|
||||
{"K1ABC RR73", "", false, ""}, // only one call + a token → 2nd token not a call
|
||||
{"", "", false, ""},
|
||||
{"CQ CQ CQ", "", true, ""}, // CQ but no resolvable call
|
||||
}
|
||||
for _, c := range cases {
|
||||
call, cq := wsjtSender(c.msg)
|
||||
if call != c.wantCall || cq != c.wantCQ {
|
||||
t.Errorf("wsjtSender(%q) = (%q,%v), want (%q,%v)", c.msg, call, cq, c.wantCall, c.wantCQ)
|
||||
call, cq, grid := wsjtSender(c.msg)
|
||||
if call != c.wantCall || cq != c.wantCQ || grid != c.wantGrid {
|
||||
t.Errorf("wsjtSender(%q) = (%q,%v,%q), want (%q,%v,%q)",
|
||||
c.msg, call, cq, grid, c.wantCall, c.wantCQ, c.wantGrid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,6 +94,13 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
||||
if err != nil {
|
||||
return Result{}, err
|
||||
}
|
||||
return parseHamQTHSearch(body)
|
||||
}
|
||||
|
||||
// parseHamQTHSearch turns one answer into a Result. Split out from the request
|
||||
// so the field mapping can be checked against a captured payload — which is how
|
||||
// the missing full name and picture were found.
|
||||
func parseHamQTHSearch(body []byte) (Result, error) {
|
||||
var resp hamqthRoot
|
||||
if err := xml.Unmarshal(body, &resp); err != nil {
|
||||
return Result{}, fmt.Errorf("hamqth: parse callsign: %w", err)
|
||||
@@ -112,11 +119,20 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
||||
if s.Callsign == "" {
|
||||
return Result{}, ErrNotFound
|
||||
}
|
||||
// <nick> is the name the operator goes BY on the air, which is what belongs
|
||||
// in a log — "Igor", not "Igor Vladimirovich Getman". adr_name is the postal
|
||||
// name and is used only when there is nothing else, so a record carrying
|
||||
// neither nick nor name no longer resolves to blank.
|
||||
name := strings.TrimSpace(s.Nick + " " + s.LastName)
|
||||
if name == "" {
|
||||
name = strings.TrimSpace(s.AdrName)
|
||||
}
|
||||
r := Result{
|
||||
Callsign: strings.ToUpper(s.Callsign),
|
||||
Name: strings.TrimSpace(s.Nick + " " + s.LastName),
|
||||
Name: name,
|
||||
QTH: firstNonEmpty(s.QTH, s.AdrCity),
|
||||
Address: s.AdrStreet1,
|
||||
Zip: s.AdrZip,
|
||||
State: strings.ToUpper(s.USState),
|
||||
County: s.USCounty,
|
||||
Country: firstNonEmpty(s.AdrCountry, s.Country),
|
||||
@@ -124,6 +140,8 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
||||
Continent: strings.ToUpper(s.Continent),
|
||||
Email: s.Email,
|
||||
QSLVia: s.QSLVia,
|
||||
Web: s.Web,
|
||||
ImageURL: s.Picture,
|
||||
}
|
||||
r.Lat, _ = strconv.ParseFloat(s.Latitude, 64)
|
||||
r.Lon, _ = strconv.ParseFloat(s.Longitude, 64)
|
||||
@@ -182,4 +200,14 @@ type hamqthSearch struct {
|
||||
Continent string `xml:"continent"`
|
||||
Email string `xml:"email"`
|
||||
QSLVia string `xml:"qsl_via"`
|
||||
// AdrName is the full postal name. Many records carry it and no <name> at
|
||||
// all, so building the name from <nick> + <name> silently kept the first
|
||||
// name and dropped the rest.
|
||||
AdrName string `xml:"adr_name"`
|
||||
AdrZip string `xml:"adr_zip"`
|
||||
// Picture is HamQTH's profile photo. Result.ImageURL was documented as "QRZ
|
||||
// only" because this element was never read — QRZ calls the same thing
|
||||
// <image>.
|
||||
Picture string `xml:"picture"`
|
||||
Web string `xml:"web"`
|
||||
}
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
package lookup
|
||||
|
||||
import (
|
||||
"encoding/xml"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// A real HamQTH answer, captured from the live API.
|
||||
//
|
||||
// Two things it settles. The email IS returned and must reach the QSO. And the
|
||||
// element names are not the ones a reading of the documentation suggests:
|
||||
// there is no <name> here at all, the full name is <adr_name>, and the picture
|
||||
// is <picture> where QRZ calls it <image>. The stray <div> is an advert the
|
||||
// server injects into its own XML; the parser has to shrug it off.
|
||||
const hamqthEU1EU = `<?xml version="1.0"?>
|
||||
<HamQTH xmlns="https://www.hamqth.com" version="2.8">
|
||||
<div id="in-page-channel-node-id" data-channel-name="in_page_channel_Sux7_K"/>
|
||||
<search>
|
||||
<callsign>eu1eu</callsign>
|
||||
<nick>Igor</nick>
|
||||
<qth>Minsk-5</qth>
|
||||
<country>Belarus</country>
|
||||
<adif>27</adif>
|
||||
<itu>29</itu>
|
||||
<cq>16</cq>
|
||||
<grid>KO33SV</grid>
|
||||
<adr_name>Igor Vladimirovich Getman</adr_name>
|
||||
<adr_street1>A/ya 143</adr_street1>
|
||||
<adr_city>Minsk-5</adr_city>
|
||||
<adr_zip>220005</adr_zip>
|
||||
<adr_country>Belarus</adr_country>
|
||||
<adr_adif>27</adr_adif>
|
||||
<district>WAARB-LE</district>
|
||||
<lotw>?</lotw>
|
||||
<qsldirect>?</qsldirect>
|
||||
<qsl>?</qsl>
|
||||
<eqsl>Y</eqsl>
|
||||
<email>eu1eu@mail.ru</email>
|
||||
<latitude>53.88999938964844</latitude>
|
||||
<longitude>27.59000015258789</longitude>
|
||||
<continent>EU</continent>
|
||||
<utc_offset>-2</utc_offset>
|
||||
<picture>https://www.hamqth.com/images/default/ts-930_qith_old_radios.jpg</picture>
|
||||
</search>
|
||||
</HamQTH>`
|
||||
|
||||
func TestHamQTHParsesEveryUsefulField(t *testing.T) {
|
||||
var root hamqthRoot
|
||||
if err := xml.Unmarshal([]byte(hamqthEU1EU), &root); err != nil {
|
||||
t.Fatalf("parse: %v", err)
|
||||
}
|
||||
s := root.Search
|
||||
|
||||
for _, c := range []struct{ name, got, want string }{
|
||||
{"callsign", s.Callsign, "eu1eu"},
|
||||
{"email", s.Email, "[email protected]"},
|
||||
{"grid", s.Grid, "KO33SV"},
|
||||
{"qth", s.QTH, "Minsk-5"},
|
||||
{"street", s.AdrStreet1, "A/ya 143"},
|
||||
{"city", s.AdrCity, "Minsk-5"},
|
||||
{"country", s.AdrCountry, "Belarus"},
|
||||
{"continent", s.Continent, "EU"},
|
||||
{"dxcc", s.DXCC, "27"},
|
||||
{"cq", s.CQ, "16"},
|
||||
{"itu", s.ITU, "29"},
|
||||
} {
|
||||
if c.got != c.want {
|
||||
t.Errorf("%s = %q, want %q", c.name, c.got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The fields the parser was blind to. Each is data OpsLog has somewhere to put.
|
||||
func TestHamQTHParsesTheFieldsThatWereMissing(t *testing.T) {
|
||||
var root hamqthRoot
|
||||
if err := xml.Unmarshal([]byte(hamqthEU1EU), &root); err != nil {
|
||||
t.Fatalf("parse: %v", err)
|
||||
}
|
||||
s := root.Search
|
||||
|
||||
// The postal name, the fallback when a record carries no nick and no name.
|
||||
if s.AdrName != "Igor Vladimirovich Getman" {
|
||||
t.Errorf("adr_name = %q", s.AdrName)
|
||||
}
|
||||
if s.LastName != "" {
|
||||
t.Errorf("this record has no <name>; got %q", s.LastName)
|
||||
}
|
||||
// The profile picture. Result.ImageURL existed and said "QRZ only" — HamQTH
|
||||
// sends one too, under a different element name.
|
||||
if s.Picture == "" {
|
||||
t.Error("picture not parsed")
|
||||
}
|
||||
if s.AdrZip != "220005" {
|
||||
t.Errorf("adr_zip = %q", s.AdrZip)
|
||||
}
|
||||
}
|
||||
|
||||
// End to end: what the provider hands back must carry the email, the full name
|
||||
// and the picture.
|
||||
func TestHamQTHResultCarriesTheLot(t *testing.T) {
|
||||
r, err := parseHamQTHSearch([]byte(hamqthEU1EU))
|
||||
if err != nil {
|
||||
t.Fatalf("parse: %v", err)
|
||||
}
|
||||
if r.Email != "[email protected]" {
|
||||
t.Errorf("Email = %q — this is what was reported missing", r.Email)
|
||||
}
|
||||
// The nick, not the postal name: a log wants the name the operator goes by
|
||||
// on the air. adr_name is only the fallback when there is nothing else.
|
||||
if r.Name != "Igor" {
|
||||
t.Errorf("Name = %q, want the on-air nick", r.Name)
|
||||
}
|
||||
if r.ImageURL == "" {
|
||||
t.Error("ImageURL empty — HamQTH sent a picture")
|
||||
}
|
||||
if r.Grid != "KO33SV" {
|
||||
t.Errorf("Grid = %q", r.Grid)
|
||||
}
|
||||
if r.Lat < 53.8 || r.Lat > 53.9 {
|
||||
t.Errorf("Lat = %v", r.Lat)
|
||||
}
|
||||
if r.DXCC != 27 || r.CQZ != 16 || r.ITUZ != 29 {
|
||||
t.Errorf("dxcc/cq/itu = %d/%d/%d", r.DXCC, r.CQZ, r.ITUZ)
|
||||
}
|
||||
if r.Address != "A/ya 143" {
|
||||
t.Errorf("Address = %q", r.Address)
|
||||
}
|
||||
}
|
||||
+57
-13
@@ -37,7 +37,13 @@ type Result struct {
|
||||
Continent string `json:"cont,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
QSLVia string `json:"qsl_via,omitempty"`
|
||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL (QRZ only for now)
|
||||
// Web is the operator's own site. The QSO table has had a `web` column all
|
||||
// along and nothing ever filled it, because no provider mapping read the
|
||||
// field.
|
||||
Web string `json:"web,omitempty"`
|
||||
// Zip is the postal code. HamQTH and QRZ both send one.
|
||||
Zip string `json:"zip,omitempty"`
|
||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
||||
Source string `json:"source"` // "qrz", "hamqth", or "cache"
|
||||
FetchedAt time.Time `json:"fetched_at"`
|
||||
}
|
||||
@@ -176,12 +182,20 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
||||
r.Callsign = call
|
||||
r.Source = p.Name()
|
||||
r.FetchedAt = time.Now().UTC()
|
||||
// The home record's location is the operator's HOME, not where they
|
||||
// are portable now — clear it so cty.dat fills the real entity.
|
||||
r.Country, r.Continent = "", ""
|
||||
r.CQZ, r.ITUZ, r.DXCC = 0, 0, 0
|
||||
r.Lat, r.Lon = 0, 0
|
||||
r.Grid, r.State, r.County = "", "", ""
|
||||
// The home record's location is the operator's HOME — clear it so
|
||||
// cty.dat fills in where they actually are.
|
||||
//
|
||||
// UNLESS the suffix says nothing about location. /QRP is a statement
|
||||
// about power, not about place: M0BFS/QRP is M0BFS, at home, running
|
||||
// five watts. Wiping the grid there threw away the one field the
|
||||
// operator was looking the call up for, and it came back empty while
|
||||
// the same lookup without the suffix answered perfectly.
|
||||
if !saysNothingAboutLocation(call) {
|
||||
r.Country, r.Continent = "", ""
|
||||
r.CQZ, r.ITUZ, r.DXCC = 0, 0, 0
|
||||
r.Lat, r.Lon = 0, 0
|
||||
r.Grid, r.State, r.County = "", "", ""
|
||||
}
|
||||
fillFromDXCC(&r, dxcc) // entity/zones/lat-lon from the FULL (slashed) call
|
||||
normalizeNames(&r)
|
||||
_ = m.cache.Put(ctx, r)
|
||||
@@ -232,6 +246,33 @@ var LogSink = func(string, ...any) {}
|
||||
// right and must be looked up exactly as entered.
|
||||
var opSuffixes = map[string]bool{"M": true, "MM": true, "AM": true, "P": true, "QRP": true}
|
||||
|
||||
// nonLocationSuffixes say nothing about WHERE the operator is.
|
||||
//
|
||||
// /QRP is a statement about power. /M and /P and their kin are not: mobile and
|
||||
// portable both mean "somewhere other than the home station", which is exactly
|
||||
// why the home record's location is discarded for them. Keeping that distinction
|
||||
// is the difference between a grid that is stale and a grid that is absent.
|
||||
var nonLocationSuffixes = map[string]bool{"QRP": true}
|
||||
|
||||
// saysNothingAboutLocation reports a call whose every suffix leaves the operator
|
||||
// at their registered address — so the home record's location can be trusted.
|
||||
func saysNothingAboutLocation(call string) bool {
|
||||
parts := strings.Split(strings.ToUpper(strings.TrimSpace(call)), "/")
|
||||
if len(parts) < 2 {
|
||||
return false
|
||||
}
|
||||
base := strings.TrimSpace(parts[0])
|
||||
if len(base) < 3 || !strings.ContainsAny(base, "0123456789") {
|
||||
return false // "JW/OR1A": the first part is a prefix — a location change
|
||||
}
|
||||
for _, p := range parts[1:] {
|
||||
if !nonLocationSuffixes[strings.TrimSpace(p)] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// stripOpSuffix returns the bare callsign when call carries nothing but
|
||||
// operational suffixes ("F4LYI/M" → "F4LYI", true). Reports false for anything
|
||||
// that changes entity or area ("JW/OR1A", "F4BPO/8"), and for a call whose base
|
||||
@@ -411,12 +452,13 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
||||
row := c.db.QueryRowContext(ctx, `
|
||||
SELECT callsign, name, qth, address, state, cnty, country, grid,
|
||||
lat, lon, dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
||||
source, fetched_at
|
||||
web, zip, source, fetched_at
|
||||
FROM callsign_cache WHERE callsign = ?`, callsign)
|
||||
var (
|
||||
r Result
|
||||
name, qth, addr, state, cnty sql.NullString
|
||||
country, grid, cont, email, qslVia, image sql.NullString
|
||||
web, zip sql.NullString
|
||||
src string
|
||||
dxcc, cqz, ituz sql.NullInt64
|
||||
lat, lon sql.NullFloat64
|
||||
@@ -424,7 +466,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
||||
)
|
||||
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
|
||||
&country, &grid, &lat, &lon,
|
||||
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image,
|
||||
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip,
|
||||
&src, &fetched); err != nil {
|
||||
return Result{}, false
|
||||
}
|
||||
@@ -446,6 +488,8 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
||||
r.Lon = lon.Float64
|
||||
r.Continent = cont.String
|
||||
r.Email = email.String
|
||||
r.Web = web.String
|
||||
r.Zip = zip.String
|
||||
r.QSLVia = qslVia.String
|
||||
r.ImageURL = image.String
|
||||
r.DXCC = int(dxcc.Int64)
|
||||
@@ -462,7 +506,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
||||
updateCols := []string{
|
||||
"name", "qth", "address", "state", "cnty",
|
||||
"country", "grid", "lat", "lon",
|
||||
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url",
|
||||
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip",
|
||||
"source", "fetched_at",
|
||||
}
|
||||
// The lookup cache always lives in the local SQLite database, so SQLite
|
||||
@@ -475,8 +519,8 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
||||
INSERT INTO callsign_cache(callsign, name, qth, address, state, cnty,
|
||||
country, grid, lat, lon,
|
||||
dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
||||
source, fetched_at)
|
||||
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?)
|
||||
web, zip, source, fetched_at)
|
||||
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?, ?,?)
|
||||
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
|
||||
_, err := c.db.ExecContext(ctx, q,
|
||||
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
||||
@@ -485,7 +529,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
||||
nullableFloat(r.Lat), nullableFloat(r.Lon),
|
||||
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
||||
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
||||
nullable(r.ImageURL),
|
||||
nullable(r.ImageURL), nullable(r.Web), nullable(r.Zip),
|
||||
r.Source, db.NowISO(),
|
||||
)
|
||||
return err
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package lookup
|
||||
|
||||
import "testing"
|
||||
|
||||
// A grid came back empty for M0BFS/QRP while the same lookup without the suffix
|
||||
// answered perfectly. The home-call pass wiped the location on the grounds that
|
||||
// a portable operator is not at their registered address — true for /P and /M,
|
||||
// and simply wrong for /QRP, which is a statement about power.
|
||||
func TestSaysNothingAboutLocation(t *testing.T) {
|
||||
keep := []string{"M0BFS/QRP", "f4bpo/qrp", "G0ABC/QRP"}
|
||||
for _, c := range keep {
|
||||
if !saysNothingAboutLocation(c) {
|
||||
t.Errorf("%s: the home location should be kept — /QRP does not move anyone", c)
|
||||
}
|
||||
}
|
||||
// These DO move the operator, or change the entity outright.
|
||||
drop := []string{"F4BPO/P", "F4BPO/M", "F4BPO/MM", "F4BPO/AM", "JW/OR1A", "VP8/F4BPO", "F4BPO/8", "F4BPO"}
|
||||
for _, c := range drop {
|
||||
if saysNothingAboutLocation(c) {
|
||||
t.Errorf("%s: the home location must NOT be trusted", c)
|
||||
}
|
||||
}
|
||||
// A power suffix on top of a portable one still moves them.
|
||||
if saysNothingAboutLocation("F4BPO/P/QRP") {
|
||||
t.Error("F4BPO/P/QRP is portable — location must not be kept")
|
||||
}
|
||||
}
|
||||
@@ -21,9 +21,9 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
defaultPort = 9008
|
||||
dialTimeout = 5 * time.Second
|
||||
ioTimeout = 3 * time.Second
|
||||
defaultPort = 9008
|
||||
dialTimeout = 5 * time.Second
|
||||
ioTimeout = 3 * time.Second
|
||||
// Poll fast enough that the amp's OWN forward/current figures make a usable
|
||||
// live meter on their own — the UI prefers them over the FlexRadio VITA stream
|
||||
// (which never traverses a public-IP/NAT link), so this direct reading is what
|
||||
@@ -240,12 +240,10 @@ func (c *Client) authLocked() error {
|
||||
if _, err := fmt.Fprintf(c.conn, "C%d|auth code=%s\n", id, c.password); err != nil {
|
||||
return err
|
||||
}
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
line, err := c.reader.ReadString('\n')
|
||||
line, err := c.readReplyLocked(fmt.Sprintf("R%d|", id))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
applog.Printf("pgxl: auth reply=%q (try %d)", line, try)
|
||||
hex, msg := "", ""
|
||||
if p := strings.SplitN(line, "|", 3); len(p) >= 2 {
|
||||
@@ -264,6 +262,39 @@ func (c *Client) authLocked() error {
|
||||
return fmt.Errorf("powergenius: authentication failed after 4 tries (R|%s|) — check the remote code", lastHex)
|
||||
}
|
||||
|
||||
// readReplyLocked reads until the reply carrying `want` as its prefix arrives,
|
||||
// feeding every unsolicited frame it passes to parse() on the way.
|
||||
//
|
||||
// The amplifier PUSHES status frames ("S0|state=…") on the same socket, and it
|
||||
// pushes them constantly once it is in OPERATE — power, SWR and temperature all
|
||||
// move while transmitting. The old code read exactly one line per command and
|
||||
// took whatever came first as its answer, so a single pushed frame put the
|
||||
// stream permanently one reply behind: every later command read the PREVIOUS
|
||||
// command's answer, and the last one waited out the 3 s deadline, failed, and
|
||||
// dropped the connection. That is the reconnect-every-few-seconds seen in the
|
||||
// field, and the stall in transmit — command() holds the mutex across that whole
|
||||
// dead wait, so anything else touching the amplifier queued behind it.
|
||||
//
|
||||
// It only showed up remotely and in OPERATE: on a LAN with an idle amplifier
|
||||
// there is almost nothing to push and the race hardly ever opens.
|
||||
func (c *Client) readReplyLocked(want string) (string, error) {
|
||||
deadline := time.Now().Add(ioTimeout)
|
||||
for {
|
||||
_ = c.conn.SetReadDeadline(deadline)
|
||||
line, err := c.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
// Every frame is worth having, ours or not — a pushed status is fresher
|
||||
// than the one we were about to ask for.
|
||||
c.parse(line)
|
||||
if strings.HasPrefix(line, want) {
|
||||
return line, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *Client) dropConn() {
|
||||
c.mu.Lock()
|
||||
if c.conn != nil {
|
||||
@@ -286,14 +317,7 @@ func (c *Client) command(cmd string) (string, error) {
|
||||
if _, err := fmt.Fprintf(c.conn, "C%d|%s\n", id, cmd); err != nil {
|
||||
return "", err
|
||||
}
|
||||
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||
line, err := c.reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
line = strings.TrimSpace(line)
|
||||
c.parse(line)
|
||||
return line, nil
|
||||
return c.readReplyLocked(fmt.Sprintf("R%d|", id))
|
||||
}
|
||||
|
||||
// parse handles "R<id>|0|<k=v …>" and "S0|<k=v …>" status lines.
|
||||
|
||||
@@ -52,6 +52,7 @@ type Profile struct {
|
||||
MyCity string `json:"my_city"`
|
||||
MyPostalCode string `json:"my_postal_code"`
|
||||
MySOTARef string `json:"my_sota_ref"`
|
||||
MyIOTA string `json:"my_iota"`
|
||||
MyPOTARef string `json:"my_pota_ref"`
|
||||
MyRig string `json:"my_rig"`
|
||||
MyAntenna string `json:"my_antenna"`
|
||||
@@ -75,7 +76,7 @@ type Repo struct{ db *sql.DB }
|
||||
func NewRepo(db *sql.DB) *Repo { return &Repo{db: db} }
|
||||
|
||||
const selectCols = `id, name, callsign, operator, op_name, owner_callsign, my_grid, my_country, my_state, my_cnty,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref, my_iota,
|
||||
my_rig, my_antenna, my_dxcc, my_cqz, my_ituz, my_lat, my_lon, tx_pwr,
|
||||
is_active, sort_order, db_config, created_at, updated_at`
|
||||
|
||||
@@ -124,12 +125,12 @@ func (r *Repo) Save(ctx context.Context, p *Profile) error {
|
||||
res, err := r.db.ExecContext(ctx, `
|
||||
INSERT INTO station_profiles
|
||||
(name, callsign, operator, op_name, owner_callsign, my_grid, my_country, my_state, my_cnty,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref,
|
||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref, my_iota,
|
||||
my_rig, my_antenna, my_dxcc, my_cqz, my_ituz, my_lat, my_lon, tx_pwr,
|
||||
is_active, sort_order, created_at, updated_at)
|
||||
VALUES(?,?,?,?,?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?,?,?,?, ?,?,?,?)`,
|
||||
VALUES(?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?, ?,?,?,?,?,?,?,?, ?,?,?,?)`,
|
||||
p.Name, p.Callsign, p.Operator, p.OpName, p.OwnerCallsign, p.MyGrid, p.MyCountry, p.MyState, p.MyCounty,
|
||||
p.MyStreet, p.MyCity, p.MyPostalCode, p.MySOTARef, p.MyPOTARef,
|
||||
p.MyStreet, p.MyCity, p.MyPostalCode, p.MySOTARef, p.MyPOTARef, p.MyIOTA,
|
||||
p.MyRig, p.MyAntenna, nullableInt(p.MyDXCC), nullableInt(p.MyCQZone), nullableInt(p.MyITUZone),
|
||||
nullableFloat(p.MyLat), nullableFloat(p.MyLon), nullableFloat(p.TxPower),
|
||||
boolInt(p.IsActive), p.SortOrder, now, now)
|
||||
@@ -144,13 +145,13 @@ func (r *Repo) Save(ctx context.Context, p *Profile) error {
|
||||
UPDATE station_profiles SET
|
||||
name = ?, callsign = ?, operator = ?, op_name = ?, owner_callsign = ?, my_grid = ?, my_country = ?,
|
||||
my_state = ?, my_cnty = ?, my_street = ?, my_city = ?, my_postal_code = ?,
|
||||
my_sota_ref = ?, my_pota_ref = ?, my_rig = ?, my_antenna = ?,
|
||||
my_sota_ref = ?, my_pota_ref = ?, my_iota = ?, my_rig = ?, my_antenna = ?,
|
||||
my_dxcc = ?, my_cqz = ?, my_ituz = ?, my_lat = ?, my_lon = ?, tx_pwr = ?,
|
||||
sort_order = ?, updated_at = ?
|
||||
WHERE id = ?`,
|
||||
p.Name, p.Callsign, p.Operator, p.OpName, p.OwnerCallsign, p.MyGrid, p.MyCountry,
|
||||
p.MyState, p.MyCounty, p.MyStreet, p.MyCity, p.MyPostalCode,
|
||||
p.MySOTARef, p.MyPOTARef, p.MyRig, p.MyAntenna,
|
||||
p.MySOTARef, p.MyPOTARef, p.MyIOTA, p.MyRig, p.MyAntenna,
|
||||
nullableInt(p.MyDXCC), nullableInt(p.MyCQZone), nullableInt(p.MyITUZone),
|
||||
nullableFloat(p.MyLat), nullableFloat(p.MyLon), nullableFloat(p.TxPower),
|
||||
p.SortOrder, now, p.ID)
|
||||
@@ -264,7 +265,7 @@ func scan(row scannable) (Profile, error) {
|
||||
var p Profile
|
||||
var (
|
||||
callsign, operator, opName, ownerCall, myGrid, myCountry, myState, myCnty,
|
||||
myStreet, myCity, myPostal, mySOTA, myPOTA,
|
||||
myStreet, myCity, myPostal, mySOTA, myPOTA, myIOTA,
|
||||
myRig, myAntenna sql.NullString
|
||||
myDXCC, myCQZ, myITUZ sql.NullInt64
|
||||
myLat, myLon, txPwr sql.NullFloat64
|
||||
@@ -273,7 +274,7 @@ func scan(row scannable) (Profile, error) {
|
||||
createdAt, updatedAt string
|
||||
)
|
||||
err := row.Scan(&p.ID, &p.Name, &callsign, &operator, &opName, &ownerCall, &myGrid, &myCountry, &myState, &myCnty,
|
||||
&myStreet, &myCity, &myPostal, &mySOTA, &myPOTA,
|
||||
&myStreet, &myCity, &myPostal, &mySOTA, &myPOTA, &myIOTA,
|
||||
&myRig, &myAntenna, &myDXCC, &myCQZ, &myITUZ, &myLat, &myLon, &txPwr,
|
||||
&isActive, &sortOrder, &dbConfig, &createdAt, &updatedAt)
|
||||
if err != nil {
|
||||
@@ -294,6 +295,7 @@ func scan(row scannable) (Profile, error) {
|
||||
p.MyCity = myCity.String
|
||||
p.MyPostalCode = myPostal.String
|
||||
p.MySOTARef = mySOTA.String
|
||||
p.MyIOTA = myIOTA.String
|
||||
p.MyPOTARef = myPOTA.String
|
||||
p.MyRig = myRig.String
|
||||
p.MyAntenna = myAntenna.String
|
||||
|
||||
@@ -0,0 +1,303 @@
|
||||
// Package pskr subscribes to PSK Reporter's MQTT feed and turns it into the
|
||||
// spots the band-opening detector already eats.
|
||||
//
|
||||
// Why this exists at all: the detector was fed from the DX cluster and the RBN,
|
||||
// and on VHF that is a few hundred skimmers, nearly all of them on HF. A 6 m
|
||||
// opening carrying 869 stations reached OpsLog as a handful of spots, or none.
|
||||
// PSK Reporter is every ordinary station running WSJT-X and reporting what it
|
||||
// decodes — the difference is two orders of magnitude, not a threshold.
|
||||
//
|
||||
// The feed's shape happens to suit us exactly:
|
||||
//
|
||||
// topic pskr/filter/v2/<band>/<mode>/<tx call>/<rx call>/...
|
||||
// payload {"f":50313000,"md":"FT8","rp":-12,"sc":"F4BPO","sl":"JN36",
|
||||
// "rc":"OH5CX","rl":"KP30","b":"6m"}
|
||||
//
|
||||
// BOTH grids are in the message, so distance and bearing are arithmetic. No
|
||||
// lookup, no DXCC-centre approximation, no extra network call — which is what
|
||||
// made the cluster path's bearings coarse.
|
||||
//
|
||||
// Volume is the real design constraint. Six metres open is thousands of
|
||||
// messages a minute, and OpsLog runs on some very old PCs. So: no history is
|
||||
// kept here, nothing is persisted, each message is parsed and handed on or
|
||||
// dropped, and the callback does the deciding.
|
||||
package pskr
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
mqtt "github.com/eclipse/paho.mqtt.golang"
|
||||
)
|
||||
|
||||
// DefaultBroker is PSK Reporter's public MQTT endpoint, TLS.
|
||||
const DefaultBroker = "tls://mqtt.pskreporter.info:1884"
|
||||
|
||||
// DefaultNearKm is the radius that counts as "around here" for a receiver.
|
||||
const DefaultNearKm = 300
|
||||
|
||||
// Bands offered. Anything below 10 m is deliberately absent, 12 m included: an
|
||||
// "opening" on 20 m is the normal state of the band and announcing it says
|
||||
// nothing, and 12 m is close enough to that at this point in the cycle to be the
|
||||
// same problem. These are the bands where an opening is an event.
|
||||
//
|
||||
// Fewer subscriptions is also less traffic, which matters here: the operator's
|
||||
// PC pays for every message the broker sends, whether or not anything comes of it.
|
||||
var Bands = []string{"10m", "6m", "4m", "2m"}
|
||||
|
||||
// Spot is one decode, already reduced to what a detector needs.
|
||||
type Spot struct {
|
||||
Call string // the transmitting station
|
||||
Band string
|
||||
Mode string
|
||||
Grid string // transmitter's grid, 4 characters
|
||||
DistKm int // from the operator
|
||||
Bearing int // degrees from the operator, short path
|
||||
At time.Time
|
||||
}
|
||||
|
||||
// Config is what the watcher needs to run.
|
||||
type Config struct {
|
||||
Broker string
|
||||
Bands []string
|
||||
// OpLat/OpLon are the operator's position: every spot is measured from it,
|
||||
// so with no position there is nothing to measure and the watcher stays down.
|
||||
OpLat, OpLon float64
|
||||
// NearKm is how close a RECEIVER must be to count as "around here". A report
|
||||
// collected further away proves a path that is not the operator's.
|
||||
//
|
||||
// 300 km by default: far enough to borrow the ears of a whole region, which
|
||||
// is the point — an opening reaches an area, not a postcode, and waiting for
|
||||
// a decode at one's own station is just working the band. Close enough that
|
||||
// the ionosphere doing something there is the ionosphere doing it here.
|
||||
NearKm int
|
||||
// Geo turns two grids into distance and bearing. Injected rather than
|
||||
// implemented here so it stays the SAME arithmetic the cluster path uses —
|
||||
// two answers for one question is how a bearing quietly becomes wrong.
|
||||
Geo func(grid string) (distKm int, bearing int, ok bool)
|
||||
// OnSpot receives every accepted decode. Called from the MQTT goroutine, so
|
||||
// it must not block: the broker's buffer is what pays for it if it does.
|
||||
OnSpot func(Spot)
|
||||
// OnGrid receives the transmitter of EVERY message, before any geographic
|
||||
// filtering, for the callsign-to-locator store. Same goroutine as OnSpot and
|
||||
// the same rule: do not block.
|
||||
OnGrid func(call, grid string)
|
||||
// RxGrids filters at the BROKER: only reports collected by a receiver in one
|
||||
// of these squares are sent at all. Empty keeps the old behaviour, which was
|
||||
// to receive the world and discard it here — measured at 83 messages a second
|
||||
// for the four opening bands, of which about one in a hundred survived.
|
||||
RxGrids []string
|
||||
Logf func(string, ...any)
|
||||
}
|
||||
|
||||
// Watcher owns the MQTT connection and its subscriptions.
|
||||
type Watcher struct {
|
||||
mu sync.Mutex
|
||||
cfg Config
|
||||
client mqtt.Client
|
||||
running bool
|
||||
|
||||
// received counts accepted spots since start, for the status panel: a
|
||||
// connection that is up but silent looks identical to one that is working
|
||||
// until you can see a number moving.
|
||||
received uint64
|
||||
lastAt time.Time
|
||||
lastErr string
|
||||
}
|
||||
|
||||
func New(cfg Config) *Watcher {
|
||||
if cfg.Broker == "" {
|
||||
cfg.Broker = DefaultBroker
|
||||
}
|
||||
if len(cfg.Bands) == 0 {
|
||||
cfg.Bands = Bands
|
||||
}
|
||||
if cfg.NearKm <= 0 {
|
||||
cfg.NearKm = DefaultNearKm
|
||||
}
|
||||
if cfg.Logf == nil {
|
||||
cfg.Logf = func(string, ...any) {}
|
||||
}
|
||||
return &Watcher{cfg: cfg}
|
||||
}
|
||||
|
||||
// topics builds the subscription list.
|
||||
//
|
||||
// The v2 topic is
|
||||
//
|
||||
// pskr/filter/v2/<band>/<mode>/<tx call>/<rx call>/<tx grid>/<rx grid>/<tx dxcc>/<rx dxcc>
|
||||
//
|
||||
// so the receiver's square is a level the broker can filter on, and a band of
|
||||
// "+" means every band. Filtering by RECEIVER square rather than by receiver
|
||||
// DXCC is deliberate: measured on 20 m, one country ranged from 1.2 messages a
|
||||
// second (OH) to 72.5 (K), because a DXCC can be a continent. By square the
|
||||
// same measurement is 0.2 to 1.2 — the load follows distance, which is what the
|
||||
// feed is actually about, and it is the same for every operator.
|
||||
func (w *Watcher) topics() []string {
|
||||
out := []string{}
|
||||
for _, b := range w.cfg.Bands {
|
||||
if len(w.cfg.RxGrids) == 0 {
|
||||
out = append(out, "pskr/filter/v2/"+b+"/#")
|
||||
continue
|
||||
}
|
||||
for _, g := range w.cfg.RxGrids {
|
||||
out = append(out, "pskr/filter/v2/"+b+"/+/+/+/+/"+strings.ToUpper(g)+"/+/+")
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Start connects and subscribes. Safe to call when already running.
|
||||
func (w *Watcher) Start() error {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
if w.running {
|
||||
return nil
|
||||
}
|
||||
if w.cfg.Geo == nil || w.cfg.OnSpot == nil {
|
||||
return fmt.Errorf("pskr: Geo and OnSpot are required")
|
||||
}
|
||||
|
||||
opts := mqtt.NewClientOptions().
|
||||
AddBroker(w.cfg.Broker).
|
||||
// A stable client id would collide with another OpsLog on the same
|
||||
// account; the broker is anonymous, so uniqueness is ours to provide.
|
||||
SetClientID(fmt.Sprintf("opslog-%d", time.Now().UnixNano())).
|
||||
SetCleanSession(true).
|
||||
SetAutoReconnect(true).
|
||||
SetConnectRetry(true).
|
||||
SetConnectRetryInterval(30 * time.Second).
|
||||
SetConnectTimeout(15 * time.Second).
|
||||
// No message is worth keeping if we cannot handle it now: an opening is
|
||||
// a thing happening at this moment, and a queue of stale decodes would
|
||||
// announce one that finished twenty minutes ago.
|
||||
SetOrderMatters(false)
|
||||
|
||||
opts.OnConnect = func(c mqtt.Client) {
|
||||
w.cfg.Logf("pskr: connected to %s", w.cfg.Broker)
|
||||
for _, topic := range w.topics() {
|
||||
if tok := c.Subscribe(topic, 0, w.handle); tok.Wait() && tok.Error() != nil {
|
||||
w.cfg.Logf("pskr: subscribe %s failed: %v", topic, tok.Error())
|
||||
continue
|
||||
}
|
||||
w.cfg.Logf("pskr: watching %s", topic)
|
||||
}
|
||||
}
|
||||
opts.OnConnectionLost = func(_ mqtt.Client, err error) {
|
||||
w.mu.Lock()
|
||||
w.lastErr = err.Error()
|
||||
w.mu.Unlock()
|
||||
w.cfg.Logf("pskr: connection lost: %v (will retry)", err)
|
||||
}
|
||||
|
||||
c := mqtt.NewClient(opts)
|
||||
// Deliberately NOT waiting on the connect token: the broker may be slow or
|
||||
// unreachable and startup must not hang on a feature that is decoration.
|
||||
// ConnectRetry brings it up in the background when it can.
|
||||
c.Connect()
|
||||
w.client = c
|
||||
w.running = true
|
||||
return nil
|
||||
}
|
||||
|
||||
// Stop disconnects. Safe to call when already stopped.
|
||||
func (w *Watcher) Stop() {
|
||||
w.mu.Lock()
|
||||
c, running := w.client, w.running
|
||||
w.client, w.running = nil, false
|
||||
w.mu.Unlock()
|
||||
if running && c != nil {
|
||||
c.Disconnect(250)
|
||||
}
|
||||
}
|
||||
|
||||
// wire is the payload as PSK Reporter sends it — short keys, no nesting.
|
||||
type wire struct {
|
||||
Freq int64 `json:"f"`
|
||||
Mode string `json:"md"`
|
||||
SNR int `json:"rp"`
|
||||
TxCall string `json:"sc"`
|
||||
TxGrid string `json:"sl"`
|
||||
RxCall string `json:"rc"`
|
||||
RxGrid string `json:"rl"`
|
||||
Band string `json:"b"`
|
||||
}
|
||||
|
||||
func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
|
||||
var p wire
|
||||
if err := json.Unmarshal(m.Payload(), &p); err != nil {
|
||||
return // malformed payloads are not worth a log line at this rate
|
||||
}
|
||||
call := strings.ToUpper(strings.TrimSpace(p.TxCall))
|
||||
grid := strings.ToUpper(strings.TrimSpace(p.TxGrid))
|
||||
rxGrid := strings.ToUpper(strings.TrimSpace(p.RxGrid))
|
||||
if call == "" || len(grid) < 4 || len(rxGrid) < 4 {
|
||||
return
|
||||
}
|
||||
|
||||
// The locator store takes every transmitter, before any of the geography
|
||||
// below. What it wants is "which square is this callsign in", and that is
|
||||
// true whoever happened to hear the report.
|
||||
if w.cfg.OnGrid != nil {
|
||||
w.cfg.OnGrid(call, grid[:4])
|
||||
}
|
||||
|
||||
// THE RECEIVER HAS TO BE NEAR THE OPERATOR. This is the whole difference
|
||||
// between a useful feed and a world map.
|
||||
//
|
||||
// A PSK Reporter message says "X was heard BY Y". Without this check, a
|
||||
// station 1400 km from here heard by somebody in Japan counted as evidence
|
||||
// of an opening — it proves the path from X to JAPAN, and says nothing at all
|
||||
// about whether anything reaches this station. That is how a "2 m opening"
|
||||
// came to be announced from a KX9X in the United States.
|
||||
//
|
||||
// Only reports collected by a receiver in the operator's own region show that
|
||||
// signals are actually arriving HERE, which is the only question worth asking.
|
||||
if rxDist, _, ok := w.cfg.Geo(rxGrid[:4]); !ok || rxDist > w.cfg.NearKm {
|
||||
return
|
||||
}
|
||||
|
||||
// The TRANSMITTER is the station on the air, so it is the transmitter's grid
|
||||
// that gives the direction and length of the path that just proved itself.
|
||||
dist, brg, ok := w.cfg.Geo(grid[:4])
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
s := Spot{
|
||||
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
|
||||
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
|
||||
DistKm: dist, Bearing: brg,
|
||||
// Stamped on receipt: the broker's own timestamps vary between payload
|
||||
// versions, and the window this feeds is measured in minutes.
|
||||
At: time.Now(),
|
||||
}
|
||||
w.mu.Lock()
|
||||
w.received++
|
||||
w.lastAt = s.At
|
||||
w.mu.Unlock()
|
||||
w.cfg.OnSpot(s)
|
||||
}
|
||||
|
||||
// Status is the snapshot the settings panel shows.
|
||||
type Status struct {
|
||||
Running bool `json:"running"`
|
||||
Received uint64 `json:"received"`
|
||||
LastAt time.Time `json:"last_at"`
|
||||
LastErr string `json:"last_err,omitempty"`
|
||||
Broker string `json:"broker"`
|
||||
Bands []string `json:"bands"`
|
||||
}
|
||||
|
||||
func (w *Watcher) Status() Status {
|
||||
w.mu.Lock()
|
||||
defer w.mu.Unlock()
|
||||
st := Status{
|
||||
Running: w.running, Received: w.received, LastAt: w.lastAt,
|
||||
LastErr: w.lastErr, Broker: w.cfg.Broker,
|
||||
}
|
||||
st.Bands = append(st.Bands, w.cfg.Bands...)
|
||||
return st
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package pskr
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// The receiver square is a level the BROKER can filter on, which is the whole
|
||||
// point: measured on the live feed, the four opening bands unfiltered are 83
|
||||
// messages a second of which about one in a hundred survives the NearKm test.
|
||||
// One ring of squares is under two a second, and the same for every operator —
|
||||
// where filtering by DXCC ranged from 1.2 (OH) to 72.5 (K) on one band.
|
||||
func TestTopicsFilterOnTheReceiverSquare(t *testing.T) {
|
||||
w := New(Config{Bands: []string{"6m"}, RxGrids: []string{"jn36", "JN37"}})
|
||||
got := w.topics()
|
||||
if len(got) != 2 {
|
||||
t.Fatalf("want one subscription per band × square, got %v", got)
|
||||
}
|
||||
// Level order: band/mode/txcall/rxcall/txgrid/RXGRID/txdxcc/rxdxcc
|
||||
want := "pskr/filter/v2/6m/+/+/+/+/JN36/+/+"
|
||||
if got[0] != want {
|
||||
t.Errorf("topic = %q, want %q", got[0], want)
|
||||
}
|
||||
if !strings.Contains(got[1], "/JN37/") {
|
||||
t.Errorf("square not upper-cased into the topic: %q", got[1])
|
||||
}
|
||||
}
|
||||
|
||||
// With no squares the old behaviour stands: receive the band and decide here.
|
||||
func TestTopicsWithoutSquares(t *testing.T) {
|
||||
w := New(Config{Bands: []string{"10m", "2m"}})
|
||||
got := w.topics()
|
||||
if len(got) != 2 || got[0] != "pskr/filter/v2/10m/#" {
|
||||
t.Errorf("unfiltered topics = %v", got)
|
||||
}
|
||||
}
|
||||
|
||||
// Grid chasing wants every band. "+" is the MQTT single-level wildcard, so one
|
||||
// subscription per square covers the lot instead of one per band per square.
|
||||
func TestTopicsAllBands(t *testing.T) {
|
||||
w := New(Config{Bands: []string{"+"}, RxGrids: []string{"JN36"}})
|
||||
got := w.topics()
|
||||
if len(got) != 1 || got[0] != "pskr/filter/v2/+/+/+/+/+/JN36/+/+" {
|
||||
t.Errorf("all-band topic = %v", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package qso
|
||||
|
||||
import "testing"
|
||||
|
||||
// Mode, submode and RST are repair fields: an import that mapped every contact
|
||||
// to SSB, or an ADIF that carried no MODE, is fixed in one pass instead of one
|
||||
// row at a time. They were excluded as "per-QSO", which confused describing a
|
||||
// QSO with repairing a batch of them.
|
||||
func TestModeAndRSTAreBulkEditable(t *testing.T) {
|
||||
for _, col := range []string{"mode", "submode", "rst_sent", "rst_rcvd"} {
|
||||
if !bulkEditableCols[col] {
|
||||
t.Errorf("%s should be bulk-editable", col)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Band must NOT be bulk-editable on its own: it travels with the frequency
|
||||
// through BulkSetFrequency. A band contradicting its own frequency is invalid
|
||||
// ADIF, and every export would carry the contradiction out into the world.
|
||||
func TestBandIsNotBulkEditableAlone(t *testing.T) {
|
||||
for _, col := range []string{"band", "freq_hz", "callsign", "qso_date"} {
|
||||
if bulkEditableCols[col] {
|
||||
t.Errorf("%s must not be bulk-editable on its own", col)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package qso
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// "equals nothing" and "is empty" are the same question. SQL answers the first
|
||||
// with nothing at all — a NULL never equals ” — so a filter written in plain
|
||||
// words returned zero rows and looked broken rather than wrong.
|
||||
func TestEqualsBlankMeansEmpty(t *testing.T) {
|
||||
sql, args, err := conditionSQL(Condition{Field: "freq_hz", Op: "eq", Value: ""})
|
||||
if err != nil {
|
||||
t.Fatalf("eq blank: %v", err)
|
||||
}
|
||||
if len(args) != 0 || !strings.Contains(sql, "IS NULL") {
|
||||
t.Errorf("sql = %q args = %v — want the empty test", sql, args)
|
||||
}
|
||||
sql, _, _ = conditionSQL(Condition{Field: "name", Op: "ne", Value: " "})
|
||||
if !strings.Contains(sql, "<> ''") {
|
||||
t.Errorf("ne blank on text gave %q — want the not-empty test", sql)
|
||||
}
|
||||
}
|
||||
|
||||
// A numeric column is empty when NULL *or* zero, and that must be explicit:
|
||||
// SQLite compares 0 against ” as false while MySQL calls it true, so one
|
||||
// expression would answer two different questions depending on the backend.
|
||||
func TestEmptyOnNumericCoversZeroAndNull(t *testing.T) {
|
||||
sql, _, err := conditionSQL(Condition{Field: "freq_hz", Op: "empty"})
|
||||
if err != nil {
|
||||
t.Fatalf("empty: %v", err)
|
||||
}
|
||||
if !strings.Contains(sql, "IS NULL") || !strings.Contains(sql, "= 0") {
|
||||
t.Errorf("sql = %q — want both NULL and zero", sql)
|
||||
}
|
||||
// Text keeps the string test: '' is a real value there, 0 is not.
|
||||
sql, _, _ = conditionSQL(Condition{Field: "name", Op: "empty"})
|
||||
if !strings.Contains(sql, "IFNULL") || strings.Contains(sql, "= 0") {
|
||||
t.Errorf("text empty gave %q", sql)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package qso
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// "2 m or 70 cm, in FT8, since January" could not be asked before: the filter
|
||||
// joins every condition with ONE AND or OR, so AND killed the two bands and OR
|
||||
// let every FT8 QSO through. The OR now lives inside a single condition.
|
||||
func TestInConditionExpressesSeveralValuesForOneField(t *testing.T) {
|
||||
sql, args, err := conditionSQL(Condition{Field: "band", Op: "in", Value: "2m, 70cm"})
|
||||
if err != nil {
|
||||
t.Fatalf("in: %v", err)
|
||||
}
|
||||
if !strings.Contains(sql, "IN (?,?)") {
|
||||
t.Errorf("sql = %q, want an IN with two placeholders", sql)
|
||||
}
|
||||
if len(args) != 2 || args[0] != "2m" || args[1] != "70cm" {
|
||||
t.Errorf("args = %v, want [2m 70cm] trimmed", args)
|
||||
}
|
||||
}
|
||||
|
||||
// A trailing comma while typing must not add an empty value that matches nothing.
|
||||
func TestInIgnoresBlanks(t *testing.T) {
|
||||
_, args, err := conditionSQL(Condition{Field: "mode", Op: "in", Value: "FT8, ,FT4,"})
|
||||
if err != nil {
|
||||
t.Fatalf("in: %v", err)
|
||||
}
|
||||
if len(args) != 2 {
|
||||
t.Errorf("args = %v, want the two real values only", args)
|
||||
}
|
||||
}
|
||||
|
||||
// An empty list matches nothing. Dropping the condition instead would WIDEN the
|
||||
// result set — the opposite of what someone typing a filter expects.
|
||||
func TestEmptyInMatchesNothing(t *testing.T) {
|
||||
sql, _, err := conditionSQL(Condition{Field: "band", Op: "in", Value: " , "})
|
||||
if err != nil {
|
||||
t.Fatalf("in: %v", err)
|
||||
}
|
||||
if sql != "1=0" {
|
||||
t.Errorf("sql = %q, want 1=0", sql)
|
||||
}
|
||||
}
|
||||
|
||||
// NOT IN must keep rows whose column is NULL: the row is not one of the listed
|
||||
// values, so it belongs in the answer. Raw SQL NOT IN drops them.
|
||||
func TestNotInKeepsNulls(t *testing.T) {
|
||||
sql, _, err := conditionSQL(Condition{Field: "band", Op: "notin", Value: "2m"})
|
||||
if err != nil {
|
||||
t.Fatalf("notin: %v", err)
|
||||
}
|
||||
if !strings.HasPrefix(sql, "IFNULL(") {
|
||||
t.Errorf("sql = %q, want the column wrapped in IFNULL", sql)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package qso
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
_ "modernc.org/sqlite"
|
||||
)
|
||||
|
||||
// OrderedIDs against a real SQLite file, with qso_date stored the way the repo
|
||||
// actually writes it.
|
||||
//
|
||||
// The first version scanned that column straight into a time.Time. It compiles,
|
||||
// it reads correctly, and it fails at run time — the column holds a formatted
|
||||
// STRING. The error was swallowed into "the column will be empty", which is
|
||||
// exactly what shipped: a column that was always blank.
|
||||
func TestOrderedIDsAgainstRealSQLite(t *testing.T) {
|
||||
conn, err := sql.Open("sqlite", "file:"+filepath.Join(t.TempDir(), "t.db"))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Cleanup(func() { conn.Close() })
|
||||
if _, err := conn.Exec(`CREATE TABLE qso (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
callsign TEXT NOT NULL,
|
||||
qso_date TEXT NOT NULL
|
||||
)`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// Inserted NEWEST first, so the ids run opposite to the dates — what an
|
||||
// imported ADIF produces, and the whole reason the id is not the number.
|
||||
for _, row := range []struct {
|
||||
call string
|
||||
at time.Time
|
||||
}{
|
||||
{"NEWEST", time.Date(2026, 8, 13, 10, 0, 0, 0, time.UTC)},
|
||||
{"MIDDLE", time.Date(2020, 1, 1, 10, 0, 0, 0, time.UTC)},
|
||||
{"OLDEST", time.Date(1999, 5, 5, 10, 0, 0, 0, time.UTC)},
|
||||
} {
|
||||
if _, err := conn.Exec(`INSERT INTO qso (callsign, qso_date) VALUES (?, ?)`,
|
||||
row.call, row.at.UTC().Format(isoMillis)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
ids, newest, err := NewRepo(conn).OrderedIDs(context.Background())
|
||||
if err != nil {
|
||||
t.Fatalf("OrderedIDs: %v — this is the failure that emptied the column", err)
|
||||
}
|
||||
if len(ids) != 3 {
|
||||
t.Fatalf("got %d ids, want 3", len(ids))
|
||||
}
|
||||
// Rows 1,2,3 were inserted newest→oldest, so chronological order is 3,2,1.
|
||||
if ids[0] != 3 || ids[1] != 2 || ids[2] != 1 {
|
||||
t.Errorf("order = %v, want the oldest contact first (3,2,1)", ids)
|
||||
}
|
||||
if newest.Year() != 2026 {
|
||||
t.Errorf("newest = %v, want the 2026 contact", newest)
|
||||
}
|
||||
}
|
||||
+221
-9
@@ -47,7 +47,15 @@ func MergeNonZero(dst *QSO, src QSO) {
|
||||
// import/export. Pointers are used to distinguish "absent" from "zero".
|
||||
// Anything in ADIF that is not a promoted column lands in Extras.
|
||||
type QSO struct {
|
||||
ID int64 `json:"id"`
|
||||
ID int64 `json:"id"`
|
||||
// Number is the contact's position in the log, oldest = 1.
|
||||
//
|
||||
// NOT a column and NOT the ID: the primary key follows insertion order, so
|
||||
// importing an old ADIF gives the oldest contacts the highest ids. This is a
|
||||
// rank over qso_date, computed by the App layer and stamped on the way out —
|
||||
// which is why it is `json:"-"`-adjacent in spirit: nothing reads or writes
|
||||
// it in SQL.
|
||||
Number int `json:"number,omitempty"`
|
||||
Callsign string `json:"callsign"`
|
||||
QSODate time.Time `json:"qso_date"` // start, UTC
|
||||
QSODateOff time.Time `json:"qso_date_off,omitempty"` // end, UTC
|
||||
@@ -734,13 +742,26 @@ func (r *Repo) MarkEQSLSent(ctx context.Context, id int64, date string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// bulkEditableCols whitelists the columns BulkSetField may write. Limited to
|
||||
// TEXT fields where setting one value across many QSOs is meaningful: the
|
||||
// per-service QSL/upload status fields, plus "my station"/operator fields that
|
||||
// are naturally constant across a run (grid, antenna, rig, address, …). It
|
||||
// deliberately excludes per-QSO fields (callsign, band, mode, date, RST, the
|
||||
// contacted station's details) and numeric columns (power, zones, lat/lon),
|
||||
// which would be corrupted or meaningless if bulk-set to a single value.
|
||||
// bulkEditableCols whitelists the columns BulkSetField may write.
|
||||
//
|
||||
// Mostly TEXT fields where one value across many QSOs is meaningful: the
|
||||
// per-service QSL/upload status fields, plus "my station"/operator fields
|
||||
// naturally constant across a run (grid, antenna, rig, address, …).
|
||||
//
|
||||
// Mode, submode and RST are here too, which the original rule excluded as
|
||||
// "per-QSO". That rule confused two different things. Bulk edit is not for
|
||||
// describing QSOs, it is for REPAIRING a batch — an import that mapped every
|
||||
// contact to SSB, an ADIF with no MODE at all — and refusing to fix a hundred
|
||||
// rows because a hundred rows should not normally share a value leaves the
|
||||
// operator editing them one at a time.
|
||||
//
|
||||
// Band is NOT here, and frequency is not either: both go through
|
||||
// BulkSetFrequency, which writes the pair together. A band that contradicts its
|
||||
// own frequency is invalid ADIF, and every export would carry the contradiction.
|
||||
//
|
||||
// Still excluded, and this part of the rule stands: callsign and date, which
|
||||
// identify the contact rather than describe it, and the numeric columns (power,
|
||||
// zones, lat/lon) that are meaningless shared.
|
||||
var bulkEditableCols = map[string]bool{
|
||||
// QSL / upload status
|
||||
"lotw_sent": true,
|
||||
@@ -820,6 +841,14 @@ var bulkEditableCols = map[string]bool{
|
||||
"iota": true,
|
||||
"sig": true,
|
||||
"sig_info": true,
|
||||
// The contact itself. Repair fields: an import that mapped everything to SSB,
|
||||
// or an ADIF that carried no MODE. Setting mode CLEARS submode (see
|
||||
// BulkSetField) — a submode left over from the old mode contradicts the new
|
||||
// one, and "FT8 / USB" is not a thing.
|
||||
"mode": true,
|
||||
"submode": true,
|
||||
"rst_sent": true,
|
||||
"rst_rcvd": true,
|
||||
// Misc text
|
||||
"comment": true,
|
||||
"notes": true,
|
||||
@@ -843,8 +872,16 @@ func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value stri
|
||||
ph[i] = "?"
|
||||
args = append(args, id)
|
||||
}
|
||||
set := column + " = ?, updated_at = ?"
|
||||
if column == "mode" {
|
||||
// A submode belongs to the mode it was recorded under. Left behind, it
|
||||
// contradicts the new one — "FT8" with a submode of "USB" is not a thing,
|
||||
// and it is the submode that most ADIF readers believe. Clearing it is the
|
||||
// only outcome that leaves the row meaning what the operator asked for.
|
||||
set += ", submode = ''"
|
||||
}
|
||||
res, err := r.db.ExecContext(ctx,
|
||||
`UPDATE qso SET `+column+` = ?, updated_at = ? WHERE id IN (`+strings.Join(ph, ",")+`)`,
|
||||
`UPDATE qso SET `+set+` WHERE id IN (`+strings.Join(ph, ",")+`)`,
|
||||
args...)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("bulk set %s: %w", column, err)
|
||||
@@ -867,6 +904,23 @@ var bulkEditableExtras = map[string]string{
|
||||
// BulkExtraKey maps a frontend field id to its ADIF key in extras_json, or "".
|
||||
func BulkExtraKey(field string) string { return bulkEditableExtras[field] }
|
||||
|
||||
// BulkEditable reports whether a COLUMN may be bulk-written. Exported so the
|
||||
// app layer can check its own field mapping against this whitelist: the two
|
||||
// lists are separate, valid on their own, and a field present in one and absent
|
||||
// from the other fails only when an operator tries to use it.
|
||||
func BulkEditable(column string) bool { return bulkEditableCols[column] }
|
||||
|
||||
// BulkEditableColumns lists every bulk-writable column, for the same check from
|
||||
// the other side: a column nothing maps to looks supported and cannot be used.
|
||||
func BulkEditableColumns() []string {
|
||||
out := make([]string, 0, len(bulkEditableCols))
|
||||
for c := range bulkEditableCols {
|
||||
out = append(out, c)
|
||||
}
|
||||
sort.Strings(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// BulkSetExtra sets one whitelisted extras_json field on every listed QSO,
|
||||
// leaving the other extras untouched. An empty value REMOVES the key rather than
|
||||
// storing a blank — an empty extra would otherwise be carried into every export.
|
||||
@@ -1220,6 +1274,17 @@ var filterableColumns = map[string]bool{
|
||||
// value compares on the date part (see conditionSQL) so day filters are exact.
|
||||
var dateColumns = map[string]bool{"qso_date": true, "qso_date_off": true}
|
||||
|
||||
// numericColumns are the filterable columns holding numbers rather than text.
|
||||
//
|
||||
// "Empty" means something different for them: NULL *or* zero. It has to be said
|
||||
// explicitly because the two backends disagree — SQLite compares 0 against ”
|
||||
// as false, MySQL calls it true — so one expression would quietly answer two
|
||||
// different questions depending on where the logbook lives.
|
||||
var numericColumns = map[string]bool{
|
||||
"freq_hz": true, "freq_rx_hz": true, "dxcc": true, "cqz": true, "ituz": true,
|
||||
"srx": true, "stx": true, "tx_pwr": true,
|
||||
}
|
||||
|
||||
// bareDateRe matches a plain calendar date with no time component.
|
||||
var bareDateRe = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
|
||||
|
||||
@@ -1289,6 +1354,23 @@ func columnExpr(field string) (string, bool) {
|
||||
}
|
||||
|
||||
// conditionSQL turns one condition into a parameterised predicate.
|
||||
// splitList parses the comma-separated value of an "in" / "not in" condition.
|
||||
//
|
||||
// Blanks are dropped, so a trailing comma or a stray space while typing does not
|
||||
// silently add an empty value that matches nothing. Case is left alone: the
|
||||
// columns this is used on (band, mode, country) are stored in the case the log
|
||||
// was written in, and forcing it here would break the ones that are not.
|
||||
func splitList(v string) []string {
|
||||
parts := strings.Split(v, ",")
|
||||
out := make([]string, 0, len(parts))
|
||||
for _, p := range parts {
|
||||
if p = strings.TrimSpace(p); p != "" {
|
||||
out = append(out, p)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func conditionSQL(c Condition) (string, []any, error) {
|
||||
col, ok := columnExpr(c.Field)
|
||||
if !ok {
|
||||
@@ -1303,6 +1385,18 @@ func conditionSQL(c Condition) (string, []any, error) {
|
||||
col = "substr(" + col + ",1,10)"
|
||||
v = strings.TrimSpace(v)
|
||||
}
|
||||
// "equals nothing" and "is empty" are the same question, and SQL answers the
|
||||
// first with nothing at all: a NULL never equals '', so a filter written that
|
||||
// way returns zero rows and looks broken rather than wrong. Asking it in
|
||||
// plain words is not a mistake worth punishing.
|
||||
if strings.TrimSpace(v) == "" {
|
||||
switch c.Op {
|
||||
case "eq":
|
||||
c.Op = "empty"
|
||||
case "ne":
|
||||
c.Op = "notempty"
|
||||
}
|
||||
}
|
||||
switch c.Op {
|
||||
case "eq":
|
||||
return col + " = ?", []any{v}, nil
|
||||
@@ -1322,9 +1416,49 @@ func conditionSQL(c Condition) (string, []any, error) {
|
||||
return col + " LIKE ?", []any{v + "%"}, nil
|
||||
case "endswith":
|
||||
return col + " LIKE ?", []any{"%" + v}, nil
|
||||
case "in", "notin":
|
||||
// Several values for ONE field, comma-separated.
|
||||
//
|
||||
// This is what makes a real question expressible. The filter joins every
|
||||
// condition with a single AND or OR, so "2 m or 70 cm, in FT8, since
|
||||
// January" could not be asked: AND killed the two bands, OR let every FT8
|
||||
// QSO through. Rather than grow the model nested groups — a tree in the UI
|
||||
// to answer a question that is nearly always "this field, any of these
|
||||
// values" — the OR lives INSIDE one condition and everything else keeps
|
||||
// ANDing.
|
||||
vals := splitList(v)
|
||||
if len(vals) == 0 {
|
||||
// An empty list matches nothing, which is the honest reading. Silently
|
||||
// dropping the condition would widen the result set instead.
|
||||
if c.Op == "in" {
|
||||
return "1=0", nil, nil
|
||||
}
|
||||
return "1=1", nil, nil
|
||||
}
|
||||
ph := strings.TrimSuffix(strings.Repeat("?,", len(vals)), ",")
|
||||
args := make([]any, 0, len(vals))
|
||||
for _, s := range vals {
|
||||
args = append(args, s)
|
||||
}
|
||||
if c.Op == "notin" {
|
||||
// IFNULL, or a NULL column would fail "NOT IN" and vanish from the
|
||||
// result — the row is not one of the listed values, so it belongs.
|
||||
return "IFNULL(" + col + ",'') NOT IN (" + ph + ")", args, nil
|
||||
}
|
||||
return col + " IN (" + ph + ")", args, nil
|
||||
case "empty":
|
||||
// A numeric column is empty when it is NULL *or* zero, and that has to be
|
||||
// said explicitly: SQLite compares 0 against '' as false while MySQL calls
|
||||
// it true, so IFNULL(col,'')='' quietly means different things on the two
|
||||
// backends OpsLog supports.
|
||||
if numericColumns[strings.ToLower(strings.TrimSpace(c.Field))] {
|
||||
return "(" + col + " IS NULL OR " + col + " = 0)", nil, nil
|
||||
}
|
||||
return "IFNULL(" + col + ",'') = ''", nil, nil
|
||||
case "notempty":
|
||||
if numericColumns[strings.ToLower(strings.TrimSpace(c.Field))] {
|
||||
return "(" + col + " IS NOT NULL AND " + col + " <> 0)", nil, nil
|
||||
}
|
||||
return "IFNULL(" + col + ",'') <> ''", nil, nil
|
||||
default:
|
||||
return "", nil, fmt.Errorf("unknown operator %q", c.Op)
|
||||
@@ -3002,3 +3136,81 @@ func IsFilterable(column string) bool { return filterableColumns[column] }
|
||||
// column of their own and live in extras_json.
|
||||
func IsBulkEditableExtra(field string) bool { _, ok := bulkEditableExtras[field]; return ok }
|
||||
func IsFilterableExtra(field string) bool { _, ok := filterableExtras[field]; return ok }
|
||||
|
||||
// WorkedGridKeys returns the set of "GRID|MODE" keys already in the log, where
|
||||
// GRID is the 4-character field+square and MODE has been through normMode.
|
||||
//
|
||||
// The mode is part of the key, and normMode is what makes the DX-cluster
|
||||
// "group digital modes" option apply to grids for free: with grouping on, FT8
|
||||
// and FT4 both normalise to the same token, so a grid worked on FT8 is not new
|
||||
// on FT4; with it off they stay separate keys and it is.
|
||||
//
|
||||
// Truncated to four characters on the way in. A log holds a mix of JN36 and
|
||||
// JN36QU depending on where each QSO came from, and grid chasing is a
|
||||
// field+square game — without the truncation the same square counts as new
|
||||
// forever, once per subsquare.
|
||||
func (r *Repo) WorkedGridKeys(ctx context.Context, normMode func(string) string) (map[string]struct{}, error) {
|
||||
rows, err := r.db.QueryContext(ctx,
|
||||
// The column is "grid", not "gridsquare" — that is the ADIF field name, and
|
||||
// gridsquare_ext is a different (six-plus character) column entirely.
|
||||
`SELECT DISTINCT COALESCE(grid,''), COALESCE(mode,'') FROM qso
|
||||
WHERE grid IS NOT NULL AND grid != ''`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := make(map[string]struct{}, 4096)
|
||||
for rows.Next() {
|
||||
var grid, mode string
|
||||
if err := rows.Scan(&grid, &mode); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
grid = strings.ToUpper(strings.TrimSpace(grid))
|
||||
if len(grid) < 4 {
|
||||
continue
|
||||
}
|
||||
grid = grid[:4]
|
||||
mode = strings.ToUpper(strings.TrimSpace(mode))
|
||||
if normMode != nil && mode != "" {
|
||||
mode = normMode(mode)
|
||||
}
|
||||
out[grid+"|"+mode] = struct{}{}
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// OrderedIDs returns every QSO id in chronological order, oldest first.
|
||||
//
|
||||
// The mirror of ListFiltered's "qso_date DESC, id DESC", so the tie-break is the
|
||||
// same one the grid displays and a contact cannot change number depending on
|
||||
// which way it is read.
|
||||
//
|
||||
// One query, ids only: the caller turns it into a rank once and keeps it in
|
||||
// memory. Asking the database for a row's rank per row would be a correlated
|
||||
// count over the whole log for each of thirty thousand rows.
|
||||
func (r *Repo) OrderedIDs(ctx context.Context) ([]int64, time.Time, error) {
|
||||
rows, err := r.db.QueryContext(ctx, `SELECT id, qso_date FROM qso ORDER BY qso_date ASC, id ASC`)
|
||||
if err != nil {
|
||||
return nil, time.Time{}, err
|
||||
}
|
||||
defer rows.Close()
|
||||
out := make([]int64, 0, 4096)
|
||||
// qso_date is stored as a formatted STRING, not a driver date. Scanning it
|
||||
// into a time.Time silently fails on SQLite, which is how this returned an
|
||||
// error and left the whole column empty.
|
||||
var lastDate string
|
||||
for rows.Next() {
|
||||
var id int64
|
||||
var at string
|
||||
if err := rows.Scan(&id, &at); err != nil {
|
||||
return nil, time.Time{}, err
|
||||
}
|
||||
out = append(out, id)
|
||||
lastDate = at // ascending, so the last row read is the newest
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, time.Time{}, err
|
||||
}
|
||||
// Parsed once, for the newest row only — the ordering came from SQL.
|
||||
return out, parseTimeLoose(lastDate), nil
|
||||
}
|
||||
|
||||
+146
-1
@@ -49,6 +49,10 @@ type Rig interface {
|
||||
SetFreq(hz int64) error
|
||||
SetMode(mode string) error
|
||||
SetPTT(on bool) error
|
||||
// SetSplit arms or clears split and places the transmit frequency. Returns an
|
||||
// error on a rig that cannot: a refusal the client can report is worth far
|
||||
// more than a success it has no way to check.
|
||||
SetSplit(on bool, txHz int64) error
|
||||
}
|
||||
|
||||
type Server struct {
|
||||
@@ -61,12 +65,24 @@ type Server struct {
|
||||
conns map[net.Conn]struct{}
|
||||
closed bool
|
||||
|
||||
// accepted counts every connection this listener has taken. Only selfTest
|
||||
// reads it, to tell "a client reached us" from "a client reached someone
|
||||
// else on our port".
|
||||
accepted atomic.Int64
|
||||
|
||||
// ptt mirrors the last PTT state a client commanded via set_ptt. WSJT-X/JTDX
|
||||
// poll get_ptt DURING transmit to confirm the rig is keyed; if get_ptt reads
|
||||
// RX they conclude PTT failed and abort the over after a second or two. We
|
||||
// don't read PTT back from every backend, so echo what the client last set —
|
||||
// always consistent with its own command, and enough to satisfy the check.
|
||||
ptt atomic.Bool
|
||||
// pttKnown says ptt reflects a state we actually commanded, so a repeat can
|
||||
// be told from the very first call — where the radio's state is unknown and
|
||||
// the command must go through.
|
||||
pttKnown atomic.Bool
|
||||
// splitWanted remembers a set_split_vfo that arrived before the frequency it
|
||||
// needs, so the pair can be honoured in the order the client sends them.
|
||||
splitWanted atomic.Bool
|
||||
}
|
||||
|
||||
func New(port int, rig Rig, logf func(string, ...any)) *Server {
|
||||
@@ -109,15 +125,58 @@ func (s *Server) Start() error {
|
||||
}
|
||||
return
|
||||
}
|
||||
s.accepted.Add(1)
|
||||
s.mu.Lock()
|
||||
s.conns[c] = struct{}{}
|
||||
s.mu.Unlock()
|
||||
go s.serve(c)
|
||||
}
|
||||
}()
|
||||
go s.selfTest()
|
||||
return nil
|
||||
}
|
||||
|
||||
// selfTest checks that a client connecting to 127.0.0.1:<port> actually reaches
|
||||
// THIS listener, and says so in the log when it does not.
|
||||
//
|
||||
// Binding successfully is not the same as being reachable. OpsLog listens on
|
||||
// 0.0.0.0, and Windows lets a second program bind the SAME port on the specific
|
||||
// address 127.0.0.1. Connections to localhost then go to the MORE SPECIFIC
|
||||
// listener — the other program — while ours sits there having logged "sharing
|
||||
// CAT on port 4532" and never seeing a single client.
|
||||
//
|
||||
// Seen in the field with Nexus, which starts its own rigctld on 127.0.0.1:4532
|
||||
// and connects to it. Neither program reports anything wrong; the operator gets
|
||||
// a CAT timeout from a daemon with no radio behind it, and OpsLog's log is
|
||||
// silent because nothing ever arrived. Three exchanges went into finding that,
|
||||
// so it is worth one line at startup.
|
||||
//
|
||||
// The counter can only be raised by our own accept loop, so a real client
|
||||
// arriving during the probe makes this pass, never fail wrongly.
|
||||
func (s *Server) selfTest() {
|
||||
before := s.accepted.Load()
|
||||
addr := fmt.Sprintf("127.0.0.1:%d", s.port)
|
||||
c, err := net.DialTimeout("tcp", addr, 2*time.Second)
|
||||
if err != nil {
|
||||
s.log("rigctld: WARNING — could not reach our own CAT port at %s (%v); "+
|
||||
"clients on this PC will not find OpsLog", addr, err)
|
||||
return
|
||||
}
|
||||
defer c.Close()
|
||||
// Give the accept loop a moment: the dial returns as soon as the handshake
|
||||
// completes, which can be marginally before Accept hands the connection over.
|
||||
for i := 0; i < 20; i++ {
|
||||
if s.accepted.Load() > before {
|
||||
return // it reached us — nothing to say
|
||||
}
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
s.log("rigctld: WARNING — another program is already answering on %s. "+
|
||||
"It will receive the CAT connections meant for OpsLog, which will look "+
|
||||
"like a timeout in that program and silence here. Close it, or move "+
|
||||
"OpsLog's shared CAT to a different port.", addr)
|
||||
}
|
||||
|
||||
// releasePTT drops the transmitter when whoever was holding it goes away.
|
||||
//
|
||||
// Nothing else will. The Kenwood/Elecraft backend deliberately suspends its
|
||||
@@ -224,6 +283,24 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
return "CHKVFO 0\n", false
|
||||
case "\\get_powerstat", "get_powerstat":
|
||||
return "1\n", false
|
||||
|
||||
// Three commands a client may issue as a matter of course. Refusing them with
|
||||
// RPRT -11 is allowed, and a tolerant client carries on — but nothing obliges
|
||||
// it to, and Nexus sends all three around every transmit. Answering costs
|
||||
// nothing and removes them as suspects when something really is wrong.
|
||||
case "\\get_lock_mode", "get_lock_mode":
|
||||
// Truthful: OpsLog never locks the dial against its own clients.
|
||||
return "0\n", false
|
||||
case "\\set_lock_mode", "set_lock_mode":
|
||||
// Accepted and ignored, like set_vfo below: there is no lock to set, and
|
||||
// failing here would abort a client's whole transmit sequence over a
|
||||
// setting that has no effect either way.
|
||||
return rprt(0), false
|
||||
case "\\stop_morse", "stop_morse":
|
||||
// Nothing is queued here — CW over CAT is keyed by the rig's own keyer
|
||||
// through the backend, not buffered in this server. "Stopped" is therefore
|
||||
// accurate rather than polite.
|
||||
return rprt(0), false
|
||||
case "q", "Q", "\\quit":
|
||||
return "", true
|
||||
|
||||
@@ -275,11 +352,27 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
return rprt(-1), false
|
||||
}
|
||||
on := args[0] != "0"
|
||||
// Only touch the radio on a CHANGE.
|
||||
//
|
||||
// A client is free to restate PTT as often as it likes, and one does:
|
||||
// Nexus sends set_ptt 0 about sixteen times a second, so the Flex was
|
||||
// getting "xmit 0" every 60 ms forever. Worse than wasteful — its own
|
||||
// "xmit 1" landed between two of them and was overwritten in the same
|
||||
// millisecond, so the radio never stayed keyed and the operator saw a
|
||||
// transmit request that simply did nothing.
|
||||
//
|
||||
// Repeating a state is not a request to change it. The first call always
|
||||
// goes through, since we cannot know how the radio was left.
|
||||
if s.pttKnown.Load() && s.ptt.Load() == on {
|
||||
return rprt(0), false
|
||||
}
|
||||
if err := s.rig.SetPTT(on); err != nil {
|
||||
s.log("rigctld: set_ptt %v failed: %v", on, err)
|
||||
return rprt(-9), false
|
||||
}
|
||||
s.ptt.Store(on)
|
||||
s.pttKnown.Store(true)
|
||||
s.log("rigctld: PTT %s", map[bool]string{true: "ON", false: "off"}[on])
|
||||
return rprt(0), false
|
||||
|
||||
case "v", "\\get_vfo":
|
||||
@@ -297,7 +390,31 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
}
|
||||
return fmt.Sprintf("%d\nVFOB\n", n), false
|
||||
case "S", "\\set_split_vfo":
|
||||
return rprt(0), false // see set_vfo — split is driven from the rig
|
||||
// "S <0|1> <VFO>". The VFO argument is ignored: which dial transmits is the
|
||||
// rig's own business, and every backend here puts it on the second one.
|
||||
//
|
||||
// This used to answer RPRT 0 and do NOTHING. WSJT-X in "Split Operating:
|
||||
// Rig" sends this and set_split_freq, believed both, and transmitted on the
|
||||
// RECEIVE frequency — on a pileup, straight onto the DX, while the software
|
||||
// showed exactly what the operator had asked for. A lie that leaves no
|
||||
// trace anywhere is the worst kind of bug, so it now works or says so.
|
||||
if len(args) < 1 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
if args[0] != "0" {
|
||||
// Arming needs a frequency, and WSJT-X sends set_split_freq AFTER this.
|
||||
// Remember the request and let that command do the work: alone, this
|
||||
// would arm split on whatever the transmit VFO happens to hold.
|
||||
s.splitWanted.Store(true)
|
||||
return rprt(0), false
|
||||
}
|
||||
s.splitWanted.Store(false)
|
||||
if err := s.rig.SetSplit(false, 0); err != nil {
|
||||
s.log("rigctld: split off failed: %v", err)
|
||||
return rprt(-9), false
|
||||
}
|
||||
s.log("rigctld: split off")
|
||||
return rprt(0), false
|
||||
case "i", "\\get_split_freq":
|
||||
_, tx := s.rig.Split()
|
||||
if tx <= 0 {
|
||||
@@ -305,9 +422,37 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
||||
}
|
||||
return fmt.Sprintf("%d\n", tx), false
|
||||
case "I", "\\set_split_freq":
|
||||
if len(args) < 1 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
// Hamlib sends a float ("14075300.000000"), so parse as one.
|
||||
hz, err := strconv.ParseFloat(args[0], 64)
|
||||
if err != nil || hz <= 0 {
|
||||
return rprt(-1), false
|
||||
}
|
||||
if err := s.rig.SetSplit(true, int64(hz)); err != nil {
|
||||
s.log("rigctld: split TX %.0f Hz failed: %v", hz, err)
|
||||
return rprt(-9), false
|
||||
}
|
||||
s.splitWanted.Store(true)
|
||||
s.log("rigctld: split ON, TX %.0f Hz", hz)
|
||||
return rprt(0), false
|
||||
|
||||
default:
|
||||
// A frame ending in ';' is not a rigctl command at all — it is raw rig
|
||||
// dialect (Kenwood/Elecraft/Yaesu), which means the client is configured
|
||||
// with a RIG MODEL pointing at this port instead of "Hamlib NET rigctl".
|
||||
//
|
||||
// Worth naming, because the symptom hides the cause completely: we answer
|
||||
// RPRT -11 like any unknown command, but that reply has no ';' to terminate
|
||||
// on, so the client's parser waits and then reports "reply incomplete, got
|
||||
// nothing". The operator sees a timeout and concludes the CAT share is
|
||||
// broken, when it is a one-line setting in the other program.
|
||||
if strings.HasSuffix(line, ";") && !strings.Contains(line, " ") {
|
||||
s.log("rigctld: %q is a raw rig command, not rigctl — the client is set to a RIG MODEL; "+
|
||||
"it must be set to \"Hamlib NET rigctl\" (rig 2) at this address", line)
|
||||
return rprt(-11), false
|
||||
}
|
||||
// RPRT -11 is "command not implemented". Answering something is essential:
|
||||
// a client waiting on a silent socket hangs rather than degrading.
|
||||
s.log("rigctld: unimplemented command %q", line)
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
package rigctld
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// A listener that binds successfully is not necessarily the one clients reach.
|
||||
// Windows lets a second program bind the same port on the specific address
|
||||
// 127.0.0.1 while ours holds 0.0.0.0, and localhost connections then go to the
|
||||
// more specific one. Seen with Nexus, which starts its own rigctld on 4532.
|
||||
func TestSelfTestWarnsWhenAnotherProgramHoldsLocalhost(t *testing.T) {
|
||||
// Squat 127.0.0.1 first, the way the other program does.
|
||||
squat, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Skipf("cannot bind localhost here: %v", err)
|
||||
}
|
||||
defer squat.Close()
|
||||
port := squat.Addr().(*net.TCPAddr).Port
|
||||
go func() {
|
||||
for {
|
||||
c, err := squat.Accept()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
c.Close()
|
||||
}
|
||||
}()
|
||||
|
||||
var mu sync.Mutex
|
||||
var lines []string
|
||||
s := New(port, nil, func(f string, a ...any) {
|
||||
mu.Lock()
|
||||
lines = append(lines, fmt.Sprintf(f, a...))
|
||||
mu.Unlock()
|
||||
})
|
||||
if err := s.Start(); err != nil {
|
||||
// The wildcard bind is refused on some setups; nothing to prove then.
|
||||
t.Skipf("wildcard bind refused: %v", err)
|
||||
}
|
||||
defer s.Stop()
|
||||
|
||||
deadline := time.Now().Add(4 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
mu.Lock()
|
||||
got := strings.Join(lines, "\n")
|
||||
mu.Unlock()
|
||||
if strings.Contains(got, "another program is already answering") {
|
||||
return
|
||||
}
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
t.Errorf("no warning was logged while another listener owned localhost:%d.\nlog was:\n%s",
|
||||
port, strings.Join(lines, "\n"))
|
||||
}
|
||||
|
||||
// The healthy case must stay silent: a warning on every clean start would be
|
||||
// noise, and noise in a log is what makes the real line easy to miss.
|
||||
func TestSelfTestIsSilentWhenReachable(t *testing.T) {
|
||||
// A real, free port: with 0 the OS picks one but s.port stays 0, so the probe
|
||||
// would dial 127.0.0.1:0 and prove nothing.
|
||||
probe, err := net.Listen("tcp", "127.0.0.1:0")
|
||||
if err != nil {
|
||||
t.Skipf("cannot bind: %v", err)
|
||||
}
|
||||
port := probe.Addr().(*net.TCPAddr).Port
|
||||
probe.Close()
|
||||
|
||||
var mu sync.Mutex
|
||||
var lines []string
|
||||
s := New(port, nil, func(f string, a ...any) {
|
||||
mu.Lock()
|
||||
lines = append(lines, fmt.Sprintf(f, a...))
|
||||
mu.Unlock()
|
||||
})
|
||||
if err := s.Start(); err != nil {
|
||||
t.Skipf("start: %v", err)
|
||||
}
|
||||
defer s.Stop()
|
||||
time.Sleep(1500 * time.Millisecond)
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
for _, l := range lines {
|
||||
if strings.Contains(l, "WARNING") {
|
||||
t.Errorf("a reachable port still warned: %q", l)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package rigctld
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
@@ -21,11 +22,26 @@ type fakeRig struct {
|
||||
setFreqs []int64
|
||||
setModes []string
|
||||
failSet bool
|
||||
// noSplit models a backend that cannot set split — the case that must reach
|
||||
// the client as a refusal instead of a silent success.
|
||||
noSplit bool
|
||||
splitCalls []string
|
||||
}
|
||||
|
||||
func (f *fakeRig) Freq() int64 { f.mu.Lock(); defer f.mu.Unlock(); return f.freq }
|
||||
func (f *fakeRig) Mode() string { f.mu.Lock(); defer f.mu.Unlock(); return f.mode }
|
||||
func (f *fakeRig) Split() (bool, int64) { f.mu.Lock(); defer f.mu.Unlock(); return f.split, f.txFreq }
|
||||
|
||||
func (f *fakeRig) SetSplit(on bool, txHz int64) error {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
if f.noSplit {
|
||||
return errors.New("this radio cannot set split from software")
|
||||
}
|
||||
f.splitCalls = append(f.splitCalls, fmt.Sprintf("%v:%d", on, txHz))
|
||||
f.split, f.txFreq = on, txHz
|
||||
return nil
|
||||
}
|
||||
func (f *fakeRig) SetFreq(hz int64) error {
|
||||
f.mu.Lock()
|
||||
defer f.mu.Unlock()
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
package rigctld
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// WSJT-X in "Split Operating: Rig" sends set_split_vfo then set_split_freq. Both
|
||||
// used to answer RPRT 0 and do NOTHING: the software believed it was
|
||||
// transmitting up the band while the radio stayed on the receive frequency —
|
||||
// on a pileup, straight onto the DX, with no trace anywhere.
|
||||
func TestSetSplitReachesTheRig(t *testing.T) {
|
||||
rig := &fakeRig{freq: 14074000, mode: "FT8"}
|
||||
s := New(0, rig, func(string, ...any) {})
|
||||
|
||||
if got, _ := s.handle("S 1 VFOB"); !strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Fatalf("set_split_vfo answered %q", got)
|
||||
}
|
||||
// Arming alone must NOT touch the rig: without a frequency it would transmit
|
||||
// on whatever the second VFO happened to hold.
|
||||
if len(rig.splitCalls) != 0 {
|
||||
t.Errorf("split was armed before a frequency arrived: %v", rig.splitCalls)
|
||||
}
|
||||
|
||||
if got, _ := s.handle("I 14075300.000000"); !strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Fatalf("set_split_freq answered %q", got)
|
||||
}
|
||||
if len(rig.splitCalls) != 1 || rig.splitCalls[0] != "true:14075300" {
|
||||
t.Fatalf("rig saw %v, want one call arming split on 14075300", rig.splitCalls)
|
||||
}
|
||||
|
||||
if got, _ := s.handle("S 0 VFOA"); !strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Fatalf("split off answered %q", got)
|
||||
}
|
||||
if len(rig.splitCalls) != 2 || !strings.HasPrefix(rig.splitCalls[1], "false:") {
|
||||
t.Errorf("rig saw %v, want split cleared", rig.splitCalls)
|
||||
}
|
||||
}
|
||||
|
||||
// A backend that cannot do split must produce an ERROR the client can report.
|
||||
// Answering success and doing nothing is what caused the original fault, and it
|
||||
// is the one outcome that must never come back.
|
||||
func TestSetSplitRefusalIsReported(t *testing.T) {
|
||||
rig := &fakeRig{freq: 14074000, noSplit: true}
|
||||
s := New(0, rig, func(string, ...any) {})
|
||||
|
||||
s.handle("S 1 VFOB")
|
||||
got, _ := s.handle("I 14075300.000000")
|
||||
if strings.HasPrefix(got, "RPRT 0") {
|
||||
t.Errorf("a rig that cannot split answered %q — the client will transmit on the wrong frequency", got)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package spe
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// decodeCSV marks the client connected on EVERY frame it parses, and the poll
|
||||
// goroutine can be mid-read while PowerOff runs. So the frame from a second ago
|
||||
// landed after PowerOff had marked the amp offline and put it straight back —
|
||||
// the console kept showing the amplifier on until the operator pressed OFF a
|
||||
// second time.
|
||||
func TestFrameInFlightDoesNotResurrectASwitchedOffAmp(t *testing.T) {
|
||||
c := &Client{}
|
||||
const frame = ",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,"
|
||||
|
||||
// Normal running: a frame marks it connected and reads OPERATE.
|
||||
c.decodeCSV(frame)
|
||||
if !c.GetStatus().Connected || !c.GetStatus().Operate {
|
||||
t.Fatal("a status frame should mark the amp connected")
|
||||
}
|
||||
|
||||
// The operator presses OFF. This is what PowerOff does, in order.
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Now().Add(3 * time.Second)
|
||||
c.statusMu.Unlock()
|
||||
c.setErr(errSwitchedOff{})
|
||||
|
||||
// A frame that was already on the wire arrives now.
|
||||
c.decodeCSV(frame)
|
||||
|
||||
if c.GetStatus().Connected {
|
||||
t.Error("a frame from before the switch-off put the amp back on — this is the double-click on OFF")
|
||||
}
|
||||
}
|
||||
|
||||
// An amp switched back on at its own front panel must reappear without OpsLog
|
||||
// being told, so the suppression has to expire rather than latch.
|
||||
func TestSuppressionExpires(t *testing.T) {
|
||||
c := &Client{}
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Now().Add(-time.Second) // window already past
|
||||
c.statusMu.Unlock()
|
||||
c.setErr(errSwitchedOff{})
|
||||
|
||||
c.decodeCSV(",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,")
|
||||
if !c.GetStatus().Connected {
|
||||
t.Error("an amp answering after the window must come back on its own")
|
||||
}
|
||||
}
|
||||
|
||||
type errSwitchedOff struct{}
|
||||
|
||||
func (errSwitchedOff) Error() string { return "switched off" }
|
||||
+56
-2
@@ -91,6 +91,15 @@ type Client struct {
|
||||
statusMu sync.RWMutex
|
||||
status Status
|
||||
lastRaw string // last raw status payload logged (log only on change)
|
||||
// offUntil suppresses status frames that were already in flight when the amp
|
||||
// was switched off. decodeCSV marks the client connected on every frame it
|
||||
// parses, and the poll goroutine can be mid-read while PowerOff runs — so the
|
||||
// frame from a second ago resurrected an amplifier the operator had just
|
||||
// switched off, and the console only caught up when they pressed OFF twice.
|
||||
//
|
||||
// Time-bounded rather than a latch: an amp switched back on at its own front
|
||||
// panel must reappear on its own.
|
||||
offUntil time.Time
|
||||
|
||||
stop chan struct{}
|
||||
running bool
|
||||
@@ -177,6 +186,12 @@ func (c *Client) PowerOn() error {
|
||||
if c.GetStatus().Connected {
|
||||
return nil
|
||||
}
|
||||
// Switching on cancels the suppression window: the operator wants frames
|
||||
// believed again, and waiting out a timer they cannot see would read as the
|
||||
// power-on having failed.
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Time{}
|
||||
c.statusMu.Unlock()
|
||||
// The poll goroutine may still be inside a blocking read on the old handle;
|
||||
// Windows keeps the port "busy" until that read times out (ioTimeout). Retry
|
||||
// the open for a little longer than that.
|
||||
@@ -205,9 +220,17 @@ func (c *Client) PowerOn() error {
|
||||
time.Sleep(wakePulse)
|
||||
return set(true)
|
||||
}
|
||||
if err = pulse(sp.SetRTS); err == nil {
|
||||
err = pulse(sp.SetDTR)
|
||||
// Each line reported separately. Not every USB-serial chip honours the modem
|
||||
// lines, and some refuse them without saying so — on an amplifier that never
|
||||
// wakes, "which of the two failed, or neither" is the whole diagnosis, and a
|
||||
// single combined error cannot give it.
|
||||
rtsErr := pulse(sp.SetRTS)
|
||||
dtrErr := pulse(sp.SetDTR)
|
||||
if err = rtsErr; err == nil {
|
||||
err = dtrErr
|
||||
}
|
||||
applog.Printf("spe: power ON pulse on %s (model=%q transport=%s) — RTS err=%v, DTR err=%v",
|
||||
c.cfg.ComPort, c.GetStatus().Model, c.cfg.Transport, rtsErr, dtrErr)
|
||||
// Booting, the amp re-enumerates its USB interface, which leaves this handle
|
||||
// pointing at a device that no longer exists — the amp came up and OpsLog
|
||||
// still read "offline". Drop it; the poll loop reopens a fresh one as soon as
|
||||
@@ -216,6 +239,26 @@ func (c *Client) PowerOn() error {
|
||||
c.dropLocked()
|
||||
c.mu.Unlock()
|
||||
applog.Printf("spe: power ON — RTS then DTR pulsed on %s (err=%v)", c.cfg.ComPort, err)
|
||||
|
||||
// Say whether it actually woke. "The ON button does nothing" is a report with
|
||||
// three different causes — the pulse was refused, the pulse went out and the
|
||||
// amp ignored it, or the amp came up and the UI missed it — and only the log
|
||||
// can separate them. Watched off the caller's goroutine so the click returns
|
||||
// at once.
|
||||
go func() {
|
||||
deadline := time.Now().Add(15 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
time.Sleep(time.Second)
|
||||
if c.GetStatus().Connected {
|
||||
applog.Printf("spe: power ON — amp answered after %.0fs",
|
||||
15-time.Until(deadline).Seconds())
|
||||
return
|
||||
}
|
||||
}
|
||||
applog.Printf("spe: power ON — no answer within 15s on %s. The pulse was sent; "+
|
||||
"either this amplifier does not wake on RTS/DTR, or the adapter does not drive those lines",
|
||||
c.cfg.ComPort)
|
||||
}()
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -226,6 +269,14 @@ func (c *Client) PowerOn() error {
|
||||
// the poll loop keeps reopening the port with both lines high and that has
|
||||
// never woken it — only the deliberate low→high sequence in PowerOn does.
|
||||
func (c *Client) PowerOff() error {
|
||||
// Close the window BEFORE the key goes out, so a frame already travelling up
|
||||
// the wire cannot land after setErr and undo it. Three seconds covers a poll
|
||||
// interval with room to spare; after that a real answer means the amp is
|
||||
// genuinely alive again, which is what happens if it is switched back on at
|
||||
// its own front panel.
|
||||
c.statusMu.Lock()
|
||||
c.offUntil = time.Now().Add(3 * time.Second)
|
||||
c.statusMu.Unlock()
|
||||
err := c.sendCmd(cmdOff)
|
||||
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
||||
// Drop the link and mark the amp offline at once, exactly as a fresh start
|
||||
@@ -482,6 +533,9 @@ func (c *Client) decodeCSV(payload string) {
|
||||
c.lastRaw = payload
|
||||
applog.Printf("spe: status raw=%q fields=%d", payload, len(f))
|
||||
}
|
||||
if time.Now().Before(c.offUntil) {
|
||||
return // a frame from before the switch-off — the amp is on its way down
|
||||
}
|
||||
c.status.Connected = true
|
||||
c.status.LastError = ""
|
||||
// The real frame carries a leading empty field (it starts with a comma), so the
|
||||
|
||||
+224
-33
@@ -10,9 +10,13 @@
|
||||
// - The page is self-contained: no external CSS, font or script. It has to
|
||||
// work dropped into any hosting, including one that blocks third-party
|
||||
// requests, and it must not leak the reader's visit to anyone.
|
||||
// - Columns are a fixed, curated set rather than "every ADIF field". This is
|
||||
// a page shown to the public: RST and QSL status belong, the operator's
|
||||
// home address does not.
|
||||
// - Every ADIF field is offered, because an operator publishing a county hunt
|
||||
// or an award chase needs fields no curated list would have guessed. That
|
||||
// puts the judgement on them, and it is a real one: this page is PUBLIC, and
|
||||
// the catalogue includes the correspondent's address, e-mail and the
|
||||
// operator's own street. Nothing is published unless it is chosen, and the
|
||||
// default selection stays the eight columns a reader of someone else's log
|
||||
// actually looks for.
|
||||
package webpub
|
||||
|
||||
import (
|
||||
@@ -29,6 +33,7 @@ import (
|
||||
|
||||
"github.com/jlaffaye/ftp"
|
||||
|
||||
"hamlog/internal/geo"
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
@@ -60,7 +65,10 @@ type Config struct {
|
||||
type Column struct {
|
||||
Key string
|
||||
Header string
|
||||
Value func(q *qso.QSO) string
|
||||
// Group is the section a picker shows this under. With every ADIF field on
|
||||
// offer, a flat list is unusable — the grouping IS what makes it navigable.
|
||||
Group string
|
||||
Value func(q *qso.QSO) string
|
||||
}
|
||||
|
||||
func str(p *int) string {
|
||||
@@ -70,43 +78,208 @@ func str(p *int) string {
|
||||
return strconv.Itoa(*p)
|
||||
}
|
||||
|
||||
// Columns is the curated set, in default display order. Add here to offer a new
|
||||
// one; the stored config keeps keys, so order changes are safe.
|
||||
func str64(p *int64) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatInt(*p, 10)
|
||||
}
|
||||
|
||||
// flt drops a trailing ".0": a distance reads better as "1420" than "1420.0",
|
||||
// and a bearing as "142.5" keeps the half-degree that matters.
|
||||
func flt(p *float64) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatFloat(*p, 'f', -1, 64)
|
||||
}
|
||||
|
||||
// distanceKm is the path length for the Distance column.
|
||||
//
|
||||
// The stored DISTANCE field is only ever filled by an ADIF import that carried
|
||||
// one — OpsLog does not compute it when logging — so publishing it straight gave
|
||||
// an empty column for every QSO made here, which is how this was reported.
|
||||
//
|
||||
// So it falls back to the two locators, which are on the QSO already. Rounded to
|
||||
// whole kilometres: the grids are squares tens of kilometres across, and a
|
||||
// decimal on a figure that imprecise claims an accuracy nobody has.
|
||||
func distanceKm(q *qso.QSO) string {
|
||||
if q.Distance != nil && *q.Distance > 0 {
|
||||
return flt(q.Distance)
|
||||
}
|
||||
km, ok := geo.DistanceBetweenGrids(q.MyGrid, q.Grid)
|
||||
if !ok || km <= 0 {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatFloat(km, 'f', 0, 64)
|
||||
}
|
||||
|
||||
func stamp(t time.Time) string {
|
||||
if t.IsZero() {
|
||||
return ""
|
||||
}
|
||||
return t.UTC().Format("2006-01-02 15:04")
|
||||
}
|
||||
|
||||
// Columns is every field a QSO can carry, in ADIF order, grouped for the picker.
|
||||
//
|
||||
// Generated from the qso.QSO struct rather than curated by hand: the previous
|
||||
// list held 23 of them, so anyone wanting to publish a county, a satellite pass
|
||||
// or an award reference simply could not. A hand list also silently rots — a new
|
||||
// ADIF field is added to the struct and nobody remembers this file exists.
|
||||
//
|
||||
// The stored configuration keeps KEYS, so order and grouping can change freely.
|
||||
var Columns = []Column{
|
||||
{"date", "Date", func(q *qso.QSO) string { return q.QSODate.UTC().Format("2006-01-02") }},
|
||||
{"time", "UTC", func(q *qso.QSO) string { return q.QSODate.UTC().Format("15:04") }},
|
||||
{"callsign", "Call", func(q *qso.QSO) string { return q.Callsign }},
|
||||
{"band", "Band", func(q *qso.QSO) string { return q.Band }},
|
||||
{"mode", "Mode", func(q *qso.QSO) string { return q.Mode }},
|
||||
{"freq", "Freq", func(q *qso.QSO) string {
|
||||
// Date and time are one column in the database and two here: a log reads by
|
||||
// day, and a reader scanning for "that evening" should not have to parse a
|
||||
// timestamp. Frequency is stored in Hz and published in MHz.
|
||||
{"date", "Date", "QSO", func(q *qso.QSO) string { return q.QSODate.UTC().Format("2006-01-02") }},
|
||||
{"time", "UTC", "QSO", func(q *qso.QSO) string { return q.QSODate.UTC().Format("15:04") }},
|
||||
{"freq", "Freq", "QSO", func(q *qso.QSO) string {
|
||||
if q.FreqHz == nil || *q.FreqHz == 0 {
|
||||
return ""
|
||||
}
|
||||
return strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64)
|
||||
}},
|
||||
{"rst_sent", "RST S", func(q *qso.QSO) string { return q.RSTSent }},
|
||||
{"rst_rcvd", "RST R", func(q *qso.QSO) string { return q.RSTRcvd }},
|
||||
{"name", "Name", func(q *qso.QSO) string { return q.Name }},
|
||||
{"qth", "QTH", func(q *qso.QSO) string { return q.QTH }},
|
||||
{"country", "Country", func(q *qso.QSO) string { return q.Country }},
|
||||
{"grid", "Grid", func(q *qso.QSO) string { return q.Grid }},
|
||||
{"dxcc", "DXCC", func(q *qso.QSO) string { return str(q.DXCC) }},
|
||||
{"cqz", "CQ", func(q *qso.QSO) string { return str(q.CQZ) }},
|
||||
{"ituz", "ITU", func(q *qso.QSO) string { return str(q.ITUZ) }},
|
||||
{"iota", "IOTA", func(q *qso.QSO) string { return q.IOTA }},
|
||||
{"pota", "POTA", func(q *qso.QSO) string { return q.POTARef }},
|
||||
{"sota", "SOTA", func(q *qso.QSO) string { return q.SOTARef }},
|
||||
{"qsl_sent", "QSL S", func(q *qso.QSO) string { return q.QSLSent }},
|
||||
{"qsl_rcvd", "QSL R", func(q *qso.QSO) string { return q.QSLRcvd }},
|
||||
{"lotw_rcvd", "LoTW", func(q *qso.QSO) string { return q.LOTWRcvd }},
|
||||
{"station", "Station", func(q *qso.QSO) string { return q.StationCallsign }},
|
||||
{"comment", "Comment", func(q *qso.QSO) string { return q.Comment }},
|
||||
{"callsign", "Callsign", "QSO", func(q *qso.QSO) string { return q.Callsign }},
|
||||
{"qso_date_off", "End", "QSO", func(q *qso.QSO) string { return stamp(q.QSODateOff) }},
|
||||
{"band", "Band", "QSO", func(q *qso.QSO) string { return q.Band }},
|
||||
{"band_rx", "Band RX", "QSO", func(q *qso.QSO) string { return q.BandRX }},
|
||||
{"mode", "Mode", "QSO", func(q *qso.QSO) string { return q.Mode }},
|
||||
{"submode", "Submode", "QSO", func(q *qso.QSO) string { return q.Submode }},
|
||||
{"freq_rx_hz", "Freq RX", "QSO", func(q *qso.QSO) string { return str64(q.FreqRXHz) }},
|
||||
{"rst_sent", "RST S", "QSO", func(q *qso.QSO) string { return q.RSTSent }},
|
||||
{"rst_rcvd", "RST R", "QSO", func(q *qso.QSO) string { return q.RSTRcvd }},
|
||||
{"name", "Name", "QSO", func(q *qso.QSO) string { return q.Name }},
|
||||
{"qth", "QTH", "QSO", func(q *qso.QSO) string { return q.QTH }},
|
||||
{"address", "Address", "QSO", func(q *qso.QSO) string { return q.Address }},
|
||||
{"email", "Email", "QSO", func(q *qso.QSO) string { return q.Email }},
|
||||
{"web", "Web", "QSO", func(q *qso.QSO) string { return q.Web }},
|
||||
{"grid", "Grid", "Location", func(q *qso.QSO) string { return q.Grid }},
|
||||
{"gridsquare_ext", "Grid ext", "Location", func(q *qso.QSO) string { return q.GridExt }},
|
||||
{"vucc_grids", "VUCC", "Location", func(q *qso.QSO) string { return q.VUCCGrids }},
|
||||
{"country", "Country", "Location", func(q *qso.QSO) string { return q.Country }},
|
||||
{"state", "State", "Location", func(q *qso.QSO) string { return q.State }},
|
||||
{"cnty", "County", "Location", func(q *qso.QSO) string { return q.County }},
|
||||
{"dxcc", "Dxcc", "Location", func(q *qso.QSO) string { return str(q.DXCC) }},
|
||||
{"cont", "Cont", "Location", func(q *qso.QSO) string { return q.Continent }},
|
||||
{"cqz", "CQ", "Location", func(q *qso.QSO) string { return str(q.CQZ) }},
|
||||
{"ituz", "ITU", "Location", func(q *qso.QSO) string { return str(q.ITUZ) }},
|
||||
{"iota", "Iota", "Awards", func(q *qso.QSO) string { return q.IOTA }},
|
||||
{"sota_ref", "SOTA", "Awards", func(q *qso.QSO) string { return q.SOTARef }},
|
||||
{"pota_ref", "POTA", "Awards", func(q *qso.QSO) string { return q.POTARef }},
|
||||
{"age", "Age", "QSO", func(q *qso.QSO) string { return str(q.Age) }},
|
||||
{"lat", "Lat", "Location", func(q *qso.QSO) string { return flt(q.Lat) }},
|
||||
{"lon", "Lon", "Location", func(q *qso.QSO) string { return flt(q.Lon) }},
|
||||
{"rig", "Rig", "QSO", func(q *qso.QSO) string { return q.Rig }},
|
||||
{"ant", "Ant", "QSO", func(q *qso.QSO) string { return q.Ant }},
|
||||
{"qsl_sent", "QSL S", "QSL", func(q *qso.QSO) string { return q.QSLSent }},
|
||||
{"qsl_rcvd", "QSL R", "QSL", func(q *qso.QSO) string { return q.QSLRcvd }},
|
||||
{"qsl_sent_date", "Qsl sent date", "QSL", func(q *qso.QSO) string { return q.QSLSentDate }},
|
||||
{"qsl_rcvd_date", "Qsl rcvd date", "QSL", func(q *qso.QSO) string { return q.QSLRcvdDate }},
|
||||
{"qsl_via", "Qsl via", "QSL", func(q *qso.QSO) string { return q.QSLVia }},
|
||||
{"qsl_msg", "Qsl msg", "QSL", func(q *qso.QSO) string { return q.QSLMsg }},
|
||||
{"qslmsg_rcvd", "Qslmsg rcvd", "QSL", func(q *qso.QSO) string { return q.QSLMsgRcvd }},
|
||||
{"lotw_sent", "LoTW S", "QSL", func(q *qso.QSO) string { return q.LOTWSent }},
|
||||
{"lotw_rcvd", "LoTW R", "QSL", func(q *qso.QSO) string { return q.LOTWRcvd }},
|
||||
{"lotw_sent_date", "Lotw sent date", "QSL", func(q *qso.QSO) string { return q.LOTWSentDate }},
|
||||
{"lotw_rcvd_date", "Lotw rcvd date", "QSL", func(q *qso.QSO) string { return q.LOTWRcvdDate }},
|
||||
{"eqsl_sent", "eQSL S", "QSL", func(q *qso.QSO) string { return q.EQSLSent }},
|
||||
{"eqsl_rcvd", "eQSL R", "QSL", func(q *qso.QSO) string { return q.EQSLRcvd }},
|
||||
{"eqsl_sent_date", "Eqsl sent date", "QSL", func(q *qso.QSO) string { return q.EQSLSentDate }},
|
||||
{"eqsl_rcvd_date", "Eqsl rcvd date", "QSL", func(q *qso.QSO) string { return q.EQSLRcvdDate }},
|
||||
{"clublog_qso_upload_date", "Clublog qso upload date", "QSL", func(q *qso.QSO) string { return q.ClublogUploadDate }},
|
||||
{"clublog_qso_upload_status", "Clublog qso upload status", "QSL", func(q *qso.QSO) string { return q.ClublogUploadStatus }},
|
||||
{"hrdlog_qso_upload_date", "Hrdlog qso upload date", "QSL", func(q *qso.QSO) string { return q.HRDLogUploadDate }},
|
||||
{"hrdlog_qso_upload_status", "Hrdlog qso upload status", "QSL", func(q *qso.QSO) string { return q.HRDLogUploadStatus }},
|
||||
{"qrzcom_qso_upload_date", "Qrzcom qso upload date", "QSL", func(q *qso.QSO) string { return q.QRZComUploadDate }},
|
||||
{"qrzcom_qso_upload_status", "Qrzcom qso upload status", "QSL", func(q *qso.QSO) string { return q.QRZComUploadStatus }},
|
||||
{"qrzcom_qso_download_date", "Qrzcom qso download date", "QSL", func(q *qso.QSO) string { return q.QRZComDownloadDate }},
|
||||
{"qrzcom_qso_download_status", "Qrzcom qso download status", "QSL", func(q *qso.QSO) string { return q.QRZComDownloadStatus }},
|
||||
{"contest_id", "Contest", "Contest", func(q *qso.QSO) string { return q.ContestID }},
|
||||
{"srx", "Srx", "Contest", func(q *qso.QSO) string { return str(q.SRX) }},
|
||||
{"stx", "Stx", "Contest", func(q *qso.QSO) string { return str(q.STX) }},
|
||||
{"srx_string", "SRX str", "QSO", func(q *qso.QSO) string { return q.SRXString }},
|
||||
{"stx_string", "STX str", "QSO", func(q *qso.QSO) string { return q.STXString }},
|
||||
{"check", "Check", "Contest", func(q *qso.QSO) string { return q.Check }},
|
||||
{"precedence", "Precedence", "Contest", func(q *qso.QSO) string { return q.Precedence }},
|
||||
{"arrl_sect", "Section", "Contest", func(q *qso.QSO) string { return q.ARRLSect }},
|
||||
{"prop_mode", "Prop", "QSO", func(q *qso.QSO) string { return q.PropMode }},
|
||||
{"sat_name", "Sat", "QSO", func(q *qso.QSO) string { return q.SatName }},
|
||||
{"sat_mode", "Sat mode", "QSO", func(q *qso.QSO) string { return q.SatMode }},
|
||||
{"ant_az", "Ant az", "QSO", func(q *qso.QSO) string { return flt(q.AntAz) }},
|
||||
{"ant_el", "Ant el", "QSO", func(q *qso.QSO) string { return flt(q.AntEl) }},
|
||||
{"ant_path", "Ant path", "QSO", func(q *qso.QSO) string { return q.AntPath }},
|
||||
{"station_callsign", "Station", "QSO", func(q *qso.QSO) string { return q.StationCallsign }},
|
||||
{"operator", "Operator", "QSO", func(q *qso.QSO) string { return q.Operator }},
|
||||
{"my_grid", "My grid", "My station", func(q *qso.QSO) string { return q.MyGrid }},
|
||||
{"my_gridsquare_ext", "My gridsquare ext", "My station", func(q *qso.QSO) string { return q.MyGridExt }},
|
||||
{"my_country", "My country", "My station", func(q *qso.QSO) string { return q.MyCountry }},
|
||||
{"my_state", "My state", "My station", func(q *qso.QSO) string { return q.MyState }},
|
||||
{"my_cnty", "My cnty", "My station", func(q *qso.QSO) string { return q.MyCounty }},
|
||||
{"my_iota", "My iota", "My station", func(q *qso.QSO) string { return q.MyIOTA }},
|
||||
{"my_sota_ref", "My sota ref", "My station", func(q *qso.QSO) string { return q.MySOTARef }},
|
||||
{"my_pota_ref", "My pota ref", "My station", func(q *qso.QSO) string { return q.MyPOTARef }},
|
||||
{"my_dxcc", "My dxcc", "My station", func(q *qso.QSO) string { return str(q.MyDXCC) }},
|
||||
{"my_cq_zone", "My cq zone", "My station", func(q *qso.QSO) string { return str(q.MyCQZone) }},
|
||||
{"my_itu_zone", "My itu zone", "My station", func(q *qso.QSO) string { return str(q.MyITUZone) }},
|
||||
{"my_lat", "My lat", "My station", func(q *qso.QSO) string { return flt(q.MyLat) }},
|
||||
{"my_lon", "My lon", "My station", func(q *qso.QSO) string { return flt(q.MyLon) }},
|
||||
{"my_street", "My street", "My station", func(q *qso.QSO) string { return q.MyStreet }},
|
||||
{"my_city", "My city", "My station", func(q *qso.QSO) string { return q.MyCity }},
|
||||
{"my_postal_code", "My postal code", "My station", func(q *qso.QSO) string { return q.MyPostalCode }},
|
||||
{"my_rig", "My rig", "My station", func(q *qso.QSO) string { return q.MyRig }},
|
||||
{"my_antenna", "My antenna", "My station", func(q *qso.QSO) string { return q.MyAntenna }},
|
||||
{"tx_pwr", "TX pwr", "QSO", func(q *qso.QSO) string { return flt(q.TXPower) }},
|
||||
{"comment", "Comment", "QSO", func(q *qso.QSO) string { return q.Comment }},
|
||||
{"notes", "Notes", "QSO", func(q *qso.QSO) string { return q.Notes }},
|
||||
{"sig", "Sig", "Awards", func(q *qso.QSO) string { return q.SIG }},
|
||||
{"sig_info", "Sig info", "Awards", func(q *qso.QSO) string { return q.SIGInfo }},
|
||||
{"my_sig", "My sig", "My station", func(q *qso.QSO) string { return q.MySIG }},
|
||||
{"my_sig_info", "My sig info", "My station", func(q *qso.QSO) string { return q.MySIGInfo }},
|
||||
{"wwff_ref", "WWFF", "Awards", func(q *qso.QSO) string { return q.WWFFRef }},
|
||||
{"my_wwff_ref", "My wwff ref", "My station", func(q *qso.QSO) string { return q.MyWWFFRef }},
|
||||
{"distance", "Distance", "Location", distanceKm},
|
||||
{"rx_pwr", "RX pwr", "QSO", func(q *qso.QSO) string { return flt(q.RXPower) }},
|
||||
{"a_index", "A", "QSO", func(q *qso.QSO) string { return flt(q.AIndex) }},
|
||||
{"k_index", "K", "QSO", func(q *qso.QSO) string { return flt(q.KIndex) }},
|
||||
{"sfi", "SFI", "QSO", func(q *qso.QSO) string { return flt(q.SFI) }},
|
||||
{"skcc", "Skcc", "Awards", func(q *qso.QSO) string { return q.SKCC }},
|
||||
{"fists", "Fists", "Awards", func(q *qso.QSO) string { return q.FISTS }},
|
||||
{"ten_ten", "10-10", "Awards", func(q *qso.QSO) string { return q.TenTen }},
|
||||
{"contacted_op", "Op worked", "QSO", func(q *qso.QSO) string { return q.ContactedOp }},
|
||||
{"eq_call", "Eq call", "QSO", func(q *qso.QSO) string { return q.EqCall }},
|
||||
{"pfx", "Pfx", "Location", func(q *qso.QSO) string { return q.PFX }},
|
||||
{"my_name", "My name", "My station", func(q *qso.QSO) string { return q.MyName }},
|
||||
{"class", "Class", "Contest", func(q *qso.QSO) string { return q.Class }},
|
||||
{"darc_dok", "DOK", "Awards", func(q *qso.QSO) string { return q.DarcDOK }},
|
||||
{"my_darc_dok", "My darc dok", "My station", func(q *qso.QSO) string { return q.MyDarcDOK }},
|
||||
{"region", "Region", "Location", func(q *qso.QSO) string { return q.Region }},
|
||||
{"silent_key", "SK", "QSO", func(q *qso.QSO) string { return q.SilentKey }},
|
||||
{"swl", "Swl", "QSO", func(q *qso.QSO) string { return q.SWL }},
|
||||
{"qso_complete", "Complete", "QSO", func(q *qso.QSO) string { return q.QSOComplete }},
|
||||
{"qso_random", "Random", "QSO", func(q *qso.QSO) string { return q.QSORandom }},
|
||||
{"credit_granted", "Credit granted", "QSL", func(q *qso.QSO) string { return q.CreditGranted }},
|
||||
{"credit_submitted", "Credit sub.", "QSL", func(q *qso.QSO) string { return q.CreditSubmitted }},
|
||||
{"my_arrl_sect", "My arrl sect", "My station", func(q *qso.QSO) string { return q.MyARRLSect }},
|
||||
{"my_vucc_grids", "My vucc grids", "My station", func(q *qso.QSO) string { return q.MyVUCCGrids }},
|
||||
{"award_refs", "Award refs", "Awards", func(q *qso.QSO) string { return q.AwardRefs }},
|
||||
}
|
||||
|
||||
// DefaultColumns is what a fresh configuration publishes — the columns a reader
|
||||
// of someone else's log actually looks for.
|
||||
var DefaultColumns = []string{"date", "time", "callsign", "band", "mode", "rst_sent", "rst_rcvd", "country"}
|
||||
|
||||
// legacyKeys maps the short names the hand-written table used onto the ADIF
|
||||
// names the generated one uses. A configuration saved before this change still
|
||||
// publishes the same columns; without it, three of them would vanish silently on
|
||||
// upgrade, which is the worst way for a setting to change.
|
||||
var legacyKeys = map[string]string{
|
||||
"pota": "pota_ref",
|
||||
"sota": "sota_ref",
|
||||
"station": "station_callsign",
|
||||
}
|
||||
|
||||
func columnsFor(keys []string) []Column {
|
||||
if len(keys) == 0 {
|
||||
keys = DefaultColumns
|
||||
@@ -117,7 +290,11 @@ func columnsFor(keys []string) []Column {
|
||||
}
|
||||
out := make([]Column, 0, len(keys))
|
||||
for _, k := range keys {
|
||||
if c, ok := byKey[strings.TrimSpace(k)]; ok {
|
||||
k = strings.TrimSpace(k)
|
||||
if alias, ok := legacyKeys[k]; ok {
|
||||
k = alias
|
||||
}
|
||||
if c, ok := byKey[k]; ok {
|
||||
out = append(out, c)
|
||||
}
|
||||
}
|
||||
@@ -224,11 +401,25 @@ func renderHTML(cfg Config, cols []Column, qsos []qso.QSO, stationCall string) [
|
||||
*{box-sizing:border-box}
|
||||
body{margin:0;padding:1.5rem 1rem;background:var(--bg);color:var(--fg);
|
||||
font:14px/1.5 system-ui,-apple-system,"Segoe UI",Roboto,sans-serif}
|
||||
.wrap{max-width:1100px;margin:0 auto}
|
||||
/* The page grows with its table instead of being capped at a comfortable
|
||||
READING width. 1100px suits eight columns and hides the rest behind a
|
||||
scrollbar on a screen wide enough to show them all — which is how this was
|
||||
reported. max-content lets a wide table use the window; min-width keeps a
|
||||
narrow one from collapsing to nothing on a large display. */
|
||||
.wrap{max-width:max-content;min-width:min(1100px,100%);margin:0 auto}
|
||||
h1{margin:0 0 .25rem;font-size:1.35rem}
|
||||
.meta{margin:0 0 1rem;color:var(--mut);font-size:.8rem}
|
||||
.scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px}
|
||||
table{border-collapse:collapse;width:100%;font-variant-numeric:tabular-nums}
|
||||
/* A visible scrollbar. Windows hides overlay scrollbars until something moves,
|
||||
so a table that scrolls looks exactly like a table that is missing columns. */
|
||||
.scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px;
|
||||
scrollbar-width:thin;scrollbar-color:var(--line) transparent}
|
||||
.scroll::-webkit-scrollbar{height:10px}
|
||||
.scroll::-webkit-scrollbar-thumb{background:var(--line);border-radius:5px}
|
||||
/* width:auto, not 100%: columns take the width their contents need. With
|
||||
width:100% the browser squeezes them to fit the container first and only then
|
||||
overflows, so a callsign could end up wrapped while empty space sat further
|
||||
along the row. min-width keeps a two-column table filling the frame. */
|
||||
table{border-collapse:collapse;width:auto;min-width:100%;font-variant-numeric:tabular-nums}
|
||||
th,td{padding:.45rem .6rem;text-align:left;border-bottom:1px solid var(--line);white-space:nowrap}
|
||||
th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em;
|
||||
text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package webpub
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
// The Distance column was published empty for every QSO logged in OpsLog: the
|
||||
// stored DISTANCE field is only ever filled by an ADIF import that carried one,
|
||||
// and nothing computes it when logging. It falls back to the two locators.
|
||||
func TestDistanceFallsBackToTheGrids(t *testing.T) {
|
||||
// JN36 (French Alps) to IO91 (southern England): a few hundred kilometres.
|
||||
got := distanceKm(&qso.QSO{MyGrid: "JN36DG", Grid: "IO91"})
|
||||
if got == "" {
|
||||
t.Fatal("no distance from two perfectly good locators")
|
||||
}
|
||||
if got == "0" {
|
||||
t.Errorf("distance = %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
// A stored distance wins: it came from the log that recorded the QSO, which knew
|
||||
// more than two four-character squares do.
|
||||
func TestStoredDistanceWins(t *testing.T) {
|
||||
d := 1234.0
|
||||
if got := distanceKm(&qso.QSO{Distance: &d, MyGrid: "JN36", Grid: "IO91"}); got != "1234" {
|
||||
t.Errorf("distance = %q, want the stored 1234", got)
|
||||
}
|
||||
}
|
||||
|
||||
// No grids, no invention. An empty cell is honest; a zero is a claim.
|
||||
func TestNoGridsNoDistance(t *testing.T) {
|
||||
for _, q := range []qso.QSO{{}, {MyGrid: "JN36"}, {Grid: "IO91"}, {MyGrid: "??", Grid: "IO91"}} {
|
||||
if got := distanceKm(&q); got != "" {
|
||||
t.Errorf("distance(%+v) = %q, want empty", q, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -67,6 +67,17 @@ func acquireInstance(postUpdate bool) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// processStart is stamped on the very first instruction of main, before the
|
||||
// single-instance guard and before anything else runs.
|
||||
//
|
||||
// It exists to split a slow launch in two, because the log alone could not: the
|
||||
// first line applog writes already sits inside startup(), so everything spent
|
||||
// loading the binary and creating the WebView2 environment happened before the
|
||||
// log begins and was invisible. An operator reporting "nothing happens for three
|
||||
// seconds" was impossible to answer from a file whose first timestamp is the
|
||||
// moment the app was already running.
|
||||
var processStart = time.Now()
|
||||
|
||||
func main() {
|
||||
// Single-instance guard: if OpsLog is already running, focus that window and
|
||||
// exit instead of spawning a duplicate. A second process would open its own
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// A per-band tune frequency goes straight to the antenna as a command, so a
|
||||
// value that is not actually in that band has to be refused rather than obeyed.
|
||||
// One wrong digit sends the elements travelling to a length that is wrong for
|
||||
// the band the operator is on — and on a SteppIR that journey inhibits transmit
|
||||
// the whole way.
|
||||
func TestNormMotorBandFreqsRefusesOutOfBand(t *testing.T) {
|
||||
in := map[string]int{
|
||||
"20m": 14050, // fine, CW end
|
||||
"40m": 7005, // fine
|
||||
"6m": 50313, // fine, FT8
|
||||
"15m": 1450, // a digit lost — lands in the broadcast band
|
||||
"10m": 28400000, // Hz typed where kHz was asked
|
||||
"17m": 14100, // right number, wrong band
|
||||
"30m": 0, // not set
|
||||
"80m": 3750, // not a band this antenna covers at all
|
||||
"bogus": 14100, // not a band
|
||||
}
|
||||
got := normMotorBandFreqs(in)
|
||||
want := map[string]int{"40m": 7005, "20m": 14050, "6m": 50313}
|
||||
if len(got) != len(want) {
|
||||
t.Fatalf("kept %v, want %v", got, want)
|
||||
}
|
||||
for k, v := range want {
|
||||
if got[k] != v {
|
||||
t.Errorf("%s = %d, want %d", k, got[k], v)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The stored form round-trips, in canonical band order rather than map order so
|
||||
// the settings row does not churn between saves.
|
||||
func TestMotorBandFreqsRoundTrip(t *testing.T) {
|
||||
m := map[string]int{"20m": 14050, "40m": 7005, "6m": 50313}
|
||||
enc := encodeMotorBandFreqs(m)
|
||||
if enc != "40m=7005,20m=14050,6m=50313" {
|
||||
t.Errorf("encoded %q — want canonical low→high order", enc)
|
||||
}
|
||||
back := decodeMotorBandFreqs(enc)
|
||||
for k, v := range m {
|
||||
if back[k] != v {
|
||||
t.Errorf("round trip lost %s: %d → %d", k, v, back[k])
|
||||
}
|
||||
}
|
||||
// Garbage in one entry must cost only that entry.
|
||||
part := decodeMotorBandFreqs("40m=7005,20m=oops,6m=50313")
|
||||
if part["40m"] != 7005 || part["6m"] != 50313 {
|
||||
t.Errorf("one bad entry took the others down: %v", part)
|
||||
}
|
||||
if _, ok := part["20m"]; ok {
|
||||
t.Errorf("kept an unparseable entry: %v", part)
|
||||
}
|
||||
}
|
||||
|
||||
// An unset band falls back to its default, which is what makes the Settings box
|
||||
// safe to leave empty.
|
||||
func TestMotorTuneKHzForBandFallsBack(t *testing.T) {
|
||||
m := map[string]int{"20m": 14050}
|
||||
if got := motorTuneKHzForBand(m, "20m"); got != 14050 {
|
||||
t.Errorf("chosen frequency ignored: %d", got)
|
||||
}
|
||||
if got := motorTuneKHzForBand(m, "15m"); got != 21150 {
|
||||
t.Errorf("15m = %d, want the 21150 default", got)
|
||||
}
|
||||
if got := motorTuneKHzForBand(m, "80m"); got != 0 {
|
||||
t.Errorf("80m = %d, want 0 — not a motor band", got)
|
||||
}
|
||||
// Every default must itself be in its band, or the fallback ships the very
|
||||
// fault normMotorBandFreqs exists to catch.
|
||||
for _, b := range motorBands {
|
||||
if got := bandForHz(int64(b.defKHz) * 1000); got != b.name {
|
||||
t.Errorf("default %d kHz for %s reads as %q", b.defKHz, b.name, got)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// The tracking mode decides how often a motorized antenna's elements run, so a
|
||||
// value that fails to parse must not silently become the most aggressive
|
||||
// setting. Anything unrecognised — including the empty string every config
|
||||
// written before this option existed contains — has to land on the threshold
|
||||
// mode, which is exactly what those configs already did.
|
||||
func TestNormMotorTrackMode(t *testing.T) {
|
||||
for _, tc := range []struct{ in, want string }{
|
||||
{"always", motorTrackAlways},
|
||||
{"ALWAYS", motorTrackAlways},
|
||||
{" band ", motorTrackBand},
|
||||
{"step", motorTrackStep},
|
||||
{"", motorTrackStep}, // never configured — behaves as before
|
||||
{"everytime", motorTrackStep}, // near-miss, not "always"
|
||||
{"per-band", motorTrackStep}, // near-miss, not "band"
|
||||
{"25", motorTrackStep}, // a step value fed in by mistake
|
||||
} {
|
||||
if got := normMotorTrackMode(tc.in); got != tc.want {
|
||||
t.Errorf("normMotorTrackMode(%q) = %q, want %q", tc.in, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Band mode compares the band the rig is on against the band the antenna was
|
||||
// last commanded for. That comparison is bandForHz, and the property it has to
|
||||
// have is that two frequencies far apart within one band agree while two
|
||||
// frequencies close together across a band edge do not — otherwise the antenna
|
||||
// either never moves or moves on every QSY.
|
||||
func TestBandForHzDrivesBandTracking(t *testing.T) {
|
||||
same := [][2]int64{
|
||||
{14000000, 14350000}, // both ends of 20 m — one band, no move
|
||||
{7000000, 7200000}, // 40 m
|
||||
{50000000, 52000000}, // 6 m, a wide one
|
||||
}
|
||||
for _, p := range same {
|
||||
if a, b := bandForHz(p[0]), bandForHz(p[1]); a != b || a == "" {
|
||||
t.Errorf("%.3f MHz is %q but %.3f MHz is %q — band mode would re-tune inside one band",
|
||||
float64(p[0])/1e6, a, float64(p[1])/1e6, b)
|
||||
}
|
||||
}
|
||||
// A small QSY that crosses from 30 m into 20 m has to read as a band change.
|
||||
if a, b := bandForHz(10150000), bandForHz(14000000); a == b {
|
||||
t.Errorf("30 m and 20 m both read %q — band mode would never re-tune between them", a)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/qso"
|
||||
)
|
||||
|
||||
func at(s string) time.Time {
|
||||
t, err := time.Parse("2006-01-02 15:04", s)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
// The number is the contact's rank in the WHOLE log, not its position in what
|
||||
// the grid happens to be showing. Ranking inside the result would renumber
|
||||
// every contact the moment a filter is applied, and QSO #1 would change
|
||||
// identity as the operator typed.
|
||||
func TestQSONumberIsGlobalNotPerPage(t *testing.T) {
|
||||
a := &App{}
|
||||
// The log, oldest first: ids are deliberately NOT in date order, which is
|
||||
// exactly what an imported ADIF produces.
|
||||
a.qsoNumbers = map[int64]int{
|
||||
770: 1, // oldest, imported last so it has the highest id
|
||||
101: 2,
|
||||
102: 3,
|
||||
103: 4,
|
||||
}
|
||||
|
||||
// A filtered page holding only two of them, newest first as the grid asks.
|
||||
page := []qso.QSO{{ID: 103}, {ID: 770}}
|
||||
a.stampQSONumbers(page)
|
||||
|
||||
if page[0].Number != 4 {
|
||||
t.Errorf("id 103 numbered %d, want 4", page[0].Number)
|
||||
}
|
||||
if page[1].Number != 1 {
|
||||
t.Errorf("id 770 numbered %d, want 1 — the oldest contact, whatever its id", page[1].Number)
|
||||
}
|
||||
}
|
||||
|
||||
// A contact logged now is the newest, so it takes the next number without
|
||||
// rereading the log — a full scan per QSO would be felt in a contest run.
|
||||
func TestNewQSOTakesTheNextNumber(t *testing.T) {
|
||||
a := &App{}
|
||||
a.qsoNumbers = map[int64]int{1: 1, 2: 2, 3: 3}
|
||||
a.qsoNumMax = at("2026-08-13 10:00")
|
||||
|
||||
a.noteQSONumbered(9, at("2026-08-13 11:00"))
|
||||
if got := a.qsoNumbers[9]; got != 4 {
|
||||
t.Errorf("new QSO numbered %d, want 4", got)
|
||||
}
|
||||
if !a.qsoNumMax.Equal(at("2026-08-13 11:00")) {
|
||||
t.Error("the newest date was not carried forward")
|
||||
}
|
||||
}
|
||||
|
||||
// A contact entered with an OLDER date belongs in the middle of the order.
|
||||
// Appending it would number it last, which is wrong — so the map is dropped and
|
||||
// rebuilt correctly instead.
|
||||
func TestBackdatedQSOForcesARebuild(t *testing.T) {
|
||||
a := &App{}
|
||||
a.qsoNumbers = map[int64]int{1: 1, 2: 2, 3: 3}
|
||||
a.qsoNumMax = at("2026-08-13 10:00")
|
||||
|
||||
a.noteQSONumbered(9, at("2020-01-01 09:00"))
|
||||
if a.qsoNumbers != nil {
|
||||
t.Errorf("a back-dated QSO was appended as the newest: %v", a.qsoNumbers)
|
||||
}
|
||||
}
|
||||
|
||||
// Nothing built yet: the lazy build will see the new contact anyway, so this
|
||||
// must not create a one-entry map that then numbers the whole log wrongly.
|
||||
func TestNoteBeforeAnyBuildDoesNothing(t *testing.T) {
|
||||
a := &App{}
|
||||
a.noteQSONumbered(9, at("2026-08-13 11:00"))
|
||||
if a.qsoNumbers != nil {
|
||||
t.Errorf("built a map from a single contact: %v", a.qsoNumbers)
|
||||
}
|
||||
}
|
||||
|
||||
// With no index available the column is simply empty — never wrong.
|
||||
func TestStampWithoutIndexLeavesZero(t *testing.T) {
|
||||
a := &App{} // no qso repo, so the index cannot be built
|
||||
page := []qso.QSO{{ID: 1}, {ID: 2}}
|
||||
a.stampQSONumbers(page)
|
||||
for _, q := range page {
|
||||
if q.Number != 0 {
|
||||
t.Errorf("invented a number without an index: %d", q.Number)
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.24.3"
|
||||
appVersion = "0.24.9"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
package main
|
||||
|
||||
import "testing"
|
||||
|
||||
// A CQ in FT8 carries the operator's square and it is where they are NOW.
|
||||
// QRZ and HamQTH describe where they LIVE, which for an expedition is the
|
||||
// wrong side of the planet — RI0FA transmitted QN35 all evening and was logged
|
||||
// with its licence-holder's home square.
|
||||
//
|
||||
// refineGrid is the referee. What it must never do is let a directory value
|
||||
// replace one heard on the air.
|
||||
func TestRefineGridKeepsWhatWasHeardOnAir(t *testing.T) {
|
||||
for _, tc := range []struct{ have, found, want string }{
|
||||
// The expedition case: heard QN35, directory says the home square.
|
||||
{"QN35", "KO85", "QN35"},
|
||||
// Nothing heard: the directory is all there is.
|
||||
{"", "KO85", "KO85"},
|
||||
// A finer square from the SAME field is an upgrade, not a contradiction.
|
||||
{"QN35", "QN35SL", "QN35SL"},
|
||||
// A finer square from a DIFFERENT field is a contradiction — refuse it.
|
||||
{"QN35", "KO85AB", "QN35"},
|
||||
// Case and padding must not decide anything.
|
||||
{" qn35 ", "KO85", "QN35"},
|
||||
{"QN35", "", "QN35"},
|
||||
} {
|
||||
if got := refineGrid(tc.have, tc.found); got != tc.want {
|
||||
t.Errorf("refineGrid(%q, %q) = %q, want %q", tc.have, tc.found, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// And the ordering that makes it work: the decoded grid has to be applied
|
||||
// BEFORE the lookup, or refineGrid has nothing to defend.
|
||||
func TestDecodedGridWinsOverTheDirectory(t *testing.T) {
|
||||
a := &App{}
|
||||
a.rememberDecodeGrid("RI0FA", "QN35", "decode")
|
||||
|
||||
grid := "" // WSJT-X's ADIF carried no GRIDSQUARE, which is the usual case
|
||||
if g := a.lookupDecodeGrid("RI0FA"); g != "" {
|
||||
grid = refineGrid(grid, g)
|
||||
}
|
||||
grid = refineGrid(grid, "KO85") // then the lookup answers with the home square
|
||||
|
||||
if grid != "QN35" {
|
||||
t.Errorf("logged grid = %q, want QN35 — the square the station actually sent", grid)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user