Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6889caae9 | ||
|
|
e3b7a35e2c | ||
|
|
1e507225dd | ||
|
|
47992b5f03 | ||
|
|
453e0df27b | ||
|
|
6ed38014ed | ||
|
|
f832d1ba07 | ||
|
|
f0e00c63a3 | ||
|
|
40ecfb9fa9 | ||
|
|
8c68a7d711 | ||
|
|
628d1e8490 | ||
|
|
0881c72c0f | ||
|
|
6da30f91c4 | ||
|
|
f833ff6d04 | ||
|
|
fba7e79a1c | ||
|
|
d829726679 | ||
|
|
c48edd7898 | ||
|
|
ffaf6fc869 | ||
|
|
4f77d51ffe | ||
|
|
a197d124dc | ||
|
|
9599c3e0b9 | ||
|
|
a81125eab1 | ||
|
|
bbe1b3ce80 | ||
|
|
5e80c27f61 | ||
|
|
7be6f64596 | ||
|
|
0bab7f05b9 | ||
|
|
dc898ce2af | ||
|
|
e5c9ca1a7d | ||
|
|
21a0d560de | ||
|
|
2941121f4b | ||
|
|
6c75ff345b | ||
|
|
d5e25244ee | ||
|
|
4095455e66 | ||
|
|
3f95763ca6 | ||
|
|
72ec3cbb97 | ||
|
|
a8bca8c316 | ||
|
|
8b75166dbe | ||
|
|
d9e03d9de3 | ||
|
|
491546c7f4 | ||
|
|
91b21a4a36 | ||
|
|
eab11db766 | ||
|
|
0c64bdcaf9 | ||
|
|
f0d7a07ed6 | ||
|
|
2aceb99948 | ||
|
|
c48294b0ca | ||
|
|
747c2b9105 | ||
|
|
724e68b38d | ||
|
|
7d664bd1de | ||
|
|
93732ee563 | ||
|
|
5293bb18c5 | ||
|
|
14ac73028e | ||
|
|
b5a88ee5a2 | ||
|
|
e81500f809 | ||
|
|
37805fe3ed | ||
|
|
7578e49573 |
+76
-1
@@ -1,6 +1,11 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"errors"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
// The coupling is a SET, not a global switch.
|
// The coupling is a SET, not a global switch.
|
||||||
//
|
//
|
||||||
@@ -61,3 +66,73 @@ func TestLinkedAmpsNeedsTwo(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Two combined amplifiers must be commanded AT THE SAME TIME, not one after the
|
||||||
|
// other.
|
||||||
|
//
|
||||||
|
// Sequentially, the second was commanded only once the first had answered — and
|
||||||
|
// an SPE answers over its own link, in its own time. The combiner heard power
|
||||||
|
// appear on one input before the other and beeped about it, on every OFF and
|
||||||
|
// every ON. This is what an operator hears, so it is worth a test that would
|
||||||
|
// hear it too.
|
||||||
|
func TestLinkedAmpCommandsLeaveTogether(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
const slow = 150 * time.Millisecond
|
||||||
|
|
||||||
|
var mu sync.Mutex
|
||||||
|
starts := map[string]time.Time{}
|
||||||
|
err := a.ampFanOut([]string{"one", "two"}, func(id string) error {
|
||||||
|
mu.Lock()
|
||||||
|
starts[id] = time.Now()
|
||||||
|
mu.Unlock()
|
||||||
|
time.Sleep(slow) // an amplifier taking its time to answer
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("fan-out: %v", err)
|
||||||
|
}
|
||||||
|
if len(starts) != 2 {
|
||||||
|
t.Fatalf("%d amplifiers were commanded, want both", len(starts))
|
||||||
|
}
|
||||||
|
// Both goroutines wait on one channel and are released by closing it, so the
|
||||||
|
// gap is scheduling noise. Sequential execution would put a full command
|
||||||
|
// between them.
|
||||||
|
gap := starts["one"].Sub(starts["two"])
|
||||||
|
if gap < 0 {
|
||||||
|
gap = -gap
|
||||||
|
}
|
||||||
|
if gap > slow/3 {
|
||||||
|
t.Errorf("the two amplifiers were commanded %v apart — the combiner hears that as one input arriving late", gap)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The amplifier the operator clicked comes first, and its failure is the one
|
||||||
|
// reported: "the amp I pressed did not respond" beats the same message about
|
||||||
|
// its silent partner.
|
||||||
|
func TestLinkedAmpErrorNamesTheOneClicked(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
clicked := errors.New("the one clicked")
|
||||||
|
other := errors.New("the other one")
|
||||||
|
err := a.ampFanOut([]string{"clicked", "other"}, func(id string) error {
|
||||||
|
if id == "clicked" {
|
||||||
|
return clicked
|
||||||
|
}
|
||||||
|
return other
|
||||||
|
})
|
||||||
|
if !errors.Is(err, clicked) {
|
||||||
|
t.Errorf("fan-out reported %v, want the amplifier the operator pressed", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One amplifier is the ordinary case and must not change: run inline, no
|
||||||
|
// goroutine, no barrier, and the error straight back.
|
||||||
|
func TestSingleAmpRunsInline(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
boom := errors.New("not running")
|
||||||
|
if err := a.ampFanOut([]string{"solo"}, func(string) error { return boom }); !errors.Is(err, boom) {
|
||||||
|
t.Errorf("a single amplifier reported %v, want the error itself", err)
|
||||||
|
}
|
||||||
|
if err := a.ampFanOut(nil, func(string) error { return boom }); err != nil {
|
||||||
|
t.Errorf("an empty group reported %v, want nothing to do", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+13
-1
@@ -716,7 +716,10 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
|
|||||||
}
|
}
|
||||||
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
|
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
|
||||||
if q.FreqHz != nil {
|
if q.FreqHz != nil {
|
||||||
vars["qso.freq"] = strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64) + " MHz"
|
// Megahertz, without the unit. The column is labelled FREQ and the box is
|
||||||
|
// narrow — "10.136 MHz" ran into the MODE column beside it, and a card that
|
||||||
|
// says FREQ 10.136 has never confused anybody.
|
||||||
|
vars["qso.freq"] = strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64)
|
||||||
}
|
}
|
||||||
return vars, a.qslCountryInfo(), nil
|
return vars, a.qslCountryInfo(), nil
|
||||||
}
|
}
|
||||||
@@ -749,12 +752,21 @@ func (a *App) qslCountryInfo() qslcard.CountryInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// sampleQSO is the canned contact used by the editor's live preview.
|
// sampleQSO is the canned contact used by the editor's live preview.
|
||||||
|
//
|
||||||
|
// Every field the QSO box can show must be FILLED here, and filled with a value
|
||||||
|
// of realistic width. The preview is the only place an operator can see whether
|
||||||
|
// a column fits before printing a card — a blank one silently promises room it
|
||||||
|
// will not have. The frequency is the widest of them, hence a real 20 m SSB one
|
||||||
|
// rather than a round number.
|
||||||
func sampleQSO() qso.QSO {
|
func sampleQSO() qso.QSO {
|
||||||
|
hz := int64(14285000)
|
||||||
return qso.QSO{
|
return qso.QSO{
|
||||||
Callsign: "DL1ABC",
|
Callsign: "DL1ABC",
|
||||||
QSODate: time.Date(2026, 5, 17, 14, 2, 0, 0, time.UTC),
|
QSODate: time.Date(2026, 5, 17, 14, 2, 0, 0, time.UTC),
|
||||||
Band: "20m",
|
Band: "20m",
|
||||||
Mode: "SSB",
|
Mode: "SSB",
|
||||||
|
Submode: "USB",
|
||||||
|
FreqHz: &hz,
|
||||||
RSTSent: "59",
|
RSTSent: "59",
|
||||||
QSLMsg: "TNX FB QSO — 73!",
|
QSLMsg: "TNX FB QSO — 73!",
|
||||||
}
|
}
|
||||||
|
|||||||
+83
-2
@@ -49,8 +49,18 @@ type RowColorSettings struct {
|
|||||||
// Configured distinguishes "saved with this off" from "saved before the
|
// Configured distinguishes "saved with this off" from "saved before the
|
||||||
// option existed", so a new marker can default ON without silently turning
|
// option existed", so a new marker can default ON without silently turning
|
||||||
// itself back on for an operator who switched it off.
|
// itself back on for an operator who switched it off.
|
||||||
Configured bool `json:"configured"`
|
// RecentZebra decides whether the Recent QSOs grid alternates its row
|
||||||
Rules []RowColorRule `json:"rules"`
|
// background. "" (or "on") keeps the banding, which is what the grid has
|
||||||
|
// always done; "off" makes every row the same colour.
|
||||||
|
//
|
||||||
|
// A string with an empty default rather than a bool: a bool would have to
|
||||||
|
// mean "true when absent", and every reader would have to remember that.
|
||||||
|
RecentZebra string `json:"recent_zebra,omitempty"`
|
||||||
|
// RecentZebraColor is the alternate row's colour. Empty follows the theme,
|
||||||
|
// which is the only answer that stays right across all four of them.
|
||||||
|
RecentZebraColor string `json:"recent_zebra_color,omitempty"`
|
||||||
|
Configured bool `json:"configured"`
|
||||||
|
Rules []RowColorRule `json:"rules"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// The rule ids, in priority order. The frontend matches on these and holds the
|
// The rule ids, in priority order. The frontend matches on these and holds the
|
||||||
@@ -94,6 +104,13 @@ func normRowColors(s RowColorSettings) RowColorSettings {
|
|||||||
out := RowColorSettings{
|
out := RowColorSettings{
|
||||||
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
||||||
BandMapLotw: s.BandMapLotw, Configured: true,
|
BandMapLotw: s.BandMapLotw, Configured: true,
|
||||||
|
RecentZebra: strings.ToLower(strings.TrimSpace(s.RecentZebra)),
|
||||||
|
}
|
||||||
|
if out.RecentZebra != "off" {
|
||||||
|
out.RecentZebra = "" // anything unrecognised means the default banding
|
||||||
|
}
|
||||||
|
if c := strings.TrimSpace(s.RecentZebraColor); hexColor.MatchString(c) {
|
||||||
|
out.RecentZebraColor = c
|
||||||
}
|
}
|
||||||
if !s.Configured {
|
if !s.Configured {
|
||||||
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
||||||
@@ -138,6 +155,70 @@ func normRowColors(s RowColorSettings) RowColorSettings {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MatrixColors recolours the band/mode matrix — the PH/CW/DIG grid in the Stats
|
||||||
|
// panel, whose five fills and current-entry ring are the fastest read in the
|
||||||
|
// whole app and the one an operator is most likely to want in their own colours.
|
||||||
|
//
|
||||||
|
// Every colour is OPTIONAL and an empty one keeps whatever the active theme
|
||||||
|
// paints. That is why this stores OVERRIDES rather than a palette: each of the
|
||||||
|
// twelve themes ships a matrix ramp tuned to its own background, and an operator
|
||||||
|
// who only wants a different green must not thereby freeze the other four to the
|
||||||
|
// theme they happened to be using the day they picked it.
|
||||||
|
type MatrixColors struct {
|
||||||
|
// Enabled off leaves the theme's own ramp untouched, so switching it off is a
|
||||||
|
// genuine revert and not "some other set of colours".
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
CallConfirmed string `json:"call_confirmed"`
|
||||||
|
CallWorked string `json:"call_worked"`
|
||||||
|
EntityConfirmed string `json:"entity_confirmed"`
|
||||||
|
EntityWorked string `json:"entity_worked"`
|
||||||
|
NotWorked string `json:"not_worked"`
|
||||||
|
CurrentEntry string `json:"current_entry"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// normMatrixColors keeps only plain hex values. Anything else becomes "" — i.e.
|
||||||
|
// "use the theme's" — because these are written straight into a CSS custom
|
||||||
|
// property, and the same rule as hexColor's own comment applies: what cannot be
|
||||||
|
// trusted into a stylesheet is refused rather than passed through.
|
||||||
|
func normMatrixColors(c MatrixColors) MatrixColors {
|
||||||
|
clean := func(s string) string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if hexColor.MatchString(s) {
|
||||||
|
return strings.ToLower(s)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return MatrixColors{
|
||||||
|
Enabled: c.Enabled,
|
||||||
|
CallConfirmed: clean(c.CallConfirmed),
|
||||||
|
CallWorked: clean(c.CallWorked),
|
||||||
|
EntityConfirmed: clean(c.EntityConfirmed),
|
||||||
|
EntityWorked: clean(c.EntityWorked),
|
||||||
|
NotWorked: clean(c.NotWorked),
|
||||||
|
CurrentEntry: clean(c.CurrentEntry),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetMatrixColors returns the operator's matrix palette overrides. All-empty
|
||||||
|
// (the default) means "whatever the theme says".
|
||||||
|
func (a *App) GetMatrixColors() MatrixColors {
|
||||||
|
var c MatrixColors
|
||||||
|
if raw := a.settingOr(keyMatrixColors, ""); raw != "" {
|
||||||
|
_ = json.Unmarshal([]byte(raw), &c)
|
||||||
|
}
|
||||||
|
return normMatrixColors(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveMatrixColors persists them.
|
||||||
|
func (a *App) SaveMatrixColors(c MatrixColors) error {
|
||||||
|
b, err := json.Marshal(normMatrixColors(c))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.setSetting(keyMatrixColors, string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetRowColors returns the row-colouring configuration, defaults included so the
|
// GetRowColors returns the row-colouring configuration, defaults included so the
|
||||||
// panel never has to invent one.
|
// panel never has to invent one.
|
||||||
func (a *App) GetRowColors() RowColorSettings {
|
func (a *App) GetRowColors() RowColorSettings {
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The award snapshot must be built ONCE however many callers ask at once.
|
||||||
|
//
|
||||||
|
// The cache lock is released before the logbook is read, so every caller that
|
||||||
|
// arrives during a build used to miss the cache and start its own. Opening the
|
||||||
|
// Awards panel does exactly that: a field log showed three pulls of the same
|
||||||
|
// 123 615 QSOs inside ten seconds, and three copies alive together took the Go
|
||||||
|
// heap from 725 MB to 2.5 GB.
|
||||||
|
//
|
||||||
|
// This models the same shape — a cheap cache check, a slow build, a shared
|
||||||
|
// result — against the pattern awardSnapshot now uses, so the invariant is
|
||||||
|
// pinned without needing a logbook.
|
||||||
|
func TestSnapshotBuildsOncePerRevision(t *testing.T) {
|
||||||
|
var (
|
||||||
|
cacheMu sync.Mutex
|
||||||
|
buildMu sync.Mutex
|
||||||
|
cached []int
|
||||||
|
rev = "r1"
|
||||||
|
gotRev string
|
||||||
|
builds int
|
||||||
|
)
|
||||||
|
|
||||||
|
get := func() []int {
|
||||||
|
cacheMu.Lock()
|
||||||
|
if cached != nil && gotRev == rev {
|
||||||
|
defer cacheMu.Unlock()
|
||||||
|
return cached
|
||||||
|
}
|
||||||
|
cacheMu.Unlock()
|
||||||
|
|
||||||
|
buildMu.Lock()
|
||||||
|
defer buildMu.Unlock()
|
||||||
|
// Re-check: whoever held the build lock has just finished.
|
||||||
|
cacheMu.Lock()
|
||||||
|
if cached != nil && gotRev == rev {
|
||||||
|
defer cacheMu.Unlock()
|
||||||
|
return cached
|
||||||
|
}
|
||||||
|
cacheMu.Unlock()
|
||||||
|
|
||||||
|
time.Sleep(50 * time.Millisecond) // the logbook read
|
||||||
|
out := []int{1, 2, 3}
|
||||||
|
|
||||||
|
cacheMu.Lock()
|
||||||
|
builds++
|
||||||
|
cached, gotRev = out, rev
|
||||||
|
cacheMu.Unlock()
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
results := make([][]int, 8)
|
||||||
|
for i := range results {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(i int) { defer wg.Done(); results[i] = get() }(i)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
|
||||||
|
if builds != 1 {
|
||||||
|
t.Errorf("%d builds for one revision — each concurrent caller pulled the whole logbook again", builds)
|
||||||
|
}
|
||||||
|
for i, r := range results {
|
||||||
|
if len(r) != 3 {
|
||||||
|
t.Errorf("caller %d got %v", i, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A new revision must rebuild: the guard is against duplicate work, not
|
||||||
|
// against a logbook that changed.
|
||||||
|
cacheMu.Lock()
|
||||||
|
rev = "r2"
|
||||||
|
cacheMu.Unlock()
|
||||||
|
get()
|
||||||
|
if builds != 2 {
|
||||||
|
t.Errorf("builds = %d after the revision moved, want 2 — a changed logbook must be re-read", builds)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/pskr"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The receiver radius is what makes an opening report evidence about the
|
||||||
|
// OPERATOR's path rather than someone else's. Both ends of the range destroy
|
||||||
|
// that: too small and no receiver is ever near enough, too large and the
|
||||||
|
// reports are about a different part of the world. A stored value that would do
|
||||||
|
// either has to fall back rather than be honoured.
|
||||||
|
func TestBandOpenNearKmClamps(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
raw string
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{"unset falls back", "", pskr.DefaultNearKm},
|
||||||
|
{"not a number falls back", "soon", pskr.DefaultNearKm},
|
||||||
|
{"zero falls back", "0", pskr.DefaultNearKm},
|
||||||
|
{"negative falls back", "-100", pskr.DefaultNearKm},
|
||||||
|
{"absurdly tight falls back", "5", pskr.DefaultNearKm},
|
||||||
|
{"absurdly wide falls back", "5000", pskr.DefaultNearKm},
|
||||||
|
{"a real choice is kept", "100", 100},
|
||||||
|
{"the lower bound is kept", "25", 25},
|
||||||
|
{"the upper bound is kept", "1000", 1000},
|
||||||
|
{"surrounding space is ignored", " 150 ", 150},
|
||||||
|
} {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
if got := bandOpenNearKm(tc.raw); got != tc.want {
|
||||||
|
t.Errorf("bandOpenNearKm(%q) = %d, want %d", tc.raw, got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
+31
-1
@@ -16,6 +16,7 @@ package main
|
|||||||
// they no longer need.
|
// they no longer need.
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
@@ -28,7 +29,8 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
keyBandOpenEnabled = "bandopen.enabled"
|
keyBandOpenEnabled = "bandopen.enabled"
|
||||||
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
keyBandOpenBands = "bandopen.bands" // comma-separated; empty = the default set
|
||||||
|
keyBandOpenNearKm = "bandopen.nearkm" // receiver radius; empty = pskr.DefaultNearKm
|
||||||
)
|
)
|
||||||
|
|
||||||
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
// rbnNodes are the two Reverse Beacon Network endpoints the watch wants: CW and
|
||||||
@@ -45,6 +47,18 @@ type BandOpenSettings struct {
|
|||||||
// Available is every band that can be watched, so the UI does not carry its
|
// 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.
|
// own copy of a list that belongs to the detector.
|
||||||
Available []string `json:"available"`
|
Available []string `json:"available"`
|
||||||
|
// NearKm is how close a RECEIVER has to be for its report to count as
|
||||||
|
// evidence about the operator's own path. An opening on these bands reaches
|
||||||
|
// an AREA, and the right radius is a judgement about how big that area is —
|
||||||
|
// a 2 m tropo duct is not a 10 m Es footprint — so it is the operator's to
|
||||||
|
// make rather than a constant.
|
||||||
|
//
|
||||||
|
// Tightening it costs nothing in traffic: the broker subscription is one
|
||||||
|
// ring of squares whatever this says, and this only decides what survives
|
||||||
|
// once the messages are here. It costs SENSITIVITY — too small a radius in a
|
||||||
|
// thinly-populated region leaves no receivers at all, and a watch with
|
||||||
|
// nothing to look at reports nothing while appearing to work.
|
||||||
|
NearKm int `json:"near_km"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
func (a *App) GetBandOpenSettings() BandOpenSettings {
|
||||||
@@ -52,6 +66,7 @@ func (a *App) GetBandOpenSettings() BandOpenSettings {
|
|||||||
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
Enabled: a.settingOr(keyBandOpenEnabled, "") == "1",
|
||||||
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
Bands: splitCSV(a.settingOr(keyBandOpenBands, "")),
|
||||||
Available: pskr.Bands,
|
Available: pskr.Bands,
|
||||||
|
NearKm: bandOpenNearKm(a.settingOr(keyBandOpenNearKm, "")),
|
||||||
}
|
}
|
||||||
// Keep only bands that are still offered. A saved selection outlives the code
|
// 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
|
// that made it: 12 m was dropped from the watched set, but every operator who
|
||||||
@@ -78,9 +93,23 @@ func keepKnownBands(want []string) []string {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bandOpenNearKm reads the stored receiver radius, falling back to the default
|
||||||
|
// for anything unset or out of range. The bounds are the two ways to make the
|
||||||
|
// watch useless: below 25 km almost nobody is ever near enough to hear anything,
|
||||||
|
// and past 1000 km the reports stop being about the operator's own path — which
|
||||||
|
// is the entire premise of measuring from a receiver rather than a transmitter.
|
||||||
|
func bandOpenNearKm(raw string) int {
|
||||||
|
n, err := strconv.Atoi(strings.TrimSpace(raw))
|
||||||
|
if err != nil || n < 25 || n > 1000 {
|
||||||
|
return pskr.DefaultNearKm
|
||||||
|
}
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
|
||||||
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
func (a *App) SaveBandOpenSettings(s BandOpenSettings) error {
|
||||||
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
a.setSetting(keyBandOpenEnabled, map[bool]string{true: "1", false: "0"}[s.Enabled])
|
||||||
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
a.setSetting(keyBandOpenBands, strings.Join(s.Bands, ","))
|
||||||
|
a.setSetting(keyBandOpenNearKm, strconv.Itoa(bandOpenNearKm(strconv.Itoa(s.NearKm))))
|
||||||
if s.Enabled {
|
if s.Enabled {
|
||||||
a.ensureRBNNodes()
|
a.ensureRBNNodes()
|
||||||
}
|
}
|
||||||
@@ -184,6 +213,7 @@ func (a *App) startBandOpenFeed() {
|
|||||||
a.pskr = pskr.New(pskr.Config{
|
a.pskr = pskr.New(pskr.Config{
|
||||||
Bands: bands,
|
Bands: bands,
|
||||||
RxGrids: rxGrids,
|
RxGrids: rxGrids,
|
||||||
|
NearKm: s.NearKm,
|
||||||
OpLat: a.opLat, OpLon: a.opLon,
|
OpLat: a.opLat, OpLon: a.opLon,
|
||||||
Geo: func(grid string) (int, int, bool) {
|
Geo: func(grid string) (int, int, bool) {
|
||||||
lat, lon, ok := gridToLatLon(grid)
|
lat, lon, ok := gridToLatLon(grid)
|
||||||
|
|||||||
+170
@@ -1,4 +1,174 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.26.1",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Auto-call: a QSO in progress is now held by OpsLog itself, so a new station is no longer called in the middle of an exchange. The hold is released when that QSO is logged, when you halt or click another decode, and after four minutes without a contact.",
|
||||||
|
"Rotor widget: the Stop button now lights up when pressed, like the direction presets, so there is no doubt the order went out.",
|
||||||
|
"FT decodes: a decode could go missing from the panel when a period arrived as one burst — the internal queue discarded it in silence. It is now deep enough for a full period, panadapter spots no longer hold the stream up, and anything still lost is written to the log.",
|
||||||
|
"Closing OpsLog can no longer leave a process behind. Each shutdown step is written to the log, and if one of them hangs the application now forces its own exit instead of staying open — which also unblocks the restart after an update.",
|
||||||
|
"CAT: a rig link whose polling loop got stuck no longer freezes every later reconnection attempt in silence. The wait is now bounded and the problem is written to the log, instead of a radio that never comes back and no explanation anywhere.",
|
||||||
|
"Cluster console: the replies to your commands are no longer buried under the spot flood. A Replies button — on by default — hides the DX spots, which the list above already shows.",
|
||||||
|
"Cluster: twelve named command buttons beside the command box — name one \"Show filters\", give it SH/FILTER, and one click sends it. They are set up in Settings → Cluster; a button with no command is not shown.",
|
||||||
|
"Cluster console: a Follow button decides whether the view sticks to the newest line, and sending a command re-arms it — a long reply is now scrolled to instead of landing out of sight. Switch Follow off to read without being pulled back down; the arrow beside it returns to the end.",
|
||||||
|
"Band map: the docked map can be switched to fit-to-band from its own header — click the px/kHz readout. It is the same setting the Band Map tab drives, so the two always agree.",
|
||||||
|
"Awards: an award can now be set to search in NO field. The matching options disappear with it, and the award counts only the references you assign to a contact by hand — for a reference like WWBOTA, which has no ADIF field anywhere.",
|
||||||
|
"New award: WWBOTA (World Wide Bunkers on the Air), with its full reference list — 31 342 bunkers. References are assigned to a contact by hand, the award having no ADIF field of its own.",
|
||||||
|
"Grid squares map: the map now fills its panel. It measured its container once, while the tab was still hidden, and kept that size — leaving a blank band under it whatever the window size.",
|
||||||
|
"Grid squares map: the fill colours for confirmed and worked squares can be chosen, beside the basemap selector. Left alone they follow the theme, and one click puts them back.",
|
||||||
|
"QSL cards: the QSO box now carries the frequency in megahertz alongside the band, and the designer lets you choose which columns it shows — date, UTC, band, frequency, mode, submode, RST.",
|
||||||
|
"Main view: up to four panes instead of two. A third and a fourth can be chosen — or left empty, in which case they are not drawn — and with four you pick between quarters (2 × 2) and four columns. Every divider is draggable, each arrangement is remembered for its own pane count, and a double-click evens it out.",
|
||||||
|
"Appearance: the alternating row shading in Recent QSOs can be switched off — every row the same colour — or given a colour of its own. It is independent of the QSL row colours, which still take precedence on the rows they paint.",
|
||||||
|
"QSL row colours: the \"left stripe\" style no longer draws a coloured hairline along the top and bottom of every coloured row. The stripe is painted differently — it is a stripe again, and nothing else.",
|
||||||
|
"QSL designer: the preview contact now fills every column the QSO box can show, frequency and submode included. A blank column promised room the printed card would not have."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Appel automatique : le QSO en cours est désormais verrouillé par OpsLog lui-même, si bien qu'une nouvelle station n'est plus appelée au milieu d'un échange. Le verrou est levé quand ce QSO est journalisé, quand tu fais Stop ou cliques un autre décodage, et au bout de quatre minutes sans contact.",
|
||||||
|
"Widget rotor : le bouton Stop s'allume maintenant quand on l'enfonce, comme les présélections de direction, pour ne plus douter que l'ordre est parti.",
|
||||||
|
"Décodages FT : un décodage pouvait manquer dans le panneau quand une période arrivait d'un bloc — la file interne le jetait sans rien dire. Elle est désormais dimensionnée pour une période entière, les spots panadapter ne retiennent plus le flux, et ce qui serait encore perdu est écrit dans le journal.",
|
||||||
|
"Fermer OpsLog ne peut plus laisser un processus derrière. Chaque étape d'arrêt est écrite dans le journal, et si l'une d'elles se bloque l'application force désormais sa propre sortie au lieu de rester ouverte — ce qui débloque aussi le redémarrage après une mise à jour.",
|
||||||
|
"CAT : une liaison radio dont la boucle d'interrogation se bloquait figeait en silence toutes les tentatives de reconnexion suivantes. L'attente est désormais bornée et le problème écrit dans le journal, au lieu d'une radio qui ne revient jamais sans la moindre explication.",
|
||||||
|
"Console cluster : les réponses à tes commandes ne sont plus noyées sous le flot de spots. Un bouton Réponses — actif par défaut — masque les spots DX, que la liste au-dessus affiche déjà.",
|
||||||
|
"Cluster : douze boutons de commande nommés à côté du champ de saisie — nomme-en un « Voir filtres », donne-lui SH/FILTER, et un clic l'envoie. Ils se règlent dans Réglages → Cluster ; un bouton sans commande n'est pas affiché.",
|
||||||
|
"Console cluster : un bouton Suivre décide si la vue reste collée à la dernière ligne, et envoyer une commande le réarme — une longue réponse défile maintenant jusqu'à elle au lieu d'arriver hors champ. Désactive Suivre pour lire sans être ramené en bas ; la flèche à côté revient à la fin.",
|
||||||
|
"Bandmap : la carte ancrée peut passer en ajustement à la bande depuis son propre en-tête — cliquer l'indicateur px/kHz. C'est le même réglage que celui de l'onglet Bandmap, les deux sont donc toujours d'accord.",
|
||||||
|
"Diplômes : un diplôme peut désormais ne chercher dans AUCUN champ. Les options de reconnaissance disparaissent avec lui, et le diplôme ne compte que les références attribuées à la main sur un contact — pour une référence comme WWBOTA, qui n'a de champ ADIF nulle part.",
|
||||||
|
"Nouveau diplôme : WWBOTA (World Wide Bunkers on the Air), avec sa liste de références complète — 31 342 bunkers. Les références s'attribuent à la main sur un contact, le diplôme n'ayant pas de champ ADIF propre.",
|
||||||
|
"Carte des carrés locator : la carte occupe enfin tout son panneau. Elle mesurait son conteneur une seule fois, alors que l'onglet était encore masqué, et gardait cette taille — d'où la bande vide en dessous quelle que soit la taille de la fenêtre.",
|
||||||
|
"Carte des carrés locator : les couleurs des carrés confirmés et contactés se choisissent, à côté du sélecteur de fond de carte. Laissées telles quelles, elles suivent le thème, et un clic les y ramène.",
|
||||||
|
"Cartes QSL : le tableau du QSO porte désormais la fréquence en mégahertz à côté de la bande, et le concepteur permet de choisir les colonnes affichées — date, UTC, bande, fréquence, mode, sous-mode, RST.",
|
||||||
|
"Vue principale : jusqu'à quatre volets au lieu de deux. Un troisième et un quatrième se choisissent — ou se laissent vides, auquel cas ils ne sont pas dessinés — et avec quatre tu choisis entre les quarts (2 × 2) et quatre colonnes. Chaque séparateur se glisse, chaque disposition est mémorisée pour son propre nombre de volets, et un double-clic la remet à égalité.",
|
||||||
|
"Apparence : l'alternance de teinte une ligne sur deux dans QSO récents peut être désactivée — toutes les lignes de la même couleur — ou recevoir sa propre couleur. Elle est indépendante des couleurs de ligne QSL, qui restent prioritaires sur les lignes qu'elles peignent.",
|
||||||
|
"Couleurs de ligne QSL : le style « barre à gauche » ne trace plus un filet coloré en haut et en bas de chaque ligne colorée. La barre est peinte autrement — c'est de nouveau une barre, et rien d'autre.",
|
||||||
|
"Concepteur QSL : le contact d'aperçu remplit maintenant toutes les colonnes que le tableau peut afficher, fréquence et sous-mode compris. Une colonne vide promettait une place que la carte imprimée n'avait pas."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.0",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"A new FT decodes tab: every decode from WSJT-X, JTDX or MSHV, grouped by transmit period, with what is new and what you are sending. Clicking a decode asks the application to call that station, exactly as double-clicking the line in its own window does. Columns are resizable and remembered, the filter bar with them, Clear empties the lists and Halt stops the transmission. With two receivers running the table splits into one column per band, each with its own transmit line, Halt and Clear, and the column lights up when that receiver is on the air. On a FlexRadio, answering a decode moves the transmitter to the slice listening on that band — unless that band already transmits, so an existing split is left alone.",
|
||||||
|
"FT decodes: auto-call. OpsLog can answer a decode without you clicking it — pick what qualifies (a new entity, band, mode, band+mode slot, grid, US county, POTA park or WPX prefix) and add a watch list of callsigns, with or without conditions of their own. It answers a CQ only, one station at a time across the whole station, never while any receiver is still mid-QSO, with a cooldown per callsign, and every call is written to the log with its reason. Armed from the decodes toolbar or Settings → FTx decodes, and off until you turn it on.",
|
||||||
|
"A grid-square map (Tools → Grid squares): every 4-character square in the log, confirmed squares solid and worked ones faint, scoped to digital or the FT modes, on the basemap of your choice. It answers the one question a decode list cannot — not who is on the band, but where the station has actually been reaching.",
|
||||||
|
"UDP: a new outbound type relays the WSJT-X stream. Every datagram received from WSJT-X, JTDX or MSHV is re-sent byte for byte to another program — JTAlert, GridTracker, a second logger — which each sender cannot do on its own, since they talk to one address only. Forwarded verbatim, with no origin header of the kind that has to be stripped back off at the far end, and a target naming one of OpsLog’s own ports is refused rather than looped.",
|
||||||
|
"New-grid detection now reads the grid from a reply as well as from a CQ. \"C91RU IZ5EME JN52\" — a station answering with its locator — is the commonest grid-bearing message on a busy band, and only CQs were being read: any station whose CQ you happened to miss had no known grid at all and could never be flagged as a new one. This is why other tools showed far more wanted grids than OpsLog did.",
|
||||||
|
"New-grid chasing is now scoped the way GridTracker scopes it, so the two agree. Pick how a square counts as already worked — this band or any band, crossed with any digital mode, this exact mode, or any FT mode (FT8/FT4/FT2) — and whether to chase only squares never worked or unconfirmed ones too, which are still missing from the award. The two are shown differently: a square never worked is a QSO to make, one worked and awaiting a confirmation is a QSL to chase, and they no longer share a badge. Settings → DX Cluster. The decodes table also gained a Grid column.",
|
||||||
|
"Cluster: NEW badges now clear after a contact however it was logged. Only hand-logging refreshed the worked snapshot, so a station worked through WSJT-X / JTDX / MSHV — or replayed from the offline outbox, arriving from a multi-op partner, or imported from the POTA hunter log — kept its NEW, NEW BAND, NEW MODE, NEW SLOT, NEW GRID, NEW PFX or NEW POTA badge for the rest of the session.",
|
||||||
|
"DX cluster: the Spotter continent filter matches again. One callsign is spotted by skimmers all over the world within a minute, and they all shared a single cached entry belonging to whichever spotter arrived first — so picking AF left the Indian and American skimmers in the list. Each spot now carries its own spotter continent. Alert rules on the spotter’s continent or country were missing RBN spots for a related reason and now match too.",
|
||||||
|
"Recent QSOs: the callsign search takes wildcards. A plain word now matches the START of a call — 4S finds 4S7AB — while * is any run of characters and ? exactly one, so *4S ends with 4S and *4S* contains it anywhere. It was an unconditional contains-match before, which made asking for a prefix impossible.",
|
||||||
|
"QSL Manager: the right-click menu now carries the same actions as Recent QSOs — ADIF export of the selection, export with a chosen field set, Cabrillo, bulk edit, the callbook and cty.dat updates, e-mail and delete. Filtered exports are deliberately not offered here: \"the filter\" means the Recent-QSOs filter, not the rows on screen. Two entries that appeared in this tab and did nothing when clicked are fixed at the same time — the menu now shows an action only where it is actually wired.",
|
||||||
|
"Column pickers and the ADIF export field chooser gained a whole-dialog Select all / Clear. Only per-group links existed, so clearing a selection meant one click per group — a dozen of them before you could tick the handful you actually wanted. Applies to Recent QSOs, Worked before, the cluster list and the export dialog, and covers the award columns the per-group links never touched.",
|
||||||
|
"Rotator: a Compact mode option (Settings → Rotator) reduces the rotor widget to the dial and the short/long-path azimuths under it. Left off, the widget keeps its quick-turn buttons, azimuth box and Stop.",
|
||||||
|
"Band-opening watch: the radius that counts a receiver as \"around here\" is now adjustable (Settings → DX Cluster), 25–1000 km, still 300 km by default. An opening on 10 m reaches a whole region, a 2 m duct does not, and the right distance is a judgement only the operator can make. Tightening it costs no extra traffic — the subscription is unchanged — only sensitivity.",
|
||||||
|
"Club Log uploads are now identified as OpsLog. They were credited to another station's application key, which took the blame for them.",
|
||||||
|
"ADIF import: \"fill my station fields\" now fills the station callsign too, on records that carry none."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Un onglet Décodages FT : tous les décodages de WSJT-X, JTDX ou MSHV, groupés par période d’émission, avec ce qui est nouveau et ce que tu émets. Cliquer un décodage demande au logiciel d’appeler cette station, exactement comme un double-clic sur la ligne dans sa propre fenêtre. Les colonnes se redimensionnent et sont mémorisées, la barre de filtres avec elles, Vider efface les listes et Stop arrête l’émission. Avec deux récepteurs, le tableau se scinde en une colonne par bande, chacune avec sa ligne d’émission, son Stop et son Vider, et la colonne s’allume quand c’est ce récepteur qui émet. Sur un FlexRadio, répondre à un décodage déplace l’émetteur sur la slice qui écoute cette bande — sauf si cette bande émet déjà, pour ne pas défaire un split en place.",
|
||||||
|
"Décodages FT : appel automatique. OpsLog peut répondre à un décodage sans que tu cliques — choisis ce qui le déclenche (nouvelle entité, bande, mode, couple bande+mode, carré, comté US, parc POTA ou préfixe WPX) et ajoute une liste d’indicatifs surveillés, avec ou sans conditions propres. Uniquement sur un CQ, une station à la fois pour toute la station, jamais tant qu’un récepteur est encore en QSO, avec un délai de garde par indicatif, et chaque appel est écrit dans le journal avec sa raison. S’arme depuis la barre d’outils des décodages ou Réglages → Décodages FTx, et reste désactivé tant que tu ne l’actives pas.",
|
||||||
|
"Une carte des carrés locator (Outils → Carrés locator) : tous les carrés de 4 caractères du journal, les confirmés en plein et les contactés en pâle, au choix en numérique ou en modes FT, sur le fond de carte de ton choix. Elle répond à la seule question qu’une liste de décodages ne peut pas traiter : non pas qui est sur la bande, mais jusqu’où la station porte réellement.",
|
||||||
|
"UDP : un nouveau type sortant relaie le flux WSJT-X. Chaque datagramme reçu de WSJT-X, JTDX ou MSHV est réémis octet pour octet vers un autre logiciel — JTAlert, GridTracker, un second carnet — ce qu’aucun émetteur ne sait faire seul puisqu’il ne parle qu’à une adresse. Transmis tel quel, sans l’en-tête d’origine qu’il faut ensuite retirer à l’autre bout, et une cible désignant un port d’écoute d’OpsLog est refusée au lieu de boucler.",
|
||||||
|
"La détection des nouveaux carrés lit désormais le locator dans une réponse autant que dans un CQ. « C91RU IZ5EME JN52 » — une station qui répond avec son locator — est le message porteur de locator le plus fréquent sur une bande chargée, et seuls les CQ étaient lus : une station dont on avait manqué le CQ n’avait aucun locator connu et ne pouvait jamais être signalée comme nouvelle. C’est ce qui expliquait l’écart avec les autres logiciels sur le nombre de carrés recherchés.",
|
||||||
|
"La chasse aux nouveaux carrés se règle désormais comme dans GridTracker, pour que les deux soient d’accord. Choisis ce qui fait qu’un carré est déjà fait — cette bande ou toutes bandes, croisé avec tout mode numérique, ce mode exact, ou tout mode FT (FT8/FT4/FT2) — et si tu chasses seulement les carrés jamais contactés ou aussi les non confirmés, qui manquent encore au diplôme. Les deux s’affichent différemment : un carré jamais contacté est un QSO à faire, un carré contacté en attente de confirmation est une QSL à relancer, et ils ne partagent plus le même badge. Réglages → Cluster DX. Le tableau des décodages gagne aussi une colonne Locator.",
|
||||||
|
"Cluster : les badges NEW s’effacent enfin après un contact, quel que soit le mode de journalisation. Seule la saisie manuelle rafraîchissait l’instantané des contacts, si bien qu’une station travaillée via WSJT-X / JTDX / MSHV — ou rejouée depuis la file hors-ligne, reçue d’un partenaire multi-op, ou importée du journal chasseur POTA — gardait son badge NEW, NEW BAND, NEW MODE, NEW SLOT, NEW GRID, NEW PFX ou NEW POTA jusqu’à la fin de la session.",
|
||||||
|
"Cluster DX : le filtre Continent du spotter fonctionne à nouveau. Un même indicatif est spotté par des skimmers du monde entier en une minute, et tous partageaient une seule entrée en cache appartenant au premier spotter arrivé — choisir AF laissait donc les skimmers indiens et américains dans la liste. Chaque spot porte désormais son propre continent de spotter. Les règles d’alerte sur le continent ou le pays du spotter rataient les spots RBN pour une raison voisine et fonctionnent aussi.",
|
||||||
|
"QSO récents : la recherche d’indicatif accepte les jokers. Un mot simple correspond désormais au DÉBUT de l’indicatif — 4S trouve 4S7AB — tandis que * remplace n’importe quelle suite de caractères et ? exactement un : *4S se termine par 4S, *4S* le contient n’importe où. C’était auparavant une recherche « contient » systématique, qui rendait impossible la recherche par préfixe.",
|
||||||
|
"Gestionnaire QSL : le menu contextuel propose désormais les mêmes actions que les QSO récents — export ADIF de la sélection, export avec choix des champs, Cabrillo, édition en masse, mises à jour cty.dat et annuaires, e-mail et suppression. Les exports « filtrés » n’y sont volontairement pas offerts : « le filtre » désigne celui des QSO récents, pas les lignes affichées ici. Deux entrées qui apparaissaient dans cet onglet sans rien faire sont corrigées au passage — le menu n’affiche plus une action que là où elle est réellement branchée.",
|
||||||
|
"Les sélecteurs de colonnes et le choix des champs à l’export ADIF ont désormais un Tout sélectionner / Tout décocher global. Seuls les liens par groupe existaient, si bien que vider une sélection demandait un clic par groupe — une douzaine avant de pouvoir cocher les quelques champs voulus. Vaut pour les QSO récents, Déjà contacté, la liste cluster et la fenêtre d’export, et couvre les colonnes de diplômes que les liens par groupe ne touchaient pas.",
|
||||||
|
"Rotor : une option Mode compact (Réglages → Rotor) réduit le widget au cadran et aux azimuts courte/longue distance en dessous. Désactivée, le widget garde ses boutons de rotation rapide, sa case d’azimut et Stop.",
|
||||||
|
"Veille d’ouverture : le rayon qui fait qu’un récepteur compte comme « près d’ici » est désormais réglable (Réglages → Cluster DX), de 25 à 1000 km, toujours 300 km par défaut. Une ouverture sur 10 m couvre toute une région, un conduit sur 2 m non, et la bonne distance est un jugement qui n’appartient qu’à l’opérateur. Le resserrer ne coûte aucun trafic supplémentaire — l’abonnement ne change pas — seulement de la sensibilité.",
|
||||||
|
"Les envois Club Log s’identifient désormais comme OpsLog. Ils étaient attribués à la clé applicative d’une autre station, qui en portait la responsabilité.",
|
||||||
|
"Import ADIF : « remplir mes champs station » renseigne aussi l’indicatif de station, sur les enregistrements qui n’en portent pas."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.9",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"The band/mode matrix colours can be chosen in Appearance, starting from the ones your theme already paints. Its legend is translated too.",
|
||||||
|
"TCI sharing: a refused un-key no longer leaves the rig stuck transmitting, and PTT is dropped if the client dies mid-over.",
|
||||||
|
"Icom: a frequency or mode change whose acknowledgement is lost is sent again, like PTT — losing one made JTDX drop the radio.",
|
||||||
|
"FlexRadio: transmit audio can switch to DAX for a voice message and back afterwards, so your microphone is not left off air.",
|
||||||
|
"Rotor widget: quick-turn buttons you can name and aim yourself, plus an azimuth box where Enter turns the antenna.",
|
||||||
|
"A station portable in another entity no longer inherits its home county, state and grid — TI8/W2RE was logged in New York.",
|
||||||
|
"LoTW confirmations for FT2, FT4 and FT8 match again: LoTW answers “DATA”, and the exact mode never lined up with the log.",
|
||||||
|
"CAT: a transverter offset, so a 28 MHz IF behind a 144 MHz transverter logs, spots and tunes on the band you are really on.",
|
||||||
|
"Band map: zoom goes down to 2 px/kHz for a whole band in one screen, and each band keeps the zoom you left it at."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Les couleurs de la matrice bandes/modes se choisissent dans Apparence, à partir de celles du thème. Sa légende est traduite aussi.",
|
||||||
|
"Partage TCI : un retour en réception refusé ne laisse plus le poste bloqué en émission, et le PTT retombe si le logiciel meurt.",
|
||||||
|
"Icom : un changement de fréquence ou de mode dont l’accusé se perd est renvoyé, comme le PTT — en perdre un faisait lâcher JTDX.",
|
||||||
|
"FlexRadio : l’audio d’émission peut basculer sur DAX le temps d’un message vocal et revenir après, pour ne pas perdre le micro.",
|
||||||
|
"Widget rotor : des boutons de rotation rapide que tu nommes et vises toi-même, et un champ azimut où Entrée lance l’antenne.",
|
||||||
|
"Une station portable dans une autre entité n’hérite plus de son comté, son état et son locator d’origine : TI8/W2RE sortait à New York.",
|
||||||
|
"Les confirmations LoTW des QSO FT2, FT4 et FT8 se retrouvent : LoTW répond « DATA », et le mode exact ne correspondait jamais au log.",
|
||||||
|
"CAT : un décalage transverter, pour qu’une FI 28 MHz derrière un transverter 144 MHz logue et accorde sur la vraie bande.",
|
||||||
|
"Carte de bande : le zoom descend à 2 px/kHz pour voir toute la bande d’un coup, et chaque bande retient son zoom."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.8",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"An entity that is a single island group now fills the IOTA reference on its own — no callbook subscription needed.",
|
||||||
|
"CAT sharing can now speak TCI instead of Hamlib, split included, so a TCI-only program reaches whatever radio you are on.",
|
||||||
|
"Lookup cache: a TTL of 0 switches it off, so a callbook record you are correcting is re-read every time.",
|
||||||
|
"TCI radios: when the rig forbids transmitting, PTT says so instead of doing nothing silently.",
|
||||||
|
"WAJA carried Japan’s civil prefecture numbers instead of the JARL’s: 35 of the 47 references are renumbered.",
|
||||||
|
"Award references can be renumbered in the editor — the number was the one field it would not let you correct.",
|
||||||
|
"The compass fills the moment Station Control opens, instead of waiting out the rest of a polling interval.",
|
||||||
|
"Combined amplifiers: the power level (L/M/H) is coupled too, and both amps are commanded at once so the combiner stops beeping.",
|
||||||
|
"Generic HTTP relay: an https:// board can be accepted with its own self-signed certificate, per board.",
|
||||||
|
"Club Log: the on-close upload now goes out as one batch — sending hundreds of contacts one at a time got operators blocked.",
|
||||||
|
"eQSL: uploads go out in batches of 100 too, and QRZ.com and HRDLog — which have no batch upload — are spaced out instead.",
|
||||||
|
"A spot you send now shows in your own spot list — most nodes never echo it back, so it looked like nothing had gone out.",
|
||||||
|
"Icom with JTDX in Fake It split: a lost PTT acknowledgement is sent again instead of failing, which made JTDX drop the rig.",
|
||||||
|
"A cluster whose only greeting is “login:” and which then asks for a password now connects — both prompts were being missed."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Une entité qui est un seul groupe d’îles remplit désormais la référence IOTA toute seule, sans abonnement callbook.",
|
||||||
|
"Le partage CAT peut désormais parler TCI au lieu de Hamlib, split compris : un logiciel TCI atteint la radio, quelle qu’elle soit.",
|
||||||
|
"Cache des recherches : un TTL à 0 le désactive, pour relire à chaque fois une fiche callbook en cours de correction.",
|
||||||
|
"Radios TCI : quand la radio interdit l’émission, le PTT le dit au lieu de ne rien faire en silence.",
|
||||||
|
"WAJA portait les numéros civils des préfectures japonaises et non ceux de la JARL : 35 des 47 références sont renumérotées.",
|
||||||
|
"Les références d’un diplôme se renumérotent dans l’éditeur : le numéro était le seul champ qu’il refusait de corriger.",
|
||||||
|
"La boussole se remplit dès l’ouverture de Station Control, au lieu d’attendre la fin d’un intervalle d’interrogation.",
|
||||||
|
"Amplis combinés : le niveau de puissance (L/M/H) est couplé lui aussi, et les deux amplis sont commandés en même temps — fini le bip du combineur.",
|
||||||
|
"Relais HTTP générique : une carte en https:// peut être acceptée avec son certificat auto-signé, carte par carte.",
|
||||||
|
"Club Log : l’envoi à la fermeture part désormais en un lot — envoyer des centaines de contacts un par un faisait bloquer l’opérateur.",
|
||||||
|
"eQSL : les envois partent aussi par lots de 100, et QRZ.com et HRDLog — qui n’ont pas d’envoi groupé — sont espacés à la place.",
|
||||||
|
"Un spot que tu envoies apparaît maintenant dans ta liste : la plupart des nœuds ne le renvoient pas, il semblait n’être jamais parti.",
|
||||||
|
"Icom avec JTDX en split Fake It : un accusé de réception PTT perdu est renvoyé au lieu d’échouer — JTDX lâchait le poste.",
|
||||||
|
"Un cluster dont tout l’accueil est « login: » puis qui réclame un mot de passe se connecte : les deux invites étaient ignorées."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.7",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Opening the Awards panel no longer pulls the whole logbook several times at once — a large log briefly took gigabytes of memory.",
|
||||||
|
"Awards: the Missing refs button now only appears where it means something — a worldwide award like POTA could only ever answer “nothing found”.",
|
||||||
|
"Worked before: a prefixed call like ZA/OE8NDR matched every other visitor to that country instead of that one operator.",
|
||||||
|
"French: seventeen strings were still in English, the whole update panel among them, plus Spot lifetime and Chase new grids.",
|
||||||
|
"Selecting a QSO shows the entity the QSO records, not one re-derived from its callsign — a 3Y0K contact logged as Bouvet showed the Antarctica matrix.",
|
||||||
|
"Back-entering a QSO resolves the ClubLog exception at the CONTACT’S date, so a DXpedition entered months later gets the entity it had then.",
|
||||||
|
"QRZ.com sends an island reference for an operator on one, and OpsLog read past it — it now fills the IOTA award reference before the QSO is logged.",
|
||||||
|
"Sync across PCs: point every OpsLog at one folder you already synchronise and your contacts follow you between machines.",
|
||||||
|
"TCI: a station spotted by several operators is drawn once on the panorama instead of two or three times a few hertz apart."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Ouvrir le panneau Awards ne tire plus plusieurs fois le journal entier en même temps — un gros log occupait brièvement des gigaoctets de mémoire.",
|
||||||
|
"Awards : le bouton Réf. manquantes n’apparaît plus que là où il a un sens — un diplôme mondial comme POTA ne pouvait répondre que « aucun manque ».",
|
||||||
|
"Déjà contacté : un indicatif préfixé comme ZA/OE8NDR rapprochait tous les autres visiteurs du pays au lieu de ce seul opérateur.",
|
||||||
|
"Français : dix-sept textes étaient restés en anglais, dont tout le panneau de mise à jour, la durée de vie des spots et Chasser les nouveaux locators.",
|
||||||
|
"Sélectionner un QSO affiche l’entité que le QSO enregistre, pas une recalculée depuis l’indicatif — un 3Y0K logué Bouvet montrait la matrice Antarctique.",
|
||||||
|
"Saisir un QSO a posteriori résout l’exception ClubLog à la date DU CONTACT : une DXpedition entrée des mois après retrouve l’entité qu’elle avait alors.",
|
||||||
|
"QRZ.com envoie la référence d’île d’un opérateur sur une île, et OpsLog l’ignorait — elle remplit désormais la référence IOTA avant l’enregistrement du QSO.",
|
||||||
|
"Synchro entre PC : fais pointer chaque OpsLog vers un dossier déjà synchronisé et tes contacts te suivent d’une machine à l’autre.",
|
||||||
|
"TCI : une station spottée par plusieurs opérateurs n’est tracée qu’une fois sur le panorama, au lieu de deux ou trois fois."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.25.6",
|
"version": "0.25.6",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+849
-68
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,13 @@
|
|||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { GetRowColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
import { GetMatrixColors, GetRowColors, SaveMatrixColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import type { RowColorSettings } from '@/lib/rowColors';
|
import type { RowColorSettings } from '@/lib/rowColors';
|
||||||
|
import {
|
||||||
|
MATRIX_VARS, applyMatrixColors, effectiveMatrixColor, emptyMatrixColors,
|
||||||
|
type MatrixColors,
|
||||||
|
} from '@/lib/matrixColors';
|
||||||
|
|
||||||
// A fixed palette plus a free picker. Muted values on purpose: they are
|
// 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
|
// composited at low opacity over a dark grid, where a saturated colour reads as
|
||||||
@@ -30,6 +34,111 @@ const CHANNEL_LABELS: Record<string, string> = {
|
|||||||
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// MatrixColorsSection recolours the band/mode matrix — the PH/CW/DIG grid in the
|
||||||
|
// Stats panel.
|
||||||
|
//
|
||||||
|
// The pickers are seeded from what the matrix is painting RIGHT NOW (the active
|
||||||
|
// theme's ramp, or an existing override), not from a fixed palette: the operator
|
||||||
|
// starts from the colours in front of them and moves one, instead of being
|
||||||
|
// handed six values that may belong to a theme they stopped using. Every change
|
||||||
|
// is applied to the live document at once, so the sample row below is the real
|
||||||
|
// thing rather than a mock-up of it.
|
||||||
|
function MatrixColorsSection() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<MatrixColors | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
setCfg((await GetMatrixColors()) as any);
|
||||||
|
} catch {
|
||||||
|
setCfg(emptyMatrixColors());
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const save = (next: MatrixColors) => {
|
||||||
|
setCfg(next);
|
||||||
|
applyMatrixColors(next); // live, before the round trip — the panel must not lag the choice
|
||||||
|
SaveMatrixColors(next as any).catch(() => {});
|
||||||
|
};
|
||||||
|
|
||||||
|
// Turning it ON with nothing stored would change nothing at all and read as a
|
||||||
|
// broken switch, so the empty slots are filled from the theme's current ramp:
|
||||||
|
// the operator sees six swatches that match the grid and edits from there.
|
||||||
|
const enable = (on: boolean) => {
|
||||||
|
if (!cfg) return;
|
||||||
|
if (!on) {
|
||||||
|
save({ ...cfg, enabled: false });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const seeded = { ...cfg, enabled: true };
|
||||||
|
for (const { key, cssVar } of MATRIX_VARS) {
|
||||||
|
if (!String(seeded[key] ?? '').trim()) seeded[key] = effectiveMatrixColor(cssVar);
|
||||||
|
}
|
||||||
|
save(seeded);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Reset clears the overrides but keeps the section switched on, then re-seeds
|
||||||
|
// from the theme — "back to the theme's colours", which is what an operator
|
||||||
|
// means by reset here, rather than "switch the whole feature off".
|
||||||
|
const reset = () => {
|
||||||
|
if (!cfg) return;
|
||||||
|
applyMatrixColors({ ...emptyMatrixColors(), enabled: false });
|
||||||
|
const seeded = { ...emptyMatrixColors(), enabled: true };
|
||||||
|
for (const { key, cssVar } of MATRIX_VARS) seeded[key] = effectiveMatrixColor(cssVar);
|
||||||
|
save(seeded);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!cfg) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-3 border-t border-border/60 pt-4">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} className="mt-0.5" onCheckedChange={(c) => enable(!!c)} />
|
||||||
|
<span>
|
||||||
|
{t('appr.matrixEnable')}{' '}
|
||||||
|
<span className="text-xs text-muted-foreground">{t('appr.matrixHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{cfg.enabled && (
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="grid grid-cols-2 gap-x-4 gap-y-2">
|
||||||
|
{MATRIX_VARS.map(({ key, cssVar, label }) => (
|
||||||
|
<label key={key} className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<input
|
||||||
|
type="color"
|
||||||
|
value={String(cfg[key] || '').trim() || effectiveMatrixColor(cssVar)}
|
||||||
|
onChange={(e) => save({ ...cfg, [key]: e.target.value })}
|
||||||
|
className="size-6 rounded-md border border-border bg-transparent p-0 cursor-pointer shrink-0"
|
||||||
|
/>
|
||||||
|
{t(label)}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* The matrix as it will actually look: same tokens, same shapes. */}
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<span className="text-xs text-muted-foreground w-10 shrink-0">{t('appr.matrixSample')}</span>
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-call-conf" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-call-work" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-dx-conf" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-dx-work" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-none" />
|
||||||
|
<span className="inline-block w-7 h-5 rounded bg-mx-none ring-2 ring-mx-cur ring-inset" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="button" onClick={reset}
|
||||||
|
className="text-xs text-muted-foreground underline underline-offset-2 hover:text-foreground">
|
||||||
|
{t('appr.matrixReset')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function AppearancePanel() {
|
export function AppearancePanel() {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
||||||
@@ -70,6 +179,31 @@ export function AppearancePanel() {
|
|||||||
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
{/* Banding is its own thing, above the QSL rules and outside them: it says
|
||||||
|
nothing about a contact, it only helps the eye keep its line across a
|
||||||
|
wide table. Turning the status colours off must not take it away. */}
|
||||||
|
<div className="space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={(cfg as any).recent_zebra !== 'off'} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => save({ ...cfg, recent_zebra: c ? '' : 'off' } as any)} />
|
||||||
|
<span>{t('appr.zebra')} <span className="text-xs text-muted-foreground">{t('appr.zebraHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
{(cfg as any).recent_zebra !== 'off' && (
|
||||||
|
<div className="flex items-center gap-2 pl-6">
|
||||||
|
<span className="text-xs text-muted-foreground">{t('appr.zebraColor')}</span>
|
||||||
|
<input type="color" className="size-7 rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={/^#[0-9a-fA-F]{6}$/.test((cfg as any).recent_zebra_color ?? '') ? (cfg as any).recent_zebra_color : '#808080'}
|
||||||
|
onChange={(e) => save({ ...cfg, recent_zebra_color: e.target.value } as any)} />
|
||||||
|
{/* Empty means "follow the theme", and there has to be a way back to
|
||||||
|
it — a colour chosen under one theme is wrong under the other. */}
|
||||||
|
{(cfg as any).recent_zebra_color && (
|
||||||
|
<button type="button" className="text-xs text-muted-foreground hover:text-foreground"
|
||||||
|
onClick={() => save({ ...cfg, recent_zebra_color: '' } as any)}>{t('appr.zebraAuto')}</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
||||||
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||||
@@ -148,6 +282,8 @@ export function AppearancePanel() {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
<MatrixColorsSection />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { useI18n } from '@/lib/i18n';
|
|||||||
import {
|
import {
|
||||||
GetAwardDefs, SaveAwardDefs, ResetAwardDefs, AwardFields,
|
GetAwardDefs, SaveAwardDefs, ResetAwardDefs, AwardFields,
|
||||||
GetAwardReferenceMeta, UpdateAwardReferenceList,
|
GetAwardReferenceMeta, UpdateAwardReferenceList,
|
||||||
ListAwardReferences, SearchAwardReferences, SaveAwardReference, DeleteAwardReference,
|
ListAwardReferences, SearchAwardReferences, SaveAwardReference, DeleteAwardReference, RenameAwardReference,
|
||||||
ImportAwardReferencesText, GetAwardPresets, ApplyAwardPreset,
|
ImportAwardReferencesText, GetAwardPresets, ApplyAwardPreset,
|
||||||
ListCountries, DXCCForCountry, DXCCName,
|
ListCountries, DXCCForCountry, DXCCName,
|
||||||
PopulateBuiltinReferences, HasBuiltinReferences,
|
PopulateBuiltinReferences, HasBuiltinReferences,
|
||||||
@@ -62,6 +62,10 @@ type Preset = { key: string; name: string; field: string; dxcc: number; refs: Aw
|
|||||||
// organizational only; matching is driven by the field/pattern/dynamic options,
|
// organizational only; matching is driven by the field/pattern/dynamic options,
|
||||||
// so there's no need for separate GRID/DXCC types (use QSOFIELDS + the field).
|
// so there's no need for separate GRID/DXCC types (use QSOFIELDS + the field).
|
||||||
const AWARD_TYPES = ['REFERENCE', 'QSOFIELDS', 'CALLSIGN'];
|
const AWARD_TYPES = ['REFERENCE', 'QSOFIELDS', 'CALLSIGN'];
|
||||||
|
// Sentinel for "no QSO field at all". The definition stores an empty field, and
|
||||||
|
// the matcher already treats that as "nothing to scan" — this only gives the
|
||||||
|
// operator a way to ASK for it.
|
||||||
|
const NO_FIELD = '__none__';
|
||||||
const CONFIRM_SRC = [
|
const CONFIRM_SRC = [
|
||||||
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
|
{ id: 'lotw', label: 'LoTW' }, { id: 'qsl', label: 'QSL' }, { id: 'eqsl', label: 'eQSL' },
|
||||||
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'custom', label: 'Custom' },
|
{ id: 'qrzcom', label: 'QRZ.com' }, { id: 'custom', label: 'Custom' },
|
||||||
@@ -277,6 +281,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
}
|
}
|
||||||
return groups;
|
return groups;
|
||||||
}, [testRows]);
|
}, [testRows]);
|
||||||
|
const noField = !String(cur?.field ?? '').trim();
|
||||||
const patch = (p: Partial<AwardDef>) => setDefs((ds) => ds.map((d, j) => (j === sel ? { ...d, ...p } : d)));
|
const patch = (p: Partial<AwardDef>) => setDefs((ds) => ds.map((d, j) => (j === sel ? { ...d, ...p } : d)));
|
||||||
const toggleIn = (key: keyof AwardDef, v: string) => {
|
const toggleIn = (key: keyof AwardDef, v: string) => {
|
||||||
const arr = ((cur?.[key] as string[]) ?? []);
|
const arr = ((cur?.[key] as string[]) ?? []);
|
||||||
@@ -566,11 +571,26 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
<div className="border-t pt-2.5 mt-1 space-y-2.5">
|
<div className="border-t pt-2.5 mt-1 space-y-2.5">
|
||||||
<p className="text-[11px] text-muted-foreground">{t('awed.qsoParams')}</p>
|
<p className="text-[11px] text-muted-foreground">{t('awed.qsoParams')}</p>
|
||||||
<Field2 label={t('awed.searchInField')}>
|
<Field2 label={t('awed.searchInField')}>
|
||||||
<Select value={cur.field} onValueChange={(v) => patch({ field: v })}>
|
{/* NO_FIELD is a sentinel because the stored value is the
|
||||||
|
empty string and a Select cannot carry one — an empty
|
||||||
|
item value means "show the placeholder" to Radix. */}
|
||||||
|
<Select value={cur.field || NO_FIELD}
|
||||||
|
onValueChange={(v) => patch({ field: v === NO_FIELD ? '' : v })}>
|
||||||
<SelectTrigger className="h-8 text-xs w-56"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-8 text-xs w-56"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent className="max-h-72">{fields.map((f) => <SelectItem key={f} value={f}>{f}</SelectItem>)}</SelectContent>
|
<SelectContent className="max-h-72">
|
||||||
|
<SelectItem value={NO_FIELD}>{t('awed.fieldNone')}</SelectItem>
|
||||||
|
{fields.map((f) => <SelectItem key={f} value={f}>{f}</SelectItem>)}
|
||||||
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</Field2>
|
</Field2>
|
||||||
|
{/* An award whose references live in no ADIF field at all —
|
||||||
|
WWBOTA has no column anywhere — has nothing to match on,
|
||||||
|
and every control below would be a question with no
|
||||||
|
answer. Hiding them is the point: the references are the
|
||||||
|
ones the operator assigns to a QSO by hand. */}
|
||||||
|
{noField ? (
|
||||||
|
<p className="text-[11px] text-muted-foreground pl-[128px]">{t('awed.fieldNoneHint')}</p>
|
||||||
|
) : (<>
|
||||||
<Field2 label={t('awed.matchBy')}>
|
<Field2 label={t('awed.matchBy')}>
|
||||||
<div className="flex items-center gap-3 text-xs">
|
<div className="flex items-center gap-3 text-xs">
|
||||||
{['code', 'description', 'pattern'].map((m) => (
|
{['code', 'description', 'pattern'].map((m) => (
|
||||||
@@ -630,6 +650,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
</>)}
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
@@ -915,6 +936,10 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
const [refs, setRefs] = useState<AwardRef[]>([]);
|
const [refs, setRefs] = useState<AwardRef[]>([]);
|
||||||
const [q, setQ] = useState('');
|
const [q, setQ] = useState('');
|
||||||
const [selCode, setSelCode] = useState<string | null>(null);
|
const [selCode, setSelCode] = useState<string | null>(null);
|
||||||
|
// The code as TYPED. The list and every patch key off selCode, so editing the
|
||||||
|
// code in place would make the editor lose the reference mid-edit; the draft
|
||||||
|
// is applied as a rename when the operator saves.
|
||||||
|
const [codeDraft, setCodeDraft] = useState('');
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [bulk, setBulk] = useState('');
|
const [bulk, setBulk] = useState('');
|
||||||
const [showBulk, setShowBulk] = useState(false);
|
const [showBulk, setShowBulk] = useState(false);
|
||||||
@@ -952,6 +977,7 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
}
|
}
|
||||||
|
|
||||||
const sel = refs.find((r) => r.code === selCode) || null;
|
const sel = refs.find((r) => r.code === selCode) || null;
|
||||||
|
useEffect(() => { setCodeDraft(selCode ?? ''); }, [selCode]);
|
||||||
// Large lists are already filtered by the server; small lists filter locally.
|
// Large lists are already filtered by the server; small lists filter locally.
|
||||||
const filtered = useMemo(() => {
|
const filtered = useMemo(() => {
|
||||||
if (large) return refs;
|
if (large) return refs;
|
||||||
@@ -965,6 +991,27 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
try { await SaveAwardReference(code, r as any); load(); onChanged(); }
|
try { await SaveAwardReference(code, r as any); load(); onChanged(); }
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
|
// Save the selected reference, renumbering it first when the code was edited.
|
||||||
|
//
|
||||||
|
// The rename has to come first and has to be a rename: saving under the new
|
||||||
|
// code would simply create a second reference and leave the old one behind,
|
||||||
|
// which is how a list quietly grows duplicates.
|
||||||
|
async function saveSelected(r: AwardRef) {
|
||||||
|
const next = codeDraft.trim().toUpperCase();
|
||||||
|
if (!next) { setErr(t('awed.refCodeEmpty')); return; }
|
||||||
|
if (next !== r.code) {
|
||||||
|
try {
|
||||||
|
await RenameAwardReference(code, r.code, next);
|
||||||
|
} catch (e: any) {
|
||||||
|
// Most often the number is already taken by another reference. Said
|
||||||
|
// here rather than swallowed: the save has NOT happened.
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setSelCode(next);
|
||||||
|
}
|
||||||
|
await saveRef({ ...r, code: next });
|
||||||
|
}
|
||||||
async function addRef() {
|
async function addRef() {
|
||||||
const c = prompt(t('awed.newRefCodePrompt'))?.trim().toUpperCase();
|
const c = prompt(t('awed.newRefCodePrompt'))?.trim().toUpperCase();
|
||||||
if (!c) return;
|
if (!c) return;
|
||||||
@@ -1046,7 +1093,13 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
) : (
|
) : (
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<Input className="h-8 w-28 font-mono font-semibold" value={sel.code} readOnly />
|
{/* Editable, because a shipped list can be wrong about it: WAJA
|
||||||
|
went out carrying Japan's civil prefecture numbers instead of
|
||||||
|
the JARL's, and correcting that meant deleting all 47
|
||||||
|
references and importing a new list. */}
|
||||||
|
<Input className="h-8 w-28 font-mono font-semibold" value={codeDraft}
|
||||||
|
title={t('awed.refCodeTip')}
|
||||||
|
onChange={(e) => setCodeDraft(e.target.value)} />
|
||||||
<label className="flex items-center gap-1.5 text-xs cursor-pointer"><Checkbox checked={sel.valid} onCheckedChange={(c) => patchSel({ valid: !!c })} /> {t('awed.valid')}</label>
|
<label className="flex items-center gap-1.5 text-xs cursor-pointer"><Checkbox checked={sel.valid} onCheckedChange={(c) => patchSel({ valid: !!c })} /> {t('awed.valid')}</label>
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
<button className="text-muted-foreground hover:text-destructive" onClick={() => delRef(sel.code)}><Trash2 className="size-4" /></button>
|
<button className="text-muted-foreground hover:text-destructive" onClick={() => delRef(sel.code)}><Trash2 className="size-4" /></button>
|
||||||
@@ -1084,7 +1137,7 @@ function ReferencesPanel({ code, presets, meta, awardValidFrom, awardValidTo, on
|
|||||||
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
|
? t('awed.refValidHintAward', { from: openEnded(awardValidFrom), to: openEnded(awardValidTo) })
|
||||||
: t('awed.refValidHint')}
|
: t('awed.refValidHint')}
|
||||||
</p>
|
</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 className="flex justify-end pt-1"><Button size="sm" className="h-7" onClick={() => sel && saveSelected(sel)}><Save className="size-3.5 mr-1" /> {t('awed.saveReference')}</Button></div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -64,7 +64,9 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[] };
|
// scoped: the award is limited to one or more DXCC entities. Missing-reference
|
||||||
|
// detection only means anything for those — see the Missing refs button.
|
||||||
|
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
||||||
|
|
||||||
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
|
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -150,7 +152,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
]);
|
]);
|
||||||
const follow = new Set(tracked);
|
const follow = new Set(tracked);
|
||||||
let list: AwardListItem[] = defs
|
let list: AwardListItem[] = defs
|
||||||
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [] }))
|
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [], scoped: (d.dxcc_filter ?? []).length > 0 }))
|
||||||
.sort((a, b) => a.code.localeCompare(b.code));
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
if (follow.size > 0) list = list.filter((a) => follow.has(a.code));
|
if (follow.size > 0) list = list.filter((a) => follow.has(a.code));
|
||||||
setAwardList(list);
|
setAwardList(list);
|
||||||
@@ -427,13 +429,21 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
<span className="text-xs text-muted-foreground">{filteredRefs.length} {t('awp.refs')}</span>
|
<span className="text-xs text-muted-foreground">{filteredRefs.length} {t('awp.refs')}</span>
|
||||||
<button
|
{/* Only for an award scoped to a DXCC entity. "In this award's
|
||||||
onClick={() => setShowMissing(true)}
|
scope but with no reference" needs a scope to be in: on a
|
||||||
className="flex items-center gap-1 text-xs text-warning-muted-foreground hover:text-warning border border-warning-border bg-warning-muted rounded px-2 py-1"
|
worldwide reference award — POTA, SOTA, IOTA, WWFF — every
|
||||||
title={t('awp.missingRefsTitle')}
|
contact anywhere would qualify, so the answer is always none.
|
||||||
>
|
The button used to be there regardless and could only ever
|
||||||
<AlertTriangle className="size-3" /> {t('awp.missingRefs')}
|
open a window saying it had found nothing. */}
|
||||||
</button>
|
{awardList.find((a) => a.code === selected)?.scoped && (
|
||||||
|
<button
|
||||||
|
onClick={() => setShowMissing(true)}
|
||||||
|
className="flex items-center gap-1 text-xs text-warning-muted-foreground hover:text-warning border border-warning-border bg-warning-muted rounded px-2 py-1"
|
||||||
|
title={t('awp.missingRefsTitle')}
|
||||||
|
>
|
||||||
|
<AlertTriangle className="size-3" /> {t('awp.missingRefs')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
{/* Legend */}
|
{/* Legend */}
|
||||||
<div className="flex items-center gap-2 text-[10px] text-muted-foreground">
|
<div className="flex items-center gap-2 text-[10px] text-muted-foreground">
|
||||||
@@ -608,6 +618,10 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
// the missing reference (e.g. a department for DDFM).
|
// the missing reference (e.g. a department for DDFM).
|
||||||
type MissingSortKey = 'qso_date' | 'callsign' | 'band' | 'mode' | 'country' | 'qth';
|
type MissingSortKey = 'qso_date' | 'callsign' | 'band' | 'mode' | 'country' | 'qth';
|
||||||
|
|
||||||
|
// How many references the assign dropdown will put in the DOM at once. Above
|
||||||
|
// this a search box appears beside it and the rest are held back, counted.
|
||||||
|
const REF_MENU_MAX = 300;
|
||||||
|
|
||||||
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
|
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [qsos, setQsos] = useState<any[]>([]);
|
const [qsos, setQsos] = useState<any[]>([]);
|
||||||
@@ -616,6 +630,7 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
const [sortKey, setSortKey] = useState<MissingSortKey>('callsign');
|
const [sortKey, setSortKey] = useState<MissingSortKey>('callsign');
|
||||||
const [sortDir, setSortDir] = useState<'asc' | 'desc'>('asc');
|
const [sortDir, setSortDir] = useState<'asc' | 'desc'>('asc');
|
||||||
const [refs, setRefs] = useState<Array<{ code: string; name: string }>>([]);
|
const [refs, setRefs] = useState<Array<{ code: string; name: string }>>([]);
|
||||||
|
const [refSearch, setRefSearch] = useState('');
|
||||||
const [assignRef, setAssignRef] = useState('');
|
const [assignRef, setAssignRef] = useState('');
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [msg, setMsg] = useState('');
|
const [msg, setMsg] = useState('');
|
||||||
@@ -629,12 +644,38 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
.finally(() => setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
};
|
};
|
||||||
useEffect(() => { load(); }, [code]);
|
useEffect(() => { load(); }, [code]);
|
||||||
// The award's reference list drives the "assign" dropdown (e.g. China provinces).
|
// The award's reference list drives the "assign" dropdown (e.g. China
|
||||||
|
// provinces) — fetched ONLY once there is something to assign it to.
|
||||||
|
//
|
||||||
|
// Missing-reference detection needs a DXCC scope, so a worldwide award like
|
||||||
|
// POTA always has zero rows here and says so. It was still loading every
|
||||||
|
// reference behind that message: on a log with the full POTA park list
|
||||||
|
// imported, tens of thousands of them, feeding a dropdown that could not be
|
||||||
|
// used for anything. That is the window freezing on a screen with nothing to
|
||||||
|
// offer.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (loading || qsos.length === 0) { setRefs([]); return; }
|
||||||
ListAwardReferences(code)
|
ListAwardReferences(code)
|
||||||
.then((r) => setRefs(((r ?? []) as any[]).map((x) => ({ code: String(x.code).toUpperCase(), name: String(x.name ?? '') }))))
|
.then((r) => setRefs(((r ?? []) as any[]).map((x) => ({ code: String(x.code).toUpperCase(), name: String(x.name ?? '') }))))
|
||||||
.catch(() => setRefs([]));
|
.catch(() => setRefs([]));
|
||||||
}, [code]);
|
}, [code, loading, qsos.length]);
|
||||||
|
|
||||||
|
// What the assign dropdown actually renders. Bounded, and it says how many it
|
||||||
|
// is holding back rather than silently showing the first few hundred.
|
||||||
|
const shownRefs = useMemo(() => {
|
||||||
|
const q = refSearch.trim().toUpperCase();
|
||||||
|
const rows = q
|
||||||
|
? refs.filter((r) => r.code.includes(q) || r.name.toUpperCase().includes(q))
|
||||||
|
: refs;
|
||||||
|
return rows.slice(0, REF_MENU_MAX);
|
||||||
|
}, [refs, refSearch]);
|
||||||
|
const hiddenRefs = useMemo(() => {
|
||||||
|
const q = refSearch.trim().toUpperCase();
|
||||||
|
const total = q
|
||||||
|
? refs.filter((r) => r.code.includes(q) || r.name.toUpperCase().includes(q)).length
|
||||||
|
: refs.length;
|
||||||
|
return Math.max(0, total - shownRefs.length);
|
||||||
|
}, [refs, refSearch, shownRefs.length]);
|
||||||
|
|
||||||
const qthOf = (q: any) => String(q.qth || q.notes || '');
|
const qthOf = (q: any) => String(q.qth || q.notes || '');
|
||||||
const sorted = useMemo(() => {
|
const sorted = useMemo(() => {
|
||||||
@@ -711,14 +752,29 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
{/* Bulk-assign toolbar */}
|
{/* Bulk-assign toolbar */}
|
||||||
<div className="flex items-center gap-2 px-4 py-2 border-b border-border/50 bg-muted/20">
|
<div className="flex items-center gap-2 px-4 py-2 border-b border-border/50 bg-muted/20">
|
||||||
<span className="text-xs text-muted-foreground">{t('awp.selectedArrow', { n: sel.size })}</span>
|
<span className="text-xs text-muted-foreground">{t('awp.selectedArrow', { n: sel.size })}</span>
|
||||||
|
{/* A search box beside the dropdown, and a bounded list inside it.
|
||||||
|
A reference list can hold tens of thousands of entries (POTA
|
||||||
|
parks, Russian districts); every one of them as a menu item is
|
||||||
|
hundreds of thousands of DOM nodes and a window that stops
|
||||||
|
answering. Nobody scrolls to K-4521 anyway — they type it. */}
|
||||||
|
{refs.length > REF_MENU_MAX && (
|
||||||
|
<Input className="h-7 w-40 text-xs font-mono" value={refSearch}
|
||||||
|
placeholder={t('awp.filterReferences')}
|
||||||
|
onChange={(e) => setRefSearch(e.target.value)} />
|
||||||
|
)}
|
||||||
<Select value={assignRef} onValueChange={setAssignRef}>
|
<Select value={assignRef} onValueChange={setAssignRef}>
|
||||||
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue placeholder={t('awp.chooseReference')} /></SelectTrigger>
|
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue placeholder={t('awp.chooseReference')} /></SelectTrigger>
|
||||||
<SelectContent className="max-h-72">
|
<SelectContent className="max-h-72">
|
||||||
{refs.map((r) => (
|
{shownRefs.map((r) => (
|
||||||
<SelectItem key={r.code} value={r.code}>
|
<SelectItem key={r.code} value={r.code}>
|
||||||
<span className="font-mono font-semibold">{r.code}</span>{r.name ? <span className="text-muted-foreground"> · {r.name}</span> : ''}
|
<span className="font-mono font-semibold">{r.code}</span>{r.name ? <span className="text-muted-foreground"> · {r.name}</span> : ''}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
))}
|
))}
|
||||||
|
{hiddenRefs > 0 && (
|
||||||
|
<div className="px-2 py-1.5 text-[11px] text-muted-foreground">
|
||||||
|
{t('awp.refsNarrow', { n: hiddenRefs })}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
<Button size="sm" disabled={!assignRef || sel.size === 0 || busy} onClick={applyAssign}>
|
<Button size="sm" disabled={!assignRef || sel.size === 0 || busy} onClick={applyAssign}>
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
||||||
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
||||||
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
|
||||||
// BandMap — vertical spectrum panel inspired by Log4OM.
|
// BandMap — vertical spectrum panel inspired by Log4OM.
|
||||||
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
||||||
@@ -82,6 +83,11 @@ interface Props {
|
|||||||
// globally from the band-map tab toolbar.
|
// globally from the band-map tab toolbar.
|
||||||
hideDigital?: boolean;
|
hideDigital?: boolean;
|
||||||
fitToBand?: boolean;
|
fitToBand?: boolean;
|
||||||
|
// onToggleFit turns the zoom readout into the fit-to-band switch. Only the
|
||||||
|
// docked map passes it: the Band Map tab has the same control in its own
|
||||||
|
// toolbar, above maps that all obey it at once, and a second switch inside
|
||||||
|
// each card would be four ways to change one setting.
|
||||||
|
onToggleFit?: () => void;
|
||||||
// Mark stations that upload to LoTW (Settings → Appearance).
|
// Mark stations that upload to LoTW (Settings → Appearance).
|
||||||
showLotw?: boolean;
|
showLotw?: boolean;
|
||||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||||
@@ -217,7 +223,37 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
|
|||||||
// Pixels-per-kHz at each zoom step. Base 8 px/kHz means a stacked spot
|
// Pixels-per-kHz at each zoom step. Base 8 px/kHz means a stacked spot
|
||||||
// every 2.75 kHz fits without anti-overlap kicking in — comfortable for
|
// every 2.75 kHz fits without anti-overlap kicking in — comfortable for
|
||||||
// most bands. Higher levels are for fine inspection of crowded sub-bands.
|
// most bands. Higher levels are for fine inspection of crowded sub-bands.
|
||||||
const PX_PER_KHZ = [8, 16, 32, 64, 128, 256];
|
// Zoom steps, px per kHz. 2 and 4 sit below the old floor of 8 so a whole band
|
||||||
|
// fits without FIT taking the scale away from you: 20 m end to end is 700 px at
|
||||||
|
// 2 px/kHz, which scrolls in one screen on most displays.
|
||||||
|
const PX_PER_KHZ = [2, 4, 8, 16, 32, 64, 128, 256];
|
||||||
|
const DEFAULT_ZOOM_IDX = PX_PER_KHZ.indexOf(32);
|
||||||
|
|
||||||
|
// Zoom is remembered PER BAND, in ONE json key rather than one key per band:
|
||||||
|
// lib/uiPref keeps an explicit list of the preferences that travel with data/,
|
||||||
|
// and thirteen entries there to say the same thing would be thirteen chances to
|
||||||
|
// forget one.
|
||||||
|
const ZOOM_KEY = 'opslog.bandMapZoom';
|
||||||
|
|
||||||
|
function readZoomMap(): Record<string, number> {
|
||||||
|
try {
|
||||||
|
const m = JSON.parse(localStorage.getItem(ZOOM_KEY) || '{}');
|
||||||
|
return m && typeof m === 'object' ? m : {};
|
||||||
|
} catch {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function readZoom(band: string): number {
|
||||||
|
const n = readZoomMap()[band];
|
||||||
|
return Number.isInteger(n) && n >= 0 && n < PX_PER_KHZ.length ? n : DEFAULT_ZOOM_IDX;
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeZoom(band: string, idx: number): void {
|
||||||
|
const m = readZoomMap();
|
||||||
|
m[band] = idx;
|
||||||
|
writeUiPref(ZOOM_KEY, JSON.stringify(m));
|
||||||
|
}
|
||||||
const SCALE_W = 56;
|
const SCALE_W = 56;
|
||||||
const PILL_H = 22; // px — height of each callsign pill
|
const PILL_H = 22; // px — height of each callsign pill
|
||||||
const PILL_GAP = 32; // px between scale border and first pill (room for leader)
|
const PILL_GAP = 32; // px between scale border and first pill (room for leader)
|
||||||
@@ -232,7 +268,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).
|
// last; ties broken by closeness to the rig freq).
|
||||||
const MAX_VISIBLE_SPOTS = 30;
|
const MAX_VISIBLE_SPOTS = 30;
|
||||||
|
|
||||||
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false, showLotw = false }: Props) {
|
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, onToggleFit, keyNav = false, showLotw = false }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
// The two display options are applied ONCE here, on the whole map, so the
|
// The two display options are applied ONCE here, on the whole map, so the
|
||||||
@@ -252,7 +288,22 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
||||||
const range = BAND_RANGES[band];
|
const range = BAND_RANGES[band];
|
||||||
const segments = SEGMENT_COLORS[band] ?? [];
|
const segments = SEGMENT_COLORS[band] ?? [];
|
||||||
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
const [zoomIdx, setZoomIdx] = useState(() => readZoom(band));
|
||||||
|
// The docked map follows the rig, so a band change must bring up THAT band's
|
||||||
|
// remembered zoom.
|
||||||
|
useEffect(() => { setZoomIdx(readZoom(band)); }, [band]);
|
||||||
|
// Stored from the interaction, not from an effect on zoomIdx: an effect would
|
||||||
|
// also fire on the band change above, and in the same commit it would still be
|
||||||
|
// holding the PREVIOUS band's index — writing it over the new band's. Doing it
|
||||||
|
// where the operator actually turns the wheel keeps the two apart. (Running
|
||||||
|
// twice under StrictMode is harmless: the same value is stored.)
|
||||||
|
const changeZoom = useCallback((delta: number) => {
|
||||||
|
setZoomIdx((z) => {
|
||||||
|
const n = Math.max(0, Math.min(PX_PER_KHZ.length - 1, z + delta));
|
||||||
|
if (n !== z) writeZoom(band, n);
|
||||||
|
return n;
|
||||||
|
});
|
||||||
|
}, [band]);
|
||||||
const scrollerRef = useRef<HTMLDivElement | null>(null);
|
const scrollerRef = useRef<HTMLDivElement | null>(null);
|
||||||
const [containerH, setContainerH] = useState(400);
|
const [containerH, setContainerH] = useState(400);
|
||||||
|
|
||||||
@@ -421,7 +472,7 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
if (!range) return;
|
if (!range) return;
|
||||||
if (e.ctrlKey || e.metaKey) {
|
if (e.ctrlKey || e.metaKey) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
setZoomIdx((z) => Math.max(0, Math.min(PX_PER_KHZ.length - 1, z + (e.deltaY > 0 ? -1 : 1))));
|
changeZoom(e.deltaY > 0 ? -1 : 1);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
el.addEventListener('wheel', onWheel, { passive: false });
|
el.addEventListener('wheel', onWheel, { passive: false });
|
||||||
@@ -476,8 +527,10 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
|
|
||||||
// Tick step (where small marks land) and label step (where the kHz
|
// Tick step (where small marks land) and label step (where the kHz
|
||||||
// number is printed) are decoupled so the scale shows ~10-20 numeric
|
// number is printed) are decoupled so the scale shows ~10-20 numeric
|
||||||
// labels per viewport regardless of zoom — at base 8 px/kHz we want
|
// labels per viewport regardless of zoom — at 8 px/kHz we want labels
|
||||||
// labels every 25 kHz, not every 250.
|
// every 25 kHz, not every 250. The bare values below are the floor, and
|
||||||
|
// they are what the 2 px/kHz step lands on: a whole band in one screen
|
||||||
|
// wants a number every 100 kHz, not every 25.
|
||||||
let tickStep = 50;
|
let tickStep = 50;
|
||||||
let labelStep = 100;
|
let labelStep = 100;
|
||||||
if (pxPerKHz >= 4) { tickStep = 25; labelStep = 50; }
|
if (pxPerKHz >= 4) { tickStep = 25; labelStep = 50; }
|
||||||
@@ -502,14 +555,28 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
return (
|
return (
|
||||||
<div className="h-full w-full flex flex-col min-h-0 bg-card">
|
<div className="h-full w-full flex flex-col min-h-0 bg-card">
|
||||||
<div className="px-2 py-1.5 text-xs font-semibold uppercase tracking-wider text-muted-foreground bg-muted/40 border-b border-border flex flex-nowrap items-center gap-0.5 shrink-0">
|
<div className="px-2 py-1.5 text-xs font-semibold uppercase tracking-wider text-muted-foreground bg-muted/40 border-b border-border flex flex-nowrap items-center gap-0.5 shrink-0">
|
||||||
<span className="flex-1 min-w-0 truncate">{t('bmp.map')} · {band}</span>
|
{/* The band alone. "Map · 20M" spent a third of a narrow header saying
|
||||||
<button type="button" onClick={() => setZoomIdx((z) => Math.max(0, z - 1))} disabled={fitToBand || zoomIdx === 0}
|
what the panel obviously is, and with four band maps side by side it
|
||||||
|
was four times the same word. */}
|
||||||
|
<span className="flex-1 min-w-0 truncate">{band}</span>
|
||||||
|
<button type="button" onClick={() => changeZoom(-1)} disabled={fitToBand || zoomIdx === 0}
|
||||||
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
||||||
title={t('bmp.zoomOut')}>
|
title={t('bmp.zoomOut')}>
|
||||||
<Minus className="size-3" />
|
<Minus className="size-3" />
|
||||||
</button>
|
</button>
|
||||||
<span className="shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-0.5">{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}</span>
|
{/* The readout IS the switch when the parent offers one — the header is
|
||||||
<button type="button" onClick={() => setZoomIdx((z) => Math.min(PX_PER_KHZ.length - 1, z + 1))} disabled={fitToBand || zoomIdx === PX_PER_KHZ.length - 1}
|
already tight with four maps side by side, and a separate chip would
|
||||||
|
cost width to say what this text says anyway. */}
|
||||||
|
{onToggleFit ? (
|
||||||
|
<button type="button" onClick={onToggleFit} title={t('bmp.fitTitle')}
|
||||||
|
className={cn('shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-1 rounded border transition-colors',
|
||||||
|
fitToBand ? 'border-primary bg-primary text-primary-foreground' : 'border-border hover:bg-muted')}>
|
||||||
|
{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
|
<span className="shrink-0 font-mono text-[10px] normal-case tracking-normal whitespace-nowrap px-0.5">{fitToBand ? t('bmp.fit') : `${pxPerKHz}px/kHz`}</span>
|
||||||
|
)}
|
||||||
|
<button type="button" onClick={() => changeZoom(1)} disabled={fitToBand || zoomIdx === PX_PER_KHZ.length - 1}
|
||||||
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
className="size-5 shrink-0 inline-flex items-center justify-center rounded hover:bg-muted disabled:opacity-30"
|
||||||
title={t('bmp.zoomIn')}>
|
title={t('bmp.zoomIn')}>
|
||||||
<Plus className="size-3" />
|
<Plus className="size-3" />
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { Badge } from '@/components/ui/badge';
|
|||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { sunTimes } from '@/lib/sun';
|
import { sunTimes } from '@/lib/sun';
|
||||||
import { isQSLConfirmed } from '@/lib/qsl';
|
import { isQSLConfirmed } from '@/lib/qsl';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
||||||
import type { WorkedBeforeView } from '@/types';
|
import type { WorkedBeforeView } from '@/types';
|
||||||
|
|
||||||
@@ -76,28 +77,31 @@ const STATUS_CLASSES: Record<string, string> = {
|
|||||||
dxcc_w: 'bg-mx-dx-work',
|
dxcc_w: 'bg-mx-dx-work',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Legend entries, in the same colour order as the cells. swatch = the
|
// Legend entries, in the same colour order as the cells — and the same order and
|
||||||
// background class (or a special ring marker for the current-entry cell).
|
// i18n keys the Appearance panel's colour pickers use, so the two can never
|
||||||
|
// disagree about which green is which. swatch = the background class (or a
|
||||||
|
// special ring marker for the current-entry cell).
|
||||||
const LEGEND: { swatch: string; ring?: boolean; label: string }[] = [
|
const LEGEND: { swatch: string; ring?: boolean; label: string }[] = [
|
||||||
{ swatch: 'bg-mx-call-conf', label: 'Call confirmed' },
|
{ swatch: 'bg-mx-call-conf', label: 'mx.callConf' },
|
||||||
{ swatch: 'bg-mx-call-work', label: 'Call worked' },
|
{ swatch: 'bg-mx-call-work', label: 'mx.callWork' },
|
||||||
{ swatch: 'bg-mx-dx-conf', label: 'Entity confirmed' },
|
{ swatch: 'bg-mx-dx-conf', label: 'mx.dxConf' },
|
||||||
{ swatch: 'bg-mx-dx-work', label: 'Entity worked' },
|
{ swatch: 'bg-mx-dx-work', label: 'mx.dxWork' },
|
||||||
{ swatch: 'bg-mx-none', label: 'Not worked' },
|
{ swatch: 'bg-mx-none', label: 'mx.none' },
|
||||||
{ swatch: 'bg-mx-none', ring: true, label: 'Current entry' },
|
{ swatch: 'bg-mx-none', ring: true, label: 'mx.current' },
|
||||||
];
|
];
|
||||||
|
|
||||||
function cellTitle(band: string, cls: string, status: string, current: boolean): string {
|
function cellTitle(t: (k: string) => string, band: string, cls: string, status: string, current: boolean): string {
|
||||||
const desc =
|
const desc =
|
||||||
status === 'call_c' ? 'This callsign confirmed' :
|
status === 'call_c' ? t('mx.tipCallConf') :
|
||||||
status === 'call_w' ? 'This callsign worked (not confirmed)' :
|
status === 'call_w' ? t('mx.tipCallWork') :
|
||||||
status === 'dxcc_c' ? 'Entity confirmed (other callsign)' :
|
status === 'dxcc_c' ? t('mx.tipDxConf') :
|
||||||
status === 'dxcc_w' ? 'Entity worked (other callsign)' :
|
status === 'dxcc_w' ? t('mx.tipDxWork') :
|
||||||
'Never worked';
|
t('mx.tipNone');
|
||||||
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
return `${band} ${cls}: ${desc}${current ? ' — ' + t('mx.current') : ''}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall, onEditQso }: Props) {
|
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true, lat, lon, forCall, onEditQso }: Props) {
|
||||||
|
const { t } = useI18n();
|
||||||
// Cell drill-down: which band+class the operator clicked, or null.
|
// Cell drill-down: which band+class the operator clicked, or null.
|
||||||
const [slot, setSlot] = useState<{ band: string; cls: string } | null>(null);
|
const [slot, setSlot] = useState<{ band: string; cls: string } | null>(null);
|
||||||
// Columns from the operator's configured bands (so the matrix shows only the
|
// Columns from the operator's configured bands (so the matrix shows only the
|
||||||
@@ -308,7 +312,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
return (
|
return (
|
||||||
<td
|
<td
|
||||||
key={b.tag}
|
key={b.tag}
|
||||||
title={cellTitle(b.tag, cls, st, isCurrent) + (st ? ' — click to list the QSOs' : '')}
|
title={cellTitle(t, b.tag, cls, st, isCurrent) + (st ? ' — ' + t('mx.tipClick') : '')}
|
||||||
onClick={st ? () => setSlot({ band: b.tag, cls }) : undefined}
|
onClick={st ? () => setSlot({ band: b.tag, cls }) : undefined}
|
||||||
className={cn(
|
className={cn(
|
||||||
'w-[28px] h-[24px] rounded transition-colors p-0',
|
'w-[28px] h-[24px] rounded transition-colors p-0',
|
||||||
@@ -316,7 +320,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
// Only a filled cell has anything to show — an empty one
|
// Only a filled cell has anything to show — an empty one
|
||||||
// stays inert rather than opening a "no QSOs" dialog.
|
// stays inert rather than opening a "no QSOs" dialog.
|
||||||
st && 'cursor-pointer hover:brightness-110',
|
st && 'cursor-pointer hover:brightness-110',
|
||||||
isCurrent && 'ring-2 ring-warning ring-inset',
|
isCurrent && 'ring-2 ring-mx-cur ring-inset',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
@@ -335,10 +339,10 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCal
|
|||||||
className={cn(
|
className={cn(
|
||||||
'inline-block size-3 rounded shrink-0',
|
'inline-block size-3 rounded shrink-0',
|
||||||
l.swatch,
|
l.swatch,
|
||||||
l.ring && 'ring-2 ring-warning ring-inset',
|
l.ring && 'ring-2 ring-mx-cur ring-inset',
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
{l.label}
|
{t(l.label)}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ export type SpotStatusEntry = {
|
|||||||
spotter_continent?: string;
|
spotter_continent?: string;
|
||||||
grid?: string;
|
grid?: string;
|
||||||
new_grid?: boolean;
|
new_grid?: boolean;
|
||||||
|
grid_state?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
@@ -266,12 +267,12 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
||||||
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
||||||
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
if (s?.new_pfx) parts.push(t('clg2.newPfx'));
|
||||||
if (s?.new_grid) parts.push(t('clg2.newGrid'));
|
if (s?.new_grid) parts.push(s.grid_state === 'unconf' ? t('clg2.newGridUnconf') : t('clg2.newGrid'));
|
||||||
return parts.join(' ');
|
return parts.join(' ');
|
||||||
},
|
},
|
||||||
cellRenderer: (p: any) => {
|
cellRenderer: (p: any) => {
|
||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
const parts: { text: string; color: string }[] = [];
|
const parts: { text: string; color: string; dim?: boolean }[] = [];
|
||||||
const main = statusColor(s);
|
const main = statusColor(s);
|
||||||
if (main) {
|
if (main) {
|
||||||
const label = s?.status === 'new' ? t('clg2.newDxcc')
|
const label = s?.status === 'new' ? t('clg2.newDxcc')
|
||||||
@@ -287,12 +288,19 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: markerColour('new_county') });
|
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_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_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') });
|
// Worked-but-unconfirmed is a QSL to chase, not a QSO to make. Same hue
|
||||||
|
// held back, so it reads as "less" of the same thing rather than a
|
||||||
|
// different fact — and the label says which.
|
||||||
|
if (s?.new_grid) {
|
||||||
|
parts.push(s.grid_state === 'unconf'
|
||||||
|
? { text: t('clg2.newGridUnconf'), color: markerColour('new_grid'), dim: true }
|
||||||
|
: { text: t('clg2.newGrid'), color: markerColour('new_grid') });
|
||||||
|
}
|
||||||
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
||||||
return (
|
return (
|
||||||
<span style={{ whiteSpace: 'nowrap' }}>
|
<span style={{ whiteSpace: 'nowrap' }}>
|
||||||
{parts.map((pt, i) => (
|
{parts.map((pt, i) => (
|
||||||
<span key={i} style={{ color: pt.color, fontWeight: 700 }}>
|
<span key={i} style={{ color: pt.color, fontWeight: 700, opacity: pt.dim ? 0.5 : 1 }}>
|
||||||
{i > 0 ? ' · ' : ''}{pt.text}
|
{i > 0 ? ' · ' : ''}{pt.text}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
@@ -638,6 +646,17 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
{t('clg2.pickerDesc')}
|
{t('clg2.pickerDesc')}
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
{/* Whole-dialog controls. showAll/hideAll with no group already mean
|
||||||
|
"every column"; only the buttons were missing, so hiding the lot
|
||||||
|
took one click per group. */}
|
||||||
|
<div className="flex items-center gap-1 px-1 text-[11px] text-muted-foreground">
|
||||||
|
<span>{t('clg2.allGroups')}</span>
|
||||||
|
<button type="button" className="text-[11px] text-primary hover:underline px-1"
|
||||||
|
onClick={() => showAll()}>{t('clg2.all')}</button>
|
||||||
|
<span className="opacity-40">·</span>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:underline px-1"
|
||||||
|
onClick={() => hideAll()}>{t('clg2.none')}</button>
|
||||||
|
</div>
|
||||||
<div className="max-h-[60vh] overflow-y-auto py-2">
|
<div className="max-h-[60vh] overflow-y-auto py-2">
|
||||||
{GROUP_ORDER.map((group) => {
|
{GROUP_ORDER.map((group) => {
|
||||||
const cols = COL_CATALOG.filter((c) => c.group === group);
|
const cols = COL_CATALOG.filter((c) => c.group === group);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -86,6 +86,13 @@ export function ExportFieldsDialog({ open, count, onExport, onClose }: {
|
|||||||
return [...m.entries()];
|
return [...m.entries()];
|
||||||
}, [official]);
|
}, [official]);
|
||||||
|
|
||||||
|
// Every tag the dialog can offer — the extras AND every group — so "select
|
||||||
|
// all" means what it says rather than "all the official ones".
|
||||||
|
const everyTag = useMemo(
|
||||||
|
() => [...extras, ...groups.flatMap(([, list]) => list.map((d) => d.name))],
|
||||||
|
[extras, groups],
|
||||||
|
);
|
||||||
|
|
||||||
const toggle = (name: string, on: boolean) =>
|
const toggle = (name: string, on: boolean) =>
|
||||||
setSel((s) => { const n = new Set(s); if (on) n.add(name); else n.delete(name); return n; });
|
setSel((s) => { const n = new Set(s); if (on) n.add(name); else n.delete(name); return n; });
|
||||||
const setMany = (names: string[], on: boolean) =>
|
const setMany = (names: string[], on: boolean) =>
|
||||||
@@ -114,11 +121,25 @@ export function ExportFieldsDialog({ open, count, onExport, onClose }: {
|
|||||||
<DialogDescription>{t('exf.desc')}</DialogDescription>
|
<DialogDescription>{t('exf.desc')}</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
|
{/* Whole-dialog select/clear, next to the count they change. Per-group
|
||||||
|
links alone meant clearing the selection was one click PER GROUP —
|
||||||
|
a dozen of them to get to "just the handful I want". */}
|
||||||
<div className="flex items-center gap-2 px-1 text-[11px] text-muted-foreground">
|
<div className="flex items-center gap-2 px-1 text-[11px] text-muted-foreground">
|
||||||
<span>{t('exf.chosen', { n: sel.size })}</span>
|
<span>{t('exf.chosen', { n: sel.size })}</span>
|
||||||
<Button variant="ghost" size="sm" className="ml-auto h-6 text-[11px]" onClick={() => setSel(defaultSet(official))}>
|
<span className="ml-auto inline-flex items-center gap-1">
|
||||||
{t('exf.defaults')}
|
<Button variant="ghost" size="sm" className="h-6 text-[11px]"
|
||||||
</Button>
|
onClick={() => setSel(new Set(everyTag))}>
|
||||||
|
{t('exf.selectAll')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-6 text-[11px]"
|
||||||
|
disabled={sel.size === 0}
|
||||||
|
onClick={() => setSel(new Set())}>
|
||||||
|
{t('exf.selectNone')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-6 text-[11px]" onClick={() => setSel(defaultSet(official))}>
|
||||||
|
{t('exf.defaults')}
|
||||||
|
</Button>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-3 gap-3 max-h-[56vh] overflow-y-auto pr-1">
|
<div className="grid grid-cols-3 gap-3 max-h-[56vh] overflow-y-auto pr-1">
|
||||||
|
|||||||
@@ -0,0 +1,272 @@
|
|||||||
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import L from 'leaflet';
|
||||||
|
import 'leaflet/dist/leaflet.css';
|
||||||
|
import { Loader2, RefreshCw } from 'lucide-react';
|
||||||
|
import { GridSquares } from '../../wailsjs/go/main/App';
|
||||||
|
import { gridSquareBounds, gridToLatLon } from '@/lib/maidenhead';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { BASEMAPS, addBasemap, loadBasemap, type BasemapKey } from '@/components/MainMap';
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
|
||||||
|
// GridSquareMap — every Maidenhead square in the log, drawn on a world map.
|
||||||
|
//
|
||||||
|
// A square, not a marker. The question this answers is "where have I been
|
||||||
|
// heard", and the shape of the answer is an area: a wall of squares across the
|
||||||
|
// Atlantic and a bare Pacific says something about an antenna that a scatter of
|
||||||
|
// pins does not. Confirmed and merely worked are two fills of the same hue —
|
||||||
|
// the distinction is a STATE of one thing, not two categories, so it must not
|
||||||
|
// be two unrelated colours.
|
||||||
|
//
|
||||||
|
// 4 characters, never 6: at world zoom a 6-character square is sub-pixel, and
|
||||||
|
// aggregating to the big square is also how the count means "contacts in this
|
||||||
|
// square" rather than "contacts at this exact spot".
|
||||||
|
|
||||||
|
type Square = { grid: string; count: number; confirmed: boolean; band?: string; mode?: string };
|
||||||
|
|
||||||
|
// The SAME basemaps the Main-tab world map offers, imported rather than copied:
|
||||||
|
// two lists of tile servers is how one map ends up on a provider the other has
|
||||||
|
// already been blocked by. This map opened on a hardcoded dark Carto, which is
|
||||||
|
// the least legible of the four under translucent squares.
|
||||||
|
|
||||||
|
// Leaflet geometry is painted onto a CANVAS, and canvas takes a colour, not a
|
||||||
|
// stylesheet: "var(--success)" handed to fillStyle is simply invalid and the
|
||||||
|
// shape is silently not drawn — a map with a correct square count and nothing
|
||||||
|
// on it. So the token is RESOLVED to its literal value here, once per theme,
|
||||||
|
// which is also why every other map in this app passes hex.
|
||||||
|
function cssColour(token: string, fallback: string): string {
|
||||||
|
try {
|
||||||
|
const v = getComputedStyle(document.documentElement).getPropertyValue(token).trim();
|
||||||
|
return v || fallback;
|
||||||
|
} catch { return fallback; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mode scope. Two, because the map lives beside a panel that decodes FTx: CW,
|
||||||
|
// phone and "everything" answer a question nobody is asking here, and a row of
|
||||||
|
// choices that are never the right one is just noise to read past.
|
||||||
|
//
|
||||||
|
// Digital is every digital mode; FTx is the FT family alone, which is the
|
||||||
|
// narrower and usually the honest one — a square worked on RTTY in a contest is
|
||||||
|
// not a square worked on FT8.
|
||||||
|
const SCOPES = [
|
||||||
|
{ key: 'DIGI', label: 'gsm.digital' },
|
||||||
|
{ key: 'FTX', label: 'gsm.ftx' },
|
||||||
|
] as const;
|
||||||
|
type ScopeKey = typeof SCOPES[number]['key'];
|
||||||
|
|
||||||
|
const SCOPE_KEY = 'opslog.gridMapScope';
|
||||||
|
// Chosen fill colours. Empty means "follow the theme", which is the default and
|
||||||
|
// stays the default: the tokens already track the four themes, and freezing a
|
||||||
|
// hex at first run would leave a dark-theme map painted in the light palette.
|
||||||
|
const COL_CONFIRMED_KEY = 'opslog.gridMapColorConfirmed';
|
||||||
|
const COL_WORKED_KEY = 'opslog.gridMapColorWorked';
|
||||||
|
|
||||||
|
// A colour input only accepts #rrggbb. The theme tokens ARE plain hex today, so
|
||||||
|
// this normally just passes them through — but a token that ever becomes oklch()
|
||||||
|
// or a named colour would silently drive the swatch to black, and a fallback is
|
||||||
|
// cheaper than that debugging session.
|
||||||
|
function asHex(v: string, fallback: string): string {
|
||||||
|
return /^#[0-9a-f]{6}$/i.test(v.trim()) ? v.trim() : fallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GridSquareMap({ myGrid, className }: { myGrid?: string; className?: string }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const hostRef = useRef<HTMLDivElement>(null);
|
||||||
|
const mapRef = useRef<L.Map | null>(null);
|
||||||
|
const layerRef = useRef<L.LayerGroup | null>(null);
|
||||||
|
const [squares, setSquares] = useState<Square[] | null>(null);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
const [scope, setScope] = useState<ScopeKey>(
|
||||||
|
() => (SCOPES.some((s) => s.key === localStorage.getItem(SCOPE_KEY))
|
||||||
|
? (localStorage.getItem(SCOPE_KEY) as ScopeKey) : 'DIGI'));
|
||||||
|
|
||||||
|
const [basemap, setBasemap] = useState<BasemapKey>(loadBasemap);
|
||||||
|
const [confColour, setConfColour] = useState(() => localStorage.getItem(COL_CONFIRMED_KEY) ?? '');
|
||||||
|
const [workedColour, setWorkedColour] = useState(() => localStorage.getItem(COL_WORKED_KEY) ?? '');
|
||||||
|
// Repaint the squares when the THEME changes, not the basemap: the fills come
|
||||||
|
// from theme tokens resolved at draw time, so a theme switch leaves them on
|
||||||
|
// the old palette until something forces a redraw.
|
||||||
|
const [themeTick, setThemeTick] = useState(0);
|
||||||
|
useEffect(() => {
|
||||||
|
const obs = new MutationObserver(() => setThemeTick((n) => n + 1));
|
||||||
|
obs.observe(document.documentElement, { attributes: true, attributeFilter: ['data-theme'] });
|
||||||
|
return () => obs.disconnect();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const load = async (sc: ScopeKey = scope) => {
|
||||||
|
setBusy(true); setErr('');
|
||||||
|
try {
|
||||||
|
const r = (await GridSquares(sc)) as any;
|
||||||
|
setSquares((Array.isArray(r) ? r : []) as Square[]);
|
||||||
|
} catch (e: any) {
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
setSquares([]);
|
||||||
|
} finally { setBusy(false); }
|
||||||
|
};
|
||||||
|
useEffect(() => { void load(scope); /* eslint-disable-next-line react-hooks/exhaustive-deps */ }, [scope]);
|
||||||
|
|
||||||
|
// One-time map creation. preferCanvas: a busy digital log is a few thousand
|
||||||
|
// rectangles, and as SVG that is a few thousand DOM nodes to lay out on every
|
||||||
|
// pan.
|
||||||
|
useEffect(() => {
|
||||||
|
if (!hostRef.current || mapRef.current) return;
|
||||||
|
const m = L.map(hostRef.current, {
|
||||||
|
preferCanvas: true,
|
||||||
|
zoomControl: true,
|
||||||
|
attributionControl: true,
|
||||||
|
worldCopyJump: true,
|
||||||
|
minZoom: 1,
|
||||||
|
}).setView([25, 0], 2);
|
||||||
|
mapRef.current = m;
|
||||||
|
layerRef.current = L.layerGroup().addTo(m);
|
||||||
|
// Leaflet measures its container ONCE, when the map is created, and never
|
||||||
|
// looks again. Here that measurement happens while the panel is still
|
||||||
|
// laying out — so the map kept the height it had at that instant and the
|
||||||
|
// rest of the panel stayed blank underneath it, whatever the window size.
|
||||||
|
// Watching the host is the only fix that also survives a window resize, a
|
||||||
|
// split-pane drag and the tab being shown for the first time.
|
||||||
|
const ro = new ResizeObserver(() => m.invalidateSize({ animate: false }));
|
||||||
|
ro.observe(hostRef.current);
|
||||||
|
return () => { ro.disconnect(); m.remove(); mapRef.current = null; layerRef.current = null; };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// The chosen basemap, shared with the Main-tab map so picking one there and
|
||||||
|
// finding another here cannot happen.
|
||||||
|
const baseRef = useRef<L.TileLayer | null>(null);
|
||||||
|
const labelsRef = useRef<L.TileLayer | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
const m = mapRef.current;
|
||||||
|
if (!m) return;
|
||||||
|
addBasemap(m, basemap, baseRef, labelsRef);
|
||||||
|
baseRef.current?.bringToBack();
|
||||||
|
}, [basemap]);
|
||||||
|
|
||||||
|
// Redraw the squares.
|
||||||
|
useEffect(() => {
|
||||||
|
const layer = layerRef.current;
|
||||||
|
if (!layer) return;
|
||||||
|
layer.clearLayers();
|
||||||
|
// Resolved once for the whole redraw, not per square: getComputedStyle
|
||||||
|
// forces a style flush, and doing that a thousand times is a visible stall.
|
||||||
|
const confirmedColour = confColour || cssColour('--success', '#16a34a');
|
||||||
|
const workedFill = workedColour || cssColour('--chart-1', '#2a78d6');
|
||||||
|
const meColour = cssColour('--warning', '#f59e0b');
|
||||||
|
for (const sq of squares ?? []) {
|
||||||
|
const b = gridSquareBounds(sq.grid);
|
||||||
|
if (!b) continue;
|
||||||
|
// One hue, two states. Confirmed is the solid, saturated one; worked is
|
||||||
|
// the same colour held back — so the eye reads "more" and "less" of the
|
||||||
|
// same thing rather than two unrelated facts.
|
||||||
|
const colour = sq.confirmed ? confirmedColour : workedFill;
|
||||||
|
L.rectangle([[b.south, b.west], [b.north, b.east]], {
|
||||||
|
color: colour,
|
||||||
|
weight: 0.5,
|
||||||
|
opacity: sq.confirmed ? 0.9 : 0.5,
|
||||||
|
fillColor: colour,
|
||||||
|
fillOpacity: sq.confirmed ? 0.55 : 0.22,
|
||||||
|
})
|
||||||
|
.bindTooltip(
|
||||||
|
`${sq.grid} — ${sq.count} QSO${sq.count > 1 ? 's' : ''}` +
|
||||||
|
`${sq.band ? ` · ${sq.band}` : ''}${sq.mode ? ` ${sq.mode}` : ''}` +
|
||||||
|
`${sq.confirmed ? ` · ${t('gsm.confirmed')}` : ''}`,
|
||||||
|
{ sticky: true },
|
||||||
|
)
|
||||||
|
.addTo(layer);
|
||||||
|
}
|
||||||
|
// The operator's own square, so the pattern has an origin to be read from.
|
||||||
|
const me = myGrid ? gridToLatLon(myGrid) : null;
|
||||||
|
if (me) {
|
||||||
|
L.circleMarker([me.lat, me.lon], {
|
||||||
|
radius: 4, color: meColour, weight: 2,
|
||||||
|
fillColor: meColour, fillOpacity: 1,
|
||||||
|
}).bindTooltip(myGrid!.toUpperCase(), { sticky: true }).addTo(layer);
|
||||||
|
}
|
||||||
|
}, [squares, myGrid, t, themeTick, confColour, workedColour]);
|
||||||
|
|
||||||
|
const stats = useMemo(() => {
|
||||||
|
const list = squares ?? [];
|
||||||
|
return { total: list.length, confirmed: list.filter((s) => s.confirmed).length };
|
||||||
|
}, [squares]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
// isolate is load-bearing, not tidiness. Leaflet puts its panes at z-index
|
||||||
|
// 400 and its zoom control at 1000, in the PAGE's stacking context — and the
|
||||||
|
// modals here are z-50. Without a stacking context of its own the map floats
|
||||||
|
// over Preferences and hides the Save and Close buttons. isolation:isolate
|
||||||
|
// confines every z-index Leaflet sets to this element.
|
||||||
|
<section className={cn('isolate relative flex flex-col min-h-0 rounded-lg border border-border bg-card overflow-hidden', className)}>
|
||||||
|
<header className="flex items-center gap-2 px-2.5 py-1.5 border-b border-border bg-muted/40 shrink-0 flex-wrap">
|
||||||
|
<span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground">
|
||||||
|
{t('gsm.title')}
|
||||||
|
</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||||
|
{SCOPES.map((s, i) => (
|
||||||
|
<button key={s.key} type="button"
|
||||||
|
onClick={() => { setScope(s.key); try { localStorage.setItem(SCOPE_KEY, s.key); } catch { /* quota */ } }}
|
||||||
|
className={cn('px-1.5 h-6 text-[11px] whitespace-nowrap', i > 0 && 'border-l border-border',
|
||||||
|
scope === s.key ? 'bg-primary text-primary-foreground' : 'hover:bg-muted text-muted-foreground')}>
|
||||||
|
{t(s.label)}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<span className="text-[11px] text-muted-foreground tabular-nums">
|
||||||
|
{t('gsm.count', { n: stats.total, c: stats.confirmed })}
|
||||||
|
</span>
|
||||||
|
<select
|
||||||
|
value={basemap}
|
||||||
|
onChange={(e) => { const v = e.target.value as BasemapKey; setBasemap(v); writeUiPref('opslog.mapBasemap', v); }}
|
||||||
|
title={t('gsm.basemap')}
|
||||||
|
className="h-6 rounded border border-border bg-background px-1 text-[11px]"
|
||||||
|
>
|
||||||
|
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
||||||
|
<option key={k} value={k}>{BASEMAPS[k].label}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
{/* Beside the basemap, because they answer the same question: what this
|
||||||
|
map looks like. Written straight through — there is no Save here. */}
|
||||||
|
<label className="inline-flex items-center gap-1 text-[11px] text-muted-foreground" title={t('gsm.colConfirmed')}>
|
||||||
|
<input type="color" className="size-5 rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={asHex(confColour || cssColour('--success', '#16a34a'), '#16a34a')}
|
||||||
|
onChange={(e) => { setConfColour(e.target.value); writeUiPref(COL_CONFIRMED_KEY, e.target.value); }} />
|
||||||
|
{t('gsm.confirmed')}
|
||||||
|
</label>
|
||||||
|
<label className="inline-flex items-center gap-1 text-[11px] text-muted-foreground" title={t('gsm.colWorked')}>
|
||||||
|
<input type="color" className="size-5 rounded border border-border bg-transparent p-0 cursor-pointer"
|
||||||
|
value={asHex(workedColour || cssColour('--chart-1', '#2a78d6'), '#2a78d6')}
|
||||||
|
onChange={(e) => { setWorkedColour(e.target.value); writeUiPref(COL_WORKED_KEY, e.target.value); }} />
|
||||||
|
{t('gsm.worked')}
|
||||||
|
</label>
|
||||||
|
{(confColour || workedColour) && (
|
||||||
|
<button type="button" title={t('gsm.colReset')}
|
||||||
|
onClick={() => {
|
||||||
|
setConfColour(''); setWorkedColour('');
|
||||||
|
writeUiPref(COL_CONFIRMED_KEY, ''); writeUiPref(COL_WORKED_KEY, '');
|
||||||
|
}}
|
||||||
|
className="text-[11px] text-muted-foreground hover:text-foreground px-1">↺</button>
|
||||||
|
)}
|
||||||
|
<span className="flex-1" />
|
||||||
|
<button type="button" onClick={() => void load()} disabled={busy} title={t('gsm.refresh')}
|
||||||
|
className="inline-flex items-center justify-center size-6 rounded border border-border hover:bg-muted disabled:opacity-50">
|
||||||
|
{busy ? <Loader2 className="size-3 animate-spin" /> : <RefreshCw className="size-3" />}
|
||||||
|
</button>
|
||||||
|
</header>
|
||||||
|
{err && <p className="px-2.5 py-1 text-[11px] text-destructive shrink-0">{err}</p>}
|
||||||
|
{/* The map host must have a real height or Leaflet renders nothing at all
|
||||||
|
— flex-1 + min-h-0, never a percentage. */}
|
||||||
|
<div ref={hostRef} className="flex-1 min-h-0" />
|
||||||
|
<footer className="flex items-center gap-3 px-2.5 py-1 border-t border-border bg-muted/30 shrink-0 text-[10px] text-muted-foreground">
|
||||||
|
<span className="inline-flex items-center gap-1.5">
|
||||||
|
<span className="inline-block size-2.5 rounded-[2px]"
|
||||||
|
style={{ background: confColour || 'var(--success)', opacity: 0.75 }} />
|
||||||
|
{t('gsm.confirmed')}
|
||||||
|
</span>
|
||||||
|
<span className="inline-flex items-center gap-1.5">
|
||||||
|
<span className="inline-block size-2.5 rounded-[2px]"
|
||||||
|
style={{ background: workedColour || 'var(--chart-1)', opacity: 0.35 }} />
|
||||||
|
{t('gsm.worked')}
|
||||||
|
</span>
|
||||||
|
</footer>
|
||||||
|
</section>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -61,8 +61,8 @@ const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, &cop
|
|||||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
||||||
type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
export type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
||||||
const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
export const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
||||||
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
||||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
@@ -71,7 +71,7 @@ const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; s
|
|||||||
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
||||||
};
|
};
|
||||||
function loadBasemap(): BasemapKey {
|
export function loadBasemap(): BasemapKey {
|
||||||
const v = localStorage.getItem('opslog.mapBasemap');
|
const v = localStorage.getItem('opslog.mapBasemap');
|
||||||
return v === 'voyager' || v === 'street' || v === 'satellite' ? v : 'light';
|
return v === 'voyager' || v === 'street' || v === 'satellite' ? v : 'light';
|
||||||
}
|
}
|
||||||
@@ -80,7 +80,7 @@ function loadBasemap(): BasemapKey {
|
|||||||
// place-name overlay. updateWhenIdle/keepBuffer keep the number of live tiles
|
// place-name overlay. updateWhenIdle/keepBuffer keep the number of live tiles
|
||||||
// down: satellite loads TWO tile layers, so its tile count — and the composited
|
// down: satellite loads TWO tile layers, so its tile count — and the composited
|
||||||
// layers WebView2 has to hold — is double every other basemap's.
|
// layers WebView2 has to hold — is double every other basemap's.
|
||||||
function addBasemap(
|
export function addBasemap(
|
||||||
m: L.Map,
|
m: L.Map,
|
||||||
key: BasemapKey,
|
key: BasemapKey,
|
||||||
base: React.MutableRefObject<L.TileLayer | null>,
|
base: React.MutableRefObject<L.TileLayer | null>,
|
||||||
|
|||||||
@@ -111,7 +111,33 @@ export function fmtQslDate(s?: string): string {
|
|||||||
|
|
||||||
// QSL Manager as an in-app tab panel: upload logged QSOs to online logbooks
|
// QSL Manager as an in-app tab panel: upload logged QSOs to online logbooks
|
||||||
// and download confirmations, while the rest of the app stays usable.
|
// and download confirmations, while the rest of the app stays usable.
|
||||||
export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
|
// GridActions are the row actions the context menu offers, forwarded straight to
|
||||||
|
// whichever grid this panel is showing.
|
||||||
|
//
|
||||||
|
// The FILTERED exports are deliberately absent. "Export everything the filter
|
||||||
|
// matches" means the Recent-QSOs filter, and the rows here come from a different
|
||||||
|
// query entirely — offering it would export something other than what is on the
|
||||||
|
// screen, which is the one thing an export must never do. Selection-based
|
||||||
|
// exports have no such ambiguity: the ids are the rows you ticked.
|
||||||
|
export type GridActions = {
|
||||||
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
|
onUpdateCountyFromULS?: (ids: number[]) => void;
|
||||||
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
|
onSendRecording?: (ids: number[]) => void;
|
||||||
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
|
onExportSelected?: (ids: number[]) => void;
|
||||||
|
onExportSelectedFields?: (ids: number[]) => void;
|
||||||
|
onExportCabrilloSelected?: (ids: number[]) => void;
|
||||||
|
onDelete?: (ids: number[]) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function QSLManagerPanel({ onEditQSO, actions }: {
|
||||||
|
onEditQSO?: (id: number) => void;
|
||||||
|
actions?: GridActions;
|
||||||
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [service, setService] = useState('lotw');
|
const [service, setService] = useState('lotw');
|
||||||
// The callsign this profile signs/uploads/downloads as for the selected
|
// The callsign this profile signs/uploads/downloads as for the selected
|
||||||
@@ -443,6 +469,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
total={paperRows.length}
|
total={paperRows.length}
|
||||||
selectAllSignal={paperSelAllSig}
|
selectAllSignal={paperSelAllSig}
|
||||||
onRowSelected={(ids) => setPaperSel(new Set(ids))}
|
onRowSelected={(ids) => setPaperSel(new Set(ids))}
|
||||||
|
{...actions}
|
||||||
|
onRowDoubleClicked={onEditQSO ? (q) => onEditQSO(q.id as number) : undefined}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
@@ -549,6 +577,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
total={rows.length}
|
total={rows.length}
|
||||||
selectAllSignal={uploadSelAllSig}
|
selectAllSignal={uploadSelAllSig}
|
||||||
onRowSelected={onUploadRowSelected}
|
onRowSelected={onUploadRowSelected}
|
||||||
|
{...actions}
|
||||||
|
onRowDoubleClicked={onEditQSO ? (q) => onEditQSO(q.id as number) : undefined}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
|
|||||||
type Props = {
|
type Props = {
|
||||||
menu: QSOMenuState;
|
menu: QSOMenuState;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
onUpdateFromCty: (ids: number[]) => void;
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
onUpdateFromQRZ: (ids: number[]) => void;
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
onUpdateFromClublog?: (ids: number[]) => void;
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
// Only passed once the offline US county database has been downloaded —
|
// Only passed once the offline US county database has been downloaded —
|
||||||
// an entry that can only ever answer "no database" is not worth a line here.
|
// an entry that can only ever answer "no database" is not worth a line here.
|
||||||
@@ -98,20 +98,28 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
<div className="px-3 py-1 text-[11px] uppercase tracking-wider text-muted-foreground">
|
<div className="px-3 py-1 text-[11px] uppercase tracking-wider text-muted-foreground">
|
||||||
{t('qctx.selected', { n })}
|
{t('qctx.selected', { n })}
|
||||||
</div>
|
</div>
|
||||||
<button
|
{/* Conditional like every other entry. These two were drawn
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
unconditionally, and the grid passes them through an arrow that calls
|
||||||
onClick={() => { onUpdateFromCty(menu.ids); onClose(); }}
|
an optional handler — so in a grid that wires neither (the QSL
|
||||||
>
|
Manager) both appeared and did precisely nothing when clicked. */}
|
||||||
<Globe2 className="size-4 text-primary" />
|
{onUpdateFromCty && (
|
||||||
<span>{t('qctx.fixCountry')}</span>
|
<button
|
||||||
</button>
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
<button
|
onClick={() => { onUpdateFromCty(menu.ids); onClose(); }}
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
>
|
||||||
onClick={() => { onUpdateFromQRZ(menu.ids); onClose(); }}
|
<Globe2 className="size-4 text-primary" />
|
||||||
>
|
<span>{t('qctx.fixCountry')}</span>
|
||||||
<RefreshCw className="size-4 text-info" />
|
</button>
|
||||||
<span>{t('qctx.updateQrz')}</span>
|
)}
|
||||||
</button>
|
{onUpdateFromQRZ && (
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
onClick={() => { onUpdateFromQRZ(menu.ids); onClose(); }}
|
||||||
|
>
|
||||||
|
<RefreshCw className="size-4 text-info" />
|
||||||
|
<span>{t('qctx.updateQrz')}</span>
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{onUpdateFromClublog && (
|
{onUpdateFromClublog && (
|
||||||
<button
|
<button
|
||||||
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
|||||||
@@ -374,7 +374,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
// refreshes it. A cached answer from a thinner QRZ subscription (or any
|
// refreshes it. A cached answer from a thinner QRZ subscription (or any
|
||||||
// stale row) otherwise stayed for its whole 30-day life and the button
|
// stale row) otherwise stayed for its whole 30-day life and the button
|
||||||
// appeared to do nothing.
|
// appeared to do nothing.
|
||||||
const r: any = await LookupCallsignFresh(call);
|
// The QSO's OWN date: a ClubLog exception is resolved as of when the
|
||||||
|
// contact happened, not as of today. Re-looking-up a DXpedition contact
|
||||||
|
// months later must not move it to whatever the prefix means now.
|
||||||
|
const r: any = await LookupCallsignFresh(call, (dateOn || '').slice(0, 10));
|
||||||
// The lookup WINS over what is in the record — that is the point of asking
|
// The lookup WINS over what is in the record — that is the point of asking
|
||||||
// for it. But an EMPTY result must never blank a good value: `??` only
|
// for it. But an EMPTY result must never blank a good value: `??` only
|
||||||
// guards against null, and Go marshals an unset string as "", so a QRZ
|
// guards against null, and Go marshals an unset string as "", so a QRZ
|
||||||
|
|||||||
@@ -631,6 +631,20 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
api.setColumnsVisible(ids, false);
|
api.setColumnsVisible(ids, false);
|
||||||
saveColumnState();
|
saveColumnState();
|
||||||
}
|
}
|
||||||
|
// Whole-dialog show/hide. showAll/hideAll cover the CATALOGUE only; the award
|
||||||
|
// columns live in their own persisted code set, so a global that skipped them
|
||||||
|
// would leave a row of columns behind and look broken.
|
||||||
|
function setEverything(visible: boolean) {
|
||||||
|
const api = gridRef.current?.api;
|
||||||
|
if (!api) return;
|
||||||
|
api.setColumnsVisible(COL_CATALOG.map((c) => c.colId!), visible);
|
||||||
|
if (awardCols && awardCols.length > 0) {
|
||||||
|
persistAwardShown(visible ? new Set(awardCols.map((a) => a.code.toUpperCase())) : new Set());
|
||||||
|
api.setColumnsVisible(awardCols.map((a) => `award_${a.code}`), visible);
|
||||||
|
}
|
||||||
|
saveColumnState();
|
||||||
|
}
|
||||||
|
|
||||||
function resetDefaults() {
|
function resetDefaults() {
|
||||||
const api = gridRef.current?.api;
|
const api = gridRef.current?.api;
|
||||||
if (!api) return;
|
if (!api) return;
|
||||||
@@ -706,16 +720,20 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
animateRows={false}
|
animateRows={false}
|
||||||
suppressCellFocus
|
suppressCellFocus
|
||||||
getRowId={(p) => String((p.data as any).id)}
|
getRowId={(p) => String((p.data as any).id)}
|
||||||
getRowStyle={(p) => rowStyleFor(p.data, rowColors ?? null)}
|
getRowStyle={(p) => rowStyleFor(p.data, rowColors ?? null, p.node.rowIndex ?? undefined)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Every handler is passed STRAIGHT through, never wrapped in an arrow: a
|
||||||
|
wrapper is always truthy, so the menu drew "Fix country" and "Update
|
||||||
|
from the callsign databases" even in a grid that wired neither — and
|
||||||
|
clicking them did nothing at all. */}
|
||||||
<QSOContextMenu
|
<QSOContextMenu
|
||||||
menu={menu}
|
menu={menu}
|
||||||
onClose={() => setMenu(null)}
|
onClose={() => setMenu(null)}
|
||||||
onUpdateFromCty={(ids) => onUpdateFromCty?.(ids)}
|
onUpdateFromCty={onUpdateFromCty}
|
||||||
onUpdateFromQRZ={(ids) => onUpdateFromQRZ?.(ids)}
|
onUpdateFromQRZ={onUpdateFromQRZ}
|
||||||
onUpdateFromClublog={onUpdateFromClublog}
|
onUpdateFromClublog={onUpdateFromClublog}
|
||||||
onUpdateCountyFromULS={onUpdateCountyFromULS}
|
onUpdateCountyFromULS={onUpdateCountyFromULS}
|
||||||
onSendTo={onSendTo}
|
onSendTo={onSendTo}
|
||||||
@@ -738,6 +756,16 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
|||||||
{t('rqg.pickerDesc')}
|
{t('rqg.pickerDesc')}
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
{/* Whole-dialog controls. The per-group links alone meant hiding
|
||||||
|
everything was one click PER GROUP, and there are a dozen. */}
|
||||||
|
<div className="flex items-center gap-1 px-5 text-[11px] text-muted-foreground">
|
||||||
|
<span>{t('rqg.pickerAllGroups')}</span>
|
||||||
|
<button type="button" className="text-[11px] text-primary hover:underline px-1"
|
||||||
|
onClick={() => setEverything(true)}>{t('rqg.all')}</button>
|
||||||
|
<span className="opacity-40">·</span>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:underline px-1"
|
||||||
|
onClick={() => setEverything(false)}>{t('rqg.none')}</button>
|
||||||
|
</div>
|
||||||
<div className="grid grid-cols-3 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
<div className="grid grid-cols-3 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
||||||
{GROUP_ORDER.map((group) => {
|
{GROUP_ORDER.map((group) => {
|
||||||
const cols = COL_CATALOG.filter((c) => c.group === group);
|
const cols = COL_CATALOG.filter((c) => c.group === group);
|
||||||
|
|||||||
@@ -5,12 +5,13 @@
|
|||||||
// when an Ultrabeam is bidirectional, the opposite one when reversed); a small
|
// when an Ultrabeam is bidirectional, the opposite one when reversed); a small
|
||||||
// red marker on the bezel shows the short-path bearing to the DX. Click the dial
|
// red marker on the bezel shows the short-path bearing to the DX. Click the dial
|
||||||
// to turn the antenna there.
|
// to turn the antenna there.
|
||||||
import { useMemo } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { geoAzimuthalEquidistant, geoPath, geoGraticule10 } from 'd3-geo';
|
import { geoAzimuthalEquidistant, geoPath, geoGraticule10 } from 'd3-geo';
|
||||||
import { feature } from 'topojson-client';
|
import { feature } from 'topojson-client';
|
||||||
import landTopo from 'world-atlas/land-110m.json';
|
import landTopo from 'world-atlas/land-110m.json';
|
||||||
import { Compass, X } from 'lucide-react';
|
import { Compass, X, Play, Square } from 'lucide-react';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
// Decode the coastline outline once (≈110 m simplified land polygons).
|
// Decode the coastline outline once (≈110 m simplified land polygons).
|
||||||
const LAND = feature(landTopo as any, (landTopo as any).objects.land);
|
const LAND = feature(landTopo as any, (landTopo as any).objects.land);
|
||||||
@@ -29,6 +30,11 @@ interface Props {
|
|||||||
onSelectRotor?: (i: number) => void; // switch the active rotor
|
onSelectRotor?: (i: number) => void; // switch the active rotor
|
||||||
onGoto?: (az: number) => void; // click-to-turn
|
onGoto?: (az: number) => void; // click-to-turn
|
||||||
onClose?: () => void;
|
onClose?: () => void;
|
||||||
|
// Quick-turn buttons and the azimuth box, shown only where the caller wants
|
||||||
|
// them: Station Control draws its own GoTo/Stop around this compass, and two
|
||||||
|
// sets of the same controls side by side would be nothing but confusing.
|
||||||
|
presets?: { label: string; azimuth: number }[];
|
||||||
|
onStop?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const SIZE = 168;
|
const SIZE = 168;
|
||||||
@@ -41,7 +47,58 @@ function pt(az: number, radius: number): [number, number] {
|
|||||||
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, rotors, activeRotor, onSelectRotor, onGoto, onClose }: Props) {
|
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, rotors, activeRotor, onSelectRotor, onGoto, onClose, presets, onStop }: Props) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
// Raw text, not a number: binding the input to a normalised value makes
|
||||||
|
// Backspace fight the operator on the way from "230" to "23". It is parsed
|
||||||
|
// when it is sent, and only then.
|
||||||
|
const [azText, setAzText] = useState('');
|
||||||
|
const showControls = !!(presets || onStop);
|
||||||
|
|
||||||
|
// Which preset was just pressed, so it can light up for a moment.
|
||||||
|
//
|
||||||
|
// A rotor takes seconds to start moving and the needle barely twitches at
|
||||||
|
// first, so without this the only answer to "did that register?" is to press
|
||||||
|
// it again — which is how an antenna ends up ordered somewhere twice. The
|
||||||
|
// acknowledgement has to come from the button itself, at once.
|
||||||
|
const [flashIdx, setFlashIdx] = useState<number | null>(null);
|
||||||
|
const flashTimer = useRef<number | undefined>(undefined);
|
||||||
|
useEffect(() => () => window.clearTimeout(flashTimer.current), []);
|
||||||
|
const pressPreset = (i: number, az: number) => {
|
||||||
|
if (!onGoto) return;
|
||||||
|
setFlashIdx(i);
|
||||||
|
window.clearTimeout(flashTimer.current);
|
||||||
|
flashTimer.current = window.setTimeout(() => setFlashIdx(null), 450);
|
||||||
|
onGoto(az);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Stop needs the same acknowledgement, for the same reason and one more: it
|
||||||
|
// is pressed when something is already wrong, and a button that stays inert
|
||||||
|
// gets hit again and again. Its own flag, so stopping does not blank a preset
|
||||||
|
// that is still lit.
|
||||||
|
const [stopFlash, setStopFlash] = useState(false);
|
||||||
|
const stopTimer = useRef<number | undefined>(undefined);
|
||||||
|
useEffect(() => () => window.clearTimeout(stopTimer.current), []);
|
||||||
|
const pressStop = () => {
|
||||||
|
if (!onStop) return;
|
||||||
|
setStopFlash(true);
|
||||||
|
window.clearTimeout(stopTimer.current);
|
||||||
|
stopTimer.current = window.setTimeout(() => setStopFlash(false), 450);
|
||||||
|
onStop();
|
||||||
|
};
|
||||||
|
|
||||||
|
// 0-359 and nothing else. 360 is refused rather than folded to 0 — it is
|
||||||
|
// almost always a typo for 36 or 306, and a rotor swinging through north on a
|
||||||
|
// slip of the finger is worth one rejected keypress.
|
||||||
|
const sendAz = () => {
|
||||||
|
const s = azText.trim();
|
||||||
|
if (s === '' || !onGoto) return;
|
||||||
|
const n = Number(s);
|
||||||
|
if (!Number.isFinite(n) || !Number.isInteger(n) || n < 0 || n > 359) return;
|
||||||
|
onGoto(n);
|
||||||
|
setAzText('');
|
||||||
|
};
|
||||||
|
|
||||||
const cardinals = useMemo(
|
const cardinals = useMemo(
|
||||||
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
||||||
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
||||||
@@ -72,6 +129,35 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
|
|
||||||
const headLabel = headings.length ? headings[0] : null;
|
const headLabel = headings.length ? headings[0] : null;
|
||||||
|
|
||||||
|
// Short and long path to the DX, in figures.
|
||||||
|
//
|
||||||
|
// The bezel already carries the short path as a red marker, but a marker is a
|
||||||
|
// direction, not a number — the same pair sits in the status bar at 10px and
|
||||||
|
// operators reported not being able to read it. It lives here because it
|
||||||
|
// belongs to the compass: every place that draws one gets the readout, instead
|
||||||
|
// of each caller inventing its own. Clickable when the caller can turn, like
|
||||||
|
// the status bar's. Built as a value because it is placed in one of two
|
||||||
|
// columns depending on whether the controls are shown.
|
||||||
|
const pathReadout = (
|
||||||
|
<div className="flex gap-1.5 mt-2 font-mono w-full">
|
||||||
|
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
|
||||||
|
<button key={lbl} type="button" disabled={az == null || !onGoto}
|
||||||
|
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
|
||||||
|
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
|
||||||
|
className={
|
||||||
|
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors active:scale-95 ' +
|
||||||
|
(az == null
|
||||||
|
? 'border-border text-muted-foreground/50 cursor-not-allowed'
|
||||||
|
: onGoto
|
||||||
|
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
|
||||||
|
: 'border-border text-muted-foreground cursor-default')
|
||||||
|
}>
|
||||||
|
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="flex flex-col h-full min-h-0 rounded-lg border border-border bg-card overflow-hidden">
|
<section className="flex flex-col h-full min-h-0 rounded-lg border border-border bg-card overflow-hidden">
|
||||||
{/* Header — matches the WinKeyer / Voice keyer panels. */}
|
{/* Header — matches the WinKeyer / Voice keyer panels. */}
|
||||||
@@ -128,9 +214,13 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Dial on the left, controls on the right. The controls column is sized to
|
||||||
|
fit WITHIN the dial's height: the widget sits in a row whose height is
|
||||||
|
set by the entry strip, so it may grow sideways but never downwards. */}
|
||||||
|
<div className="flex items-start gap-2 p-2 min-h-0">
|
||||||
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
||||||
sibling of the <svg> landed beside it. */}
|
sibling of the <svg> landed beside it. */}
|
||||||
<div className="flex flex-col items-center justify-center p-2 min-h-0">
|
<div className="flex flex-col items-center justify-center min-h-0 shrink-0">
|
||||||
<svg
|
<svg
|
||||||
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
||||||
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
||||||
@@ -191,30 +281,92 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
||||||
</svg>
|
</svg>
|
||||||
|
|
||||||
{/* Short and long path to the DX, in figures.
|
{/* With the controls column present the readout goes at the FOOT OF IT
|
||||||
The bezel already carries the short path as a red marker, but a
|
instead: the dial sets the widget's height, the controls are shorter
|
||||||
marker is a direction, not a number — the same pair sits in the
|
than the dial, and that leftover space is exactly the right size for
|
||||||
status bar at 10px and operators reported not being able to read it.
|
the pair. Under the dial it would push the whole widget taller. */}
|
||||||
Here because it belongs to the compass: every place that draws one
|
{!showControls && pathReadout}
|
||||||
gets the readout, instead of each caller inventing its own.
|
</div>
|
||||||
Clickable when the caller can turn, like the status bar's. */}
|
|
||||||
<div className="flex gap-1.5 mt-2 font-mono w-full">
|
{/* Quick turns + free azimuth + Stop. */}
|
||||||
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
|
{showControls && (
|
||||||
<button key={lbl} type="button" disabled={az == null || !onGoto}
|
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
||||||
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
|
{/* Two columns so six regions fit beside the dial rather than under
|
||||||
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
|
it. An operator with fewer keeps the same compact block. */}
|
||||||
className={
|
{!!presets?.length && (
|
||||||
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors ' +
|
<div className="grid grid-cols-2 gap-1">
|
||||||
(az == null
|
{presets.map((p, i) => (
|
||||||
? 'border-border text-muted-foreground/50 cursor-not-allowed'
|
<button
|
||||||
: onGoto
|
key={`${p.label}-${i}`}
|
||||||
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
|
type="button"
|
||||||
: 'border-border text-muted-foreground cursor-default')
|
disabled={!onGoto}
|
||||||
}>
|
onClick={() => pressPreset(i, p.azimuth)}
|
||||||
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
|
title={`${p.label} — ${p.azimuth}°`}
|
||||||
|
className={cn(
|
||||||
|
'rounded-md border py-1 text-xs font-semibold truncate transition-all duration-150 active:scale-95',
|
||||||
|
flashIdx === i
|
||||||
|
// Lit, and showing the azimuth it just sent: the label alone
|
||||||
|
// would only say the press landed, not what was ordered.
|
||||||
|
? 'border-success bg-success text-success-foreground scale-95'
|
||||||
|
: 'border-border bg-muted/40',
|
||||||
|
onGoto && flashIdx !== i ? 'hover:bg-muted' : '',
|
||||||
|
!onGoto ? 'opacity-50 cursor-not-allowed' : '',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
{flashIdx === i ? `${p.azimuth}°` : p.label}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Free azimuth: Enter sends, so the whole thing is type-three-digits
|
||||||
|
-and-go without reaching for the mouse. */}
|
||||||
|
<div className="flex gap-1">
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
inputMode="numeric"
|
||||||
|
value={azText}
|
||||||
|
onChange={(e) => setAzText(e.target.value.replace(/[^0-9]/g, '').slice(0, 3))}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); sendAz(); } }}
|
||||||
|
placeholder={t('rotor.azPh')}
|
||||||
|
title={t('rotor.azTitle')}
|
||||||
|
disabled={!onGoto}
|
||||||
|
className="min-w-0 flex-1 rounded-md border border-border bg-background px-2 py-1 text-xs font-mono tabular-nums text-center disabled:opacity-50"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={sendAz}
|
||||||
|
disabled={!onGoto || azText.trim() === ''}
|
||||||
|
title={t('rotor.go')}
|
||||||
|
className="flex items-center gap-1 rounded-md border border-success/60 bg-success-muted px-2 py-1 text-xs font-bold text-success-muted-foreground transition-transform hover:bg-success/25 active:scale-95 disabled:opacity-40 disabled:cursor-not-allowed"
|
||||||
|
>
|
||||||
|
<Play className="size-3" /> {t('rotor.go')}
|
||||||
</button>
|
</button>
|
||||||
))}
|
</div>
|
||||||
|
|
||||||
|
{onStop && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={pressStop}
|
||||||
|
title={t('rotor.stop')}
|
||||||
|
className={cn(
|
||||||
|
'flex items-center justify-center gap-1.5 rounded-md border py-1 text-xs font-bold transition-all duration-150 active:scale-95',
|
||||||
|
stopFlash
|
||||||
|
// Solid, not a tint: STOP reads the same in both languages, so
|
||||||
|
// the fill is the whole acknowledgement.
|
||||||
|
? 'border-destructive bg-destructive text-destructive-foreground scale-95'
|
||||||
|
: 'border-destructive/60 bg-destructive/15 text-destructive hover:bg-destructive/25',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<Square className="size-3 fill-current" /> {t('rotor.stop')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* mt-auto: the readout sits at the FOOT of the column, level with the
|
||||||
|
bottom of the dial, instead of floating under the Stop button. */}
|
||||||
|
<div className="mt-auto">{pathReadout}</div>
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
GetCATSettings, SaveCATSettings, DiscoverFlexRadios,
|
GetCATSettings, SaveCATSettings, DiscoverFlexRadios,
|
||||||
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
||||||
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
||||||
|
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
|
||||||
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
|
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
|
||||||
GetAntGeniusSettings, SaveAntGeniusSettings,
|
GetAntGeniusSettings, SaveAntGeniusSettings,
|
||||||
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
||||||
@@ -51,9 +52,10 @@ import {
|
|||||||
GetUIPref, SetUIPref,
|
GetUIPref, SetUIPref,
|
||||||
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
|
GetFlexState, GetFlexBandAntennas, SaveFlexBandAntennas, GetFlexBandPower, SaveFlexBandPower,
|
||||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||||
|
GetFolderSync, SaveFolderSync, PickFolderSyncFolder, GetFolderSyncStatus, SyncFolderNow,
|
||||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||||
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
|
GetBandOpenSettings, SaveBandOpenSettings, GetGridScopeSettings, SaveGridScopeSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetChaseNew, SetChaseNew, GetGridCacheStatus, GetLinkedAmps, SetLinkedAmps, GetSpotTTLMinutes, SetSpotTTLMinutes,
|
||||||
} from '../../wailsjs/go/main/App';
|
} from '../../wailsjs/go/main/App';
|
||||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||||
@@ -74,12 +76,14 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { writeUiPref } from '@/lib/uiPref';
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
import { loadAutoCall, autoCallKey, type AutoCallSettings, type AutoCallCriteria } from '@/lib/autocall';
|
||||||
import { getDateFormat, setDateFormat, type DateFormat } from '@/lib/dateFormat';
|
import { getDateFormat, setDateFormat, type DateFormat } from '@/lib/dateFormat';
|
||||||
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
|
import { useI18n, FlagGB, FlagFR, type Lang } from '@/lib/i18n';
|
||||||
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
|
import { useTheme, CONCRETE_THEMES, type ThemeChoice } from '@/lib/theme';
|
||||||
import { OperatingPanel } from '@/components/OperatingPanel';
|
import { OperatingPanel } from '@/components/OperatingPanel';
|
||||||
import { AppearancePanel } from '@/components/AppearancePanel';
|
import { AppearancePanel } from '@/components/AppearancePanel';
|
||||||
import { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
import { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
||||||
|
import { loadClusterMacros, saveClusterMacros, type ClusterMacro } from '@/lib/clusterMacros';
|
||||||
|
|
||||||
type LookupSettings = LookupSettingsForm;
|
type LookupSettings = LookupSettingsForm;
|
||||||
type StationSettings = StationSettingsForm;
|
type StationSettings = StationSettingsForm;
|
||||||
@@ -164,7 +168,7 @@ interface Props {
|
|||||||
initialSection?: string;
|
initialSection?: string;
|
||||||
onClose: () => void;
|
onClose: () => void;
|
||||||
onSaved: () => void;
|
onSaved: () => void;
|
||||||
onMainPaneChanged?: (side: 'left' | 'right', value: string) => void; // live Main-view layout update
|
onMainPaneChanged?: (side: 'left' | 'right' | 'p3' | 'p4' | 'layout', value: string) => void; // live Main-view layout update
|
||||||
flexAvailable?: boolean; // CAT backend is FlexRadio → offer it as a Main pane
|
flexAvailable?: boolean; // CAT backend is FlexRadio → offer it as a Main pane
|
||||||
icomAvailable?: boolean; // CAT backend is Icom → offer the Icom console as a Main pane
|
icomAvailable?: boolean; // CAT backend is Icom → offer the Icom console as a Main pane
|
||||||
yaesuAvailable?: boolean; // CAT backend is Yaesu → offer the Yaesu console as a Main pane
|
yaesuAvailable?: boolean; // CAT backend is Yaesu → offer the Yaesu console as a Main pane
|
||||||
@@ -188,6 +192,7 @@ type SectionId =
|
|||||||
| 'external-services'
|
| 'external-services'
|
||||||
| 'udp'
|
| 'udp'
|
||||||
| 'adifmon'
|
| 'adifmon'
|
||||||
|
| 'foldersync'
|
||||||
| 'webpublish'
|
| 'webpublish'
|
||||||
| 'lookup'
|
| 'lookup'
|
||||||
| 'lists-bands'
|
| 'lists-bands'
|
||||||
@@ -199,6 +204,7 @@ type SectionId =
|
|||||||
| 'uscounties'
|
| 'uscounties'
|
||||||
| 'awards'
|
| 'awards'
|
||||||
| 'cat'
|
| 'cat'
|
||||||
|
| 'ftx'
|
||||||
| 'rotator'
|
| 'rotator'
|
||||||
| 'winkeyer'
|
| 'winkeyer'
|
||||||
| 'antenna'
|
| 'antenna'
|
||||||
@@ -242,6 +248,29 @@ function VendorMark({ vendor }: { vendor: 'o3a' }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PanelHost renders the selected settings panel, and exists so a panel may hold
|
||||||
|
// hooks of its own.
|
||||||
|
//
|
||||||
|
// The panels are nested inside SettingsModal, closing over its state — so they
|
||||||
|
// cannot be rendered as <Panel />: a nested function is a NEW component type on
|
||||||
|
// every parent render, which would unmount and remount the panel on each
|
||||||
|
// keystroke. They were therefore CALLED, `PANELS[selected]()`, and a call runs
|
||||||
|
// any hook inside them in SettingsModal's own hook list — conditionally, since
|
||||||
|
// only the open section is called. React counts those, and the window stopped
|
||||||
|
// drawing the moment such a section was opened (error #310, "rendered more
|
||||||
|
// hooks than during the previous render"). It had happened once and was headed
|
||||||
|
// off by a comment; the comment did not survive contact with the next panel.
|
||||||
|
//
|
||||||
|
// This host is module-scope, so its identity is stable and calling `render()`
|
||||||
|
// inside it puts those hooks in a component context that persists. `key` is the
|
||||||
|
// section, so switching sections REMOUNTS it — a fresh, consistent hook list per
|
||||||
|
// section, and no panel state leaking into the next one. Within a section the
|
||||||
|
// render prop is a new closure each parent render, which is how the panel keeps
|
||||||
|
// seeing current values.
|
||||||
|
function PanelHost({ render }: { render?: () => JSX.Element }) {
|
||||||
|
return render ? render() : null;
|
||||||
|
}
|
||||||
|
|
||||||
// buildTree returns the settings sidebar. The FlexRadio item only appears when
|
// buildTree returns the settings sidebar. The FlexRadio item only appears when
|
||||||
// the active CAT backend is a Flex (per-band antenna config is Flex-specific).
|
// the active CAT backend is a Flex (per-band antenna config is Flex-specific).
|
||||||
function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[] {
|
function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[] {
|
||||||
@@ -280,8 +309,10 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{ kind: 'item', label: t('sec.modes'), id: 'lists-modes' },
|
{ kind: 'item', label: t('sec.modes'), id: 'lists-modes' },
|
||||||
]},
|
]},
|
||||||
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
||||||
|
{ kind: 'item', label: t('sec.ftx'), id: 'ftx' },
|
||||||
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
||||||
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
||||||
|
{ kind: 'item', label: t('sec.foldersync'), id: 'foldersync' },
|
||||||
{ kind: 'item', label: t('sec.webpublish'), id: 'webpublish' },
|
{ kind: 'item', label: t('sec.webpublish'), id: 'webpublish' },
|
||||||
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
||||||
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
||||||
@@ -298,8 +329,9 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
||||||
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
station: 'sec.station', profiles: 'sec.profiles', operating: 'sec.operating', confirmations: 'sec.confirmations',
|
||||||
'external-services': 'sec.external', appearance: 'sec.appearance', 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',
|
cluster: 'sec.cluster', ftx: 'sec.ftx', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||||
adifmon: 'sec.adifmon',
|
adifmon: 'sec.adifmon',
|
||||||
|
foldersync: 'sec.foldersync',
|
||||||
webpublish: 'sec.webpublish',
|
webpublish: 'sec.webpublish',
|
||||||
uscounties: 'sec.uscounties',
|
uscounties: 'sec.uscounties',
|
||||||
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
||||||
@@ -682,6 +714,120 @@ function ADIFMonitorPanel() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FolderSyncPanel: one operator, several PCs, one logbook through a folder they
|
||||||
|
// already synchronise (Seafile, OneDrive, Dropbox, a NAS share).
|
||||||
|
//
|
||||||
|
// The status half is the point of the panel. Every part of this runs on someone
|
||||||
|
// else's machine and on a sync client OpsLog cannot see, so "it is not working"
|
||||||
|
// has to be answerable from here: which other PCs have written to the folder,
|
||||||
|
// when each last did, and whether anything is sitting there unread.
|
||||||
|
function FolderSyncPanel() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<{ enabled: boolean; folder: string; machine: string }>({ enabled: false, folder: '', machine: '' });
|
||||||
|
const [st, setSt] = useState<any>(null);
|
||||||
|
const [loaded, setLoaded] = useState(false);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
const [msg, setMsg] = useState('');
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
GetFolderSync()
|
||||||
|
.then((c: any) => { if (c) setCfg({ enabled: !!c.enabled, folder: c.folder ?? '', machine: c.machine ?? '' }); })
|
||||||
|
.catch(() => {})
|
||||||
|
.finally(() => setLoaded(true));
|
||||||
|
}, []);
|
||||||
|
// Polled while the panel is open: a first setup is verified by watching the
|
||||||
|
// other PC appear in this list, and that happens on the sync client's clock,
|
||||||
|
// not on any action taken here.
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = () => GetFolderSyncStatus().then((s: any) => { if (alive) setSt(s); }).catch(() => {});
|
||||||
|
tick();
|
||||||
|
const h = window.setInterval(tick, 3000);
|
||||||
|
return () => { alive = false; window.clearInterval(h); };
|
||||||
|
}, []);
|
||||||
|
const save = async (next: typeof cfg) => {
|
||||||
|
setCfg(next);
|
||||||
|
setErr(''); setMsg('');
|
||||||
|
try {
|
||||||
|
await SaveFolderSync(next as any);
|
||||||
|
setMsg(t('sync.saved'));
|
||||||
|
GetFolderSyncStatus().then(setSt).catch(() => {});
|
||||||
|
} catch (e: any) {
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
// The switch goes back off rather than sitting on while nothing is
|
||||||
|
// written: a folder that refused the write test would lose every contact
|
||||||
|
// in silence, which is the one outcome this feature must never have.
|
||||||
|
setCfg({ ...next, enabled: false });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
const pick = async () => {
|
||||||
|
try {
|
||||||
|
const p = await PickFolderSyncFolder();
|
||||||
|
if (p) save({ ...cfg, folder: p });
|
||||||
|
} catch { /* dialog cancelled */ }
|
||||||
|
};
|
||||||
|
const syncNow = async () => {
|
||||||
|
setBusy(true); setErr(''); setMsg('');
|
||||||
|
try {
|
||||||
|
const n = await SyncFolderNow();
|
||||||
|
setMsg(t('sync.applied').replace('{n}', String(n)));
|
||||||
|
GetFolderSyncStatus().then(setSt).catch(() => {});
|
||||||
|
} catch (e: any) {
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
} finally { setBusy(false); }
|
||||||
|
};
|
||||||
|
const when = (iso: string) => (iso ? new Date(iso).toLocaleString() : t('sync.never'));
|
||||||
|
return (
|
||||||
|
<div className="space-y-4 max-w-2xl">
|
||||||
|
<p className="text-xs text-muted-foreground">{t('sync.hint')}</p>
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} disabled={!loaded} onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||||
|
{t('sync.enable')}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div className="grid grid-cols-[130px_1fr] items-center gap-2">
|
||||||
|
<span className="text-sm">{t('sync.machine')}</span>
|
||||||
|
<Input value={cfg.machine} placeholder="shack" className="h-8"
|
||||||
|
onChange={(e) => setCfg({ ...cfg, machine: e.target.value })}
|
||||||
|
onBlur={() => save(cfg)} />
|
||||||
|
<span className="text-sm">{t('sync.folder')}</span>
|
||||||
|
<div className="flex items-center gap-2 min-w-0">
|
||||||
|
<span className="flex-1 font-mono text-xs truncate" title={cfg.folder}>{cfg.folder || '—'}</span>
|
||||||
|
<Button variant="outline" size="sm" onClick={pick}><FolderOpen className="size-3.5 mr-1" /> {t('sync.choose')}</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{err && <p className="text-xs text-destructive">{err}</p>}
|
||||||
|
{msg && <p className="text-xs text-success">{msg}</p>}
|
||||||
|
|
||||||
|
<SectionHeader title={t('sync.state')} />
|
||||||
|
<div className="rounded-md border border-border bg-muted/20 p-3 space-y-2 text-xs">
|
||||||
|
<div className="flex flex-wrap gap-x-6 gap-y-1 text-muted-foreground">
|
||||||
|
<span>{t('sync.thisPc')}: <span className="font-mono text-foreground">{st?.machine_id || '—'}</span></span>
|
||||||
|
<span>{t('sync.lastSync')}: <span className="text-foreground">{when(st?.last_sync ?? '')}</span></span>
|
||||||
|
<span>{t('sync.sent')}: <span className="text-foreground">{st?.sent ?? 0}</span></span>
|
||||||
|
<span>{t('sync.received')}: <span className="text-foreground">{st?.received ?? 0}</span></span>
|
||||||
|
</div>
|
||||||
|
{st?.error && <p className="text-destructive">{st.error}</p>}
|
||||||
|
<div className="space-y-1">
|
||||||
|
{(st?.peers ?? []).length === 0 && <p className="italic text-muted-foreground">{t('sync.noPeers')}</p>}
|
||||||
|
{(st?.peers ?? []).map((p: any) => (
|
||||||
|
<div key={p.machine} className="flex items-center gap-2">
|
||||||
|
<span className="font-mono truncate">{p.machine}</span>
|
||||||
|
<span className="text-muted-foreground">{when(p.last_change)}</span>
|
||||||
|
{p.behind > 0 && <span className="text-warning">{t('sync.behind')}</span>}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Button variant="outline" size="sm" onClick={syncNow} disabled={busy || !cfg.enabled}>
|
||||||
|
{busy ? <Loader2 className="size-3.5 animate-spin mr-1.5" /> : null}
|
||||||
|
{t('sync.now')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// AmpUI mirrors the backend AmpConfig — one configured amplifier.
|
// AmpUI mirrors the backend AmpConfig — one configured amplifier.
|
||||||
type AmpUI = { id: string; name: string; enabled: boolean; type: string; transport: string; host: string; port: number; com_port: string; baud: number;
|
type AmpUI = { id: string; name: string; enabled: boolean; type: string; transport: string; host: string; port: number; com_port: string; baud: number;
|
||||||
// Band-follow (ACOM): a SECOND serial port on which OpsLog answers the amp's
|
// Band-follow (ACOM): a SECOND serial port on which OpsLog answers the amp's
|
||||||
@@ -883,15 +1029,16 @@ function RelayAutoPanel() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// MainViewPanes lets the operator choose what the Main tab's left and right
|
// MainViewPanes lets the operator choose what the Main tab shows, in up to four
|
||||||
// panes show, independently: the great-circle map, the locator street map, the
|
// panes. The first two are the view; the third and fourth can be left empty, and
|
||||||
// cluster grid or the worked-before grid. Per-profile (stored via SetUIPref,
|
// an empty one is not drawn at all. Per-profile (stored via SetUIPref, which is
|
||||||
// which is profile-prefixed). Self-contained so it owns its async-loaded state.
|
// profile-prefixed). Self-contained so it owns its async-loaded state.
|
||||||
const MAIN_PANE_VALUES = ['map1', 'map2', 'cluster', 'worked', 'recent', 'netcontrol'];
|
const MAIN_PANE_VALUES = ['map1', 'map2', 'cluster', 'worked', 'recent', 'netcontrol', 'decodes'];
|
||||||
function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable }: { onChanged?: (side: 'left' | 'right', value: string) => void; flexAvailable?: boolean; icomAvailable?: boolean; yaesuAvailable?: boolean }) {
|
const PANE_NONE = 'none';
|
||||||
|
function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable }: { onChanged?: (side: 'left' | 'right' | 'p3' | 'p4' | 'layout', value: string) => void; flexAvailable?: boolean; icomAvailable?: boolean; yaesuAvailable?: boolean }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [left, setLeft] = useState('map1');
|
const [panes, setPanes] = useState<Record<string, string>>({ left: 'map1', right: 'map2', p3: PANE_NONE, p4: PANE_NONE });
|
||||||
const [right, setRight] = useState('map2');
|
const [layout, setLayout] = useState('quad');
|
||||||
// Radio-control panes are only offered when that CAT backend is active. Sorted A→Z.
|
// Radio-control panes are only offered when that CAT backend is active. Sorted A→Z.
|
||||||
const options = [
|
const options = [
|
||||||
...MAIN_PANE_VALUES,
|
...MAIN_PANE_VALUES,
|
||||||
@@ -900,42 +1047,77 @@ function MainViewPanes({ onChanged, flexAvailable, icomAvailable, yaesuAvailable
|
|||||||
...(yaesuAvailable ? ['yaesu'] : []),
|
...(yaesuAvailable ? ['yaesu'] : []),
|
||||||
].map((value) => ({ value, label: t(`settings.pane.${value}`) }))
|
].map((value) => ({ value, label: t(`settings.pane.${value}`) }))
|
||||||
.sort((a, b) => a.label.localeCompare(b.label));
|
.sort((a, b) => a.label.localeCompare(b.label));
|
||||||
|
const KEYS: Record<string, string> = { left: 'mainPaneLeft', right: 'mainPaneRight', p3: 'mainPane3', p4: 'mainPane4' };
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const valid = (v: string) => v === 'flex' || v === 'icom' || v === 'yaesu' || MAIN_PANE_VALUES.includes(v);
|
const valid = (v: string) => v === 'flex' || v === 'icom' || v === 'yaesu' || MAIN_PANE_VALUES.includes(v);
|
||||||
Promise.all([GetUIPref('mainPaneLeft').catch(() => ''), GetUIPref('mainPaneRight').catch(() => '')])
|
Promise.all([
|
||||||
.then(([l, r]) => { if (valid(l)) setLeft(l); if (valid(r)) setRight(r); });
|
...Object.values(KEYS).map((k) => GetUIPref(k).catch(() => '')),
|
||||||
|
GetUIPref('mainPaneLayout').catch(() => ''),
|
||||||
|
]).then(([l, r, p3, p4, lay]) => {
|
||||||
|
setPanes({
|
||||||
|
left: valid(l) ? l : 'map1',
|
||||||
|
right: valid(r) ? r : 'map2',
|
||||||
|
p3: valid(p3) ? p3 : PANE_NONE,
|
||||||
|
p4: valid(p4) ? p4 : PANE_NONE,
|
||||||
|
});
|
||||||
|
if (lay === 'cols' || lay === 'quad') setLayout(lay);
|
||||||
|
});
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, []);
|
}, []);
|
||||||
const pick = (side: 'left' | 'right', v: string) => {
|
const pick = (side: string, v: string) => {
|
||||||
if (side === 'left') setLeft(v); else setRight(v);
|
setPanes((p) => ({ ...p, [side]: v }));
|
||||||
// Persist (per-profile) AND tell the parent the new value directly, so the
|
// Persist (per-profile) AND tell the parent the new value directly, so the
|
||||||
// Main view updates from the chosen value — never a stale DB re-read.
|
// Main view updates from the chosen value — never a stale DB re-read.
|
||||||
SetUIPref(side === 'left' ? 'mainPaneLeft' : 'mainPaneRight', v).catch(() => {});
|
SetUIPref(KEYS[side], v).catch(() => {});
|
||||||
onChanged?.(side, v);
|
onChanged?.(side as any, v);
|
||||||
};
|
};
|
||||||
|
const pickLayout = (v: string) => {
|
||||||
|
setLayout(v);
|
||||||
|
SetUIPref('mainPaneLayout', v).catch(() => {});
|
||||||
|
onChanged?.('layout', v);
|
||||||
|
};
|
||||||
|
const filled = ['left', 'right', 'p3', 'p4'].filter((k) => panes[k] !== PANE_NONE).length;
|
||||||
|
const SIDES = [
|
||||||
|
{ key: 'left', label: t('settings.leftPane'), canBeEmpty: false },
|
||||||
|
{ key: 'right', label: t('settings.rightPane'), canBeEmpty: false },
|
||||||
|
{ key: 'p3', label: t('settings.thirdPane'), canBeEmpty: true },
|
||||||
|
{ key: 'p4', label: t('settings.fourthPane'), canBeEmpty: true },
|
||||||
|
];
|
||||||
return (
|
return (
|
||||||
<div className="border-t border-border/60 pt-4 space-y-2">
|
<div className="border-t border-border/60 pt-4 space-y-2">
|
||||||
<h4 className="text-sm font-semibold text-foreground">{t('settings.mainView')}</h4>
|
<h4 className="text-sm font-semibold text-foreground">{t('settings.mainView')}</h4>
|
||||||
<p className="text-xs text-muted-foreground">{t('settings.mainViewHint')}</p>
|
<p className="text-xs text-muted-foreground">{t('settings.mainViewHint')}</p>
|
||||||
<div className="grid grid-cols-2 gap-3 max-w-xl">
|
<div className="grid grid-cols-2 gap-3 max-w-xl">
|
||||||
<label className="flex flex-col gap-1 text-xs">
|
{SIDES.map((sd) => (
|
||||||
<span className="text-muted-foreground">{t('settings.leftPane')}</span>
|
<label key={sd.key} className="flex flex-col gap-1 text-xs">
|
||||||
<Select value={left} onValueChange={(v) => pick('left', v)}>
|
<span className="text-muted-foreground">{sd.label}</span>
|
||||||
<SelectTrigger className="h-8 text-xs"><SelectValue /></SelectTrigger>
|
<Select value={panes[sd.key]} onValueChange={(v) => pick(sd.key, v)}>
|
||||||
<SelectContent>
|
<SelectTrigger className="h-8 text-xs"><SelectValue /></SelectTrigger>
|
||||||
{options.map((o) => <SelectItem key={o.value} value={o.value}>{o.label}</SelectItem>)}
|
<SelectContent>
|
||||||
</SelectContent>
|
{/* Only the third and fourth may be empty: the first two ARE the
|
||||||
</Select>
|
Main view, and a tab with nothing in it is not a layout. */}
|
||||||
</label>
|
{sd.canBeEmpty && <SelectItem value={PANE_NONE}>{t('settings.paneNone')}</SelectItem>}
|
||||||
<label className="flex flex-col gap-1 text-xs">
|
{options.map((o) => <SelectItem key={o.value} value={o.value}>{o.label}</SelectItem>)}
|
||||||
<span className="text-muted-foreground">{t('settings.rightPane')}</span>
|
</SelectContent>
|
||||||
<Select value={right} onValueChange={(v) => pick('right', v)}>
|
</Select>
|
||||||
<SelectTrigger className="h-8 text-xs"><SelectValue /></SelectTrigger>
|
</label>
|
||||||
<SelectContent>
|
))}
|
||||||
{options.map((o) => <SelectItem key={o.value} value={o.value}>{o.label}</SelectItem>)}
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</label>
|
|
||||||
</div>
|
</div>
|
||||||
|
{/* Only asked when it can matter. Three panes are columns and nothing
|
||||||
|
else; four are the only case with two honest answers. */}
|
||||||
|
{filled === 4 && (
|
||||||
|
<div className="flex items-center gap-2 pt-1">
|
||||||
|
<span className="text-xs text-muted-foreground">{t('settings.paneLayout')}</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||||
|
{[{ v: 'quad', l: t('settings.paneQuad') }, { v: 'cols', l: t('settings.paneCols') }].map((o) => (
|
||||||
|
<button key={o.v} type="button" onClick={() => pickLayout(o.v)}
|
||||||
|
className={cn('px-2.5 py-1', layout === o.v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{o.l}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1258,16 +1440,25 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [bandDraft, setBandDraft] = useState('');
|
const [bandDraft, setBandDraft] = useState('');
|
||||||
const [modeDraft, setModeDraft] = useState('');
|
const [modeDraft, setModeDraft] = useState('');
|
||||||
const [catCfg, setCatCfg] = useState<CATSettings>({
|
const [catCfg, setCatCfg] = useState<CATSettings>({
|
||||||
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120,
|
enabled: false, backend: 'omnirig', omnirig_rig: 1, omnirig_vfo: '', flex_host: '', flex_port: 4992, flex_spots: false, flex_decode_spots: false, flex_decode_secs: 120, flex_dvk_dax: false,
|
||||||
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
yaesu_port: '', yaesu_baud: 38400, yaesu_low_lines: false, kenwood_low_lines: false, kenwood_port: '', kenwood_baud: 9600, kenwood_host: '', kenwood_data_mode: 'usb', xiegu_port: '', xiegu_baud: 19200, xiegu_addr: 0x70, xiegu_ptt_line: '',
|
||||||
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
icom_port: '', icom_baud: 115200, icom_addr: 0x98, icom_net_host: '', icom_net_user: '', icom_net_pass: '', icom_net_audio: false,
|
||||||
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0,
|
tci_host: '', tci_port: 40001, tci_spots: false, poll_ms: 250, delay_ms: 0, offset_on: false, offset_hz: 0,
|
||||||
digital_default: 'FT8', share_enabled: false, share_port: 4532,
|
digital_default: 'FT8', share_enabled: false, share_port: 4532, share_proto: 'rigctl', share_tci_port: 40001,
|
||||||
ptt_hotkey_enabled: false, ptt_hotkey: '', ptt_hotkey_toggle: false,
|
ptt_hotkey_enabled: false, ptt_hotkey: '', ptt_hotkey_toggle: false,
|
||||||
});
|
});
|
||||||
// While true, the next key press is captured as the PTT hotkey.
|
// While true, the next key press is captured as the PTT hotkey.
|
||||||
const [capturingPtt, setCapturingPtt] = useState(false);
|
const [capturingPtt, setCapturingPtt] = useState(false);
|
||||||
const [rotors, setRotors] = useState<RotatorDevice[]>([]);
|
const [rotors, setRotors] = useState<RotatorDevice[]>([]);
|
||||||
|
const [rotorPresets, setRotorPresets] = useState<{ label: string; azimuth: number }[]>([]);
|
||||||
|
// Whether the presets have actually been READ back yet.
|
||||||
|
//
|
||||||
|
// An empty list is a legitimate answer — an operator may want no quick-turn
|
||||||
|
// buttons at all — so the backend stores it as one. That makes "not loaded
|
||||||
|
// yet" and "deliberately none" the same value, and a Save landing in the first
|
||||||
|
// state wiped the buttons for good. Saving is gated on having read them, so
|
||||||
|
// the only empty list that can ever reach the store is one the operator made.
|
||||||
|
const [rotorPresetsLoaded, setRotorPresetsLoaded] = useState(false);
|
||||||
const [rotatorTesting, setRotatorTesting] = useState(false);
|
const [rotatorTesting, setRotatorTesting] = useState(false);
|
||||||
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [rotatorTest, setRotatorTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
|
|
||||||
@@ -1368,10 +1559,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [autofocusWB, setAutofocusWB] = useState(() => localStorage.getItem('opslog.autofocusWB') !== '0');
|
const [autofocusWB, setAutofocusWB] = useState(() => localStorage.getItem('opslog.autofocusWB') !== '0');
|
||||||
const [checkUpdates, setCheckUpdates] = useState(() => localStorage.getItem('opslog.checkUpdates') !== '0');
|
const [checkUpdates, setCheckUpdates] = useState(() => localStorage.getItem('opslog.checkUpdates') !== '0');
|
||||||
const [showBeamMap, setShowBeamMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
|
const [showBeamMap, setShowBeamMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
|
||||||
|
// Compact rotor widget: the dial and the SP/LP readout only. Off by default —
|
||||||
|
// the full widget is what the operator has today, and a setting that changes
|
||||||
|
// a panel the moment you upgrade is a setting that gets blamed for it.
|
||||||
|
const [rotorCompact, setRotorCompact] = useState(() => localStorage.getItem('opslog.rotorCompact') === '1');
|
||||||
const [startEqEnd, setStartEqEnd] = useState(() => localStorage.getItem('opslog.startEqualsEnd') === '1');
|
const [startEqEnd, setStartEqEnd] = useState(() => localStorage.getItem('opslog.startEqualsEnd') === '1');
|
||||||
const [lookupOnBlur, setLookupOnBlur] = useState(() => localStorage.getItem('opslog.lookupOnBlur') === '1');
|
const [lookupOnBlur, setLookupOnBlur] = useState(() => localStorage.getItem('opslog.lookupOnBlur') === '1');
|
||||||
const [groupDigital, setGroupDigital] = useState(() => localStorage.getItem('opslog.groupDigitalSlots') === '1');
|
const [groupDigital, setGroupDigital] = useState(() => localStorage.getItem('opslog.groupDigitalSlots') === '1');
|
||||||
const [clusterWorkedSameSlot, setClusterWorkedSameSlot] = useState(() => localStorage.getItem('opslog.clusterWorkedSameSlot') === '1');
|
const [clusterWorkedSameSlot, setClusterWorkedSameSlot] = useState(() => localStorage.getItem('opslog.clusterWorkedSameSlot') === '1');
|
||||||
|
// Declared HERE and not in ClusterPanel: that renderer is called as a plain
|
||||||
|
// function by the PANELS map, so it must stay hooks-free.
|
||||||
|
const [clusterMacros, setClusterMacros] = useState<ClusterMacro[]>(loadClusterMacros);
|
||||||
const [showQsoRate, setShowQsoRate] = useState(() => localStorage.getItem('opslog.showQsoRate') === '1');
|
const [showQsoRate, setShowQsoRate] = useState(() => localStorage.getItem('opslog.showQsoRate') === '1');
|
||||||
const [catModeBeforeFreq, setCatModeBeforeFreq] = useState(() => localStorage.getItem('opslog.catModeBeforeFreq') === '1');
|
const [catModeBeforeFreq, setCatModeBeforeFreq] = useState(() => localStorage.getItem('opslog.catModeBeforeFreq') === '1');
|
||||||
// Password-encryption (secret vault) state.
|
// Password-encryption (secret vault) state.
|
||||||
@@ -1534,8 +1732,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const [eqslTest, setEqslTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
const [eqslTest, setEqslTest] = useState<{ ok: boolean; msg: string } | null>(null);
|
||||||
const [eqslTesting, setEqslTesting] = useState(false);
|
const [eqslTesting, setEqslTesting] = useState(false);
|
||||||
const [stationLocations, setStationLocations] = useState<string[]>([]);
|
const [stationLocations, setStationLocations] = useState<string[]>([]);
|
||||||
// Active tab in the External Services panel — lifted here because
|
// Active tab in the External Services panel. Lifted here back when a panel
|
||||||
// PANELS[selected]() is called as a function, so panels can't hold hooks.
|
// could not hold hooks at all; PanelHost lifted that restriction, and this
|
||||||
|
// stays put because moving it down would reset the tab on every reopen —
|
||||||
|
// a choice now, not a workaround.
|
||||||
const [extSvcTab, setExtSvcTab] = useState<'qrz' | 'clublog' | 'hrdlog' | 'eqsl' | 'lotw' | 'cloudlog' | 'pota'>('qrz');
|
const [extSvcTab, setExtSvcTab] = useState<'qrz' | 'clublog' | 'hrdlog' | 'eqsl' | 'lotw' | 'cloudlog' | 'pota'>('qrz');
|
||||||
// POTA hunter-log sync (stamps pota_ref on local QSOs from your pota.app log).
|
// POTA hunter-log sync (stamps pota_ref on local QSOs from your pota.app log).
|
||||||
const [potaToken, setPotaToken] = useState('');
|
const [potaToken, setPotaToken] = useState('');
|
||||||
@@ -1571,6 +1771,14 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// has side effects there — adding the RBN nodes, bringing the PSK Reporter
|
// 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.
|
// feed up or down — so the write has to go where those live.
|
||||||
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
|
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
|
||||||
|
// How a worked square is matched, and what counts as still wanted.
|
||||||
|
const [autoCall, setAutoCall] = useState<AutoCallSettings>(loadAutoCall);
|
||||||
|
const [gridScope, setGridScope] = useState<any>({ scope: 'mix_digi', hunt: 'new', scopes: [] });
|
||||||
|
useEffect(() => { GetGridScopeSettings().then((g) => setGridScope(g as any)).catch(() => {}); }, []);
|
||||||
|
const saveGridScope = async (next: any) => {
|
||||||
|
setGridScope(next);
|
||||||
|
try { await SaveGridScopeSettings(next); } catch { /* the panel keeps the choice either way */ }
|
||||||
|
};
|
||||||
const [chaseGrids, setChaseGrids] = useState(false);
|
const [chaseGrids, setChaseGrids] = useState(false);
|
||||||
const [chaseNew, setChaseNew] = useState(false);
|
const [chaseNew, setChaseNew] = useState(false);
|
||||||
const [spotTTL, setSpotTTL] = useState(0);
|
const [spotTTL, setSpotTTL] = useState(0);
|
||||||
@@ -1632,9 +1840,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
return () => { unsub?.(); };
|
return () => { unsub?.(); };
|
||||||
}, []);
|
}, []);
|
||||||
const [profiles, setProfiles] = useState<Profile[]>([]);
|
const [profiles, setProfiles] = useState<Profile[]>([]);
|
||||||
// State for ProfilesPanel — lifted here because PANELS[selected]() calls
|
// State for ProfilesPanel. Lifted here back when a panel could not hold hooks
|
||||||
// the panel as a plain function, not as a JSX element, so any useState
|
// — PanelHost lifted that restriction — and left here because the selection
|
||||||
// inside the panel function would violate the Rules of Hooks.
|
// then survives switching sections, which is what an operator expects of it.
|
||||||
const [profileSelectedId, setProfileSelectedId] = useState<number>(0);
|
const [profileSelectedId, setProfileSelectedId] = useState<number>(0);
|
||||||
const [profileNameDraft, setProfileNameDraft] = useState<string>('');
|
const [profileNameDraft, setProfileNameDraft] = useState<string>('');
|
||||||
|
|
||||||
@@ -1682,6 +1890,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
await reloadClusterServers();
|
await reloadClusterServers();
|
||||||
setCatCfg(c);
|
setCatCfg(c);
|
||||||
setRotors((r ?? []) as any);
|
setRotors((r ?? []) as any);
|
||||||
|
// Loaded HERE, in the loader that runs on mount — not only in the
|
||||||
|
// event-driven one below. Missing from this one, the state stayed empty
|
||||||
|
// on a normal open and Save then wrote an empty list over the operator's
|
||||||
|
// buttons. See rotorPresetsLoaded for the belt to this brace.
|
||||||
|
try { setRotorPresets((((await GetRotorPresets()) ?? []) as any)); setRotorPresetsLoaded(true); } catch {}
|
||||||
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
||||||
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
||||||
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
||||||
@@ -1725,6 +1938,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
try { setLookup(await GetLookupSettings() as any); } catch {}
|
try { setLookup(await GetLookupSettings() as any); } catch {}
|
||||||
try { setCatCfg(await GetCATSettings() as any); } catch {}
|
try { setCatCfg(await GetCATSettings() as any); } catch {}
|
||||||
try { setRotors(((await GetRotators()) ?? []) as any); } catch {}
|
try { setRotors(((await GetRotators()) ?? []) as any); } catch {}
|
||||||
|
try { setRotorPresets((((await GetRotorPresets()) ?? []) as any)); setRotorPresetsLoaded(true); } catch {}
|
||||||
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
try { setUltrabeam(await GetUltrabeamSettings() as any); } catch {}
|
||||||
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
try { setAntgenius(await GetAntGeniusSettings() as any); } catch {}
|
||||||
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
try { setTunergenius(await GetTunerGeniusSettings() as any); } catch {}
|
||||||
@@ -1919,6 +2133,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
await SaveLookupSettings(lookup as any);
|
await SaveLookupSettings(lookup as any);
|
||||||
await SaveCATSettings(catCfg as any);
|
await SaveCATSettings(catCfg as any);
|
||||||
await SaveRotators(rotors as any);
|
await SaveRotators(rotors as any);
|
||||||
|
// Only once they have been read back — see rotorPresetsLoaded.
|
||||||
|
if (rotorPresetsLoaded) await SaveRotorPresets(rotorPresets as any);
|
||||||
await SaveUltrabeamSettings(ultrabeam as any);
|
await SaveUltrabeamSettings(ultrabeam as any);
|
||||||
await SaveAntGeniusSettings(antgenius as any);
|
await SaveAntGeniusSettings(antgenius as any);
|
||||||
await SaveTunerGeniusSettings(tunergenius as any);
|
await SaveTunerGeniusSettings(tunergenius as any);
|
||||||
@@ -2225,6 +2441,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
}
|
}
|
||||||
|
|
||||||
function LookupPanel() {
|
function LookupPanel() {
|
||||||
|
// The cache lifetime as TYPED, so the box can be emptied and re-filled.
|
||||||
|
// Re-seeded when the settings arrive from the backend — which is after the
|
||||||
|
// first render, so it cannot simply be the initial value.
|
||||||
|
const [ttlText, setTtlText] = useState(String(lookup.cache_ttl_days));
|
||||||
|
useEffect(() => { setTtlText(String(lookup.cache_ttl_days)); }, [lookup.cache_ttl_days]);
|
||||||
// Per-row provider editor — kept inline because it's only used twice
|
// Per-row provider editor — kept inline because it's only used twice
|
||||||
// and needs closure access to the parent state.
|
// and needs closure access to the parent state.
|
||||||
const row = (
|
const row = (
|
||||||
@@ -2361,16 +2582,31 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<div className="flex gap-3 items-end">
|
<div className="flex gap-3 items-end">
|
||||||
<div className="space-y-1 w-40">
|
<div className="space-y-1 w-40">
|
||||||
<Label>{t('lk.ttl')}</Label>
|
<Label>{t('lk.ttl')}</Label>
|
||||||
|
{/* Raw text, not the stored number. Deriving the value from the
|
||||||
|
number on every keystroke made the box impossible to empty —
|
||||||
|
and "0" itself unreachable, since parseInt('0') || 30 is 30.
|
||||||
|
Zero is now a real setting, so it has to be typeable. */}
|
||||||
<Input
|
<Input
|
||||||
type="number" min={1} max={3650}
|
type="number" min={0} max={3650}
|
||||||
value={lookup.cache_ttl_days}
|
value={ttlText}
|
||||||
onChange={(e) => setLookup((s) => ({ ...s, cache_ttl_days: parseInt(e.target.value) || 30 }))}
|
onChange={(e) => {
|
||||||
|
const raw = e.target.value;
|
||||||
|
setTtlText(raw);
|
||||||
|
const n = parseInt(raw, 10);
|
||||||
|
if (Number.isFinite(n) && n >= 0) {
|
||||||
|
setLookup((s) => ({ ...s, cache_ttl_days: Math.min(n, 3650) }));
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onBlur={() => setTtlText(String(lookup.cache_ttl_days))}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<Button variant="outline" onClick={clearCache} disabled={clearing}>
|
<Button variant="outline" onClick={clearCache} disabled={clearing}>
|
||||||
{clearing ? t('lk.clearing') : t('lk.clearCache')}
|
{clearing ? t('lk.clearing') : t('lk.clearCache')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
{lookup.cache_ttl_days === 0 && (
|
||||||
|
<p className="text-[11px] text-warning mt-2">{t('lk.cacheOff')}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -2699,6 +2935,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<span className="text-xs text-muted-foreground">{t('cat.flexDecodeSecsHint')}</span>
|
<span className="text-xs text-muted-foreground">{t('cat.flexDecodeSecsHint')}</span>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
<label className="col-span-2 flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5" checked={!!catCfg.flex_dvk_dax} onCheckedChange={(c) => setCatCfg((s) => ({ ...s, flex_dvk_dax: !!c }))} />
|
||||||
|
<span>{t('cat.flexDvkDax')} <span className="text-xs text-muted-foreground">{t('cat.flexDvkDaxHint')}</span></span>
|
||||||
|
</label>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{catCfg.backend === 'xiegu' && (
|
{catCfg.backend === 'xiegu' && (
|
||||||
@@ -2979,6 +3219,28 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{/* Transverter offset. OUTSIDE the per-backend blocks on purpose: a
|
||||||
|
transverter hangs off the IF of whatever radio you own, and the
|
||||||
|
offset is applied in the CAT manager, above every backend. Tucked
|
||||||
|
under the OmniRig/Icom section it would have been invisible to the
|
||||||
|
Yaesu, Kenwood, Xiegu, Flex and TCI operators who need it just as
|
||||||
|
much. */}
|
||||||
|
<label className="col-span-2 flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5" checked={!!catCfg.offset_on}
|
||||||
|
onCheckedChange={(c) => setCatCfg((s) => ({ ...s, offset_on: !!c }))} />
|
||||||
|
<span>{t('cat.offsetOn')} <span className="text-xs text-muted-foreground">{t('cat.offsetHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
{catCfg.offset_on && (
|
||||||
|
<div className="col-span-2 flex items-center gap-2 pl-6">
|
||||||
|
<Label className="text-sm">{t('cat.offsetMhz')}</Label>
|
||||||
|
<Input
|
||||||
|
type="number" step="0.000001" className="w-40"
|
||||||
|
value={(catCfg.offset_hz ?? 0) / 1e6}
|
||||||
|
onChange={(e) => setCatCfg((s) => ({ ...s, offset_hz: Math.round((parseFloat(e.target.value) || 0) * 1e6) }))}
|
||||||
|
/>
|
||||||
|
<span className="text-xs text-muted-foreground">{t('cat.offsetExample')}</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<div className="space-y-1 col-span-2">
|
<div className="space-y-1 col-span-2">
|
||||||
<Label>{t('cat.digitalDefault')}</Label>
|
<Label>{t('cat.digitalDefault')}</Label>
|
||||||
<Select
|
<Select
|
||||||
@@ -3006,15 +3268,47 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</label>
|
</label>
|
||||||
<p className="text-[11px] text-muted-foreground">{t('cat.shareHint')}</p>
|
<p className="text-[11px] text-muted-foreground">{t('cat.shareHint')}</p>
|
||||||
{catCfg.share_enabled && (
|
{catCfg.share_enabled && (
|
||||||
<div className="space-y-1 max-w-[200px]">
|
<div className="flex flex-wrap items-end gap-4">
|
||||||
<Label>{t('cat.sharePort')}</Label>
|
{/* One protocol or the other. They answer the same questions about
|
||||||
<PortInput
|
the same radio, and no program speaks both — so this is a
|
||||||
value={catCfg.share_port || 4532}
|
choice, not two switches. */}
|
||||||
fallback={4532}
|
<div className="space-y-1">
|
||||||
onChange={(n) => setCatCfg((s) => ({ ...s, share_port: n }))}
|
<Label>{t('cat.shareProto')}</Label>
|
||||||
/>
|
<Select
|
||||||
|
value={(catCfg as any).share_proto === 'tci' ? 'tci' : 'rigctl'}
|
||||||
|
onValueChange={(v) => setCatCfg((s) => ({ ...s, share_proto: v } as any))}
|
||||||
|
>
|
||||||
|
<SelectTrigger className="h-8 w-[240px]"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="rigctl">{t('cat.shareRigctl')}</SelectItem>
|
||||||
|
<SelectItem value="tci">{t('cat.shareTci')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1 max-w-[200px]">
|
||||||
|
<Label>{t('cat.sharePort')}</Label>
|
||||||
|
{(catCfg as any).share_proto === 'tci' ? (
|
||||||
|
<PortInput
|
||||||
|
value={(catCfg as any).share_tci_port || 40001}
|
||||||
|
fallback={40001}
|
||||||
|
onChange={(n) => setCatCfg((s) => ({ ...s, share_tci_port: n } as any))}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<PortInput
|
||||||
|
value={catCfg.share_port || 4532}
|
||||||
|
fallback={4532}
|
||||||
|
onChange={(n) => setCatCfg((s) => ({ ...s, share_port: n }))}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{catCfg.share_enabled && (catCfg as any).share_proto === 'tci' && catCfg.backend === 'tci' && (
|
||||||
|
// Both ends TCI: ExpertSDR is almost certainly already holding
|
||||||
|
// 40001 on this machine, and our server would fail to bind. Worth
|
||||||
|
// saying here rather than leaving it in the log.
|
||||||
|
<p className="text-[11px] text-warning">{t('cat.shareTciClash')}</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
{/* PTT hotkey — a keyboard key that keys the rig while OpsLog is focused.
|
{/* PTT hotkey — a keyboard key that keys the rig while OpsLog is focused.
|
||||||
Uses the Audio → PTT method (CAT / RTS / DTR), falling back to CAT. */}
|
Uses the Audio → PTT method (CAT / RTS / DTR), falling back to CAT. */}
|
||||||
@@ -3406,13 +3700,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// register — the output on/off. The voltage and current SET points are shown
|
// register — the output on/off. The voltage and current SET points are shown
|
||||||
// because they are worth seeing, and are not editable here: they belong to the
|
// because they are worth seeing, and are not editable here: they belong to the
|
||||||
// supply's front panel, and a logbook that can set them can set them wrong.
|
// supply's front panel, and a logbook that can set them can set them wrong.
|
||||||
// NO HOOKS IN HERE. This panel is called as a plain function, like its
|
// The COM ports come from the list SettingsModal already loads for the
|
||||||
// neighbours — PANELS[x]() — so a useState of its own lands in SettingsModal's
|
// Winkeyer panel — one machine, one set of serial ports, fetched once. A hook
|
||||||
// hook list and only while this section is open. React counts those, and it
|
// of its own would be legal now (see PanelHost) and would fetch them twice.
|
||||||
// stopped drawing the moment the section was clicked (error #310, "rendered
|
|
||||||
// more hooks than during the previous render"). The COM ports come from the
|
|
||||||
// list SettingsModal already loads for the Winkeyer panel: one machine, one
|
|
||||||
// set of serial ports, loaded once.
|
|
||||||
function PSUPanelSettings() {
|
function PSUPanelSettings() {
|
||||||
const ports = wkPorts;
|
const ports = wkPorts;
|
||||||
const setPorts = setWkPorts;
|
const setPorts = setWkPorts;
|
||||||
@@ -3944,6 +4234,56 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* How much of the rotor widget to draw. Compact keeps the dial and the
|
||||||
|
SP/LP azimuths and drops the controls — for an operator who turns
|
||||||
|
the antenna from the bearing pill or from PstRotator and wants the
|
||||||
|
dial to take a column, not a panel. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<div className="text-sm font-semibold">{t('rot.widget')}</div>
|
||||||
|
<label className="flex items-center gap-2 text-sm">
|
||||||
|
<Checkbox checked={rotorCompact}
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setRotorCompact(v); writeUiPref('opslog.rotorCompact', v ? '1' : '0'); }} />
|
||||||
|
{t('rot.compact')}
|
||||||
|
</label>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('rot.compactHint')}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Quick-turn buttons for the rotor widget. Their azimuths start out
|
||||||
|
computed from the station square, so they are right for THIS QTH
|
||||||
|
rather than copied from someone else's. Hidden in compact mode —
|
||||||
|
editing buttons that are not drawn is a trap. */}
|
||||||
|
<div className={cn('border-t border-border/60 pt-3 space-y-2', rotorCompact && 'opacity-40')}>
|
||||||
|
<div className="text-sm font-semibold">{t('rot.presets')}</div>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('rot.presetsHint')}</p>
|
||||||
|
<div className="space-y-1.5">
|
||||||
|
{rotorPresets.map((p, i) => (
|
||||||
|
<div key={i} className="flex items-center gap-2">
|
||||||
|
<Input className="w-24" maxLength={6} value={p.label}
|
||||||
|
placeholder={t('rot.presetName')}
|
||||||
|
onChange={(e) => setRotorPresets((list) => list.map((x, j) => (j === i ? { ...x, label: e.target.value } : x)))} />
|
||||||
|
<Input className="w-24" type="number" min={0} max={359} value={p.azimuth}
|
||||||
|
onChange={(e) => setRotorPresets((list) => list.map((x, j) => (j === i ? { ...x, azimuth: Math.max(0, Math.min(359, parseInt(e.target.value, 10) || 0)) } : x)))} />
|
||||||
|
<span className="text-xs text-muted-foreground">°</span>
|
||||||
|
<Button variant="ghost" size="sm" title={t('rot.remove')}
|
||||||
|
onClick={() => setRotorPresets((list) => list.filter((_, j) => j !== i))}>
|
||||||
|
<Trash2 className="size-3.5" />
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
{rotorPresets.length < 8 && (
|
||||||
|
<Button variant="outline" size="sm" onClick={() => setRotorPresets((l) => [...l, { label: '', azimuth: 0 }])}>
|
||||||
|
<Plus className="size-3.5 mr-1" /> {t('rot.presetAdd')}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button variant="outline" size="sm"
|
||||||
|
onClick={() => { ResetRotorPresets().then((p) => setRotorPresets((p ?? []) as any)).catch((e) => setErr(String(e?.message ?? e))); }}>
|
||||||
|
{t('rot.presetsReset')}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{rotatorTest && (
|
{rotatorTest && (
|
||||||
<div className={cn(
|
<div className={cn(
|
||||||
'text-xs rounded-md p-2.5 border',
|
'text-xs rounded-md p-2.5 border',
|
||||||
@@ -4290,8 +4630,101 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
setEditingServer(next);
|
setEditingServer(next);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FTx decodes: what OpsLog does on its own with the digital stream.
|
||||||
|
//
|
||||||
|
// Auto-call KEYS THE TRANSMITTER without anyone clicking, so the panel is
|
||||||
|
// deliberately explicit about it: off by default, every criterion opt-in, and
|
||||||
|
// a plain statement of what the machine will do once it is on.
|
||||||
|
function FtxPanel() {
|
||||||
|
const set = (patch: Partial<AutoCallSettings>) => {
|
||||||
|
const next = { ...autoCall, ...patch };
|
||||||
|
setAutoCall(next);
|
||||||
|
writeUiPref(autoCallKey, JSON.stringify(next));
|
||||||
|
};
|
||||||
|
const crit = (which: 'criteria' | 'watchCriteria', k: keyof AutoCallCriteria) => (
|
||||||
|
<label key={k} className="flex items-center gap-1.5 text-xs cursor-pointer">
|
||||||
|
<Checkbox
|
||||||
|
checked={!!autoCall[which][k]}
|
||||||
|
onCheckedChange={(v) => set({ [which]: { ...autoCall[which], [k]: !!v } } as any)}
|
||||||
|
/>
|
||||||
|
{t(`ftx.c_${k}`)}
|
||||||
|
</label>
|
||||||
|
);
|
||||||
|
const KEYS: (keyof AutoCallCriteria)[] = ['dxcc', 'band', 'mode', 'slot', 'grid', 'county', 'pota', 'pfx'];
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SectionHeader title={t('sec.ftx')} hint={t('ftx.hint')} />
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="rounded-md border border-border p-3 space-y-3">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={autoCall.enabled} className="mt-0.5"
|
||||||
|
onCheckedChange={(v) => set({ enabled: !!v })} />
|
||||||
|
<span>
|
||||||
|
{t('ftx.enable')}{' '}
|
||||||
|
<span className="text-xs text-muted-foreground">{t('ftx.enableHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{autoCall.enabled && (
|
||||||
|
<div className="pl-6 space-y-3">
|
||||||
|
<div>
|
||||||
|
<p className="text-xs font-semibold text-muted-foreground mb-1.5">{t('ftx.callWhen')}</p>
|
||||||
|
<div className="grid grid-cols-2 gap-x-4 gap-y-1">{KEYS.map((k) => crit('criteria', k))}</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t border-border/60 pt-3">
|
||||||
|
<p className="text-xs font-semibold text-muted-foreground mb-1">{t('ftx.watch')}</p>
|
||||||
|
<p className="text-[11px] text-muted-foreground mb-1.5 leading-relaxed">{t('ftx.watchHint')}</p>
|
||||||
|
<Textarea
|
||||||
|
className="h-20 font-mono text-xs"
|
||||||
|
placeholder={"4S7*\nTM0HQ\n*/P"}
|
||||||
|
defaultValue={(autoCall.watch ?? []).join('\n')}
|
||||||
|
key={`w-${(autoCall.watch ?? []).length}`}
|
||||||
|
onBlur={(e) => set({
|
||||||
|
watch: e.target.value.split('\n').map((x) => x.trim().toUpperCase()).filter(Boolean),
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
{(autoCall.watch ?? []).length > 0 && (
|
||||||
|
<div className="mt-2">
|
||||||
|
<p className="text-[11px] text-muted-foreground mb-1">{t('ftx.watchOnlyIf')}</p>
|
||||||
|
<div className="grid grid-cols-2 gap-x-4 gap-y-1">{KEYS.map((k) => crit('watchCriteria', k))}</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t border-border/60 pt-3 flex items-center gap-2 flex-wrap">
|
||||||
|
<span className="text-xs text-muted-foreground">{t('ftx.cooldown')}</span>
|
||||||
|
<Input type="number" min={10} max={3600} className="w-24 h-7 text-xs"
|
||||||
|
defaultValue={autoCall.cooldownSec}
|
||||||
|
key={`cd-${autoCall.cooldownSec}`}
|
||||||
|
onBlur={(e) => {
|
||||||
|
const v = parseInt(e.target.value, 10);
|
||||||
|
if (!isNaN(v) && v >= 10 && v <= 3600) set({ cooldownSec: v });
|
||||||
|
}} />
|
||||||
|
<span className="text-xs text-muted-foreground">s</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className="text-[11px] rounded border border-warning-border bg-warning-muted text-warning-muted-foreground px-2 py-1.5 leading-relaxed">
|
||||||
|
{t('ftx.warn')}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ClusterPanel() {
|
function ClusterPanel() {
|
||||||
const sorted = [...clusterServers].sort((a, b) => (a.sort_order ?? 0) - (b.sort_order ?? 0));
|
const sorted = [...clusterServers].sort((a, b) => (a.sort_order ?? 0) - (b.sort_order ?? 0));
|
||||||
|
// Written on every keystroke. This panel has no Save button, and a pair of
|
||||||
|
// text boxes whose contents only take effect on some other button is how
|
||||||
|
// work gets lost.
|
||||||
|
const setMacro = (i: number, patch: Partial<ClusterMacro>) => {
|
||||||
|
const next = clusterMacros.map((m, j) => (j === i ? { ...m, ...patch } : m));
|
||||||
|
setClusterMacros(next);
|
||||||
|
saveClusterMacros(next);
|
||||||
|
};
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<SectionHeader
|
<SectionHeader
|
||||||
@@ -4384,6 +4817,35 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{t('clu.autoConnect')}
|
{t('clu.autoConnect')}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<div>
|
||||||
|
<span className="text-sm font-medium">{t('clu.macros')}</span>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('clu.macrosHint')}</p>
|
||||||
|
</div>
|
||||||
|
{/* Two columns of six: twelve rows stacked would push everything else
|
||||||
|
in this panel off the screen. */}
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-x-4 gap-y-1.5">
|
||||||
|
{clusterMacros.map((m, i) => (
|
||||||
|
<div key={i} className="flex items-center gap-1.5">
|
||||||
|
<span className="text-[10px] text-muted-foreground tabular-nums w-4 text-right shrink-0">{i + 1}</span>
|
||||||
|
<Input
|
||||||
|
className="h-8 w-28 shrink-0 text-xs"
|
||||||
|
placeholder={t('clu.macroLabel')}
|
||||||
|
value={m.label}
|
||||||
|
maxLength={24}
|
||||||
|
onChange={(e) => setMacro(i, { label: e.target.value })}
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
className="h-8 flex-1 min-w-0 font-mono text-xs"
|
||||||
|
placeholder={t('clu.macroCmd')}
|
||||||
|
value={m.cmd}
|
||||||
|
maxLength={120}
|
||||||
|
onChange={(e) => setMacro(i, { cmd: e.target.value })}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
{t('clu.freeNodes')} <span className="font-mono">dxc.k0xm.net:7300</span>,{' '}
|
{t('clu.freeNodes')} <span className="font-mono">dxc.k0xm.net:7300</span>,{' '}
|
||||||
<span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
|
<span className="font-mono">dx.maritimecontestclub.net:7300</span>,{' '}
|
||||||
@@ -4444,6 +4906,36 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{pskrStatus?.running ? ` · ${t('bo.feedUp', { n: pskrStatus.received ?? 0 })}` : ''}
|
{pskrStatus?.running ? ` · ${t('bo.feedUp', { n: pskrStatus.received ?? 0 })}` : ''}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* What counts as "I already have this square". There is no single
|
||||||
|
right answer — a VUCC chaser counts a square per band, someone
|
||||||
|
filling a wall map counts it once — so it is a choice, and the
|
||||||
|
same six GridTracker offers, because a square wanted in one and
|
||||||
|
not the other is a bug report every time. */}
|
||||||
|
<div className="pl-6 space-y-1.5 pt-1">
|
||||||
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
|
<span className="text-xs text-muted-foreground w-28 shrink-0">{t('gsc.scope')}</span>
|
||||||
|
<Select value={gridScope.scope} onValueChange={(v) => saveGridScope({ ...gridScope, scope: v })}>
|
||||||
|
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{(gridScope.scopes ?? []).map((s: any) => (
|
||||||
|
<SelectItem key={s.key} value={s.key}>{t(`gsc.scope_${s.key}`)}</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
|
<span className="text-xs text-muted-foreground w-28 shrink-0">{t('gsc.hunt')}</span>
|
||||||
|
<Select value={gridScope.hunt} onValueChange={(v) => saveGridScope({ ...gridScope, hunt: v })}>
|
||||||
|
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="new">{t('gsc.huntNew')}</SelectItem>
|
||||||
|
<SelectItem value="new_unconfirmed">{t('gsc.huntUnconf')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('gsc.hint')}</p>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Chase new — its own option, NOT nested under grid chasing. Chasing
|
{/* Chase new — its own option, NOT nested under grid chasing. Chasing
|
||||||
@@ -4484,6 +4976,28 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
{/* How near a RECEIVER has to be. This is the whole premise of
|
||||||
|
the watch — a report is evidence about YOUR path only if it
|
||||||
|
was collected near you — and the right distance differs by
|
||||||
|
band, so it is the operator's call. Committed on blur/Enter,
|
||||||
|
not per keystroke: each save restarts the feed. */}
|
||||||
|
<div className="flex items-center gap-2 flex-wrap">
|
||||||
|
<span className="text-xs text-muted-foreground">{t('bo.nearKm')}</span>
|
||||||
|
<Input
|
||||||
|
type="number" min={25} max={1000} step={25}
|
||||||
|
className="w-24 h-7 text-xs"
|
||||||
|
defaultValue={bandOpen.near_km ?? 300}
|
||||||
|
key={`nk-${bandOpen.near_km ?? 300}`}
|
||||||
|
onBlur={(e) => {
|
||||||
|
const v = parseInt(e.target.value, 10);
|
||||||
|
if (!isNaN(v) && v !== bandOpen.near_km) saveBandOpen({ ...bandOpen, near_km: v });
|
||||||
|
}}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter') (e.target as HTMLInputElement).blur(); }}
|
||||||
|
/>
|
||||||
|
<span className="text-xs text-muted-foreground">km</span>
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('bo.nearKmHint')}</p>
|
||||||
|
|
||||||
{/* A live count, because a feed that is connected but silent looks
|
{/* A live count, because a feed that is connected but silent looks
|
||||||
exactly like one that is broken until a number moves. */}
|
exactly like one that is broken until a number moves. */}
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
@@ -4720,10 +5234,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<SectionHeader
|
{/* No hint: everyone knows what a backup is. */}
|
||||||
title={t('sec.backup')}
|
<SectionHeader title={t('sec.backup')} />
|
||||||
hint={mysqlCfg.enabled ? t('bk.hintMysql') : t('bk.hint')}
|
|
||||||
/>
|
|
||||||
<div className="space-y-5 max-w-2xl">
|
<div className="space-y-5 max-w-2xl">
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
@@ -5641,7 +6153,9 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Button variant="outline" size="sm" onClick={openExisting}><Database className="size-3.5" /> {t('db.openExisting')}</Button>
|
<Button variant="outline" size="sm" onClick={openExisting}><Database className="size-3.5" /> {t('db.openExisting')}</Button>
|
||||||
<Button variant="outline" size="sm" onClick={saveCopy}><Copy className="size-3.5" /> {t('db.saveCopy')}</Button>
|
<Button variant="outline" size="sm" onClick={saveCopy}><Copy className="size-3.5" /> {t('db.saveCopy')}</Button>
|
||||||
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
|
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
|
||||||
<Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
|
{/* Pushed right: these two act on the file that is already there,
|
||||||
|
while the four on the left change WHICH file is in use. */}
|
||||||
|
<Button variant="outline" size="sm" className="ml-auto" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
|
||||||
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
|
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
|
||||||
</div>
|
</div>
|
||||||
{/* The DB pointer is only read at startup, so offer the restart inline. */}
|
{/* The DB pointer is only read at startup, so offer the restart inline. */}
|
||||||
@@ -5674,7 +6188,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-[11px] text-muted-foreground max-w-2xl mb-3">{t('db.profileHint')}</p>
|
|
||||||
|
|
||||||
{/* Compact active-backend confirmation / MySQL-fallback warning. */}
|
{/* Compact active-backend confirmation / MySQL-fallback warning. */}
|
||||||
{backendStatus && (
|
{backendStatus && (
|
||||||
@@ -5715,7 +6228,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{/* MySQL: shared logbook connection (multi-operator) */}
|
{/* MySQL: shared logbook connection (multi-operator) */}
|
||||||
{mysqlCfg.enabled && (
|
{mysqlCfg.enabled && (
|
||||||
<div className="space-y-3 max-w-2xl">
|
<div className="space-y-3 max-w-2xl">
|
||||||
<div className="text-[11px] text-muted-foreground leading-relaxed">{t('db.mysqlHint')}</div>
|
|
||||||
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||||
<Label className="text-sm">{t('db.host')}</Label>
|
<Label className="text-sm">{t('db.host')}</Label>
|
||||||
<Input className="h-8" placeholder="192.168.1.10 or db.example.com" value={mysqlCfg.host} onChange={(e) => setMysqlField({ host: e.target.value })} />
|
<Input className="h-8" placeholder="192.168.1.10 or db.example.com" value={mysqlCfg.host} onChange={(e) => setMysqlField({ host: e.target.value })} />
|
||||||
@@ -6206,12 +6718,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
}}
|
}}
|
||||||
className="mt-0.5"
|
className="mt-0.5"
|
||||||
/>
|
/>
|
||||||
<span>
|
{/* No explanatory line: every operator knows what Most Wanted is. */}
|
||||||
{t('gen.mwShow')}
|
<span>{t('gen.mwShow')}</span>
|
||||||
<span className="block text-xs text-muted-foreground mt-0.5">
|
|
||||||
{t('gen.mwDesc')}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</label>
|
</label>
|
||||||
<div className="flex items-center gap-3 pl-6">
|
<div className="flex items-center gap-3 pl-6">
|
||||||
<Button variant="outline" size="sm" className="h-8" disabled={mwBusy}
|
<Button variant="outline" size="sm" className="h-8" disabled={mwBusy}
|
||||||
@@ -6406,11 +6914,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
'lists-bands': BandsPanel,
|
'lists-bands': BandsPanel,
|
||||||
'lists-modes': ModesPanel,
|
'lists-modes': ModesPanel,
|
||||||
cluster: ClusterPanel,
|
cluster: ClusterPanel,
|
||||||
|
ftx: FtxPanel,
|
||||||
udp: UDPIntegrationsPanelWrapper,
|
udp: UDPIntegrationsPanelWrapper,
|
||||||
// Rendered as a real element (not called as a bare function) so its own hooks
|
// Module-scope components, wrapped so their props can be passed. The nested
|
||||||
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
|
// panels below go through PanelHost instead — which is what now lets either
|
||||||
// is a plain call and hook-holding panels must go through JSX like this.
|
// kind hold hooks.
|
||||||
adifmon: () => <ADIFMonitorPanel />,
|
adifmon: () => <ADIFMonitorPanel />,
|
||||||
|
foldersync: () => <FolderSyncPanel />,
|
||||||
webpublish: () => <WebPublishPanel />,
|
webpublish: () => <WebPublishPanel />,
|
||||||
relayauto: () => <RelayAutoPanel />,
|
relayauto: () => <RelayAutoPanel />,
|
||||||
backup: BackupPanel,
|
backup: BackupPanel,
|
||||||
@@ -6452,7 +6962,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-3 font-semibold">
|
<div className="text-[10px] uppercase tracking-wider text-muted-foreground mb-3 font-semibold">
|
||||||
{breadcrumb}
|
{breadcrumb}
|
||||||
</div>
|
</div>
|
||||||
{PANELS[selected]?.()}
|
<PanelHost key={selected} render={PANELS[selected]} />
|
||||||
|
|
||||||
{err && (
|
{err && (
|
||||||
<div className="mt-6 text-xs text-destructive bg-destructive/10 border border-destructive/30 rounded-md px-3 py-2 max-w-2xl">
|
<div className="mt-6 text-xs text-destructive bg-destructive/10 border border-destructive/30 rounded-md px-3 py-2 max-w-2xl">
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { Plus, Pencil, Trash2, Power, PlugZap, Loader2, Check, X, Compass, Squar
|
|||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
@@ -82,7 +83,7 @@ type Device = {
|
|||||||
id: string; type: string; name: string; host: string;
|
id: string; type: string; name: string; host: string;
|
||||||
user?: string; pass?: string; channels?: number; labels: string[];
|
user?: string; pass?: string; channels?: number; labels: string[];
|
||||||
// Generic HTTP board only. The per-relay URLs win over the patterns.
|
// Generic HTTP board only. The per-relay URLs win over the patterns.
|
||||||
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string;
|
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string; insecure_tls?: boolean;
|
||||||
};
|
};
|
||||||
type Relay = { number: number; label: string; on: boolean };
|
type Relay = { number: number; label: string; on: boolean };
|
||||||
type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
|
type DevStatus = { id: string; name: string; type: string; connected: boolean; error?: string; relays: Relay[] };
|
||||||
@@ -787,6 +788,12 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
|
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
|
||||||
.some((s) => (s ?? '').includes('{value}'))
|
.some((s) => (s ?? '').includes('{value}'))
|
||||||
&& device.labels.some((l) => !l.trim());
|
&& device.labels.some((l) => !l.trim());
|
||||||
|
// Any https:// among this board's URLs. A relay box on the LAN signs its own
|
||||||
|
// certificate, so HTTPS to one cannot be verified — the operator has to say
|
||||||
|
// whether to accept that, and the question only arises once they type https.
|
||||||
|
const usesHTTPS = isHTTPGen
|
||||||
|
&& [...(device.on_urls ?? []), ...(device.off_urls ?? []), device.on_pattern ?? '', device.off_pattern ?? '']
|
||||||
|
.some((u) => (u ?? '').trim().toLowerCase().startsWith('https://'));
|
||||||
// COM ports for the generic USB-serial relay picker.
|
// COM ports for the generic USB-serial relay picker.
|
||||||
const [serialPorts, setSerialPorts] = useState<string[]>([]);
|
const [serialPorts, setSerialPorts] = useState<string[]>([]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -959,6 +966,19 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
|
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
|
||||||
|
{/* Shown only once an https:// URL is actually in use. A board on
|
||||||
|
plain HTTP has no certificate to argue about, and an option that
|
||||||
|
cannot matter yet is one more thing to wonder about. */}
|
||||||
|
{usesHTTPS && (
|
||||||
|
<label className="flex items-start gap-2 text-xs cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5" checked={!!device.insecure_tls}
|
||||||
|
onCheckedChange={(c) => onChange({ ...device, insecure_tls: !!c })} />
|
||||||
|
<span>
|
||||||
|
{t('station.insecureTls')}
|
||||||
|
<span className="block text-[10px] text-muted-foreground">{t('station.insecureTlsHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('station.perRelayUrls')}</Label>
|
<Label>{t('station.perRelayUrls')}</Label>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ type UDPConfig = {
|
|||||||
direction: 'inbound' | 'outbound';
|
direction: 'inbound' | 'outbound';
|
||||||
name: string;
|
name: string;
|
||||||
port: number;
|
port: number;
|
||||||
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'custom';
|
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'wsjt_relay' | 'custom';
|
||||||
// Custom rows only.
|
// Custom rows only.
|
||||||
trigger?: string;
|
trigger?: string;
|
||||||
template?: string;
|
template?: string;
|
||||||
@@ -95,6 +95,19 @@ const SERVICE_TYPES: Array<{
|
|||||||
hint: 'udpp.svcWsjtLogHint',
|
hint: 'udpp.svcWsjtLogHint',
|
||||||
defaults: { port: 2250, destination_ip: '127.0.0.1' },
|
defaults: { port: 2250, destination_ip: '127.0.0.1' },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// Feeds a SECOND application the stream this OpsLog receives. WSJT-X, JTDX
|
||||||
|
// and MSHV each send to ONE address, so without a relay the choice is
|
||||||
|
// between OpsLog and JTAlert/GridTracker rather than both.
|
||||||
|
//
|
||||||
|
// 2238 by default: beside the 2237 the sender uses, and free. Pointing it AT
|
||||||
|
// 2237 would name an OpsLog listener, which the relay refuses.
|
||||||
|
id: 'wsjt_relay',
|
||||||
|
direction: 'outbound',
|
||||||
|
label: 'udpp.svcWsjtRelayLabel',
|
||||||
|
hint: 'udpp.svcWsjtRelayHint',
|
||||||
|
defaults: { port: 2238, destination_ip: '127.0.0.1' },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
// The general case: the operator picks the moment and writes the message.
|
// The general case: the operator picks the moment and writes the message.
|
||||||
// Mainly for antenna switches, which are driven by a URL and want the band
|
// Mainly for antenna switches, which are driven by a URL and want the band
|
||||||
|
|||||||
@@ -298,6 +298,20 @@ export function WorkedBeforeGrid({ wb, myGrid, busy, currentCall, onRowDoubleCli
|
|||||||
{t('wbg.pickerDesc')}
|
{t('wbg.pickerDesc')}
|
||||||
</DialogDescription>
|
</DialogDescription>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
{/* Whole-dialog controls — the award columns included, which the
|
||||||
|
catalogue-only helpers do not cover. */}
|
||||||
|
<div className="flex items-center gap-1 px-5 text-[11px] text-muted-foreground">
|
||||||
|
<span>{t('wbg.allGroups')}</span>
|
||||||
|
<button type="button" className="text-[11px] text-primary hover:underline px-1"
|
||||||
|
onClick={() => { showAll(); (awardCols ?? []).forEach((a) => setColVisible(`award_${a.code}`, true)); }}>
|
||||||
|
{t('wbg.all')}
|
||||||
|
</button>
|
||||||
|
<span className="opacity-40">·</span>
|
||||||
|
<button type="button" className="text-[11px] text-muted-foreground hover:underline px-1"
|
||||||
|
onClick={() => { hideAll(); (awardCols ?? []).forEach((a) => setColVisible(`award_${a.code}`, false)); }}>
|
||||||
|
{t('wbg.none')}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div className="grid grid-cols-2 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
<div className="grid grid-cols-2 gap-4 max-h-[60vh] overflow-y-auto px-5 py-3">
|
||||||
{GROUP_ORDER.map((group) => {
|
{GROUP_ORDER.map((group) => {
|
||||||
const cols = COL_CATALOG.filter((c) => c.group === group);
|
const cols = COL_CATALOG.filter((c) => c.group === group);
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { Separator } from '@/components/ui/separator';
|
import { Separator } from '@/components/ui/separator';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { QSO_BOX_FIELDS, QSO_FIELD_LABELS } from './qslTypes';
|
||||||
import type { CardTemplate, CardElement, QSOBox, QSLPresetInfo, StyleParams } from './qslTypes';
|
import type { CardTemplate, CardElement, QSOBox, QSLPresetInfo, StyleParams } from './qslTypes';
|
||||||
import type { CardSelection } from './CardPreview';
|
import type { CardSelection } from './CardPreview';
|
||||||
import { StylePresetPicker, NumberField } from './StylePresetPicker';
|
import { StylePresetPicker, NumberField } from './StylePresetPicker';
|
||||||
@@ -199,6 +200,26 @@ export function EditorPanel({ template, sel, presets, fontFamilies, onPatchEleme
|
|||||||
<Input className="h-7 w-44 font-mono text-xs" value={box.title ?? ''}
|
<Input className="h-7 w-44 font-mono text-xs" value={box.title ?? ''}
|
||||||
onChange={(ev) => onPatchBox({ title: ev.target.value })} />
|
onChange={(ev) => onPatchBox({ title: ev.target.value })} />
|
||||||
</div>
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs text-muted-foreground">Columns</Label>
|
||||||
|
{/* Rebuilt from the canonical order every time rather than
|
||||||
|
appended to: a box whose columns come out in the order they
|
||||||
|
were ticked reads as a bug, and the widths are tuned for this
|
||||||
|
order. */}
|
||||||
|
<div className="grid grid-cols-2 gap-x-2">
|
||||||
|
{QSO_BOX_FIELDS.map((f) => (
|
||||||
|
<label key={f} className="flex items-center gap-1.5 text-xs">
|
||||||
|
<Checkbox
|
||||||
|
checked={box.fields.includes(f)}
|
||||||
|
onCheckedChange={(v) => onPatchBox({
|
||||||
|
fields: QSO_BOX_FIELDS.filter((k) => (k === f ? v === true : box.fields.includes(k))),
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
{QSO_FIELD_LABELS[f] ?? f}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div className="flex items-center justify-between gap-2">
|
<div className="flex items-center justify-between gap-2">
|
||||||
<Label className="text-xs text-muted-foreground">Footer</Label>
|
<Label className="text-xs text-muted-foreground">Footer</Label>
|
||||||
<Input className="h-7 w-44 font-mono text-xs" value={box.footer}
|
<Input className="h-7 w-44 font-mono text-xs" value={box.footer}
|
||||||
|
|||||||
@@ -165,6 +165,12 @@ export interface QSLPresetInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Human labels for the QSO box fields the renderer knows.
|
// Human labels for the QSO box fields the renderer knows.
|
||||||
|
// QSO_BOX_FIELDS is the canonical COLUMN ORDER of the confirmation box, and
|
||||||
|
// the whole list the designer offers. The renderer's column widths are tuned
|
||||||
|
// for it, so a box is always rebuilt from this order rather than from the
|
||||||
|
// order the operator happened to tick the boxes in.
|
||||||
|
export const QSO_BOX_FIELDS = ['qso_date', 'time_on', 'band', 'freq', 'mode', 'submode', 'rst_sent'] as const;
|
||||||
|
|
||||||
export const QSO_FIELD_LABELS: Record<string, string> = {
|
export const QSO_FIELD_LABELS: Record<string, string> = {
|
||||||
qso_date: 'Date',
|
qso_date: 'Date',
|
||||||
time_on: 'UTC',
|
time_on: 'UTC',
|
||||||
|
|||||||
@@ -0,0 +1,176 @@
|
|||||||
|
// Auto-call: let OpsLog answer a decode without the operator clicking it.
|
||||||
|
//
|
||||||
|
// This KEYS THE TRANSMITTER on its own, which is why the rules here are written
|
||||||
|
// as a series of refusals rather than a search for a reason to call. Everything
|
||||||
|
// below has to be true; anything unknown means no.
|
||||||
|
//
|
||||||
|
// The decision is made here, in one pure function, precisely because it is the
|
||||||
|
// dangerous part: it can be read, argued with and tested without a radio.
|
||||||
|
|
||||||
|
export type AutoCallCriteria = {
|
||||||
|
dxcc: boolean; // entity never worked
|
||||||
|
band: boolean; // entity never worked on this band
|
||||||
|
mode: boolean; // entity never worked in this mode
|
||||||
|
slot: boolean; // band and mode each worked, never together
|
||||||
|
grid: boolean; // square wanted under the grid scope
|
||||||
|
county: boolean; // US county never worked
|
||||||
|
pota: boolean; // park never worked
|
||||||
|
sota: boolean; // summit never worked (spot-tagged only)
|
||||||
|
pfx: boolean; // CQ WPX prefix never worked
|
||||||
|
};
|
||||||
|
|
||||||
|
export type AutoCallSettings = {
|
||||||
|
enabled: boolean;
|
||||||
|
criteria: AutoCallCriteria;
|
||||||
|
// Callsigns to answer on sight, wildcards allowed (4S7*, */P). Each is still
|
||||||
|
// subject to `watchCriteria` — "call TM0HQ, but only if it is a new band" is
|
||||||
|
// the request, not "call it every time it appears".
|
||||||
|
watch: string[];
|
||||||
|
// Empty means call a watched callsign whenever it is not already worked.
|
||||||
|
watchCriteria: AutoCallCriteria;
|
||||||
|
// Seconds to ignore a callsign after calling it, so a station that keeps
|
||||||
|
// sending CQ is not re-answered every slot while the QSO is in progress.
|
||||||
|
cooldownSec: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const emptyCriteria: AutoCallCriteria = {
|
||||||
|
dxcc: false, band: false, mode: false, slot: false,
|
||||||
|
grid: false, county: false, pota: false, sota: false, pfx: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const defaultAutoCall: AutoCallSettings = {
|
||||||
|
// OFF, and it stays off until asked for. Unattended transmit is not something
|
||||||
|
// to inherit from an upgrade.
|
||||||
|
enabled: false,
|
||||||
|
criteria: { ...emptyCriteria },
|
||||||
|
watch: [],
|
||||||
|
watchCriteria: { ...emptyCriteria },
|
||||||
|
cooldownSec: 120,
|
||||||
|
};
|
||||||
|
|
||||||
|
const AC_KEY = 'opslog.autoCall';
|
||||||
|
|
||||||
|
export function loadAutoCall(): AutoCallSettings {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(AC_KEY);
|
||||||
|
if (!raw) return { ...defaultAutoCall };
|
||||||
|
const v = JSON.parse(raw);
|
||||||
|
return {
|
||||||
|
...defaultAutoCall,
|
||||||
|
...v,
|
||||||
|
criteria: { ...emptyCriteria, ...(v?.criteria ?? {}) },
|
||||||
|
watchCriteria: { ...emptyCriteria, ...(v?.watchCriteria ?? {}) },
|
||||||
|
watch: Array.isArray(v?.watch) ? v.watch : [],
|
||||||
|
};
|
||||||
|
} catch { return { ...defaultAutoCall }; }
|
||||||
|
}
|
||||||
|
|
||||||
|
export const autoCallKey = AC_KEY;
|
||||||
|
|
||||||
|
// A decode's resolved novelty, the same shape the panel already renders from.
|
||||||
|
export type DecodeStatus = {
|
||||||
|
status?: string;
|
||||||
|
worked_call?: boolean;
|
||||||
|
new_grid?: boolean;
|
||||||
|
grid_state?: string;
|
||||||
|
new_county?: boolean;
|
||||||
|
new_pota?: boolean;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
// matchesWildcard is the same rule the alert filters use: * is any run, ? is one.
|
||||||
|
export function matchesWildcard(pattern: string, call: string): boolean {
|
||||||
|
const p = pattern.trim().toUpperCase();
|
||||||
|
const c = call.trim().toUpperCase();
|
||||||
|
if (!p) return false;
|
||||||
|
const re = new RegExp('^' + p.split('').map((ch) => (
|
||||||
|
ch === '*' ? '.*' : ch === '?' ? '.' : ch.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||||
|
)).join('') + '$');
|
||||||
|
return re.test(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
// anyCriterion is false for an all-off set, which is what makes "watch this
|
||||||
|
// callsign, no conditions" expressible.
|
||||||
|
function anyCriterion(c: AutoCallCriteria): boolean {
|
||||||
|
return Object.values(c).some(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
// meets reports whether a decode satisfies at least one ticked criterion.
|
||||||
|
function meets(c: AutoCallCriteria, e: DecodeStatus): boolean {
|
||||||
|
if (c.dxcc && e.status === 'new') return true;
|
||||||
|
if (c.band && e.status === 'new-band') return true;
|
||||||
|
if (c.mode && e.status === 'new-mode') return true;
|
||||||
|
if (c.slot && e.status === 'new-slot') return true;
|
||||||
|
// A square that is merely UNCONFIRMED is not called: the QSO is already made,
|
||||||
|
// and calling again would work a duplicate to chase a QSL.
|
||||||
|
if (c.grid && e.new_grid && e.grid_state !== 'unconf') return true;
|
||||||
|
if (c.county && e.new_county) return true;
|
||||||
|
if (c.pota && e.new_pota) return true;
|
||||||
|
if (c.pfx && e.new_pfx) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type AutoCallDecode = {
|
||||||
|
call: string;
|
||||||
|
cq?: boolean;
|
||||||
|
msg?: string;
|
||||||
|
instance?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
// shouldAutoCall decides whether to answer one decode. The reason is returned
|
||||||
|
// for the log: an automatic transmission with no record of WHY is the thing an
|
||||||
|
// operator cannot argue with after the fact.
|
||||||
|
export function shouldAutoCall(
|
||||||
|
s: AutoCallSettings,
|
||||||
|
d: AutoCallDecode,
|
||||||
|
e: DecodeStatus | undefined,
|
||||||
|
opts: {
|
||||||
|
// busy is "some receiver is mid-QSO", NOT "this one is transmitting".
|
||||||
|
//
|
||||||
|
// The distinction is the whole bug it fixes: with two instances the caller
|
||||||
|
// used to test a single global transmit flag, which belonged to whichever
|
||||||
|
// receiver reported last. So while slice A worked a station, slice B looked
|
||||||
|
// idle and auto-call started another QSO on it — and the moment either
|
||||||
|
// finished it chained straight into the next. One station at a time means
|
||||||
|
// one across ALL receivers, not one per receiver.
|
||||||
|
busy: boolean;
|
||||||
|
calledAt: Map<string, number>;
|
||||||
|
now: number;
|
||||||
|
myCall?: string;
|
||||||
|
},
|
||||||
|
): { call: boolean; reason: string } {
|
||||||
|
const no = (why: string) => ({ call: false, reason: why });
|
||||||
|
if (!s.enabled) return no('off');
|
||||||
|
if (!e) return no('status not resolved yet');
|
||||||
|
const call = (d.call ?? '').trim().toUpperCase();
|
||||||
|
if (!call) return no('no callsign');
|
||||||
|
// Never answer ourselves, however the decode reached us.
|
||||||
|
if (opts.myCall && call === opts.myCall.trim().toUpperCase()) return no('own callsign');
|
||||||
|
// Only a CQ. Answering a station mid-QSO is both rude and futile — WSJT-X
|
||||||
|
// actions a Reply only for CQ and QRZ anyway.
|
||||||
|
if (!d.cq) return no('not a CQ');
|
||||||
|
// Not while ANY receiver is mid-QSO — transmitting, or holding a DX call it
|
||||||
|
// has not finished with. Starting a second exchange before the first is done
|
||||||
|
// is what turned this into a machine that called without stopping.
|
||||||
|
if (opts.busy) return no('a QSO is already in progress');
|
||||||
|
const last = opts.calledAt.get(call);
|
||||||
|
if (last !== undefined && opts.now - last < s.cooldownSec * 1000) return no('called recently');
|
||||||
|
|
||||||
|
// The watch list first: an explicitly named station outranks the general
|
||||||
|
// criteria, and may carry conditions of its own.
|
||||||
|
const watched = s.watch.some((p) => matchesWildcard(p, call));
|
||||||
|
if (watched) {
|
||||||
|
if (!anyCriterion(s.watchCriteria)) {
|
||||||
|
// No conditions attached: call it unless it is already worked.
|
||||||
|
return e.worked_call ? no('watched, but already worked') : { call: true, reason: 'watch list' };
|
||||||
|
}
|
||||||
|
return meets(s.watchCriteria, e)
|
||||||
|
? { call: true, reason: 'watch list + criteria' }
|
||||||
|
: no('watched, but no criterion met');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!anyCriterion(s.criteria)) return no('no criteria ticked');
|
||||||
|
return meets(s.criteria, e)
|
||||||
|
? { call: true, reason: 'criteria' }
|
||||||
|
: no('no criterion met');
|
||||||
|
}
|
||||||
@@ -192,3 +192,27 @@ export function spotRefList(byCode: Record<string, string>, fieldOf: Record<stri
|
|||||||
}
|
}
|
||||||
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
|
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// withIOTARef adds an island reference from the callbook to an entry's award
|
||||||
|
// references, unless the operator has already set one.
|
||||||
|
//
|
||||||
|
// QRZ sends <iota> for an operator on an island and OpsLog used to read past it.
|
||||||
|
// It matters more here than it would for another award: unlike POTA there is no
|
||||||
|
// live "who is on an island right now" feed anywhere, so the callbook record is
|
||||||
|
// the practical source — and it is known before the contact is logged, which is
|
||||||
|
// when it is useful.
|
||||||
|
//
|
||||||
|
// A reference the operator typed or picked wins. A callbook entry can be years
|
||||||
|
// old, and the operator in front of the radio has just been told where the
|
||||||
|
// station is.
|
||||||
|
export function withIOTARef(awardRefs: string, iota: string): string {
|
||||||
|
const ref = (iota || '').trim().toUpperCase();
|
||||||
|
// EU-048: two letters, a hyphen, three digits. Anything else is not an IOTA
|
||||||
|
// reference, and writing it into the award would make a reference that no
|
||||||
|
// list contains — which counts for nothing and has to be found by hand later.
|
||||||
|
if (!/^[A-Z]{2}-\d{3}$/.test(ref)) return awardRefs;
|
||||||
|
const byCode = parseAwardRefs(awardRefs);
|
||||||
|
if ((byCode['IOTA'] ?? '').trim() !== '') return awardRefs; // already set: leave it
|
||||||
|
const sep = awardRefs.trim() === '' ? '' : ';';
|
||||||
|
return awardRefs + sep + 'IOTA@' + ref;
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
// Cluster command macros — a named button for a command you would otherwise
|
||||||
|
// retype.
|
||||||
|
//
|
||||||
|
// Twelve slots, fixed. A list you can grow needs add/remove/reorder controls and
|
||||||
|
// a decision about what an empty row means; twelve boxes you fill in need
|
||||||
|
// neither, and nobody has thirteen cluster commands they use daily. A slot with
|
||||||
|
// no command is simply not drawn, so the toolbar is as long as the operator made
|
||||||
|
// it and no longer.
|
||||||
|
//
|
||||||
|
// Stored through writeUiPref like every other portable preference, so the
|
||||||
|
// buttons travel with data/ rather than living in one browser profile.
|
||||||
|
|
||||||
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
|
|
||||||
|
export type ClusterMacro = {
|
||||||
|
label: string; // what the button says
|
||||||
|
cmd: string; // what is sent to the master server
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CLUSTER_MACRO_COUNT = 12;
|
||||||
|
export const clusterMacrosKey = 'opslog.clusterMacros';
|
||||||
|
|
||||||
|
export const emptyClusterMacros = (): ClusterMacro[] =>
|
||||||
|
Array.from({ length: CLUSTER_MACRO_COUNT }, () => ({ label: '', cmd: '' }));
|
||||||
|
|
||||||
|
// loadClusterMacros always returns exactly CLUSTER_MACRO_COUNT entries, whatever
|
||||||
|
// was stored: a saved list from a build with fewer slots must not leave the
|
||||||
|
// editor rendering undefined rows.
|
||||||
|
export function loadClusterMacros(): ClusterMacro[] {
|
||||||
|
const out = emptyClusterMacros();
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(clusterMacrosKey);
|
||||||
|
if (!raw) return out;
|
||||||
|
const v = JSON.parse(raw);
|
||||||
|
if (!Array.isArray(v)) return out;
|
||||||
|
for (let i = 0; i < CLUSTER_MACRO_COUNT && i < v.length; i++) {
|
||||||
|
out[i] = {
|
||||||
|
label: String(v[i]?.label ?? '').slice(0, 24),
|
||||||
|
cmd: String(v[i]?.cmd ?? '').slice(0, 120),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch { /* a corrupt preference is not worth failing the panel over */ }
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function saveClusterMacros(macros: ClusterMacro[]): void {
|
||||||
|
writeUiPref(clusterMacrosKey, JSON.stringify(macros));
|
||||||
|
}
|
||||||
|
|
||||||
|
// visibleClusterMacros drops the slots that would send nothing. The COMMAND is
|
||||||
|
// what decides: a slot with a label and no command is a button that lies, and a
|
||||||
|
// command with no label still has something to show — its own text.
|
||||||
|
export function visibleClusterMacros(macros: ClusterMacro[]): ClusterMacro[] {
|
||||||
|
return macros
|
||||||
|
.filter((m) => m.cmd.trim() !== '')
|
||||||
|
.map((m) => ({ label: m.label.trim() || m.cmd.trim(), cmd: m.cmd.trim() }));
|
||||||
|
}
|
||||||
+146
-43
File diff suppressed because one or more lines are too long
@@ -0,0 +1,66 @@
|
|||||||
|
// Operator overrides for the band/mode matrix palette.
|
||||||
|
//
|
||||||
|
// Applied as inline custom properties on <html>, which is what lets them be
|
||||||
|
// OVERRIDES rather than a palette: the twelve themes each define their own
|
||||||
|
// --mx-* ramp in style.css, an inline value wins over all of them, and removing
|
||||||
|
// it hands the colour straight back to the theme. Nothing has to know which
|
||||||
|
// theme is active, and switching theme with overrides off is a clean revert.
|
||||||
|
|
||||||
|
export type MatrixColors = {
|
||||||
|
enabled: boolean;
|
||||||
|
call_confirmed: string;
|
||||||
|
call_worked: string;
|
||||||
|
entity_confirmed: string;
|
||||||
|
entity_worked: string;
|
||||||
|
not_worked: string;
|
||||||
|
current_entry: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The six settings fields and the CSS custom property each one drives. Also the
|
||||||
|
// display order — the same order the legend under the matrix reads in, so the
|
||||||
|
// settings panel and the grid can never disagree about which green is which.
|
||||||
|
export const MATRIX_VARS: { key: keyof Omit<MatrixColors, 'enabled'>; cssVar: string; label: string }[] = [
|
||||||
|
{ key: 'call_confirmed', cssVar: '--mx-call-conf', label: 'mx.callConf' },
|
||||||
|
{ key: 'call_worked', cssVar: '--mx-call-work', label: 'mx.callWork' },
|
||||||
|
{ key: 'entity_confirmed', cssVar: '--mx-dx-conf', label: 'mx.dxConf' },
|
||||||
|
{ key: 'entity_worked', cssVar: '--mx-dx-work', label: 'mx.dxWork' },
|
||||||
|
{ key: 'not_worked', cssVar: '--mx-none', label: 'mx.none' },
|
||||||
|
{ key: 'current_entry', cssVar: '--mx-cur', label: 'mx.current' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const emptyMatrixColors = (): MatrixColors => ({
|
||||||
|
enabled: false,
|
||||||
|
call_confirmed: '', call_worked: '', entity_confirmed: '',
|
||||||
|
entity_worked: '', not_worked: '', current_entry: '',
|
||||||
|
});
|
||||||
|
|
||||||
|
// applyMatrixColors stamps (or clears) the overrides on <html>. Safe to call as
|
||||||
|
// often as you like — it is the whole rendering path, so the settings panel uses
|
||||||
|
// it for a live preview and the app uses it once at startup.
|
||||||
|
export function applyMatrixColors(c?: MatrixColors | null): void {
|
||||||
|
const root = document.documentElement;
|
||||||
|
for (const { key, cssVar } of MATRIX_VARS) {
|
||||||
|
const v = c?.enabled ? String(c[key] ?? '').trim() : '';
|
||||||
|
if (v) root.style.setProperty(cssVar, v);
|
||||||
|
else root.style.removeProperty(cssVar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// effectiveMatrixColor reads what the matrix is ACTUALLY painting right now —
|
||||||
|
// the override if there is one, else the active theme's value. It is what seeds
|
||||||
|
// the colour pickers, so the operator starts from the colours in front of them
|
||||||
|
// instead of from a hardcoded palette that may belong to a different theme.
|
||||||
|
//
|
||||||
|
// A custom property's computed value has its var() references substituted, so
|
||||||
|
// --mx-cur resolves to the theme's --warning rather than to the literal text.
|
||||||
|
export function effectiveMatrixColor(cssVar: string): string {
|
||||||
|
try {
|
||||||
|
const v = getComputedStyle(document.documentElement).getPropertyValue(cssVar).trim();
|
||||||
|
// <input type="color"> only accepts #rrggbb. Anything else (a theme that
|
||||||
|
// ever moves to oklch, an empty read during boot) falls back to mid grey
|
||||||
|
// rather than silently resetting the picker to black.
|
||||||
|
return /^#[0-9a-f]{6}$/i.test(v) ? v.toLowerCase() : '#808080';
|
||||||
|
} catch {
|
||||||
|
return '#808080';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -36,6 +36,14 @@ let timer: number | undefined;
|
|||||||
let inFlight = false;
|
let inFlight = false;
|
||||||
let lastAz: number | null = null;
|
let lastAz: number | null = null;
|
||||||
let lastMoveAt = 0;
|
let lastMoveAt = 0;
|
||||||
|
// The last heading anyone received, replayed to whoever subscribes next.
|
||||||
|
//
|
||||||
|
// Without it, opening Station Control left the compass blank for one or two
|
||||||
|
// seconds while every other panel filled at once. Nothing was slow: the status
|
||||||
|
// bar already had the loop running with a tick pending, so a component mounting
|
||||||
|
// halfway through an idle interval simply waited out the rest of it. The
|
||||||
|
// heading was known the whole time — it just had nowhere to be read from.
|
||||||
|
let last: RotorHeading | null = null;
|
||||||
|
|
||||||
function schedule(delay: number) {
|
function schedule(delay: number) {
|
||||||
if (timer !== undefined) window.clearTimeout(timer);
|
if (timer !== undefined) window.clearTimeout(timer);
|
||||||
@@ -54,6 +62,7 @@ async function tick() {
|
|||||||
if (lastAz !== null && h.azimuth !== lastAz) lastMoveAt = Date.now();
|
if (lastAz !== null && h.azimuth !== lastAz) lastMoveAt = Date.now();
|
||||||
lastAz = h.azimuth;
|
lastAz = h.azimuth;
|
||||||
}
|
}
|
||||||
|
last = h;
|
||||||
subs.forEach((fn) => { try { fn(h); } catch { /* a subscriber must not stop the loop */ } });
|
subs.forEach((fn) => { try { fn(h); } catch { /* a subscriber must not stop the loop */ } });
|
||||||
} catch {
|
} catch {
|
||||||
// Leave the last heading alone: a single failed poll on a shared serial port
|
// Leave the last heading alone: a single failed poll on a shared serial port
|
||||||
@@ -69,6 +78,12 @@ async function tick() {
|
|||||||
// unsubscribe. The loop stops when the last subscriber leaves.
|
// unsubscribe. The loop stops when the last subscriber leaves.
|
||||||
export function subscribeRotorHeading(fn: (h: RotorHeading) => void): () => void {
|
export function subscribeRotorHeading(fn: (h: RotorHeading) => void): () => void {
|
||||||
subs.add(fn);
|
subs.add(fn);
|
||||||
|
// Hand over what is already known, at once. An Alpha SPID poll is an open,
|
||||||
|
// a read at 600 baud and a close, so even an immediate one takes a moment —
|
||||||
|
// the cached heading is what makes the compass appear with the panel rather
|
||||||
|
// than after it. In a microtask, so a subscriber is never called back before
|
||||||
|
// subscribeRotorHeading has returned to it.
|
||||||
|
if (last) { const h = last; queueMicrotask(() => { if (subs.has(fn)) fn(h); }); }
|
||||||
if (timer === undefined && !inFlight) void tick();
|
if (timer === undefined && !inFlight) void tick();
|
||||||
return () => {
|
return () => {
|
||||||
subs.delete(fn);
|
subs.delete(fn);
|
||||||
|
|||||||
@@ -16,9 +16,16 @@ export type RowColorSettings = {
|
|||||||
style?: 'bar' | 'tint' | 'both';
|
style?: 'bar' | 'tint' | 'both';
|
||||||
intensity?: number;
|
intensity?: number;
|
||||||
bandmap_lotw?: boolean;
|
bandmap_lotw?: boolean;
|
||||||
|
recent_zebra?: string; // '' = alternate (default), 'off' = every row alike
|
||||||
|
recent_zebra_color?: string; // '' = follow the theme
|
||||||
rules: RowColorRule[];
|
rules: RowColorRule[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// The banding the grid theme applies on its own. Repeated here because turning
|
||||||
|
// the option OFF means painting every row explicitly — the theme would
|
||||||
|
// otherwise keep striping underneath whatever we do per row.
|
||||||
|
const ZEBRA_DEFAULT = 'color-mix(in srgb, var(--muted) 40%, var(--card))';
|
||||||
|
|
||||||
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||||
|
|
||||||
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||||
@@ -76,21 +83,43 @@ export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule
|
|||||||
// A log where nearly every contact has SOME QSL state ends up with every row
|
// 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
|
// 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.
|
// 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 {
|
// rowIndex is optional: only the Recent QSOs grid bands its rows, and the other
|
||||||
if (!cfg?.enabled) return undefined;
|
// callers have nothing to say about odd and even.
|
||||||
|
export function rowStyleFor(q: any, cfg: RowColorSettings | null, rowIndex?: number): Record<string, string> | undefined {
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
// Banding first, and INDEPENDENT of cfg.enabled: it is legibility, not QSL
|
||||||
|
// status, and an operator who wants plain rows should not have to turn the
|
||||||
|
// status colours off to get them.
|
||||||
|
if (typeof rowIndex === 'number') {
|
||||||
|
if (cfg?.recent_zebra === 'off') {
|
||||||
|
out.backgroundColor = 'var(--card)';
|
||||||
|
} else if (rowIndex % 2 === 1) {
|
||||||
|
out.backgroundColor = cfg?.recent_zebra_color || ZEBRA_DEFAULT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const empty = () => (Object.keys(out).length ? out : undefined);
|
||||||
|
if (!cfg?.enabled) return empty();
|
||||||
const rule = matchRowRule(q, cfg);
|
const rule = matchRowRule(q, cfg);
|
||||||
if (!rule?.color) return undefined;
|
if (!rule?.color) return empty();
|
||||||
|
|
||||||
const style = cfg.style ?? 'bar';
|
const style = cfg.style ?? 'bar';
|
||||||
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
||||||
const out: Record<string, string> = {};
|
|
||||||
if (style === 'tint' || style === 'both') {
|
if (style === 'tint' || style === 'both') {
|
||||||
|
// Overrides the banding on purpose: the QSL colour is information, the
|
||||||
|
// banding is only there to help the eye keep its line.
|
||||||
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
||||||
}
|
}
|
||||||
if (style === 'bar' || style === 'both') {
|
if (style === 'bar' || style === 'both') {
|
||||||
// inset shadow rather than a border: a border would shift the cells three
|
// A background gradient, not a border and not a shadow.
|
||||||
// pixels on coloured rows only, and the columns would stop lining up.
|
//
|
||||||
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
|
// A border would shift the cells three pixels on coloured rows only, and
|
||||||
|
// the columns would stop lining up. An inset box-shadow was the first fix
|
||||||
|
// for that and drew the stripe correctly — but on the grid's transformed,
|
||||||
|
// absolutely-positioned rows it also bled a hairline of the same colour
|
||||||
|
// along the row edges, so every coloured row got a horizontal rule it was
|
||||||
|
// never meant to have. A gradient paints inside the box and nothing else:
|
||||||
|
// three pixels of colour, then transparent, and no edge to bleed from.
|
||||||
|
out.backgroundImage = `linear-gradient(to right, ${rule.color} 0, ${rule.color} 3px, transparent 3px)`;
|
||||||
}
|
}
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,6 +17,8 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.autofocusWB', // auto-focus Worked-before
|
'opslog.autofocusWB', // auto-focus Worked-before
|
||||||
'hamlog.filterPresets', // Filter Builder saved presets
|
'hamlog.filterPresets', // Filter Builder saved presets
|
||||||
'opslog.showRotor', // rotor compass shown next to the keyers
|
'opslog.showRotor', // rotor compass shown next to the keyers
|
||||||
|
'opslog.rotorCompact', // rotor widget: dial + SP/LP only, no quick-turn buttons or Stop
|
||||||
|
'opslog.decodesGridMap',// FT decodes tab: grid-square map shown beside the table
|
||||||
'opslog.showChaseNew', // Chase New panel shown next to the keyers
|
'opslog.showChaseNew', // Chase New panel shown next to the keyers
|
||||||
'opslog.showAmpWidget', // amplifier widget shown next to the keyers
|
'opslog.showAmpWidget', // amplifier widget shown next to the keyers
|
||||||
'opslog.ampSel.widget', // which amplifier that widget shows ("all" or an amp id)
|
'opslog.ampSel.widget', // which amplifier that widget shows ("all" or an amp id)
|
||||||
@@ -39,11 +41,19 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.clusterLockBand', 'opslog.clusterLockMode', 'opslog.clusterStatusFilter',
|
'opslog.clusterLockBand', 'opslog.clusterLockMode', 'opslog.clusterStatusFilter',
|
||||||
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
||||||
'opslog.activeTab', // last selected tab
|
'opslog.activeTab', // last selected tab
|
||||||
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
'opslog.mainSplit', // Main tab: width share of the left pane (percent) — legacy, read once to seed mainShares
|
||||||
|
'opslog.mainShares', // Main tab: column shares per column count, as {2:[..],3:[..],4:[..]}
|
||||||
|
'opslog.mainQuad', // Main tab: the 2x2 cross, as {col,row} percentages
|
||||||
'opslog.clusterMuteWorked', // cluster/band map: no colour or badge on worked spots
|
'opslog.clusterMuteWorked', // cluster/band map: no colour or badge on worked spots
|
||||||
'opslog.clusterSlotHighlight', // cluster/band map: colour calls not worked on this band+mode
|
'opslog.clusterSlotHighlight', // cluster/band map: colour calls not worked on this band+mode
|
||||||
'opslog.bandMapWidth', // docked band map: column width (px)
|
'opslog.bandMapWidth', // docked band map: column width (px)
|
||||||
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
||||||
|
'opslog.bandMapZoom', // band map zoom (px/kHz step) remembered per band, as one {band: index} map
|
||||||
|
'opslog.decodeColWidths', // FT decodes table: per-column widths (px), as one {col: px} map
|
||||||
|
'opslog.clusterMacros', // cluster console: the twelve named command buttons
|
||||||
|
'opslog.clusterHideSpots', // cluster console: hide the DX spot flood so replies are readable
|
||||||
|
'opslog.clusterConsoleFollow', // cluster console: keep the view pinned to the newest line
|
||||||
|
'opslog.gridMapColorConfirmed', 'opslog.gridMapColorWorked', // grid map: chosen fills (empty = follow the theme)
|
||||||
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
||||||
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
||||||
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
||||||
|
|||||||
@@ -85,6 +85,12 @@
|
|||||||
--mx-dx-conf: #3730a3; /* entity confirmed*/
|
--mx-dx-conf: #3730a3; /* entity confirmed*/
|
||||||
--mx-dx-work: #a5b4fc; /* entity worked */
|
--mx-dx-work: #a5b4fc; /* entity worked */
|
||||||
--mx-none: #e7e5e4; /* never worked */
|
--mx-none: #e7e5e4; /* never worked */
|
||||||
|
/* Ring on the cell the operator is entering. Declared ONCE, on :root, and
|
||||||
|
deliberately not repeated per theme: it follows --warning, which every theme
|
||||||
|
already tunes to its own background. The token exists so the matrix ring can
|
||||||
|
be recoloured on its own without dragging every other warning in the app
|
||||||
|
with it (Appearance → matrix colours). */
|
||||||
|
--mx-cur: var(--warning);
|
||||||
|
|
||||||
--scrollbar-thumb: #b8a880;
|
--scrollbar-thumb: #b8a880;
|
||||||
--scrollbar-thumb-hover: #968455;
|
--scrollbar-thumb-hover: #968455;
|
||||||
@@ -974,6 +980,7 @@
|
|||||||
--color-mx-dx-conf: var(--mx-dx-conf);
|
--color-mx-dx-conf: var(--mx-dx-conf);
|
||||||
--color-mx-dx-work: var(--mx-dx-work);
|
--color-mx-dx-work: var(--mx-dx-work);
|
||||||
--color-mx-none: var(--mx-none);
|
--color-mx-none: var(--mx-none);
|
||||||
|
--color-mx-cur: var(--mx-cur);
|
||||||
|
|
||||||
--radius: 0.5rem;
|
--radius: 0.5rem;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// 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).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.25.6';
|
export const APP_VERSION = '0.26.1';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+38
-2
@@ -53,6 +53,8 @@ export function AmpPower(arg1:string,arg2:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function AmpPowerLevel(arg1:string,arg2:string):Promise<void>;
|
export function AmpPowerLevel(arg1:string,arg2:string):Promise<void>;
|
||||||
|
|
||||||
|
export function AnswerDecode(arg1:string,arg2:number,arg3:number,arg4:number,arg5:number,arg6:string,arg7:string,arg8:boolean):Promise<void>;
|
||||||
|
|
||||||
export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
|
export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
export function AntGeniusDeselect(arg1:number):Promise<void>;
|
export function AntGeniusDeselect(arg1:number):Promise<void>;
|
||||||
@@ -355,6 +357,8 @@ export function FlexSetXITFreq(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function FlexStopCW():Promise<void>;
|
export function FlexStopCW():Promise<void>;
|
||||||
|
|
||||||
|
export function FlexTXOnBand(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function FlexTune(arg1:boolean):Promise<void>;
|
export function FlexTune(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function GetACOMStatus():Promise<acom.Status>;
|
export function GetACOMStatus():Promise<acom.Status>;
|
||||||
@@ -451,8 +455,14 @@ export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
|||||||
|
|
||||||
export function GetFlexState():Promise<cat.FlexTXState>;
|
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||||
|
|
||||||
|
export function GetFolderSync():Promise<main.FolderSyncConfig>;
|
||||||
|
|
||||||
|
export function GetFolderSyncStatus():Promise<main.FolderSyncStatus>;
|
||||||
|
|
||||||
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
||||||
|
|
||||||
|
export function GetGridScopeSettings():Promise<main.GridScopeSettings>;
|
||||||
|
|
||||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
export function GetLinkedAmps():Promise<Array<string>>;
|
export function GetLinkedAmps():Promise<Array<string>>;
|
||||||
@@ -473,6 +483,8 @@ export function GetLogbookRevision():Promise<string>;
|
|||||||
|
|
||||||
export function GetLookupSettings():Promise<main.LookupSettings>;
|
export function GetLookupSettings():Promise<main.LookupSettings>;
|
||||||
|
|
||||||
|
export function GetMatrixColors():Promise<main.MatrixColors>;
|
||||||
|
|
||||||
export function GetMySQLSettings():Promise<main.MySQLSettings>;
|
export function GetMySQLSettings():Promise<main.MySQLSettings>;
|
||||||
|
|
||||||
export function GetOfflineStatus():Promise<main.OfflineStatus>;
|
export function GetOfflineStatus():Promise<main.OfflineStatus>;
|
||||||
@@ -507,6 +519,8 @@ export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
|||||||
|
|
||||||
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
||||||
|
|
||||||
|
export function GetRotorPresets():Promise<Array<main.RotorPreset>>;
|
||||||
|
|
||||||
export function GetRowColors():Promise<main.RowColorSettings>;
|
export function GetRowColors():Promise<main.RowColorSettings>;
|
||||||
|
|
||||||
export function GetSPEStatus():Promise<spe.Status>;
|
export function GetSPEStatus():Promise<spe.Status>;
|
||||||
@@ -559,6 +573,10 @@ export function GetWorkedCallVariants():Promise<boolean>;
|
|||||||
|
|
||||||
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
||||||
|
|
||||||
|
export function GridSquares(arg1:string):Promise<Array<qso.GridSquare>>;
|
||||||
|
|
||||||
|
export function HaltDecodeTx(arg1:string,arg2:boolean):Promise<void>;
|
||||||
|
|
||||||
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
||||||
|
|
||||||
export function IcomRefresh():Promise<void>;
|
export function IcomRefresh():Promise<void>;
|
||||||
@@ -703,9 +721,9 @@ export function LogUDPLoggedADIF(arg1:string):Promise<number>;
|
|||||||
|
|
||||||
export function LogUIError(arg1:string,arg2:string,arg3:string):Promise<void>;
|
export function LogUIError(arg1:string,arg2:string,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function LookupCallsign(arg1:string):Promise<lookup.Result>;
|
export function LookupCallsign(arg1:string,arg2:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
export function LookupCallsignFresh(arg1:string):Promise<lookup.Result>;
|
export function LookupCallsignFresh(arg1:string,arg2:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
export function MotorNudgeKHz(arg1:number):Promise<void>;
|
||||||
|
|
||||||
@@ -775,6 +793,8 @@ export function PickAudioFolder():Promise<string>;
|
|||||||
|
|
||||||
export function PickBackupFolder():Promise<string>;
|
export function PickBackupFolder():Promise<string>;
|
||||||
|
|
||||||
|
export function PickFolderSyncFolder():Promise<string>;
|
||||||
|
|
||||||
export function PickOpenDatabase():Promise<string>;
|
export function PickOpenDatabase():Promise<string>;
|
||||||
|
|
||||||
export function PickSaveDatabase():Promise<string>;
|
export function PickSaveDatabase():Promise<string>;
|
||||||
@@ -855,6 +875,8 @@ export function ReloadUDPIntegrations():Promise<Array<string>>;
|
|||||||
|
|
||||||
export function RemovePassphrase(arg1:string):Promise<void>;
|
export function RemovePassphrase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function RenameAwardReference(arg1:string,arg2:string,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function RenameDatabase(arg1:string):Promise<void>;
|
export function RenameDatabase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function RenameLogbook(arg1:string):Promise<void>;
|
export function RenameLogbook(arg1:string):Promise<void>;
|
||||||
@@ -873,6 +895,8 @@ export function ResetAwardDefs():Promise<Array<award.Def>>;
|
|||||||
|
|
||||||
export function ResetDatabaseToDefault():Promise<void>;
|
export function ResetDatabaseToDefault():Promise<void>;
|
||||||
|
|
||||||
|
export function ResetRotorPresets():Promise<Array<main.RotorPreset>>;
|
||||||
|
|
||||||
export function RestartApp():Promise<void>;
|
export function RestartApp():Promise<void>;
|
||||||
|
|
||||||
export function RestartQSORecorder():Promise<void>;
|
export function RestartQSORecorder():Promise<void>;
|
||||||
@@ -935,10 +959,16 @@ export function SaveFlexBandAntennas(arg1:Record<string, main.FlexBandAnt>):Prom
|
|||||||
|
|
||||||
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
|
export function SaveFlexBandPower(arg1:Record<string, main.FlexBandPower>):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveFolderSync(arg1:main.FolderSyncConfig):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveGridScopeSettings(arg1:main.GridScopeSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
|
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
|
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveMatrixColors(arg1:main.MatrixColors):Promise<void>;
|
||||||
|
|
||||||
export function SaveMySQLSettings(arg1:main.MySQLSettings):Promise<void>;
|
export function SaveMySQLSettings(arg1:main.MySQLSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveOperatingAntenna(arg1:operating.Antenna):Promise<operating.Antenna>;
|
export function SaveOperatingAntenna(arg1:operating.Antenna):Promise<operating.Antenna>;
|
||||||
@@ -959,6 +989,8 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
|
|||||||
|
|
||||||
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveRotorPresets(arg1:Array<main.RotorPreset>):Promise<void>;
|
||||||
|
|
||||||
export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
export function SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
||||||
@@ -989,6 +1021,8 @@ export function SendClusterCommand(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<void>;
|
export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SendDecodeFreeText(arg1:string,arg2:string,arg3:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
|
export function SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function SendLogToDeveloper():Promise<void>;
|
export function SendLogToDeveloper():Promise<void>;
|
||||||
@@ -1095,6 +1129,8 @@ export function StopCWDecoder():Promise<void>;
|
|||||||
|
|
||||||
export function SwitchCATRig(arg1:number):Promise<void>;
|
export function SwitchCATRig(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SyncFolderNow():Promise<number>;
|
||||||
|
|
||||||
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
||||||
|
|
||||||
export function TailLogFile(arg1:number):Promise<string>;
|
export function TailLogFile(arg1:number):Promise<string>;
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ export function AmpPowerLevel(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['AmpPowerLevel'](arg1, arg2);
|
return window['go']['main']['App']['AmpPowerLevel'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function AnswerDecode(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) {
|
||||||
|
return window['go']['main']['App']['AnswerDecode'](arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
|
||||||
|
}
|
||||||
|
|
||||||
export function AntGeniusActivate(arg1, arg2) {
|
export function AntGeniusActivate(arg1, arg2) {
|
||||||
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
|
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -650,6 +654,10 @@ export function FlexStopCW() {
|
|||||||
return window['go']['main']['App']['FlexStopCW']();
|
return window['go']['main']['App']['FlexStopCW']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function FlexTXOnBand(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexTXOnBand'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function FlexTune(arg1) {
|
export function FlexTune(arg1) {
|
||||||
return window['go']['main']['App']['FlexTune'](arg1);
|
return window['go']['main']['App']['FlexTune'](arg1);
|
||||||
}
|
}
|
||||||
@@ -842,10 +850,22 @@ export function GetFlexState() {
|
|||||||
return window['go']['main']['App']['GetFlexState']();
|
return window['go']['main']['App']['GetFlexState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetFolderSync() {
|
||||||
|
return window['go']['main']['App']['GetFolderSync']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetFolderSyncStatus() {
|
||||||
|
return window['go']['main']['App']['GetFolderSyncStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetGridCacheStatus() {
|
export function GetGridCacheStatus() {
|
||||||
return window['go']['main']['App']['GetGridCacheStatus']();
|
return window['go']['main']['App']['GetGridCacheStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetGridScopeSettings() {
|
||||||
|
return window['go']['main']['App']['GetGridScopeSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetIcomState() {
|
export function GetIcomState() {
|
||||||
return window['go']['main']['App']['GetIcomState']();
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
}
|
}
|
||||||
@@ -886,6 +906,10 @@ export function GetLookupSettings() {
|
|||||||
return window['go']['main']['App']['GetLookupSettings']();
|
return window['go']['main']['App']['GetLookupSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetMatrixColors() {
|
||||||
|
return window['go']['main']['App']['GetMatrixColors']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetMySQLSettings() {
|
export function GetMySQLSettings() {
|
||||||
return window['go']['main']['App']['GetMySQLSettings']();
|
return window['go']['main']['App']['GetMySQLSettings']();
|
||||||
}
|
}
|
||||||
@@ -954,6 +978,10 @@ export function GetRotators() {
|
|||||||
return window['go']['main']['App']['GetRotators']();
|
return window['go']['main']['App']['GetRotators']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetRotorPresets() {
|
||||||
|
return window['go']['main']['App']['GetRotorPresets']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetRowColors() {
|
export function GetRowColors() {
|
||||||
return window['go']['main']['App']['GetRowColors']();
|
return window['go']['main']['App']['GetRowColors']();
|
||||||
}
|
}
|
||||||
@@ -1058,6 +1086,14 @@ export function GetYaesuState() {
|
|||||||
return window['go']['main']['App']['GetYaesuState']();
|
return window['go']['main']['App']['GetYaesuState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GridSquares(arg1) {
|
||||||
|
return window['go']['main']['App']['GridSquares'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function HaltDecodeTx(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['HaltDecodeTx'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
export function HasBuiltinReferences(arg1) {
|
export function HasBuiltinReferences(arg1) {
|
||||||
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1346,12 +1382,12 @@ export function LogUIError(arg1, arg2, arg3) {
|
|||||||
return window['go']['main']['App']['LogUIError'](arg1, arg2, arg3);
|
return window['go']['main']['App']['LogUIError'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function LookupCallsign(arg1) {
|
export function LookupCallsign(arg1, arg2) {
|
||||||
return window['go']['main']['App']['LookupCallsign'](arg1);
|
return window['go']['main']['App']['LookupCallsign'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function LookupCallsignFresh(arg1) {
|
export function LookupCallsignFresh(arg1, arg2) {
|
||||||
return window['go']['main']['App']['LookupCallsignFresh'](arg1);
|
return window['go']['main']['App']['LookupCallsignFresh'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function MotorNudgeKHz(arg1) {
|
export function MotorNudgeKHz(arg1) {
|
||||||
@@ -1490,6 +1526,10 @@ export function PickBackupFolder() {
|
|||||||
return window['go']['main']['App']['PickBackupFolder']();
|
return window['go']['main']['App']['PickBackupFolder']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function PickFolderSyncFolder() {
|
||||||
|
return window['go']['main']['App']['PickFolderSyncFolder']();
|
||||||
|
}
|
||||||
|
|
||||||
export function PickOpenDatabase() {
|
export function PickOpenDatabase() {
|
||||||
return window['go']['main']['App']['PickOpenDatabase']();
|
return window['go']['main']['App']['PickOpenDatabase']();
|
||||||
}
|
}
|
||||||
@@ -1650,6 +1690,10 @@ export function RemovePassphrase(arg1) {
|
|||||||
return window['go']['main']['App']['RemovePassphrase'](arg1);
|
return window['go']['main']['App']['RemovePassphrase'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RenameAwardReference(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['RenameAwardReference'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function RenameDatabase(arg1) {
|
export function RenameDatabase(arg1) {
|
||||||
return window['go']['main']['App']['RenameDatabase'](arg1);
|
return window['go']['main']['App']['RenameDatabase'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1686,6 +1730,10 @@ export function ResetDatabaseToDefault() {
|
|||||||
return window['go']['main']['App']['ResetDatabaseToDefault']();
|
return window['go']['main']['App']['ResetDatabaseToDefault']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ResetRotorPresets() {
|
||||||
|
return window['go']['main']['App']['ResetRotorPresets']();
|
||||||
|
}
|
||||||
|
|
||||||
export function RestartApp() {
|
export function RestartApp() {
|
||||||
return window['go']['main']['App']['RestartApp']();
|
return window['go']['main']['App']['RestartApp']();
|
||||||
}
|
}
|
||||||
@@ -1810,6 +1858,14 @@ export function SaveFlexBandPower(arg1) {
|
|||||||
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
|
return window['go']['main']['App']['SaveFlexBandPower'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveFolderSync(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveFolderSync'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SaveGridScopeSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveGridScopeSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveListsSettings(arg1) {
|
export function SaveListsSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveListsSettings'](arg1);
|
return window['go']['main']['App']['SaveListsSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1818,6 +1874,10 @@ export function SaveLookupSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveLookupSettings'](arg1);
|
return window['go']['main']['App']['SaveLookupSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveMatrixColors(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveMatrixColors'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveMySQLSettings(arg1) {
|
export function SaveMySQLSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveMySQLSettings'](arg1);
|
return window['go']['main']['App']['SaveMySQLSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1858,6 +1918,10 @@ export function SaveRotators(arg1) {
|
|||||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveRotorPresets(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveRotorPresets'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveRowColors(arg1) {
|
export function SaveRowColors(arg1) {
|
||||||
return window['go']['main']['App']['SaveRowColors'](arg1);
|
return window['go']['main']['App']['SaveRowColors'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1918,6 +1982,10 @@ export function SendClusterSpot(arg1, arg2, arg3) {
|
|||||||
return window['go']['main']['App']['SendClusterSpot'](arg1, arg2, arg3);
|
return window['go']['main']['App']['SendClusterSpot'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SendDecodeFreeText(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['SendDecodeFreeText'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function SendEQSL(arg1, arg2, arg3) {
|
export function SendEQSL(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['SendEQSL'](arg1, arg2, arg3);
|
return window['go']['main']['App']['SendEQSL'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -2130,6 +2198,10 @@ export function SwitchCATRig(arg1) {
|
|||||||
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SyncFolderNow() {
|
||||||
|
return window['go']['main']['App']['SyncFolderNow']();
|
||||||
|
}
|
||||||
|
|
||||||
export function SyncPOTAHunterLog(arg1, arg2) {
|
export function SyncPOTAHunterLog(arg1, arg2) {
|
||||||
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
return window['go']['main']['App']['SyncPOTAHunterLog'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1444,6 +1444,7 @@ export namespace lookup {
|
|||||||
email?: string;
|
email?: string;
|
||||||
qsl_via?: string;
|
qsl_via?: string;
|
||||||
web?: string;
|
web?: string;
|
||||||
|
iota?: string;
|
||||||
zip?: string;
|
zip?: string;
|
||||||
image_url?: string;
|
image_url?: string;
|
||||||
source: string;
|
source: string;
|
||||||
@@ -1473,6 +1474,7 @@ export namespace lookup {
|
|||||||
this.email = source["email"];
|
this.email = source["email"];
|
||||||
this.qsl_via = source["qsl_via"];
|
this.qsl_via = source["qsl_via"];
|
||||||
this.web = source["web"];
|
this.web = source["web"];
|
||||||
|
this.iota = source["iota"];
|
||||||
this.zip = source["zip"];
|
this.zip = source["zip"];
|
||||||
this.image_url = source["image_url"];
|
this.image_url = source["image_url"];
|
||||||
this.source = source["source"];
|
this.source = source["source"];
|
||||||
@@ -1999,6 +2001,7 @@ export namespace main {
|
|||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
bands: string[];
|
bands: string[];
|
||||||
available: string[];
|
available: string[];
|
||||||
|
near_km: number;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new BandOpenSettings(source);
|
return new BandOpenSettings(source);
|
||||||
@@ -2009,6 +2012,7 @@ export namespace main {
|
|||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
this.bands = source["bands"];
|
this.bands = source["bands"];
|
||||||
this.available = source["available"];
|
this.available = source["available"];
|
||||||
|
this.near_km = source["near_km"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class CATSettings {
|
export class CATSettings {
|
||||||
@@ -2019,6 +2023,7 @@ export namespace main {
|
|||||||
flex_host: string;
|
flex_host: string;
|
||||||
flex_port: number;
|
flex_port: number;
|
||||||
flex_spots: boolean;
|
flex_spots: boolean;
|
||||||
|
flex_dvk_dax: boolean;
|
||||||
flex_decode_spots: boolean;
|
flex_decode_spots: boolean;
|
||||||
flex_decode_secs: number;
|
flex_decode_secs: number;
|
||||||
xiegu_port: string;
|
xiegu_port: string;
|
||||||
@@ -2045,9 +2050,13 @@ export namespace main {
|
|||||||
tci_spots: boolean;
|
tci_spots: boolean;
|
||||||
poll_ms: number;
|
poll_ms: number;
|
||||||
delay_ms: number;
|
delay_ms: number;
|
||||||
|
offset_on: boolean;
|
||||||
|
offset_hz: number;
|
||||||
digital_default: string;
|
digital_default: string;
|
||||||
share_enabled: boolean;
|
share_enabled: boolean;
|
||||||
share_port: number;
|
share_port: number;
|
||||||
|
share_proto: string;
|
||||||
|
share_tci_port: number;
|
||||||
ptt_hotkey_enabled: boolean;
|
ptt_hotkey_enabled: boolean;
|
||||||
ptt_hotkey: string;
|
ptt_hotkey: string;
|
||||||
ptt_hotkey_toggle: boolean;
|
ptt_hotkey_toggle: boolean;
|
||||||
@@ -2065,6 +2074,7 @@ export namespace main {
|
|||||||
this.flex_host = source["flex_host"];
|
this.flex_host = source["flex_host"];
|
||||||
this.flex_port = source["flex_port"];
|
this.flex_port = source["flex_port"];
|
||||||
this.flex_spots = source["flex_spots"];
|
this.flex_spots = source["flex_spots"];
|
||||||
|
this.flex_dvk_dax = source["flex_dvk_dax"];
|
||||||
this.flex_decode_spots = source["flex_decode_spots"];
|
this.flex_decode_spots = source["flex_decode_spots"];
|
||||||
this.flex_decode_secs = source["flex_decode_secs"];
|
this.flex_decode_secs = source["flex_decode_secs"];
|
||||||
this.xiegu_port = source["xiegu_port"];
|
this.xiegu_port = source["xiegu_port"];
|
||||||
@@ -2091,9 +2101,13 @@ export namespace main {
|
|||||||
this.tci_spots = source["tci_spots"];
|
this.tci_spots = source["tci_spots"];
|
||||||
this.poll_ms = source["poll_ms"];
|
this.poll_ms = source["poll_ms"];
|
||||||
this.delay_ms = source["delay_ms"];
|
this.delay_ms = source["delay_ms"];
|
||||||
|
this.offset_on = source["offset_on"];
|
||||||
|
this.offset_hz = source["offset_hz"];
|
||||||
this.digital_default = source["digital_default"];
|
this.digital_default = source["digital_default"];
|
||||||
this.share_enabled = source["share_enabled"];
|
this.share_enabled = source["share_enabled"];
|
||||||
this.share_port = source["share_port"];
|
this.share_port = source["share_port"];
|
||||||
|
this.share_proto = source["share_proto"];
|
||||||
|
this.share_tci_port = source["share_tci_port"];
|
||||||
this.ptt_hotkey_enabled = source["ptt_hotkey_enabled"];
|
this.ptt_hotkey_enabled = source["ptt_hotkey_enabled"];
|
||||||
this.ptt_hotkey = source["ptt_hotkey"];
|
this.ptt_hotkey = source["ptt_hotkey"];
|
||||||
this.ptt_hotkey_toggle = source["ptt_hotkey_toggle"];
|
this.ptt_hotkey_toggle = source["ptt_hotkey_toggle"];
|
||||||
@@ -2463,6 +2477,82 @@ export namespace main {
|
|||||||
this.body = source["body"];
|
this.body = source["body"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class FolderSyncConfig {
|
||||||
|
enabled: boolean;
|
||||||
|
folder: string;
|
||||||
|
machine: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FolderSyncConfig(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.folder = source["folder"];
|
||||||
|
this.machine = source["machine"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FolderSyncPeer {
|
||||||
|
machine: string;
|
||||||
|
last_change: string;
|
||||||
|
behind: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FolderSyncPeer(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.machine = source["machine"];
|
||||||
|
this.last_change = source["last_change"];
|
||||||
|
this.behind = source["behind"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FolderSyncStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
folder: string;
|
||||||
|
machine_id: string;
|
||||||
|
peers: FolderSyncPeer[];
|
||||||
|
last_sync: string;
|
||||||
|
sent: number;
|
||||||
|
received: number;
|
||||||
|
error: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FolderSyncStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.folder = source["folder"];
|
||||||
|
this.machine_id = source["machine_id"];
|
||||||
|
this.peers = this.convertValues(source["peers"], FolderSyncPeer);
|
||||||
|
this.last_sync = source["last_sync"];
|
||||||
|
this.sent = source["sent"];
|
||||||
|
this.received = source["received"];
|
||||||
|
this.error = source["error"];
|
||||||
|
}
|
||||||
|
|
||||||
|
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 GridCacheStatus {
|
export class GridCacheStatus {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
known: number;
|
known: number;
|
||||||
@@ -2479,6 +2569,56 @@ export namespace main {
|
|||||||
this.pending = source["pending"];
|
this.pending = source["pending"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class gridScope {
|
||||||
|
key: string;
|
||||||
|
band: boolean;
|
||||||
|
mode: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new gridScope(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.key = source["key"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class GridScopeSettings {
|
||||||
|
scope: string;
|
||||||
|
hunt: string;
|
||||||
|
scopes: gridScope[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridScopeSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.scope = source["scope"];
|
||||||
|
this.hunt = source["hunt"];
|
||||||
|
this.scopes = this.convertValues(source["scopes"], gridScope);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 ModePreset {
|
export class ModePreset {
|
||||||
name: string;
|
name: string;
|
||||||
default_rst_sent?: string;
|
default_rst_sent?: string;
|
||||||
@@ -2601,6 +2741,30 @@ export namespace main {
|
|||||||
this.cache_ttl_days = source["cache_ttl_days"];
|
this.cache_ttl_days = source["cache_ttl_days"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class MatrixColors {
|
||||||
|
enabled: boolean;
|
||||||
|
call_confirmed: string;
|
||||||
|
call_worked: string;
|
||||||
|
entity_confirmed: string;
|
||||||
|
entity_worked: string;
|
||||||
|
not_worked: string;
|
||||||
|
current_entry: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new MatrixColors(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.call_confirmed = source["call_confirmed"];
|
||||||
|
this.call_worked = source["call_worked"];
|
||||||
|
this.entity_confirmed = source["entity_confirmed"];
|
||||||
|
this.entity_worked = source["entity_worked"];
|
||||||
|
this.not_worked = source["not_worked"];
|
||||||
|
this.current_entry = source["current_entry"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export class MySQLSettings {
|
export class MySQLSettings {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
@@ -3100,6 +3264,20 @@ export namespace main {
|
|||||||
this.motorized = source["motorized"];
|
this.motorized = source["motorized"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class RotorPreset {
|
||||||
|
label: string;
|
||||||
|
azimuth: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RotorPreset(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.label = source["label"];
|
||||||
|
this.azimuth = source["azimuth"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class RowColorRule {
|
export class RowColorRule {
|
||||||
id: string;
|
id: string;
|
||||||
color: string;
|
color: string;
|
||||||
@@ -3123,6 +3301,8 @@ export namespace main {
|
|||||||
style: string;
|
style: string;
|
||||||
intensity: number;
|
intensity: number;
|
||||||
bandmap_lotw: boolean;
|
bandmap_lotw: boolean;
|
||||||
|
recent_zebra?: string;
|
||||||
|
recent_zebra_color?: string;
|
||||||
configured: boolean;
|
configured: boolean;
|
||||||
rules: RowColorRule[];
|
rules: RowColorRule[];
|
||||||
|
|
||||||
@@ -3136,6 +3316,8 @@ export namespace main {
|
|||||||
this.style = source["style"];
|
this.style = source["style"];
|
||||||
this.intensity = source["intensity"];
|
this.intensity = source["intensity"];
|
||||||
this.bandmap_lotw = source["bandmap_lotw"];
|
this.bandmap_lotw = source["bandmap_lotw"];
|
||||||
|
this.recent_zebra = source["recent_zebra"];
|
||||||
|
this.recent_zebra_color = source["recent_zebra_color"];
|
||||||
this.configured = source["configured"];
|
this.configured = source["configured"];
|
||||||
this.rules = this.convertValues(source["rules"], RowColorRule);
|
this.rules = this.convertValues(source["rules"], RowColorRule);
|
||||||
}
|
}
|
||||||
@@ -3236,6 +3418,7 @@ export namespace main {
|
|||||||
new_pota: boolean;
|
new_pota: boolean;
|
||||||
grid?: string;
|
grid?: string;
|
||||||
new_grid: boolean;
|
new_grid: boolean;
|
||||||
|
grid_state?: string;
|
||||||
spotter_continent?: string;
|
spotter_continent?: string;
|
||||||
lotw: boolean;
|
lotw: boolean;
|
||||||
new_pfx: boolean;
|
new_pfx: boolean;
|
||||||
@@ -3261,6 +3444,7 @@ export namespace main {
|
|||||||
this.new_pota = source["new_pota"];
|
this.new_pota = source["new_pota"];
|
||||||
this.grid = source["grid"];
|
this.grid = source["grid"];
|
||||||
this.new_grid = source["new_grid"];
|
this.new_grid = source["new_grid"];
|
||||||
|
this.grid_state = source["grid_state"];
|
||||||
this.spotter_continent = source["spotter_continent"];
|
this.spotter_continent = source["spotter_continent"];
|
||||||
this.lotw = source["lotw"];
|
this.lotw = source["lotw"];
|
||||||
this.new_pfx = source["new_pfx"];
|
this.new_pfx = source["new_pfx"];
|
||||||
@@ -3297,6 +3481,7 @@ export namespace main {
|
|||||||
off_urls?: string[];
|
off_urls?: string[];
|
||||||
on_pattern?: string;
|
on_pattern?: string;
|
||||||
off_pattern?: string;
|
off_pattern?: string;
|
||||||
|
insecure_tls?: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new StationDevice(source);
|
return new StationDevice(source);
|
||||||
@@ -3316,6 +3501,7 @@ export namespace main {
|
|||||||
this.off_urls = source["off_urls"];
|
this.off_urls = source["off_urls"];
|
||||||
this.on_pattern = source["on_pattern"];
|
this.on_pattern = source["on_pattern"];
|
||||||
this.off_pattern = source["off_pattern"];
|
this.off_pattern = source["off_pattern"];
|
||||||
|
this.insecure_tls = source["insecure_tls"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StationRelay {
|
export class StationRelay {
|
||||||
@@ -4391,6 +4577,26 @@ export namespace qso {
|
|||||||
this.minutes = source["minutes"];
|
this.minutes = source["minutes"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class GridSquare {
|
||||||
|
grid: string;
|
||||||
|
count: number;
|
||||||
|
confirmed: boolean;
|
||||||
|
band?: string;
|
||||||
|
mode?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridSquare(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.grid = source["grid"];
|
||||||
|
this.count = source["count"];
|
||||||
|
this.confirmed = source["confirmed"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ListFilter {
|
export class ListFilter {
|
||||||
callsign?: string;
|
callsign?: string;
|
||||||
band?: string;
|
band?: string;
|
||||||
@@ -4546,6 +4752,7 @@ export namespace qso {
|
|||||||
my_vucc_grids?: string;
|
my_vucc_grids?: string;
|
||||||
extras?: Record<string, string>;
|
extras?: Record<string, string>;
|
||||||
award_refs?: string;
|
award_refs?: string;
|
||||||
|
sync_uid?: string;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
created_at: any;
|
created_at: any;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
@@ -4687,6 +4894,7 @@ export namespace qso {
|
|||||||
this.my_vucc_grids = source["my_vucc_grids"];
|
this.my_vucc_grids = source["my_vucc_grids"];
|
||||||
this.extras = source["extras"];
|
this.extras = source["extras"];
|
||||||
this.award_refs = source["award_refs"];
|
this.award_refs = source["award_refs"];
|
||||||
|
this.sync_uid = source["sync_uid"];
|
||||||
this.created_at = this.convertValues(source["created_at"], null);
|
this.created_at = this.convertValues(source["created_at"], null);
|
||||||
this.updated_at = this.convertValues(source["updated_at"], null);
|
this.updated_at = this.convertValues(source["updated_at"], null);
|
||||||
}
|
}
|
||||||
|
|||||||
+187
@@ -0,0 +1,187 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/award"
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// New-grid scoping: WHICH prior contacts count as "I already have this square".
|
||||||
|
//
|
||||||
|
// The question has no single right answer, which is why it is a setting rather
|
||||||
|
// than a rule. A VUCC chaser counts a square per band; someone filling in a
|
||||||
|
// wall map counts it once. GridTracker offers the same six combinations, and an
|
||||||
|
// operator running both alongside each other needs them to agree — a square
|
||||||
|
// "wanted" in one and not the other is a bug report every time.
|
||||||
|
const (
|
||||||
|
keyGridScope = "grid.scope" // band+mode combination — see gridScopes
|
||||||
|
keyGridHunt = "grid.hunt" // "new" | "new_unconfirmed"
|
||||||
|
)
|
||||||
|
|
||||||
|
// gridScope is one band × mode combination.
|
||||||
|
type gridScope struct {
|
||||||
|
Key string `json:"key"`
|
||||||
|
// Band is true when the square has to have been worked on THIS band. False
|
||||||
|
// is GridTracker's "Mix Bands": any band counts.
|
||||||
|
Band bool `json:"band"`
|
||||||
|
// Mode is how much of the mode matters:
|
||||||
|
// "digi" — any digital mode at all
|
||||||
|
// "ftx" — any of the FT family (FT8/FT4/FT2)
|
||||||
|
// "mode" — this exact mode and no other
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
}
|
||||||
|
|
||||||
|
var gridScopes = []gridScope{
|
||||||
|
{Key: "band_digi", Band: true, Mode: "digi"},
|
||||||
|
{Key: "band_mode", Band: true, Mode: "mode"},
|
||||||
|
{Key: "band_ftx", Band: true, Mode: "ftx"},
|
||||||
|
{Key: "mix_digi", Band: false, Mode: "digi"},
|
||||||
|
{Key: "mix_mode", Band: false, Mode: "mode"},
|
||||||
|
{Key: "mix_ftx", Band: false, Mode: "ftx"},
|
||||||
|
}
|
||||||
|
|
||||||
|
// defaultGridScope matches what the panel showed before the setting existed:
|
||||||
|
// any band, any digital mode. Changing an operator's badges on upgrade is worse
|
||||||
|
// than offering them a choice they have not made yet.
|
||||||
|
const defaultGridScope = "mix_digi"
|
||||||
|
|
||||||
|
func lookupGridScope(key string) gridScope {
|
||||||
|
for _, s := range gridScopes {
|
||||||
|
if s.Key == key {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, s := range gridScopes {
|
||||||
|
if s.Key == defaultGridScope {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return gridScopes[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
// ftxModes is the FT family, which is a narrower thing than "digital": an
|
||||||
|
// operator chasing squares on FT8 does not count the RTTY contest contact, and
|
||||||
|
// GridTracker draws the same line.
|
||||||
|
var ftxModes = map[string]bool{"FT8": true, "FT4": true, "FT2": true}
|
||||||
|
|
||||||
|
// gridClassesOf lists every bucket one logged mode belongs to. A single FT8
|
||||||
|
// contact counts under its own name, under FTx and under digital — the scopes
|
||||||
|
// overlap by construction, so the index stores all three and the lookup picks.
|
||||||
|
func gridClassesOf(mode string) []string {
|
||||||
|
m := strings.ToUpper(strings.TrimSpace(mode))
|
||||||
|
if m == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := []string{"m:" + m}
|
||||||
|
if ftxModes[m] {
|
||||||
|
out = append(out, "ftx")
|
||||||
|
}
|
||||||
|
if award.ModeClass(m) == "DIGI" {
|
||||||
|
out = append(out, "digi")
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// gridClassFor turns the scope plus the mode being heard into the one class to
|
||||||
|
// look up. Empty means "this scope cannot judge this mode" — a phone contact
|
||||||
|
// under an FTx scope — and the caller then flags nothing rather than guessing.
|
||||||
|
func gridClassFor(s gridScope, mode string) string {
|
||||||
|
m := strings.ToUpper(strings.TrimSpace(mode))
|
||||||
|
if m == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
switch s.Mode {
|
||||||
|
case "mode":
|
||||||
|
return "m:" + m
|
||||||
|
case "ftx":
|
||||||
|
if ftxModes[m] {
|
||||||
|
return "ftx"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
default: // digi
|
||||||
|
if award.ModeClass(m) == "DIGI" {
|
||||||
|
return "digi"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GridScopeSettings is the panel's shape.
|
||||||
|
type GridScopeSettings struct {
|
||||||
|
Scope string `json:"scope"`
|
||||||
|
Hunt string `json:"hunt"`
|
||||||
|
// Scopes is the list the UI renders, so it cannot drift from the one the
|
||||||
|
// lookup honours.
|
||||||
|
Scopes []gridScope `json:"scopes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) GetGridScopeSettings() GridScopeSettings {
|
||||||
|
return GridScopeSettings{
|
||||||
|
Scope: lookupGridScope(a.settingOr(keyGridScope, "")).Key,
|
||||||
|
Hunt: gridHunt(a.settingOr(keyGridHunt, "")),
|
||||||
|
Scopes: gridScopes,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// gridHunt normalises the hunting mode. "new" is never-worked; "new_unconfirmed"
|
||||||
|
// also chases a square worked but not yet confirmed — the same square is still
|
||||||
|
// missing from the award either way.
|
||||||
|
func gridHunt(v string) string {
|
||||||
|
if strings.TrimSpace(v) == "new_unconfirmed" {
|
||||||
|
return "new_unconfirmed"
|
||||||
|
}
|
||||||
|
return "new"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *App) SaveGridScopeSettings(s GridScopeSettings) error {
|
||||||
|
a.setSetting(keyGridScope, lookupGridScope(s.Scope).Key)
|
||||||
|
a.setSetting(keyGridHunt, gridHunt(s.Hunt))
|
||||||
|
// The worked-grid index is built under these rules, so it is now stale.
|
||||||
|
a.clusterStatusMu.Lock()
|
||||||
|
a.clusterStatusIdx = nil
|
||||||
|
a.clusterStatusMu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Grid states a heard square can be in, from the operator's point of view.
|
||||||
|
//
|
||||||
|
// "wanted" is not one state but two, and they call for different decisions: a
|
||||||
|
// square never worked is a QSO to make, one worked and not yet confirmed is a
|
||||||
|
// QSL to chase. Reporting both as plain NEW GRID — which is what this did when
|
||||||
|
// the unconfirmed hunt was added — leaves an operator staring at a badge on a
|
||||||
|
// station the log plainly says they worked an hour ago.
|
||||||
|
const (
|
||||||
|
gridStateNew = "new" // never worked under this scope
|
||||||
|
gridStateUnconf = "unconf" // worked under this scope, not yet confirmed
|
||||||
|
)
|
||||||
|
|
||||||
|
// gridStateFor classifies one heard square. "" means nothing to chase: already
|
||||||
|
// confirmed, or a mode this scope cannot judge.
|
||||||
|
//
|
||||||
|
// band is where it was heard and mode what it was heard in — the SCOPE decides
|
||||||
|
// whether either is allowed to matter.
|
||||||
|
func gridStateFor(idx map[string]bool, s gridScope, hunt, grid, band, mode string) string {
|
||||||
|
cls := gridClassFor(s, mode)
|
||||||
|
if cls == "" || len(grid) < 4 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
key := qso.GridKey(strings.ToUpper(grid[:4]), "", cls)
|
||||||
|
if s.Band {
|
||||||
|
key = qso.GridKey(strings.ToUpper(grid[:4]), band, cls)
|
||||||
|
}
|
||||||
|
confirmed, worked := idx[key]
|
||||||
|
switch {
|
||||||
|
case !worked:
|
||||||
|
return gridStateNew
|
||||||
|
case !confirmed && hunt == "new_unconfirmed":
|
||||||
|
return gridStateUnconf
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// gridIsWanted is gridStateFor reduced to the yes/no the filters need.
|
||||||
|
func gridIsWanted(idx map[string]bool, s gridScope, hunt, grid, band, mode string) bool {
|
||||||
|
return gridStateFor(idx, s, hunt, grid, band, mode) != ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// idx builds a worked-grid index the way GridWorkedIndex does, so the test
|
||||||
|
// exercises the real key shape rather than a convenient one.
|
||||||
|
func idx(entries ...struct {
|
||||||
|
grid, band, mode string
|
||||||
|
confirmed bool
|
||||||
|
}) map[string]bool {
|
||||||
|
m := map[string]bool{}
|
||||||
|
for _, e := range entries {
|
||||||
|
for _, cls := range gridClassesOf(e.mode) {
|
||||||
|
for _, k := range []string{qso.GridKey(e.grid, e.band, cls), qso.GridKey(e.grid, "", cls)} {
|
||||||
|
m[k] = m[k] || e.confirmed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
type entry = struct {
|
||||||
|
grid, band, mode string
|
||||||
|
confirmed bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// The six scopes are six different questions, and the whole point of offering
|
||||||
|
// them is that the same square answers differently.
|
||||||
|
func TestGridScopes(t *testing.T) {
|
||||||
|
// JN36 worked once: 20 m, FT8, not confirmed.
|
||||||
|
i := idx(entry{"JN36", "20m", "FT8", false})
|
||||||
|
|
||||||
|
for _, tc := range []struct {
|
||||||
|
scope string
|
||||||
|
band string
|
||||||
|
mode string
|
||||||
|
want bool
|
||||||
|
why string
|
||||||
|
}{
|
||||||
|
{"band_ftx", "20m", "FT8", false, "same band, same family — already mine"},
|
||||||
|
{"band_ftx", "15m", "FT8", true, "another band, and the scope counts bands"},
|
||||||
|
{"mix_ftx", "15m", "FT8", false, "another band, but this scope does not care"},
|
||||||
|
{"band_mode", "20m", "FT4", true, "same band, but FT4 is not FT8 under an exact-mode scope"},
|
||||||
|
{"band_ftx", "20m", "FT4", false, "same band, and FT4 is in the same FT family"},
|
||||||
|
{"band_digi", "20m", "RTTY", false, "digital counts every digital mode"},
|
||||||
|
{"band_ftx", "20m", "RTTY", false, "RTTY is outside an FTx scope — it is not evidence either way, so nothing is flagged"},
|
||||||
|
{"mix_digi", "15m", "FT4", false, "the widest scope: worked anywhere, any digital"},
|
||||||
|
} {
|
||||||
|
got := gridIsWanted(i, lookupGridScope(tc.scope), "new", "JN36", tc.band, tc.mode)
|
||||||
|
if got != tc.want {
|
||||||
|
t.Errorf("scope %s, %s %s → wanted=%v, want %v — %s", tc.scope, tc.band, tc.mode, got, tc.want, tc.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "New + unconfirmed" chases a square that is worked but not yet confirmed: it
|
||||||
|
// is still missing from the award, which is the only sense in which it is done.
|
||||||
|
func TestGridHuntUnconfirmed(t *testing.T) {
|
||||||
|
unconf := idx(entry{"JN36", "20m", "FT8", false})
|
||||||
|
conf := idx(entry{"IO91", "20m", "FT8", true})
|
||||||
|
|
||||||
|
if gridIsWanted(unconf, lookupGridScope("band_ftx"), "new", "JN36", "20m", "FT8") {
|
||||||
|
t.Error("worked-but-unconfirmed must NOT be wanted when hunting only what is new")
|
||||||
|
}
|
||||||
|
if !gridIsWanted(unconf, lookupGridScope("band_ftx"), "new_unconfirmed", "JN36", "20m", "FT8") {
|
||||||
|
t.Error("worked-but-unconfirmed must BE wanted when hunting unconfirmed too")
|
||||||
|
}
|
||||||
|
if gridIsWanted(conf, lookupGridScope("band_ftx"), "new_unconfirmed", "IO91", "20m", "FT8") {
|
||||||
|
t.Error("a confirmed square is finished under either hunt")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A mode the scope cannot judge flags nothing rather than guessing: a phone
|
||||||
|
// contact under an FTx scope is not evidence either way.
|
||||||
|
func TestGridScopeIgnoresModesItCannotJudge(t *testing.T) {
|
||||||
|
i := idx(entry{"JN36", "20m", "FT8", false})
|
||||||
|
for _, mode := range []string{"SSB", "CW", ""} {
|
||||||
|
if gridIsWanted(i, lookupGridScope("band_ftx"), "new", "KO01", "20m", mode) {
|
||||||
|
t.Errorf("mode %q is outside an FTx scope — nothing should be flagged", mode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An unknown or unset scope falls back rather than answering "wanted" for
|
||||||
|
// everything, which is what an empty class would have done.
|
||||||
|
func TestGridScopeFallsBack(t *testing.T) {
|
||||||
|
if got := lookupGridScope("").Key; got != defaultGridScope {
|
||||||
|
t.Errorf("unset scope = %q, want the default %q", got, defaultGridScope)
|
||||||
|
}
|
||||||
|
if got := lookupGridScope("nonsense").Key; got != defaultGridScope {
|
||||||
|
t.Errorf("unknown scope = %q, want the default %q", got, defaultGridScope)
|
||||||
|
}
|
||||||
|
if got := gridHunt("nonsense"); got != "new" {
|
||||||
|
t.Errorf("unknown hunt = %q, want new", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The two wanted states must be told apart, not merged. A square worked an hour
|
||||||
|
// ago and awaiting a QSL is a different job from one never worked, and reporting
|
||||||
|
// both as plain NEW GRID is what made a station the log plainly shows as worked
|
||||||
|
// still wear the badge.
|
||||||
|
func TestGridStateSeparatesNewFromUnconfirmed(t *testing.T) {
|
||||||
|
i := idx(
|
||||||
|
entry{"JN74", "20m", "FT8", false}, // worked, no confirmation yet
|
||||||
|
entry{"IO91", "20m", "FT8", true}, // worked and confirmed
|
||||||
|
)
|
||||||
|
s := lookupGridScope("band_ftx")
|
||||||
|
|
||||||
|
if got := gridStateFor(i, s, "new_unconfirmed", "KO99", "20m", "FT8"); got != gridStateNew {
|
||||||
|
t.Errorf("never worked → %q, want %q", got, gridStateNew)
|
||||||
|
}
|
||||||
|
if got := gridStateFor(i, s, "new_unconfirmed", "JN74", "20m", "FT8"); got != gridStateUnconf {
|
||||||
|
t.Errorf("worked but unconfirmed → %q, want %q", got, gridStateUnconf)
|
||||||
|
}
|
||||||
|
if got := gridStateFor(i, s, "new_unconfirmed", "IO91", "20m", "FT8"); got != "" {
|
||||||
|
t.Errorf("confirmed → %q, want nothing to chase", got)
|
||||||
|
}
|
||||||
|
// Under the plain "new" hunt an unconfirmed square is finished business.
|
||||||
|
if got := gridStateFor(i, s, "new", "JN74", "20m", "FT8"); got != "" {
|
||||||
|
t.Errorf("unconfirmed under the new-only hunt → %q, want nothing", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Every user-visible string ships in BOTH languages. That is a project rule,
|
||||||
|
// and until now it was only a rule: seventeen keys had drifted into English
|
||||||
|
// only, among them the whole update panel and two DX-cluster settings, found by
|
||||||
|
// a French operator photographing his own screen.
|
||||||
|
//
|
||||||
|
// A key present in one dictionary and not the other falls back to the key
|
||||||
|
// itself, so the interface shows "clu.spotTtl" where a label belongs — or, as
|
||||||
|
// here, the English text, which reads as deliberate and is not.
|
||||||
|
func TestEveryStringIsInBothLanguages(t *testing.T) {
|
||||||
|
src, err := os.ReadFile("frontend/src/lib/i18n.tsx")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read i18n.tsx: %v", err)
|
||||||
|
}
|
||||||
|
en := dictKeys(t, string(src), "const en: Dict = {")
|
||||||
|
fr := dictKeys(t, string(src), "const fr: Dict = {")
|
||||||
|
|
||||||
|
if len(en) == 0 || len(fr) == 0 {
|
||||||
|
t.Fatal("one of the dictionaries came back empty — this test has stopped checking anything")
|
||||||
|
}
|
||||||
|
for k := range en {
|
||||||
|
if !fr[k] {
|
||||||
|
t.Errorf("%q has no French — a French operator sees the English string, or the key itself", k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for k := range fr {
|
||||||
|
if !en[k] {
|
||||||
|
t.Errorf("%q exists only in French — an English operator sees the key", k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dictKeys collects the keys of one dictionary literal: from its opening line
|
||||||
|
// to the closing brace in column 0.
|
||||||
|
func dictKeys(t *testing.T, src, opening string) map[string]bool {
|
||||||
|
t.Helper()
|
||||||
|
i := strings.Index(src, opening)
|
||||||
|
if i < 0 {
|
||||||
|
t.Fatalf("%q not found — the dictionaries have been renamed and this test needs updating", opening)
|
||||||
|
}
|
||||||
|
body := src[i+len(opening):]
|
||||||
|
if j := strings.Index(body, "\n};"); j >= 0 {
|
||||||
|
body = body[:j]
|
||||||
|
}
|
||||||
|
keyRe := regexp.MustCompile(`'([a-zA-Z0-9_.]+)'\s*:`)
|
||||||
|
out := map[string]bool{}
|
||||||
|
for _, m := range keyRe.FindAllStringSubmatch(body, -1) {
|
||||||
|
out[m[1]] = true
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -684,3 +684,26 @@ func TestCatalogForcesBuiltin(t *testing.T) {
|
|||||||
t.Fatal("empty catalog")
|
t.Fatal("empty catalog")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// An award with NO QSO field at all counts only what the operator assigned by
|
||||||
|
// hand. WWBOTA is the case: bunker references have no ADIF field anywhere, so
|
||||||
|
// the definition names no field and the matcher must scan nothing rather than
|
||||||
|
// fall back on some default. The manual override still applies — it is the only
|
||||||
|
// thing that can feed such an award.
|
||||||
|
func TestComputeNoFieldManualOnly(t *testing.T) {
|
||||||
|
def := Def{Code: "WWBOTA", Type: TypeReference, Field: "", Dynamic: true, Valid: true}
|
||||||
|
qsos := []qso.QSO{
|
||||||
|
// Assigned by hand → counts.
|
||||||
|
{Callsign: "F4ABC", Band: "40m", Extras: map[string]string{ManualRefsKey: "WWBOTA@B/F-0123"}},
|
||||||
|
// Nothing assigned. The other fields are deliberately full: none of them
|
||||||
|
// may be scanned just because no field was named.
|
||||||
|
{Callsign: "F4DEF", Band: "20m", POTARef: "FF-0001", QTH: "B/F-0999", Comment: "B/F-0888"},
|
||||||
|
}
|
||||||
|
r := Compute([]Def{def}, qsos, nil, nil)[0]
|
||||||
|
if r.Worked != 1 {
|
||||||
|
t.Errorf("WWBOTA worked = %d, want 1 (%v)", r.Worked, refCodes(r))
|
||||||
|
}
|
||||||
|
if got := refCodes(r); len(got) != 1 || got[0] != "B/F-0123" {
|
||||||
|
t.Errorf("WWBOTA refs = %v, want [B/F-0123]", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+145
-144
@@ -46,11 +46,12 @@
|
|||||||
"qsl"
|
"qsl"
|
||||||
],
|
],
|
||||||
"total": 0,
|
"total": 0,
|
||||||
"builtin": true
|
"builtin": true,
|
||||||
|
"version": 2
|
||||||
},
|
},
|
||||||
"references": [
|
"references": [
|
||||||
{
|
{
|
||||||
"code": "1",
|
"code": "01",
|
||||||
"name": "Hokkaido",
|
"name": "Hokkaido",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -58,16 +59,81 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "10",
|
"code": "02",
|
||||||
"name": "Gunma",
|
"name": "Aomori",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"code": "03",
|
||||||
|
"name": "Iwate",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "04",
|
||||||
|
"name": "Akita",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "05",
|
||||||
|
"name": "Yamagata",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "06",
|
||||||
|
"name": "Miyagi",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "07",
|
||||||
|
"name": "Fukushima",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "08",
|
||||||
|
"name": "Niigata",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "09",
|
||||||
|
"name": "Nagano",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "10",
|
||||||
|
"name": "Tokyo",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"pattern": "\\bTok[iy]o\\b",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"code": "11",
|
"code": "11",
|
||||||
"name": "Saitama",
|
"name": "Kanagawa",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -83,16 +149,15 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "13",
|
"code": "13",
|
||||||
"name": "Tokyo",
|
"name": "Saitama",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"pattern": "\\bTok[iy]o\\b",
|
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "14",
|
"code": "14",
|
||||||
"name": "Kanagawa",
|
"name": "Ibaraki",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -100,7 +165,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "15",
|
"code": "15",
|
||||||
"name": "Niigata",
|
"name": "Tochigi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -108,7 +173,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "16",
|
"code": "16",
|
||||||
"name": "Toyama",
|
"name": "Gunma",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -116,22 +181,6 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "17",
|
"code": "17",
|
||||||
"name": "Ishikawa",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "18",
|
|
||||||
"name": "Fukui",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "19",
|
|
||||||
"name": "Yamanashi",
|
"name": "Yamanashi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -139,31 +188,7 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "2",
|
"code": "18",
|
||||||
"name": "Aomori",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "20",
|
|
||||||
"name": "Nagano",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "21",
|
|
||||||
"name": "Gifu",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "22",
|
|
||||||
"name": "Shizuoka",
|
"name": "Shizuoka",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -171,7 +196,15 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "23",
|
"code": "19",
|
||||||
|
"name": "Gifu",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "20",
|
||||||
"name": "Aichi",
|
"name": "Aichi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -179,7 +212,7 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "24",
|
"code": "21",
|
||||||
"name": "Mie",
|
"name": "Mie",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -187,15 +220,7 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "25",
|
"code": "22",
|
||||||
"name": "Shiga",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "26",
|
|
||||||
"name": "Kyoto",
|
"name": "Kyoto",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -203,23 +228,15 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "27",
|
"code": "23",
|
||||||
"name": "Osaka",
|
"name": "Shiga",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "28",
|
"code": "24",
|
||||||
"name": "Hyogo",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "29",
|
|
||||||
"name": "Nara",
|
"name": "Nara",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
@@ -227,24 +244,56 @@
|
|||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "3",
|
"code": "25",
|
||||||
"name": "Iwate",
|
"name": "Osaka",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "30",
|
"code": "26",
|
||||||
"name": "Wakayama",
|
"name": "Wakayama",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"code": "27",
|
||||||
|
"name": "Hyogo",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "28",
|
||||||
|
"name": "Toyama",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "29",
|
||||||
|
"name": "Fukui",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "30",
|
||||||
|
"name": "Ishikawa",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"code": "31",
|
"code": "31",
|
||||||
"name": "Tottori",
|
"name": "Okayama",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -260,31 +309,31 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "33",
|
"code": "33",
|
||||||
"name": "Okayama",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "34",
|
|
||||||
"name": "Hiroshima",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "35",
|
|
||||||
"name": "Yamaguchi",
|
"name": "Yamaguchi",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"code": "34",
|
||||||
|
"name": "Tottori",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"code": "35",
|
||||||
|
"name": "Hiroshima",
|
||||||
|
"dxcc": 0,
|
||||||
|
"group": "",
|
||||||
|
"subgrp": "",
|
||||||
|
"valid": true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"code": "36",
|
"code": "36",
|
||||||
"name": "Tokushima",
|
"name": "Kagawa",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -292,7 +341,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"code": "37",
|
"code": "37",
|
||||||
"name": "Kagawa",
|
"name": "Tokushima",
|
||||||
"dxcc": 0,
|
"dxcc": 0,
|
||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
@@ -314,14 +363,6 @@
|
|||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"code": "4",
|
|
||||||
"name": "Miyagi",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"code": "40",
|
"code": "40",
|
||||||
"name": "Fukuoka",
|
"name": "Fukuoka",
|
||||||
@@ -385,48 +426,8 @@
|
|||||||
"group": "",
|
"group": "",
|
||||||
"subgrp": "",
|
"subgrp": "",
|
||||||
"valid": true
|
"valid": true
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "5",
|
|
||||||
"name": "Akita",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "6",
|
|
||||||
"name": "Yamagata",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "7",
|
|
||||||
"name": "Fukushima",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "8",
|
|
||||||
"name": "Ibaraki",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"code": "9",
|
|
||||||
"name": "Tochigi",
|
|
||||||
"dxcc": 0,
|
|
||||||
"group": "",
|
|
||||||
"subgrp": "",
|
|
||||||
"valid": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,101 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WAJA is numbered by the JARL, and the numbering is NOT Japan's ordinary
|
||||||
|
// prefecture code.
|
||||||
|
//
|
||||||
|
// The catalog shipped with the government's JIS numbering instead — 01
|
||||||
|
// Hokkaido, 02 Aomori, 03 Iwate, 04 Miyagi… — which agrees with the JARL's for
|
||||||
|
// the first three prefectures and then diverges for thirty-five of the
|
||||||
|
// remaining forty-four. The names were right throughout, so the award still
|
||||||
|
// counted the right contacts; every reference simply carried the wrong number,
|
||||||
|
// which is what an operator sends to the JARL when they claim it.
|
||||||
|
//
|
||||||
|
// The two schemes agree often enough to look correct at a glance, so this pins
|
||||||
|
// the places they differ rather than a count. Each pair below is one the old
|
||||||
|
// list got wrong, and the comment is what the old list said.
|
||||||
|
func TestCatalogWAJAUsesTheJARLNumbering(t *testing.T) {
|
||||||
|
raw, ok := CatalogRefs("WAJA")
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("WAJA has no reference list in the embedded catalog")
|
||||||
|
}
|
||||||
|
var refs []struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Pattern string `json:"pattern"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(raw, &refs); err != nil {
|
||||||
|
t.Fatalf("WAJA references: %v", err)
|
||||||
|
}
|
||||||
|
if len(refs) != 47 {
|
||||||
|
t.Fatalf("WAJA has %d prefectures, want exactly 47", len(refs))
|
||||||
|
}
|
||||||
|
|
||||||
|
byName := map[string]string{}
|
||||||
|
byCode := map[string]string{}
|
||||||
|
for _, r := range refs {
|
||||||
|
byName[r.Name] = r.Code
|
||||||
|
if prev, dup := byCode[r.Code]; dup {
|
||||||
|
t.Errorf("number %s is on both %s and %s", r.Code, prev, r.Name)
|
||||||
|
}
|
||||||
|
byCode[r.Code] = r.Name
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range []struct{ name, code string }{
|
||||||
|
{"Hokkaido", "01"}, // the one both schemes agree on, and the anchor
|
||||||
|
{"Miyagi", "06"}, // was 04
|
||||||
|
{"Akita", "04"}, // was 05
|
||||||
|
{"Niigata", "08"}, // was 15 — the JIS number
|
||||||
|
{"Nagano", "09"}, // was 20
|
||||||
|
{"Tokyo", "10"}, // was 13, the JIS number everyone recognises
|
||||||
|
{"Kanagawa", "11"}, // was 14
|
||||||
|
{"Saitama", "13"}, // was 11
|
||||||
|
{"Ibaraki", "14"}, // was 8
|
||||||
|
{"Gunma", "16"}, // was 10
|
||||||
|
{"Yamanashi", "17"}, // was 19
|
||||||
|
{"Kyoto", "22"}, // was 26
|
||||||
|
{"Osaka", "25"}, // was 27
|
||||||
|
{"Toyama", "28"}, // was 16
|
||||||
|
{"Ishikawa", "30"}, // was 17
|
||||||
|
{"Okayama", "31"}, // was 33
|
||||||
|
{"Tottori", "34"}, // was 31
|
||||||
|
{"Kagawa", "36"}, // was 37
|
||||||
|
{"Tokushima", "37"}, // was 36
|
||||||
|
{"Okinawa", "47"}, // unchanged: the far end of the list was already right
|
||||||
|
} {
|
||||||
|
if got := byName[c.name]; got != c.code {
|
||||||
|
t.Errorf("%s is numbered %q, want %q on the JARL list", c.name, got, c.code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two digits throughout, as the JARL prints them. Not cosmetic: the codes
|
||||||
|
// are strings, so "1" sorts between "09" and "10" and the panel showed the
|
||||||
|
// prefectures in an order no list anywhere uses.
|
||||||
|
for _, r := range refs {
|
||||||
|
if len(r.Code) != 2 {
|
||||||
|
t.Errorf("%s is numbered %q — the JARL list is two digits throughout", r.Name, r.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Tokyo spelling rule has to sit on Tokyo, and Tokyo moved. Left behind
|
||||||
|
// on the old number it would be matching QTHs for Saitama.
|
||||||
|
for _, r := range refs {
|
||||||
|
if r.Pattern == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if r.Name != "Tokyo" {
|
||||||
|
t.Errorf("%s (%s) carries the pattern %q, which belongs to Tokyo", r.Name, r.Code, r.Pattern)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if byName["Tokyo"] != "" {
|
||||||
|
for _, r := range refs {
|
||||||
|
if r.Name == "Tokyo" && r.Pattern == "" {
|
||||||
|
t.Error("Tokyo lost its spelling pattern in the renumbering — Tokio would stop counting")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -266,6 +266,48 @@ func (r *Repo) Upsert(ctx context.Context, awardCode string, ref Ref) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Rename changes a reference's CODE, keeping everything else about it.
|
||||||
|
//
|
||||||
|
// Wanted because a shipped list can simply be wrong: WAJA went out numbered by
|
||||||
|
// the Japanese state instead of by the JARL, and the only way to correct it was
|
||||||
|
// to delete all 47 references and import a new list — losing anything the
|
||||||
|
// operator had adjusted. The number is the one field an editor could not touch.
|
||||||
|
//
|
||||||
|
// A rename, not a delete plus an insert: everything the reference carries — its
|
||||||
|
// pattern, its DXCC list, its validity window — travels with it, which is the
|
||||||
|
// whole point of correcting a number rather than replacing an entry.
|
||||||
|
func (r *Repo) Rename(ctx context.Context, awardCode, oldCode, newCode string) error {
|
||||||
|
ac := strings.ToUpper(strings.TrimSpace(awardCode))
|
||||||
|
from := strings.ToUpper(strings.TrimSpace(oldCode))
|
||||||
|
to := strings.ToUpper(strings.TrimSpace(newCode))
|
||||||
|
if ac == "" || from == "" || to == "" {
|
||||||
|
return fmt.Errorf("empty award or reference code")
|
||||||
|
}
|
||||||
|
if from == to {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
// A collision would REPLACE the other reference and take its name, pattern
|
||||||
|
// and dates with it — one silently swallowing another, discovered much later
|
||||||
|
// as a reference that has quietly gone missing.
|
||||||
|
var n int
|
||||||
|
if err := r.db.QueryRowContext(ctx,
|
||||||
|
`SELECT COUNT(*) FROM award_references WHERE award_code = ? AND ref_code = ?`, ac, to).Scan(&n); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if n > 0 {
|
||||||
|
return fmt.Errorf("%s already has a reference %s", ac, to)
|
||||||
|
}
|
||||||
|
res, err := r.db.ExecContext(ctx,
|
||||||
|
`UPDATE award_references SET ref_code = ? WHERE award_code = ? AND ref_code = ?`, to, ac, from)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if rows, _ := res.RowsAffected(); rows == 0 {
|
||||||
|
return fmt.Errorf("%s has no reference %s", ac, from)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// Delete removes one reference from an award.
|
// Delete removes one reference from an award.
|
||||||
func (r *Repo) Delete(ctx context.Context, awardCode, refCode string) error {
|
func (r *Repo) Delete(ctx context.Context, awardCode, refCode string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
// One-IOTA DXCC entities: a table of the entities that ARE a single IOTA group.
|
||||||
|
//
|
||||||
|
// WHY IT EXISTS. QRZ.com carries <iota> for an operator who fills it in, and
|
||||||
|
// most do not. But for a great many entities the island reference follows from
|
||||||
|
// the entity alone — a station in Ascension Island is on AF-003, there is
|
||||||
|
// nothing else it could be — and the entity is known for every callsign, from
|
||||||
|
// cty.dat, without any callbook at all. So the reference can be filled for an
|
||||||
|
// operator with no QRZ subscription, on a station that has never touched a
|
||||||
|
// callbook, before the contact is logged.
|
||||||
|
//
|
||||||
|
// Only entities that map to EXACTLY ONE reference are here. France is not: a
|
||||||
|
// French station is usually on the mainland and on no island at all, and
|
||||||
|
// guessing would put a reference on hundreds of contacts that earn none.
|
||||||
|
//
|
||||||
|
// SOURCE: dxcc_matches_one_iota.json from the IOTA programme
|
||||||
|
// (www.iota-world.org/islands-on-the-air/downloads/), fetched 2026-08-17,
|
||||||
|
// 99 entities. It changes only when an entity appears or IOTA re-maps one, so
|
||||||
|
// it is a table here rather than a download: it then works offline, which is
|
||||||
|
// where a portable station usually is. To refresh, fetch that file again and
|
||||||
|
// re-emit this map, sorted by entity number.
|
||||||
|
//
|
||||||
|
// Entity names are comments only, joined from internal/dxcc for readability.
|
||||||
|
var iotaByDXCC = map[int]string{
|
||||||
|
5: "EU-002", // Aland Islands
|
||||||
|
10: "AF-002", // Amsterdam & St. Paul Is.
|
||||||
|
12: "NA-022", // Anguilla
|
||||||
|
17: "NA-020", // Aves Island
|
||||||
|
20: "OC-089", // Baker & Howland Islands
|
||||||
|
21: "EU-004", // Balearic Islands
|
||||||
|
24: "AN-002", // Bouvet
|
||||||
|
29: "AF-004", // Canary Islands
|
||||||
|
34: "OC-038", // Chatham Islands
|
||||||
|
35: "OC-002", // Christmas Island
|
||||||
|
36: "NA-011", // Clipperton Island
|
||||||
|
37: "NA-012", // Cocos Island
|
||||||
|
38: "OC-003", // Cocos (Keeling) Islands
|
||||||
|
41: "AF-008", // Crozet Island
|
||||||
|
43: "NA-095", // Desecheo Island
|
||||||
|
45: "EU-001", // Dodecanese
|
||||||
|
62: "NA-021", // Barbados
|
||||||
|
64: "NA-005", // Bermuda
|
||||||
|
65: "NA-023", // British Virgin Islands
|
||||||
|
69: "NA-016", // Cayman Islands
|
||||||
|
71: "SA-004", // Galapagos Islands
|
||||||
|
82: "NA-097", // Jamaica
|
||||||
|
84: "NA-107", // Martinique
|
||||||
|
91: "SA-036", // Aruba
|
||||||
|
94: "NA-100", // Antigua & Barbuda
|
||||||
|
95: "NA-101", // Dominica
|
||||||
|
96: "NA-103", // Montserrat
|
||||||
|
97: "NA-108", // St. Lucia
|
||||||
|
99: "AF-011", // Glorioso Islands
|
||||||
|
103: "OC-026", // Guam
|
||||||
|
105: "NA-015", // Guantanamo Bay
|
||||||
|
106: "EU-114", // Guernsey
|
||||||
|
111: "AN-003", // Heard Island
|
||||||
|
114: "EU-116", // Isle Of Man
|
||||||
|
118: "EU-022", // Jan Mayen
|
||||||
|
123: "OC-023", // Johnston Island
|
||||||
|
131: "AF-048", // Kerguelen Islands
|
||||||
|
133: "OC-039", // Kermadec Islands
|
||||||
|
138: "OC-020", // Kure Island
|
||||||
|
141: "SA-002", // Falkland Islands
|
||||||
|
147: "OC-004", // Lord Howe Island
|
||||||
|
153: "AN-005", // Macquarie Island
|
||||||
|
157: "OC-031", // Nauru
|
||||||
|
159: "AS-013", // Maldives
|
||||||
|
161: "SA-007", // Malpelo Island
|
||||||
|
165: "AF-049", // Mauritius
|
||||||
|
166: "OC-086", // Mariana Islands
|
||||||
|
167: "EU-053", // Market Reef
|
||||||
|
169: "AF-027", // Mayotte
|
||||||
|
171: "OC-072", // Mellish Reef
|
||||||
|
174: "OC-030", // Midway Island
|
||||||
|
177: "OC-073", // Minami Torishima
|
||||||
|
182: "NA-098", // Navassa Island
|
||||||
|
188: "OC-040", // Niue
|
||||||
|
189: "OC-005", // Norfolk Island
|
||||||
|
190: "OC-097", // Samoa
|
||||||
|
195: "AF-039", // Annobon Island
|
||||||
|
199: "AN-004", // Peter 1 Island
|
||||||
|
201: "AF-021", // Pr. Edward & Marion Is.
|
||||||
|
205: "AF-003", // Ascension Island
|
||||||
|
207: "AF-017", // Rodriguez Island
|
||||||
|
211: "NA-063", // Sable Island
|
||||||
|
217: "SA-013", // San Felix & San Ambrosio
|
||||||
|
222: "EU-018", // Faroe Islands
|
||||||
|
238: "AN-008", // South Orkney Islands
|
||||||
|
240: "AN-009", // South Sandwich Islands
|
||||||
|
241: "AN-010", // South Shetland Islands
|
||||||
|
247: "AS-051", // Spratly Islands
|
||||||
|
249: "NA-104", // St. Kitts & Nevis
|
||||||
|
250: "AF-022", // St. Helena
|
||||||
|
252: "NA-094", // St. Paul Island
|
||||||
|
253: "SA-014", // St. Peter & St. Paul
|
||||||
|
257: "EU-023", // Malta
|
||||||
|
270: "OC-048", // Tokelau Islands
|
||||||
|
273: "SA-010", // Trindade & Martim Vaz
|
||||||
|
276: "AF-031", // Tromelin Island
|
||||||
|
277: "NA-032", // St. Pierre & Miquelon
|
||||||
|
282: "OC-015", // Tuvalu
|
||||||
|
283: "AS-004", // Uk Base Areas On Cyprus
|
||||||
|
285: "NA-106", // Us Virgin Islands
|
||||||
|
297: "OC-053", // Wake Island
|
||||||
|
301: "OC-017", // Western Kiribati
|
||||||
|
303: "OC-007", // Willis Island
|
||||||
|
381: "AS-019", // Singapore
|
||||||
|
411: "AF-007", // Comoros
|
||||||
|
453: "AF-016", // Reunion Island
|
||||||
|
460: "OC-060", // Rotuma Island
|
||||||
|
489: "OC-112", // Conway Reef
|
||||||
|
490: "OC-018", // Banaba Island
|
||||||
|
505: "AS-110", // Pratas Island
|
||||||
|
506: "AS-116", // Scarborough Reef
|
||||||
|
509: "OC-027", // Marquesas Islands
|
||||||
|
512: "OC-176", // Chesterfield Islands
|
||||||
|
513: "OC-182", // Ducie Island
|
||||||
|
515: "OC-200", // Swains Island
|
||||||
|
516: "NA-146", // St. Barthelemy
|
||||||
|
517: "SA-099", // Curacao
|
||||||
|
519: "NA-145", // Saba & St. Eustatius
|
||||||
|
520: "SA-006", // Bonaire
|
||||||
|
}
|
||||||
|
|
||||||
|
// IOTAForDXCC returns the island reference of a DXCC entity that is a single
|
||||||
|
// IOTA group, or "" for an entity that holds several islands or none.
|
||||||
|
func IOTAForDXCC(dxcc int) string { return iotaByDXCC[dxcc] }
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The entities an operator meets: an island group that is its own DXCC, and a
|
||||||
|
// mainland country that is not.
|
||||||
|
func TestIOTAForDXCC(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
dxcc int
|
||||||
|
want string
|
||||||
|
why string
|
||||||
|
}{
|
||||||
|
{205, "AF-003", "Ascension Island is one island and one reference"},
|
||||||
|
{5, "EU-002", "Aland Islands"},
|
||||||
|
{12, "NA-022", "Anguilla"},
|
||||||
|
{24, "AN-002", "Bouvet — the entity whose entry is checked most often and worked least"},
|
||||||
|
// France holds hundreds of islands and, far more to the point, a
|
||||||
|
// mainland. Filling a reference here would earn nothing and would put
|
||||||
|
// one on nearly every European contact in the log.
|
||||||
|
{227, "", "France is not one IOTA"},
|
||||||
|
{291, "", "the United States is not one IOTA"},
|
||||||
|
{0, "", "no entity resolved"},
|
||||||
|
{99999, "", "not an entity at all"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := IOTAForDXCC(c.dxcc); got != c.want {
|
||||||
|
t.Errorf("IOTAForDXCC(%d) = %q, want %q — %s", c.dxcc, got, c.want, c.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Every reference in the table must be a well-formed IOTA reference, because
|
||||||
|
// one that is not would be written onto a contact's award references and count
|
||||||
|
// for nothing — and would then have to be found by hand, one QSO at a time.
|
||||||
|
func TestEveryOneIOTAEntryIsWellFormed(t *testing.T) {
|
||||||
|
ref := regexp.MustCompile(`^(AF|AN|AS|EU|NA|OC|SA)-\d{3}$`)
|
||||||
|
if len(iotaByDXCC) < 50 {
|
||||||
|
t.Fatalf("the table holds %d entities — it has been truncated", len(iotaByDXCC))
|
||||||
|
}
|
||||||
|
for dxcc, r := range iotaByDXCC {
|
||||||
|
if dxcc <= 0 {
|
||||||
|
t.Errorf("entity number %d is not a DXCC entity", dxcc)
|
||||||
|
}
|
||||||
|
if !ref.MatchString(r) {
|
||||||
|
t.Errorf("entity %d maps to %q, which is not an IOTA reference", dxcc, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
func renameRepo(t *testing.T) *Repo {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := db.Open(filepath.Join(t.TempDir(), "a.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { conn.Close() })
|
||||||
|
return NewRepo(conn)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Correcting a reference's number must keep the reference.
|
||||||
|
//
|
||||||
|
// WAJA shipped numbered by the Japanese state instead of by the JARL, and until
|
||||||
|
// now the only way to fix that was to delete all 47 references and import a new
|
||||||
|
// list — losing anything the operator had adjusted. A rename keeps the pattern,
|
||||||
|
// the entity list and the validity window, because a wrong NUMBER is all that
|
||||||
|
// was wrong.
|
||||||
|
func TestRenameKeepsEverythingButTheCode(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
if err := r.Upsert(ctx, "WAJA", Ref{
|
||||||
|
Code: "13", Name: "Tokyo", Pattern: `\bTok[iy]o\b`, Valid: true,
|
||||||
|
DXCCList: []int{339}, ValidFrom: "1970-01-01",
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.Rename(ctx, "WAJA", "13", "10"); err != nil {
|
||||||
|
t.Fatalf("rename: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
refs, err := r.List(ctx, "WAJA")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list: %v", err)
|
||||||
|
}
|
||||||
|
if len(refs) != 1 {
|
||||||
|
t.Fatalf("WAJA holds %d references after a rename, want 1 — it was copied, not renamed", len(refs))
|
||||||
|
}
|
||||||
|
got := refs[0]
|
||||||
|
if got.Code != "10" {
|
||||||
|
t.Errorf("code = %q, want 10", got.Code)
|
||||||
|
}
|
||||||
|
if got.Name != "Tokyo" || got.Pattern != `\bTok[iy]o\b` {
|
||||||
|
t.Errorf("the reference lost what it carried: name=%q pattern=%q", got.Name, got.Pattern)
|
||||||
|
}
|
||||||
|
if len(got.DXCCList) != 1 || got.DXCCList[0] != 339 || got.ValidFrom != "1970-01-01" {
|
||||||
|
t.Errorf("the reference lost its entity list or dates: %+v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A number already in use must be refused. Left to REPLACE, the rename would
|
||||||
|
// take the other reference's name, pattern and dates with it — one entry
|
||||||
|
// silently swallowing another, found much later as a prefecture that has
|
||||||
|
// quietly gone missing from the list.
|
||||||
|
func TestRenameRefusesANumberAlreadyTaken(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
if err := r.Upsert(ctx, "WAJA", Ref{Code: "10", Name: "Gunma", Valid: true}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
if err := r.Upsert(ctx, "WAJA", Ref{Code: "13", Name: "Tokyo", Valid: true}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.Rename(ctx, "WAJA", "13", "10"); err == nil {
|
||||||
|
t.Fatal("renaming onto an existing number was accepted — one reference would have eaten the other")
|
||||||
|
}
|
||||||
|
refs, _ := r.List(ctx, "WAJA")
|
||||||
|
if len(refs) != 2 {
|
||||||
|
t.Fatalf("WAJA holds %d references, want both still there", len(refs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Renaming something that is not there is an error, not a silent no-op: it
|
||||||
|
// means the editor and the store disagree about what the award holds.
|
||||||
|
func TestRenameAnUnknownReferenceFails(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
if err := r.Rename(context.Background(), "WAJA", "99", "10"); err == nil {
|
||||||
|
t.Error("renaming a reference the award does not have was accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Codes are stored upper-cased, so a rename must compare the same way — else
|
||||||
|
// "eu-048" onto "EU-048" looks like a move and is really the same reference,
|
||||||
|
// which the collision check has to catch.
|
||||||
|
func TestRenameIsCaseInsensitive(t *testing.T) {
|
||||||
|
r := renameRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
if err := r.Upsert(ctx, "IOTA", Ref{Code: "EU-048", Name: "Belle-Ile", Valid: true}); err != nil {
|
||||||
|
t.Fatalf("seed: %v", err)
|
||||||
|
}
|
||||||
|
if err := r.Rename(ctx, "iota", "eu-048", "eu-048"); err != nil {
|
||||||
|
t.Errorf("renaming a reference to itself in another case failed: %v", err)
|
||||||
|
}
|
||||||
|
if err := r.Rename(ctx, "IOTA", "eu-048", "eu-049"); err != nil {
|
||||||
|
t.Fatalf("rename: %v", err)
|
||||||
|
}
|
||||||
|
refs, _ := r.List(ctx, "IOTA")
|
||||||
|
if len(refs) != 1 || refs[0].Code != "EU-049" {
|
||||||
|
t.Errorf("references = %+v, want the one renamed to EU-049 and upper-cased", refs)
|
||||||
|
}
|
||||||
|
}
|
||||||
+75
-1
@@ -79,6 +79,9 @@ type Manager struct {
|
|||||||
|
|
||||||
pollEvery time.Duration
|
pollEvery time.Duration
|
||||||
cmdDelay time.Duration // pause after each command (some rigs need it)
|
cmdDelay time.Duration // pause after each command (some rigs need it)
|
||||||
|
// freqOffset is the transverter offset in Hz — see SetFreqOffset. Added to
|
||||||
|
// what the rig reports, taken off what it is told.
|
||||||
|
freqOffset int64
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewManager(emit func(RigState)) *Manager {
|
func NewManager(emit func(RigState)) *Manager {
|
||||||
@@ -181,12 +184,65 @@ func (m *Manager) stopLocked() {
|
|||||||
iv.Interrupt()
|
iv.Interrupt()
|
||||||
}
|
}
|
||||||
if done != nil {
|
if done != nil {
|
||||||
<-done
|
// Bounded, and loud when it expires.
|
||||||
|
//
|
||||||
|
// This used to be a bare <-done. A poll goroutine wedged in a serial read
|
||||||
|
// then held every caller for ever: each restart attempt blocked inside
|
||||||
|
// Start before it could even try to connect, so the rig stayed dead and
|
||||||
|
// NOTHING was written to the log — the operator saw a CAT link that would
|
||||||
|
// not come back and no reason anywhere. Shutdown blocked on the same wait.
|
||||||
|
//
|
||||||
|
// Ten seconds is far longer than any honest disconnect. Past that the old
|
||||||
|
// poller is not coming back, and carrying on without it — noisily — beats
|
||||||
|
// freezing the application around it. The abandoned goroutine still holds
|
||||||
|
// its port, which is exactly what the log line has to say, because the
|
||||||
|
// next connect will fail because of it.
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
case <-time.After(10 * time.Second):
|
||||||
|
name := "cat"
|
||||||
|
if b != nil {
|
||||||
|
name = b.Name()
|
||||||
|
}
|
||||||
|
debugLog.Printf("%s: poll loop did not stop within 10s — abandoning it; "+
|
||||||
|
"its port stays open, so the next connect may fail until OpsLog is restarted", name)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetFreqOffset sets the transverter offset: the number of hertz between what
|
||||||
|
// the RIG is tuned to and where the station is actually on the air.
|
||||||
|
//
|
||||||
|
// A 28 MHz IF driving a 144 MHz transverter is an offset of +116 MHz. Everything
|
||||||
|
// above this layer — the entry form, the band, the log, the cluster, the shared
|
||||||
|
// CAT servers — then works in real frequencies, and the rig keeps seeing its own.
|
||||||
|
//
|
||||||
|
// Zero disables it, which is why it is a plain number and not a flag plus a
|
||||||
|
// number: "enabled with an offset of nothing" and "disabled" are the same thing
|
||||||
|
// to everyone downstream.
|
||||||
|
func (m *Manager) SetFreqOffset(hz int64) {
|
||||||
|
m.mu.Lock()
|
||||||
|
m.freqOffset = hz
|
||||||
|
m.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// freqOffsetHz reads the offset.
|
||||||
|
func (m *Manager) freqOffsetHz() int64 {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
return m.freqOffset
|
||||||
|
}
|
||||||
|
|
||||||
// SetFrequency dispatches a SetFreq call to the CAT goroutine.
|
// SetFrequency dispatches a SetFreq call to the CAT goroutine.
|
||||||
|
//
|
||||||
|
// The caller speaks in REAL frequencies (a 2 m spot is 144.300), so the offset
|
||||||
|
// comes back off before the rig hears it. Without this the offset would be a
|
||||||
|
// display trick: the readout would say 144 and every spot click, band change and
|
||||||
|
// memory recall would send the rig somewhere 116 MHz away.
|
||||||
func (m *Manager) SetFrequency(hz int64) error {
|
func (m *Manager) SetFrequency(hz int64) error {
|
||||||
|
if off := m.freqOffsetHz(); off != 0 && hz > off {
|
||||||
|
hz -= off
|
||||||
|
}
|
||||||
return m.exec(func(b Backend) error { return b.SetFrequency(hz) })
|
return m.exec(func(b Backend) error { return b.SetFrequency(hz) })
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,6 +271,10 @@ type splitSetter interface {
|
|||||||
// band when it was transmitting on the DX's own frequency. A refusal WSJT-X can
|
// 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.
|
// report is worth far more than a success it cannot check.
|
||||||
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
func (m *Manager) SetSplit(on bool, txHz int64) error {
|
||||||
|
// Real frequency in, IF frequency out — same as SetFrequency.
|
||||||
|
if off := m.freqOffsetHz(); off != 0 && txHz > off {
|
||||||
|
txHz -= off
|
||||||
|
}
|
||||||
return m.exec(func(b Backend) error {
|
return m.exec(func(b Backend) error {
|
||||||
s, ok := b.(splitSetter)
|
s, ok := b.(splitSetter)
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -744,6 +804,20 @@ func (m *Manager) run(b Backend, stop, done chan struct{}, cmds chan func(), pol
|
|||||||
ns.Enabled = true
|
ns.Enabled = true
|
||||||
ns.Backend = b.Name()
|
ns.Backend = b.Name()
|
||||||
ns.UpdatedAt = time.Now()
|
ns.UpdatedAt = time.Now()
|
||||||
|
// Transverter offset: the rig reports its IF, the operator is on the
|
||||||
|
// real band. Applied BEFORE the band is worked out, or a 28 MHz IF
|
||||||
|
// behind a 2 m transverter would log every contact on 10 m — and the
|
||||||
|
// band the backend may already have filled in is the IF's, so it is
|
||||||
|
// recomputed rather than trusted.
|
||||||
|
if off := m.freqOffsetHz(); off != 0 {
|
||||||
|
if ns.FreqHz != 0 {
|
||||||
|
ns.FreqHz += off
|
||||||
|
ns.Band = ""
|
||||||
|
}
|
||||||
|
if ns.RxFreqHz != 0 {
|
||||||
|
ns.RxFreqHz += off
|
||||||
|
}
|
||||||
|
}
|
||||||
if ns.FreqHz != 0 && ns.Band == "" {
|
if ns.FreqHz != 0 && ns.Band == "" {
|
||||||
ns.Band = BandFromHz(ns.FreqHz)
|
ns.Band = BandFromHz(ns.FreqHz)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package cat
|
package cat
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -513,7 +514,8 @@ func (b *IcomSerial) SetFrequency(hz int64) error {
|
|||||||
return fmt.Errorf("invalid frequency")
|
return fmt.Errorf("invalid frequency")
|
||||||
}
|
}
|
||||||
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
||||||
return b.exec(append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
return b.execIdempotent(fmt.Sprintf("set frequency %d Hz", hz),
|
||||||
|
append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *IcomSerial) SetMode(mode string) error {
|
func (b *IcomSerial) SetMode(mode string) error {
|
||||||
@@ -523,7 +525,7 @@ func (b *IcomSerial) SetMode(mode string) error {
|
|||||||
}
|
}
|
||||||
// Set the base mode (keeping the rig's current filter by sending only the
|
// Set the base mode (keeping the rig's current filter by sending only the
|
||||||
// mode byte), then set the data-mode flag for digital modes.
|
// mode byte), then set the data-mode flag for digital modes.
|
||||||
if err := b.exec(civ.CmdSetMode, code); err != nil {
|
if err := b.execIdempotent("set mode "+mode, civ.CmdSetMode, code); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
dataByte := byte(0)
|
dataByte := byte(0)
|
||||||
@@ -531,16 +533,48 @@ func (b *IcomSerial) SetMode(mode string) error {
|
|||||||
dataByte = 1
|
dataByte = 1
|
||||||
}
|
}
|
||||||
// Filter 0x01 (FIL1) is the conventional default for the data-mode set.
|
// Filter 0x01 (FIL1) is the conventional default for the data-mode set.
|
||||||
_ = b.exec(civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
|
_ = b.execIdempotent("set data mode", civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// errIcomAckLost is "the reply never came" — as opposed to a reply that said no
|
||||||
|
// (NG) or a dead port. Only this one is worth repeating: the command may well
|
||||||
|
// have been carried out and only its acknowledgement lost. Sentinel rather than
|
||||||
|
// a formatted string so callers can tell the two apart.
|
||||||
|
var errIcomAckLost = errors.New("icom: timeout waiting for response")
|
||||||
|
|
||||||
|
// execIdempotent runs a SET command and sends it ONCE MORE if the
|
||||||
|
// acknowledgement is lost.
|
||||||
|
//
|
||||||
|
// A missing FB is not a missing command — the rig acts on the frame as soon as it
|
||||||
|
// decodes it, and what expires is our wait for the answer on a bus shared with
|
||||||
|
// the rig's own transceive updates. JTDX in "Split Operating: Fake It" moves the
|
||||||
|
// dial and the mode immediately before every key-down, so those acks queue behind
|
||||||
|
// each other, and losing one was fatal: rigctld answers RPRT -9, JTDX reads that
|
||||||
|
// as losing rig control and tears the connection down mid-over. An operator's log
|
||||||
|
// shows it happening on set_ptt, on set_freq and on set_mode alike, each failure
|
||||||
|
// followed within 300 ms by a fresh rigctld client — and shows this resend
|
||||||
|
// rescuing a PTT that would otherwise have ended the over.
|
||||||
|
//
|
||||||
|
// Only for commands that say "be in this state": re-sending one changes nothing
|
||||||
|
// if the first arrived. A relative or incremental command must not come through
|
||||||
|
// here, which is why this is opt-in per caller rather than folded into exec.
|
||||||
|
func (b *IcomSerial) execIdempotent(what string, payload ...byte) error {
|
||||||
|
err := b.exec(payload...)
|
||||||
|
if err == nil || !errors.Is(err, errIcomAckLost) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
applog.Printf("icom: %s — no acknowledgement in %s, sending it once more", what, icomCmdTimeout)
|
||||||
|
return b.exec(payload...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPTT keys or unkeys the transmitter (CI-V 0x1C 0x00).
|
||||||
func (b *IcomSerial) SetPTT(on bool) error {
|
func (b *IcomSerial) SetPTT(on bool) error {
|
||||||
state := byte(0)
|
state := byte(0)
|
||||||
if on {
|
if on {
|
||||||
state = 1
|
state = 1
|
||||||
}
|
}
|
||||||
return b.exec(civ.CmdPTT, civ.SubPTT, state)
|
return b.execIdempotent(fmt.Sprintf("PTT %v", on), civ.CmdPTT, civ.SubPTT, state)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
|
// SetPower turns the transceiver on or off (CI-V 0x18). Power-ON is prefixed with
|
||||||
@@ -619,7 +653,7 @@ func (b *IcomSerial) recv(timeout time.Duration, match func(civ.Decoded) bool) (
|
|||||||
case <-cancel:
|
case <-cancel:
|
||||||
return civ.Decoded{}, fmt.Errorf("icom: interrupted")
|
return civ.Decoded{}, fmt.Errorf("icom: interrupted")
|
||||||
case <-deadline:
|
case <-deadline:
|
||||||
return civ.Decoded{}, fmt.Errorf("icom: timeout waiting for response")
|
return civ.Decoded{}, errIcomAckLost
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+116
-2
@@ -46,8 +46,33 @@ type TCI struct {
|
|||||||
mode string
|
mode string
|
||||||
split bool
|
split bool
|
||||||
tx bool
|
tx bool
|
||||||
|
// txAllowed is what the radio last said about TRANSMIT PERMISSION.
|
||||||
|
//
|
||||||
|
// TX_ENABLE is sent by ExpertSDR when a client connects and again whenever
|
||||||
|
// the band changes, "in case transmitter permission was changed" (§4.3). When
|
||||||
|
// it is false the radio silently ignores TRX — which is exactly what an
|
||||||
|
// operator sees as "PTT does nothing", with no error anywhere to explain it.
|
||||||
|
//
|
||||||
|
// txAllowedKnown keeps an OLDER ExpertSDR, or a TCI-compatible program that
|
||||||
|
// never sends TX_ENABLE at all, from being treated as refusing: without a
|
||||||
|
// word from the radio we key and let it decide.
|
||||||
|
txAllowed bool
|
||||||
|
txAllowedKnown bool
|
||||||
|
|
||||||
lastSig string // last logged state signature (log only on change)
|
lastSig string // last logged state signature (log only on change)
|
||||||
|
|
||||||
|
// spotFreq is the frequency of the marker currently on the panorama for each
|
||||||
|
// callsign — the panadapter's own state, which TCI never reports back. It is
|
||||||
|
// what makes one spot per call possible: without it there is no way to know
|
||||||
|
// there is an older marker to delete.
|
||||||
|
spotFreq map[string]int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func absInt64(v int64) int64 {
|
||||||
|
if v < 0 {
|
||||||
|
return -v
|
||||||
|
}
|
||||||
|
return v
|
||||||
}
|
}
|
||||||
|
|
||||||
const tciDefaultPort = 40001
|
const tciDefaultPort = 40001
|
||||||
@@ -96,18 +121,73 @@ func (t *TCI) Connect() error {
|
|||||||
t.mu.Lock()
|
t.mu.Lock()
|
||||||
t.conn = conn
|
t.conn = conn
|
||||||
t.ready = false
|
t.ready = false
|
||||||
|
// Forget the previous session's transmit permission: the radio announces it
|
||||||
|
// again on connect, and a refusal remembered from a band we have since left
|
||||||
|
// would block PTT until it did.
|
||||||
|
t.txAllowed, t.txAllowedKnown = false, false
|
||||||
t.mu.Unlock()
|
t.mu.Unlock()
|
||||||
debugLog.Printf("TCI: connected to %s", url)
|
debugLog.Printf("TCI: connected to %s", url)
|
||||||
go t.reader(conn)
|
go t.reader(conn)
|
||||||
if t.spotsEnabled {
|
if t.spotsEnabled {
|
||||||
|
// Forget what we thought was on the panorama at the same moment the radio
|
||||||
|
// is told to drop it. Kept, the memory would suppress the next spot for
|
||||||
|
// each of those calls as "already drawn" onto a panorama now empty.
|
||||||
|
t.mu.Lock()
|
||||||
|
t.spotFreq = map[string]int64{}
|
||||||
|
t.mu.Unlock()
|
||||||
_ = t.send("spot_clear;") // drop any leftover spots from a previous session
|
_ = t.send("spot_clear;") // drop any leftover spots from a previous session
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// spotFreqTolHz is how far a re-spot of the same callsign may sit from the one
|
||||||
|
// already on the panorama before it is treated as a move rather than the same
|
||||||
|
// spot said again.
|
||||||
|
//
|
||||||
|
// Two spotters hearing the same CW station rarely agree to better than a couple
|
||||||
|
// of hundred hertz, and every one of them produces a cluster line. Below this
|
||||||
|
// they are the same spot and nothing is sent at all; above it the marker is
|
||||||
|
// deleted and redrawn where the station now is.
|
||||||
|
const spotFreqTolHz = 500
|
||||||
|
|
||||||
|
// noteSpot records what the panorama is about to hold for a callsign and says
|
||||||
|
// what has to be sent: whether to draw at all, and whether an older marker for
|
||||||
|
// the same call must be deleted first.
|
||||||
|
//
|
||||||
|
// Separate from SendSpot so the rule can be tested without a radio — and
|
||||||
|
// because the lock must be released before anything is sent: t.send takes t.mu
|
||||||
|
// itself, Go mutexes are not reentrant, and sending while holding it would
|
||||||
|
// deadlock the backend and take the rig offline.
|
||||||
|
func (t *TCI) noteSpot(call string, freqHz int64) (draw, deletePrev bool) {
|
||||||
|
key := strings.ToUpper(strings.TrimSpace(call))
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
prev, had := t.spotFreq[key]
|
||||||
|
if had && absInt64(prev-freqHz) <= spotFreqTolHz {
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
|
if t.spotFreq == nil {
|
||||||
|
t.spotFreq = map[string]int64{}
|
||||||
|
}
|
||||||
|
if len(t.spotFreq) > 4000 {
|
||||||
|
t.spotFreq = map[string]int64{} // bound memory on a long session
|
||||||
|
had = false // forgotten: nothing left to delete by name
|
||||||
|
}
|
||||||
|
t.spotFreq[key] = freqHz
|
||||||
|
return true, had
|
||||||
|
}
|
||||||
|
|
||||||
// SendSpot mirrors a cluster spot onto the TCI panorama (implements Spotter).
|
// SendSpot mirrors a cluster spot onto the TCI panorama (implements Spotter).
|
||||||
// The radio replaces a spot that has the same callsign, so re-spotting updates
|
// No-op when spot mirroring is disabled.
|
||||||
// it in place. No-op when spot mirroring is disabled.
|
//
|
||||||
|
// ONE MARKER PER CALLSIGN. This code assumed the radio replaced a spot carrying
|
||||||
|
// a callsign it already had; it does not. ExpertSDR keys a spot on its
|
||||||
|
// frequency too, so a DX station spotted by three operators — 14025.00,
|
||||||
|
// 14025.12, 14024.90, which is an ordinary minute on a cluster — was drawn
|
||||||
|
// three times, a few pixels apart, and stayed that way.
|
||||||
|
//
|
||||||
|
// So the previous spot for the call is deleted before the new one is sent,
|
||||||
|
// which is what the FlexRadio backend has always done (spot remove / spot add).
|
||||||
func (t *TCI) SendSpot(s SpotInfo) error {
|
func (t *TCI) SendSpot(s SpotInfo) error {
|
||||||
if !t.spotsEnabled {
|
if !t.spotsEnabled {
|
||||||
return nil
|
return nil
|
||||||
@@ -116,6 +196,17 @@ func (t *TCI) SendSpot(s SpotInfo) error {
|
|||||||
if call == "" || s.FreqHz <= 0 {
|
if call == "" || s.FreqHz <= 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
draw, deletePrev := t.noteSpot(call, s.FreqHz)
|
||||||
|
if !draw {
|
||||||
|
return nil // the same station said again by another spotter
|
||||||
|
}
|
||||||
|
if deletePrev {
|
||||||
|
// SPOT_DELETE takes the callsign alone. Not in the protocol PDF this
|
||||||
|
// backend was written from; confirmed against ars-ka0s/eesdr-tci, which
|
||||||
|
// lists SPOT (5 arguments), SPOT_DELETE (1) and SPOT_CLEAR (0) — the
|
||||||
|
// other two matching what already works here.
|
||||||
|
_ = t.send(fmt.Sprintf("spot_delete:%s;", call))
|
||||||
|
}
|
||||||
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
|
// TCI's SPOT command wants the colour as a signed 32-bit DECIMAL integer in
|
||||||
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
|
// 0xAARRGGBB order — NOT a "0x…" hex string (e.g. "spot:UN7GK,cw,14025000,
|
||||||
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
|
// -16776961,test;"). ExpertSDR silently drops a spot whose colour field it
|
||||||
@@ -223,7 +314,22 @@ func (t *TCI) SetMode(mode string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// SetPTT keys or unkeys the transmitter (VFO 0).
|
// SetPTT keys or unkeys the transmitter (VFO 0).
|
||||||
|
//
|
||||||
|
// A refusal by the radio is reported rather than swallowed. ExpertSDR announces
|
||||||
|
// transmit permission with TX_ENABLE and then simply IGNORES trx when it is
|
||||||
|
// false — out-of-band frequency, TX disabled in the program, no PA. The command
|
||||||
|
// went out, nothing happened, and nothing anywhere said why. Now the operator
|
||||||
|
// is told, and the message names the place to look.
|
||||||
func (t *TCI) SetPTT(on bool) error {
|
func (t *TCI) SetPTT(on bool) error {
|
||||||
|
if on {
|
||||||
|
t.mu.Lock()
|
||||||
|
known, allowed := t.txAllowedKnown, t.txAllowed
|
||||||
|
t.mu.Unlock()
|
||||||
|
if known && !allowed {
|
||||||
|
return fmt.Errorf("the radio is refusing to transmit (TCI reports TX disabled) — " +
|
||||||
|
"check the frequency is inside a transmit band and that TX is enabled in ExpertSDR")
|
||||||
|
}
|
||||||
|
}
|
||||||
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -317,6 +423,14 @@ func (t *TCI) handle(msg string) {
|
|||||||
if get(0) == "0" {
|
if get(0) == "0" {
|
||||||
t.tx = get(1) == "true"
|
t.tx = get(1) == "true"
|
||||||
}
|
}
|
||||||
|
case "tx_enable":
|
||||||
|
if get(0) == "0" {
|
||||||
|
allowed := get(1) == "true"
|
||||||
|
if !t.txAllowedKnown || t.txAllowed != allowed {
|
||||||
|
debugLog.Printf("TCI: the radio %s transmitting", map[bool]string{true: "allows", false: "REFUSES"}[allowed])
|
||||||
|
}
|
||||||
|
t.txAllowed, t.txAllowedKnown = allowed, true
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
lname := strings.ToLower(name)
|
lname := strings.ToLower(name)
|
||||||
// A click on one of our panorama spots comes back as
|
// A click on one of our panorama spots comes back as
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// feed pushes messages at the backend the way the radio would.
|
||||||
|
func feed(t *TCI, msgs ...string) {
|
||||||
|
for _, m := range msgs {
|
||||||
|
t.handle(m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "PTT via CAT does nothing on TCI."
|
||||||
|
//
|
||||||
|
// ExpertSDR announces transmit permission with TX_ENABLE — on connect, and
|
||||||
|
// again whenever the band changes "in case transmitter permission was changed"
|
||||||
|
// (§4.3 of the protocol document). When it is false the radio simply IGNORES
|
||||||
|
// trx. OpsLog sent the documented command, the radio discarded it, and nothing
|
||||||
|
// anywhere said why: the operator pressed a dead key.
|
||||||
|
func TestPTTIsRefusedOutLoudWhenTheRadioForbidsTransmitting(t *testing.T) {
|
||||||
|
tci := NewTCI("localhost", 40001, "FT8", false)
|
||||||
|
feed(tci, "tx_enable:0,false")
|
||||||
|
|
||||||
|
err := tci.SetPTT(true)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("keying was accepted while the radio forbids transmitting — the operator gets no reason at all")
|
||||||
|
}
|
||||||
|
// The message has to name where to look; "PTT failed" sends nobody anywhere.
|
||||||
|
for _, want := range []string{"transmit", "ExpertSDR"} {
|
||||||
|
if !contains(err.Error(), want) {
|
||||||
|
t.Errorf("the refusal reads %q, which does not mention %q", err.Error(), want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unkeying is never blocked. Whatever the radio thinks about permission, a
|
||||||
|
// request to STOP transmitting must always reach it.
|
||||||
|
if err := tci.SetPTT(false); err != nil && contains(err.Error(), "refusing") {
|
||||||
|
t.Errorf("unkeying was refused: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Permission comes back when the operator returns to a band they may use, and
|
||||||
|
// PTT has to come back with it — not stay blocked until OpsLog is restarted.
|
||||||
|
func TestPermissionGrantedAgainRestoresPTT(t *testing.T) {
|
||||||
|
tci := NewTCI("localhost", 40001, "FT8", false)
|
||||||
|
feed(tci, "tx_enable:0,false")
|
||||||
|
if err := tci.SetPTT(true); err == nil {
|
||||||
|
t.Fatal("keying was accepted while forbidden")
|
||||||
|
}
|
||||||
|
feed(tci, "tx_enable:0,true")
|
||||||
|
// No connection here, so the send fails — but it must fail as a TRANSPORT
|
||||||
|
// error, never as a refusal.
|
||||||
|
if err := tci.SetPTT(true); err != nil && contains(err.Error(), "refusing") {
|
||||||
|
t.Errorf("still refusing after permission was granted: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A radio that never mentions TX_ENABLE — an older ExpertSDR, or one of the
|
||||||
|
// other programs that speak TCI — must not be treated as refusing. Silence is
|
||||||
|
// not a "no": we key, and let the radio decide.
|
||||||
|
func TestSilenceAboutPermissionIsNotARefusal(t *testing.T) {
|
||||||
|
tci := NewTCI("localhost", 40001, "FT8", false)
|
||||||
|
if err := tci.SetPTT(true); err != nil && contains(err.Error(), "refusing") {
|
||||||
|
t.Errorf("a radio that never sent TX_ENABLE was treated as forbidding transmit: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func contains(s, sub string) bool {
|
||||||
|
return len(sub) == 0 || (len(s) >= len(sub) && indexOf(s, sub) >= 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func indexOf(s, sub string) int {
|
||||||
|
for i := 0; i+len(sub) <= len(s); i++ {
|
||||||
|
if s[i:i+len(sub)] == sub {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The reported symptom: with spot mirroring on, the same station appeared two
|
||||||
|
// or three times on the panorama.
|
||||||
|
//
|
||||||
|
// Its cause is not in OpsLog's spot pipeline — one cluster line produces one
|
||||||
|
// SendSpot. It is that a popular DX station IS spotted two or three times, by
|
||||||
|
// different operators within the same minute, and no two of them agree on the
|
||||||
|
// frequency to better than a few tens of hertz. The backend assumed ExpertSDR
|
||||||
|
// replaced a spot bearing a callsign it already had; it keys on the frequency
|
||||||
|
// too, so each of those became its own marker.
|
||||||
|
func TestSameStationSpottedBySeveralOperatorsIsDrawnOnce(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
|
||||||
|
draw, del := tci.noteSpot("UN7GK", 14025000)
|
||||||
|
if !draw || del {
|
||||||
|
t.Fatalf("first spot: draw=%v delete=%v, want draw and nothing to delete", draw, del)
|
||||||
|
}
|
||||||
|
// The same station, two more spotters, a few tens of hertz apart.
|
||||||
|
for _, hz := range []int64{14025120, 14024900} {
|
||||||
|
if draw, del := tci.noteSpot("UN7GK", hz); draw || del {
|
||||||
|
t.Errorf("re-spot at %d Hz: draw=%v delete=%v, want nothing sent — this is the duplicate marker", hz, draw, del)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A station that really moves must still move on the panorama, and the marker
|
||||||
|
// left where it was must go. Deleting first is the whole difference between
|
||||||
|
// "the spot follows the station" and "the station collects markers".
|
||||||
|
func TestAStationThatMovesReplacesItsMarker(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("UN7GK", 14025000)
|
||||||
|
|
||||||
|
draw, del := tci.noteSpot("UN7GK", 14032000) // 7 kHz up: a real QSY
|
||||||
|
if !draw || !del {
|
||||||
|
t.Fatalf("after a QSY: draw=%v delete=%v, want the old marker deleted and a new one drawn", draw, del)
|
||||||
|
}
|
||||||
|
// And the new position becomes the reference, so spotters agreeing with it
|
||||||
|
// are quiet again.
|
||||||
|
if draw, _ := tci.noteSpot("UN7GK", 14032100); draw {
|
||||||
|
t.Error("a spot at the station's new frequency was drawn again")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Case matters nowhere in ham radio, and the cluster is not consistent about it.
|
||||||
|
func TestSpotMemoryIgnoresCase(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("un7gk", 14025000)
|
||||||
|
if draw, _ := tci.noteSpot("UN7GK", 14025000); draw {
|
||||||
|
t.Error("the same call in another case was treated as a different station")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two different stations are two markers — the whole point of the panorama.
|
||||||
|
func TestDifferentStationsEachGetAMarker(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("UN7GK", 14025000)
|
||||||
|
draw, del := tci.noteSpot("ZD7BG", 14025050) // 50 Hz away, a different operator
|
||||||
|
if !draw {
|
||||||
|
t.Error("a second station near the first was swallowed as a duplicate")
|
||||||
|
}
|
||||||
|
if del {
|
||||||
|
t.Error("deleting by callsign would have removed a spot this station never had")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The connection drops and comes back: Connect sends spot_clear, so the
|
||||||
|
// panorama is empty. If the memory survived that, the next spot for each of
|
||||||
|
// those calls would be suppressed as "already drawn" onto an empty panorama —
|
||||||
|
// the operator's spots would simply stop appearing until they changed
|
||||||
|
// frequency.
|
||||||
|
func TestReconnectingForgetsWhatWasDrawn(t *testing.T) {
|
||||||
|
tci := &TCI{spotsEnabled: true}
|
||||||
|
tci.noteSpot("UN7GK", 14025000)
|
||||||
|
|
||||||
|
tci.mu.Lock()
|
||||||
|
tci.spotFreq = map[string]int64{} // what Connect does alongside spot_clear
|
||||||
|
tci.mu.Unlock()
|
||||||
|
|
||||||
|
if draw, del := tci.noteSpot("UN7GK", 14025000); !draw || del {
|
||||||
|
t.Errorf("after a reconnect: draw=%v delete=%v, want it drawn again and nothing deleted", draw, del)
|
||||||
|
}
|
||||||
|
}
|
||||||
+150
-24
@@ -18,6 +18,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
@@ -46,7 +47,12 @@ type Spot struct {
|
|||||||
SourceID int64 `json:"source_id"` // ID of the cluster server this came from
|
SourceID int64 `json:"source_id"` // ID of the cluster server this came from
|
||||||
SourceName string `json:"source_name"` // display name (handy in the UI when multiple servers)
|
SourceName string `json:"source_name"` // display name (handy in the UI when multiple servers)
|
||||||
Spotter string `json:"spotter"` // DE field
|
Spotter string `json:"spotter"` // DE field
|
||||||
DXCall string `json:"dx_call"` // the DX station heard
|
// SpotterContinent belongs to the SPOT, not to the DX station: one call is
|
||||||
|
// spotted by dozens of skimmers on every continent within a minute. It is
|
||||||
|
// resolved per spot at ingest for exactly that reason — see the note on the
|
||||||
|
// spotter-continent filter in App.tsx.
|
||||||
|
SpotterContinent string `json:"spotter_continent,omitempty"`
|
||||||
|
DXCall string `json:"dx_call"` // the DX station heard
|
||||||
FreqKHz float64 `json:"freq_khz"`
|
FreqKHz float64 `json:"freq_khz"`
|
||||||
FreqHz int64 `json:"freq_hz"`
|
FreqHz int64 `json:"freq_hz"`
|
||||||
Band string `json:"band,omitempty"`
|
Band string `json:"band,omitempty"`
|
||||||
@@ -355,6 +361,18 @@ func (s *session) run() {
|
|||||||
// that gets skipped.
|
// that gets skipped.
|
||||||
var idleTick = 30 * time.Second
|
var idleTick = 30 * time.Second
|
||||||
|
|
||||||
|
// promptTick is the read deadline used until the login handshake is finished.
|
||||||
|
// Short, because a node's "login:" / "password:" carries no newline and is only
|
||||||
|
// visible when the read times out — see the read loop. It costs a few wake-ups
|
||||||
|
// during the first seconds of a connection and nothing afterwards.
|
||||||
|
const promptTick = 700 * time.Millisecond
|
||||||
|
|
||||||
|
// handshakeWindow bounds how long the fast promptTick applies. A node that has
|
||||||
|
// a password configured but never asks for one would otherwise keep the loop
|
||||||
|
// waking every 700 ms for the life of the connection, for a prompt that is never
|
||||||
|
// coming. Any real login exchange is over in a second or two.
|
||||||
|
const handshakeWindow = 20 * time.Second
|
||||||
|
|
||||||
// quietNotice is the silence after which the log says so, once.
|
// quietNotice is the silence after which the log says so, once.
|
||||||
const quietNotice = 10 * time.Minute
|
const quietNotice = 10 * time.Minute
|
||||||
|
|
||||||
@@ -398,16 +416,37 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
|
|
||||||
// Login: send on first prompt OR blindly after 1.5s. Many DXSpider
|
// Login: send on first prompt OR blindly after 1.5s. Many DXSpider
|
||||||
// nodes accept the callsign without re-prompting.
|
// nodes accept the callsign without re-prompting.
|
||||||
loginSent := false
|
//
|
||||||
|
// Atomic because the blind-login timer below and the read loop both touch
|
||||||
|
// these. loginSent used to be a plain bool that the timer NEVER SET: the
|
||||||
|
// callsign went out and nothing recorded it, so the password branch — gated on
|
||||||
|
// loginSent — was dead code, and the session could only reach "connected" by
|
||||||
|
// recognising a welcome banner. On a node whose entire greeting is a bare
|
||||||
|
// "login:" and which then demands a password (f5mzn.org:9000), that left the
|
||||||
|
// server stuck at "connecting" for ever while telnet logged in by hand fine.
|
||||||
|
var loginSent, pwdSent atomic.Bool
|
||||||
|
// CompareAndSwap, not a plain store: the timer and the loop can reach these at
|
||||||
|
// the same moment, and the callsign must be written exactly once.
|
||||||
|
sendLogin := func() {
|
||||||
|
if s.login != "" && loginSent.CompareAndSwap(false, true) {
|
||||||
|
_, _ = conn.Write([]byte(s.login + "\r\n"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Sent ONCE per connection. A node that re-prompts is refusing the password,
|
||||||
|
// and answering with the same one again only loops — better to let the
|
||||||
|
// refusal show in the console than to hide it behind a retry.
|
||||||
|
sendPassword := func() {
|
||||||
|
if s.cfg.Password != "" && loginSent.Load() && pwdSent.CompareAndSwap(false, true) {
|
||||||
|
_, _ = conn.Write([]byte(s.cfg.Password + "\r\n"))
|
||||||
|
}
|
||||||
|
}
|
||||||
if s.login != "" {
|
if s.login != "" {
|
||||||
go func() {
|
go func() {
|
||||||
select {
|
select {
|
||||||
case <-s.stopCh:
|
case <-s.stopCh:
|
||||||
return
|
return
|
||||||
case <-time.After(1500 * time.Millisecond):
|
case <-time.After(1500 * time.Millisecond):
|
||||||
if !loginSent {
|
sendLogin()
|
||||||
_, _ = conn.Write([]byte(s.login + "\r\n"))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
@@ -453,7 +492,21 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
|
|
||||||
var connectedAt time.Time
|
var connectedAt time.Time
|
||||||
var quiet time.Duration // how long the node has said nothing
|
var quiet time.Duration // how long the node has said nothing
|
||||||
|
var quietNoticed bool // the long-silence line is said once
|
||||||
var pending string // a line cut in half by a read deadline
|
var pending string // a line cut in half by a read deadline
|
||||||
|
markConnected := func() {
|
||||||
|
if s.snapshot().State == StateConnected {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
connectedAt = time.Now()
|
||||||
|
s.mu.Lock()
|
||||||
|
s.status.State = StateConnected
|
||||||
|
s.status.ConnectedAt = connectedAt
|
||||||
|
s.status.Error = ""
|
||||||
|
s.mu.Unlock()
|
||||||
|
s.emitStatus()
|
||||||
|
fireInitCommands()
|
||||||
|
}
|
||||||
rd := bufio.NewReader(conn)
|
rd := bufio.NewReader(conn)
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
@@ -471,7 +524,21 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
// Only a REAL error ends the session. A dead peer still gets caught:
|
// Only a REAL error ends the session. A dead peer still gets caught:
|
||||||
// TCP keepalive probes an idle connection and its failure arrives here
|
// TCP keepalive probes an idle connection and its failure arrives here
|
||||||
// as an error, not as a timeout.
|
// as an error, not as a timeout.
|
||||||
_ = conn.SetReadDeadline(time.Now().Add(idleTick))
|
// SHORT deadline until the handshake is done, the long idle tick after.
|
||||||
|
//
|
||||||
|
// A cluster writes its prompts WITHOUT a trailing newline, and ReadString
|
||||||
|
// only returns on one — so a prompt is never a "line" at all, it is whatever
|
||||||
|
// is sitting in the buffer when the read deadline expires. At the ordinary
|
||||||
|
// 30 s tick that made a bare "login:" invisible for half a minute and a
|
||||||
|
// following "password:" invisible for another, which is long enough for the
|
||||||
|
// node to give up on us. Only the handshake needs the fast tick; once logged
|
||||||
|
// in, a long deadline is exactly what we want (see idleTick).
|
||||||
|
tick := idleTick
|
||||||
|
if time.Since(linkUpAt) < handshakeWindow &&
|
||||||
|
(!loginSent.Load() || (s.cfg.Password != "" && !pwdSent.Load())) {
|
||||||
|
tick = promptTick
|
||||||
|
}
|
||||||
|
_ = conn.SetReadDeadline(time.Now().Add(tick))
|
||||||
chunk, err := rd.ReadString('\n')
|
chunk, err := rd.ReadString('\n')
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var ne net.Error
|
var ne net.Error
|
||||||
@@ -480,16 +547,48 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
// Keep it: a spot line straddling the deadline would otherwise lose
|
// Keep it: a spot line straddling the deadline would otherwise lose
|
||||||
// its first half and arrive as nonsense, or vanish entirely.
|
// its first half and arrive as nonsense, or vanish entirely.
|
||||||
pending += chunk
|
pending += chunk
|
||||||
quiet += idleTick
|
// …but a newline-less PROMPT is not half a line, it is a question,
|
||||||
|
// and this is the only place it can ever be seen. Answer it, show it
|
||||||
|
// in the console (an operator watching a stuck server has a right to
|
||||||
|
// see what the node actually asked), and drop it so it is not glued
|
||||||
|
// onto the front of the next real line.
|
||||||
|
if p := strings.TrimSpace(pending); p != "" {
|
||||||
|
switch {
|
||||||
|
case !loginSent.Load() && s.login != "" && isLoginPrompt(p):
|
||||||
|
s.emitLine(p, false)
|
||||||
|
pending = ""
|
||||||
|
sendLogin()
|
||||||
|
if s.cfg.Password == "" {
|
||||||
|
markConnected()
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
case !pwdSent.Load() && isPasswordPrompt(p):
|
||||||
|
s.emitLine(p, false)
|
||||||
|
pending = ""
|
||||||
|
if s.cfg.Password == "" {
|
||||||
|
// Nothing to answer with. Shown in the console rather than
|
||||||
|
// swallowed: an unanswered "password:" sitting there IS the
|
||||||
|
// explanation for a server that never finishes connecting,
|
||||||
|
// and it is something the operator can act on.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sendPassword()
|
||||||
|
markConnected()
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
quiet += tick
|
||||||
// Said once at the first long silence, so a genuinely mute node is
|
// Said once at the first long silence, so a genuinely mute node is
|
||||||
// visible without a line every tick.
|
// visible without a line every tick.
|
||||||
if quiet == quietNotice {
|
if !quietNoticed && quiet >= quietNotice {
|
||||||
|
quietNoticed = true
|
||||||
applog.Printf("cluster[%s] no traffic for %s — still connected", s.cfg.Name, quiet)
|
applog.Printf("cluster[%s] no traffic for %s — still connected", s.cfg.Name, quiet)
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return connectedAt, fmt.Errorf("read: %w", err)
|
return connectedAt, fmt.Errorf("read: %w", err)
|
||||||
}
|
}
|
||||||
|
quietNoticed = false
|
||||||
quiet = 0
|
quiet = 0
|
||||||
line := pending + chunk
|
line := pending + chunk
|
||||||
pending = ""
|
pending = ""
|
||||||
@@ -519,28 +618,23 @@ func (s *session) runOnce() (time.Time, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Login on explicit prompt.
|
// Login on explicit prompt — the case where the node DID terminate it with
|
||||||
if !loginSent && s.login != "" && isLoginPrompt(line) {
|
// a newline. The newline-less form is handled on the timeout path above.
|
||||||
_, _ = conn.Write([]byte(s.login + "\r\n"))
|
if !loginSent.Load() && s.login != "" && isLoginPrompt(line) {
|
||||||
loginSent = true
|
s.emitLine(line, false)
|
||||||
|
sendLogin()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// Password on prompt (rare).
|
// Password on prompt.
|
||||||
if loginSent && s.cfg.Password != "" && isPasswordPrompt(line) {
|
if !pwdSent.Load() && isPasswordPrompt(line) {
|
||||||
_, _ = conn.Write([]byte(s.cfg.Password + "\r\n"))
|
s.emitLine(line, false)
|
||||||
|
sendPassword()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark connected once we've sent login OR seen a welcome banner.
|
// Mark connected once we've sent login OR seen a welcome banner.
|
||||||
if s.snapshot().State != StateConnected && (loginSent || isWelcome(line)) {
|
if loginSent.Load() || isWelcome(line) {
|
||||||
connectedAt = time.Now()
|
markConnected()
|
||||||
s.mu.Lock()
|
|
||||||
s.status.State = StateConnected
|
|
||||||
s.status.ConnectedAt = connectedAt
|
|
||||||
s.status.Error = ""
|
|
||||||
s.mu.Unlock()
|
|
||||||
s.emitStatus()
|
|
||||||
fireInitCommands()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EVERY line goes to the console — spot or not. This is the whole point:
|
// EVERY line goes to the console — spot or not. This is the whole point:
|
||||||
@@ -701,6 +795,38 @@ func parseSpot(line string) (Spot, bool) {
|
|||||||
}, true
|
}, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewLocalSpot builds the Spot for a DX announcement WE just sent, so it lands
|
||||||
|
// in the operator's own list at once.
|
||||||
|
//
|
||||||
|
// A node does not necessarily broadcast a spot back to the station that sent it:
|
||||||
|
// DXSpider suppresses the echo to the originator, and a node-side filter can eat
|
||||||
|
// it too. So an operator spotted a station, watched their own spot list stay
|
||||||
|
// empty, and concluded the spot had never gone out — when it had. This is the
|
||||||
|
// spot the echo would have carried, built from what we sent, deliberately the
|
||||||
|
// same shape so the UI's call+band de-dupe folds the two into one row on the
|
||||||
|
// nodes that DO echo.
|
||||||
|
func NewLocalSpot(srv ServerConfig, spotter, dxCall string, freqKHz float64, comment string) Spot {
|
||||||
|
freqHz := int64(freqKHz*1000 + 0.5)
|
||||||
|
now := time.Now()
|
||||||
|
sp := Spot{
|
||||||
|
SourceID: srv.ID,
|
||||||
|
SourceName: srv.Name,
|
||||||
|
Spotter: strings.ToUpper(strings.TrimSpace(spotter)),
|
||||||
|
DXCall: strings.ToUpper(strings.TrimSpace(dxCall)),
|
||||||
|
FreqKHz: freqKHz,
|
||||||
|
FreqHz: freqHz,
|
||||||
|
Band: bandFromHz(freqHz),
|
||||||
|
Comment: strings.TrimSpace(comment),
|
||||||
|
TimeUTC: now.UTC().Format("1504") + "Z",
|
||||||
|
ReceivedAt: now,
|
||||||
|
}
|
||||||
|
// Raw reads like the node's own broadcast — it is what anything showing the
|
||||||
|
// source line expects, and it keeps a local spot legible in the log.
|
||||||
|
sp.Raw = fmt.Sprintf("DX de %s: %9.1f %-12s %-30s %s",
|
||||||
|
sp.Spotter, sp.FreqKHz, sp.DXCall, sp.Comment, sp.TimeUTC)
|
||||||
|
return sp
|
||||||
|
}
|
||||||
|
|
||||||
func isLoginPrompt(s string) bool {
|
func isLoginPrompt(s string) bool {
|
||||||
low := strings.ToLower(s)
|
low := strings.ToLower(s)
|
||||||
return strings.Contains(low, "login:") ||
|
return strings.Contains(low, "login:") ||
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
package cluster
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A node whose whole greeting is a bare "login:" — no newline, no banner — and
|
||||||
|
// which then demands a password must still log in.
|
||||||
|
//
|
||||||
|
// Reported on f5mzn.org:9000: telnet by hand worked, OpsLog sat at "connecting"
|
||||||
|
// for ever. Two faults met there. The prompts carry no newline, and the read
|
||||||
|
// loop only ever looked at complete LINES, so neither prompt was seen at all;
|
||||||
|
// and the blind 1.5 s login never recorded that it had sent the callsign, which
|
||||||
|
// left the password branch — gated on that flag — permanently switched off.
|
||||||
|
//
|
||||||
|
// The test speaks the node's side literally: "login:" with no newline, then
|
||||||
|
// "password:" with no newline, then a spot. It asserts both answers arrive and
|
||||||
|
// that the session reaches Connected without any welcome banner to lean on.
|
||||||
|
func TestBareLoginAndPasswordPromptsWithoutNewlines(t *testing.T) {
|
||||||
|
ln, err := net.Listen("tcp", "127.0.0.1:0")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer ln.Close()
|
||||||
|
|
||||||
|
host, portStr, _ := net.SplitHostPort(ln.Addr().String())
|
||||||
|
port, err := strconv.Atoi(portStr)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
type answers struct{ login, pwd string }
|
||||||
|
got := make(chan answers, 1)
|
||||||
|
go func() {
|
||||||
|
c, err := ln.Accept()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer c.Close()
|
||||||
|
rd := bufio.NewReader(c)
|
||||||
|
// No newline, exactly as the node sends it.
|
||||||
|
if _, err := c.Write([]byte("login: ")); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
call, err := rd.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := c.Write([]byte("password: ")); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
pwd, err := rd.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
got <- answers{strings.TrimSpace(call), strings.TrimSpace(pwd)}
|
||||||
|
// Something to prove the link is live and parsing again afterwards.
|
||||||
|
_, _ = c.Write([]byte("DX de F4BPO: 14074.0 OY1CT FT8 1234Z\r\n"))
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
}()
|
||||||
|
|
||||||
|
spots := make(chan Spot, 4)
|
||||||
|
s := &session{
|
||||||
|
cfg: ServerConfig{Name: "pwd node", Host: host, Port: port, Password: "s3cret"},
|
||||||
|
login: "F4BPO",
|
||||||
|
onSpot: func(sp Spot) { spots <- sp },
|
||||||
|
onLine: func(Line) {},
|
||||||
|
onStatus: func() {},
|
||||||
|
stopCh: make(chan struct{}),
|
||||||
|
}
|
||||||
|
done := make(chan error, 1)
|
||||||
|
go func() { _, err := s.runOnce(); done <- err }()
|
||||||
|
defer func() { close(s.stopCh); <-done }()
|
||||||
|
|
||||||
|
select {
|
||||||
|
case a := <-got:
|
||||||
|
if a.login != "F4BPO" {
|
||||||
|
t.Errorf("callsign sent = %q, want F4BPO", a.login)
|
||||||
|
}
|
||||||
|
if a.pwd != "s3cret" {
|
||||||
|
t.Errorf("password sent = %q, want s3cret — the prompt carried no newline", a.pwd)
|
||||||
|
}
|
||||||
|
case <-time.After(10 * time.Second):
|
||||||
|
t.Fatal("the node's newline-less prompts were never answered")
|
||||||
|
}
|
||||||
|
|
||||||
|
select {
|
||||||
|
case sp := <-spots:
|
||||||
|
if sp.DXCall != "OY1CT" {
|
||||||
|
t.Errorf("spot from the wrong station: %+v", sp)
|
||||||
|
}
|
||||||
|
case <-time.After(5 * time.Second):
|
||||||
|
t.Fatal("no spot after the login — the stream is not being parsed")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Connected without a welcome banner: the handshake alone must be enough.
|
||||||
|
if st := s.snapshot().State; st != StateConnected {
|
||||||
|
t.Errorf("state = %q, want %q — the server would still show as connecting", st, StateConnected)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A TEXT column that an index is built on must be listed in varcharColumns.
|
||||||
|
//
|
||||||
|
// MySQL cannot index a TEXT column without a prefix length: the migration dies
|
||||||
|
// with error 1170 — and it dies again on every startup afterwards, leaving the
|
||||||
|
// operator with a logbook that will not connect and no way forward from the
|
||||||
|
// interface. The translator only emits VARCHAR for the names in varcharColumns,
|
||||||
|
// and that list is maintained by hand.
|
||||||
|
//
|
||||||
|
// So: read the migrations, work out which columns are TEXT, find which are
|
||||||
|
// indexed, and insist the list covers the overlap. Integer columns are indexed
|
||||||
|
// perfectly well and are none of this test's business.
|
||||||
|
func TestIndexedTextColumnsAreVarchar(t *testing.T) {
|
||||||
|
files, err := migrationsFS.ReadDir("migrations")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read migrations: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// name → declared type, from "ADD COLUMN name TYPE" and from the column
|
||||||
|
// lines inside a CREATE TABLE body.
|
||||||
|
declared := map[string]string{}
|
||||||
|
reAdd := regexp.MustCompile(`(?i)ADD\s+COLUMN\s+` + "`" + `?(\w+)` + "`" + `?\s+(\w+)`)
|
||||||
|
reCol := regexp.MustCompile(`(?im)^\s*` + "`" + `?(\w+)` + "`" + `?\s+(TEXT|VARCHAR|INTEGER|INT|REAL|BLOB|DATETIME|BOOLEAN)\b`)
|
||||||
|
reIdx := regexp.MustCompile(`(?i)CREATE\s+INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?\S+\s+ON\s+\S+\s*\(([^)]*)\)`)
|
||||||
|
|
||||||
|
var indexed []struct{ file, col string }
|
||||||
|
for _, f := range files {
|
||||||
|
if f.IsDir() || !strings.HasSuffix(f.Name(), ".sql") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
body, err := migrationsFS.ReadFile("migrations/" + f.Name())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read %s: %v", f.Name(), err)
|
||||||
|
}
|
||||||
|
src := string(body)
|
||||||
|
for _, m := range reAdd.FindAllStringSubmatch(src, -1) {
|
||||||
|
declared[strings.ToLower(m[1])] = strings.ToUpper(m[2])
|
||||||
|
}
|
||||||
|
for _, m := range reCol.FindAllStringSubmatch(src, -1) {
|
||||||
|
if _, seen := declared[strings.ToLower(m[1])]; !seen {
|
||||||
|
declared[strings.ToLower(m[1])] = strings.ToUpper(m[2])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, m := range reIdx.FindAllStringSubmatch(src, -1) {
|
||||||
|
for _, col := range strings.Split(m[1], ",") {
|
||||||
|
col = strings.TrimSpace(col)
|
||||||
|
if col == "" || strings.Contains(col, "(") {
|
||||||
|
continue // a prefix length or an expression is MySQL-safe already
|
||||||
|
}
|
||||||
|
col = strings.Trim(col, "`\"")
|
||||||
|
if i := strings.IndexAny(col, " \t"); i > 0 {
|
||||||
|
col = col[:i] // "col DESC"
|
||||||
|
}
|
||||||
|
indexed = append(indexed, struct{ file, col string }{f.Name(), strings.ToLower(col)})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(indexed) == 0 || len(declared) == 0 {
|
||||||
|
t.Fatal("nothing parsed out of the migrations — this test has stopped checking anything")
|
||||||
|
}
|
||||||
|
|
||||||
|
textIndexed := 0
|
||||||
|
for _, ix := range indexed {
|
||||||
|
typ, known := declared[ix.col]
|
||||||
|
if !known || typ != "TEXT" {
|
||||||
|
continue // an integer index, or a column this test could not type
|
||||||
|
}
|
||||||
|
textIndexed++
|
||||||
|
if !varcharColumns[ix.col] {
|
||||||
|
t.Errorf("%s indexes the TEXT column %q, which is not in varcharColumns — "+
|
||||||
|
"on MySQL that migration fails with error 1170 and the logbook stops connecting for good",
|
||||||
|
ix.file, ix.col)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if textIndexed == 0 {
|
||||||
|
t.Fatal("no indexed TEXT column found — the parsing has drifted and this test checks nothing")
|
||||||
|
}
|
||||||
|
t.Logf("%d indexed TEXT column(s) checked against varcharColumns", textIndexed)
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
-- A stable identity per contact, for folder-based synchronisation.
|
||||||
|
--
|
||||||
|
-- Two PCs exchanging changes through a shared folder need to name the SAME
|
||||||
|
-- contact in both logs. "the QSO with M0ABC at 14:32" is a guess, and the two
|
||||||
|
-- machines can disagree about which row that is — so an edit or a deletion
|
||||||
|
-- cannot be addressed at all without an identity that travels with the record.
|
||||||
|
--
|
||||||
|
-- A REAL COLUMN, indexed, rather than a key inside extras_json. The identity is
|
||||||
|
-- looked up once per incoming change, and on a 120 000-QSO logbook scanning
|
||||||
|
-- JSON for it would turn every sync into a full table read. A column costs one
|
||||||
|
-- migration; the JSON would cost a scan every time.
|
||||||
|
--
|
||||||
|
-- sync_uid is listed in varcharColumns (internal/db/mysql.go): MySQL cannot
|
||||||
|
-- index a TEXT column without a prefix length, and a migration that tries dies
|
||||||
|
-- with error 1170 on every startup thereafter, with no way out from the UI.
|
||||||
|
--
|
||||||
|
-- Empty on every existing row, and it STAYS empty on most of them. The change
|
||||||
|
-- log starts empty too, so contacts logged before synchronisation was switched
|
||||||
|
-- on are never exchanged: nothing has to be copied across, and an identity is
|
||||||
|
-- stamped only on a contact that is actually logged, edited or deleted from
|
||||||
|
-- then on. Seeding a second machine with the existing log is a one-time copy of
|
||||||
|
-- the database or an ADIF import, not something synchronisation does.
|
||||||
|
ALTER TABLE qso ADD COLUMN sync_uid TEXT NOT NULL DEFAULT '';
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_qso_sync_uid ON qso (sync_uid);
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
-- The lookup cache gains the IOTA reference QRZ was already sending.
|
||||||
|
--
|
||||||
|
-- QRZ's XML carries <iota>EU-048</iota> for an operator on an island, and
|
||||||
|
-- nothing read it — so the one place an IOTA reference can be known BEFORE the
|
||||||
|
-- contact is logged was thrown away on every lookup. There is no live "who is
|
||||||
|
-- on an island right now" feed anywhere (unlike POTA), which makes the callbook
|
||||||
|
-- record the practical source.
|
||||||
|
ALTER TABLE callsign_cache ADD COLUMN iota TEXT;
|
||||||
@@ -67,6 +67,10 @@ var varcharColumns = map[string]bool{
|
|||||||
"callsign": true, "qso_date": true, "band": true, "mode": true,
|
"callsign": true, "qso_date": true, "band": true, "mode": true,
|
||||||
"grid": true, "station_callsign": true, "state": true, "contest_id": true,
|
"grid": true, "station_callsign": true, "state": true, "contest_id": true,
|
||||||
"sat_name": true, "prop_mode": true, "sig": true, "wwff_ref": true, "skcc": true,
|
"sat_name": true, "prop_mode": true, "sig": true, "wwff_ref": true, "skcc": true,
|
||||||
|
"sync_uid": true, // qso index (0029) — folder-sync identity, looked up per record
|
||||||
|
// A new indexed TEXT column MUST be added here. TestIndexedTextColumnsAreVarchar
|
||||||
|
// reads the migrations and fails if one is missing, because the alternative is
|
||||||
|
// a MySQL logbook that stops connecting for good on error 1170.
|
||||||
// integrations_udp index (0011)
|
// integrations_udp index (0011)
|
||||||
"direction": true,
|
"direction": true,
|
||||||
// award_references composite primary key (0017)
|
// award_references composite primary key (0017)
|
||||||
|
|||||||
@@ -40,12 +40,26 @@ func looksLikeHTML(s string) bool {
|
|||||||
// anything in the operator's log, which is what a test button must never do.
|
// anything in the operator's log, which is what a test button must never do.
|
||||||
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
const clublogDownloadURL = "https://clublog.org/getadif.php"
|
||||||
|
|
||||||
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
// clublogAppAPIKey is OpsLog's own Club Log *application* API key, issued to
|
||||||
// requires an api parameter that identifies the client software (not the
|
// "OpsLog" by G7VJR on 2026-08-18.
|
||||||
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
//
|
||||||
// rather than asking each user for one. It's an application identifier, not
|
// Club Log requires an api parameter identifying the client SOFTWARE, not the
|
||||||
// a user secret, but note it is visible in the source and the binary.
|
// user — the same way Log4OM embeds its own — so it ships baked in rather than
|
||||||
const clublogAppAPIKey = "5767f19333363a9ef432ee9cd4141fe76b8adf38"
|
// asking every operator to request one.
|
||||||
|
//
|
||||||
|
// It replaces a key that was registered to XV9Q, not to OpsLog. That was not a
|
||||||
|
// cosmetic detail: every OpsLog upload in the world was attributed to that
|
||||||
|
// callsign, its owner received the abuse warnings OpsLog earned, and a
|
||||||
|
// revocation aimed at them would have cut Club Log uploads for every user of
|
||||||
|
// this program at once.
|
||||||
|
//
|
||||||
|
// Club Log asks that the key not be published in source code. The source lives
|
||||||
|
// on a private remote and only the built exe is released — but the key is still
|
||||||
|
// recoverable from that binary by anyone who looks, as it is for every logger
|
||||||
|
// that embeds one. Treat it as an identifier that can be attributed, never as a
|
||||||
|
// secret: it authorises nothing on its own, since every request also carries the
|
||||||
|
// operator's own e-mail and password.
|
||||||
|
const clublogAppAPIKey = "8df47807a412c586787c9401c96c10c135d6e580"
|
||||||
|
|
||||||
// UploadClublog pushes one ADIF record to Club Log in real time. The user
|
// UploadClublog pushes one ADIF record to Club Log in real time. The user
|
||||||
// supplies the account email + password and the logbook callsign; the
|
// supplies the account email + password and the logbook callsign; the
|
||||||
@@ -117,6 +131,13 @@ func UploadClublogADIF(ctx context.Context, client *http.Client, cfg ServiceConf
|
|||||||
if api == "" {
|
if api == "" {
|
||||||
api = clublogAppAPIKey
|
api = clublogAppAPIKey
|
||||||
}
|
}
|
||||||
|
// putlogs.php reads the upload as an ADIF *file*, so it needs a header.
|
||||||
|
// Callers that already build a full document (the QSL Manager) pass one;
|
||||||
|
// callers that only have <EOR>-terminated records (the on-close flush) do
|
||||||
|
// not, and a headerless file is rejected. Same rule as the LoTW writer.
|
||||||
|
if !strings.Contains(strings.ToUpper(adifDoc), "<EOH>") {
|
||||||
|
adifDoc = "OpsLog Club Log upload\n<PROGRAMID:6>OpsLog <EOH>\n" + adifDoc
|
||||||
|
}
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
mw := multipart.NewWriter(&buf)
|
mw := multipart.NewWriter(&buf)
|
||||||
|
|||||||
@@ -267,6 +267,78 @@ func UploadEQSL(ctx context.Context, client *http.Client, user, pswd, qthNick, a
|
|||||||
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eqslBatchMax is the largest number of records eQSL asks a single upload to
|
||||||
|
// carry ("upload only files smaller than about 1000 records at a time", eQSL's
|
||||||
|
// own ImportADIF interface notes). Callers chunk to this.
|
||||||
|
const eqslBatchMax = 1000
|
||||||
|
|
||||||
|
// UploadEQSLBatch pushes MANY ADIF records to eQSL.cc in ONE request.
|
||||||
|
//
|
||||||
|
// ImportADIF.cfm is a file importer, not a per-QSO endpoint: it takes one *or
|
||||||
|
// more* QSOs and answers "Result: X out of Y records added" — the plural in its
|
||||||
|
// own reply. So an on-close sweep or a bulk upload is one request, not one per
|
||||||
|
// contact. No ADIF header is prepended: the single-record path has always posted
|
||||||
|
// bare <EOR> records and eQSL accepts them (per ADIF, a file starting with '<'
|
||||||
|
// has no header), and there is no reason to change what is known to work.
|
||||||
|
//
|
||||||
|
// A PARTIAL result ("97 out of 100") sets Ignored so the caller can say so.
|
||||||
|
// eQSL does not identify which records it left out, and in practice they are
|
||||||
|
// QSOs it already holds — the same duplicate that UploadEQSL reports as success.
|
||||||
|
func UploadEQSLBatch(ctx context.Context, client *http.Client, user, pswd, qthNick string, records []string) (UploadResult, error) {
|
||||||
|
user = strings.ToUpper(strings.TrimSpace(user))
|
||||||
|
if user == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: username (callsign) not set")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(pswd) == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: password not set")
|
||||||
|
}
|
||||||
|
docs := make([]string, 0, len(records))
|
||||||
|
for _, r := range records {
|
||||||
|
if strings.TrimSpace(r) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
docs = append(docs, eqslRecordWithNickname(strings.TrimRight(r, "\r\n"), qthNick))
|
||||||
|
}
|
||||||
|
if len(docs) == 0 {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: empty adif batch")
|
||||||
|
}
|
||||||
|
if len(docs) > eqslBatchMax {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: batch of %d exceeds the %d-record limit", len(docs), eqslBatchMax)
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := eqslPost(ctx, client, user, pswd, strings.Join(docs, "\n"))
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{OK: false, Message: body}, err
|
||||||
|
}
|
||||||
|
if reason := authErrEQSL(body); reason != "" {
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: %s", reason)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The counted result is read FIRST here, unlike the single-record path: a
|
||||||
|
// batch reply routinely carries both "Result: 97 out of 100 records added"
|
||||||
|
// and a "Bad record: Duplicate" line for the other three, and matching the
|
||||||
|
// duplicate first would throw away the count that says the rest went in.
|
||||||
|
if m := eqslResultRe.FindStringSubmatch(body); m != nil {
|
||||||
|
added, _ := strconv.Atoi(m[1])
|
||||||
|
total, _ := strconv.Atoi(m[2])
|
||||||
|
if added >= 1 {
|
||||||
|
return UploadResult{OK: true, Message: strings.TrimSpace(m[0]), Ignored: added < total}, nil
|
||||||
|
}
|
||||||
|
// "0 out of N" — nothing added. A re-upload of QSOs eQSL already holds
|
||||||
|
// lands here, and that is not a failure.
|
||||||
|
if strings.Contains(strings.ToLower(body), "duplicate") {
|
||||||
|
return UploadResult{OK: true, Message: "already in logbook"}, nil
|
||||||
|
}
|
||||||
|
reason := eqslReason(body)
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: batch upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
if strings.Contains(strings.ToLower(body), "duplicate") {
|
||||||
|
return UploadResult{OK: true, Message: "already in logbook"}, nil
|
||||||
|
}
|
||||||
|
reason := eqslReason(body)
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: batch upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
|
||||||
// eqslReason trims an eQSL reply to a short human-readable reason: the first
|
// eqslReason trims an eQSL reply to a short human-readable reason: the first
|
||||||
// "Error:" / "Warning:" / "Bad record:" line if present, else the whole body
|
// "Error:" / "Warning:" / "Bad record:" line if present, else the whole body
|
||||||
// (capped), else a generic phrase.
|
// (capped), else a generic phrase.
|
||||||
|
|||||||
+180
-30
@@ -295,9 +295,10 @@ func (m *Manager) CloseUploadCount() int {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// FlushOnClose uploads every QSO due for an on-close push, scanning the whole
|
// FlushOnClose uploads every QSO due for an on-close push, scanning the whole
|
||||||
// logbook (not just this session). Called from the shutdown sequence. QRZ/Club
|
// logbook (not just this session). Called from the shutdown sequence. QRZ and
|
||||||
// Log go one-by-one (fast HTTP); LoTW is signed and uploaded as a single TQSL
|
// the rest go one-by-one (fast HTTP, no batch API); LoTW is signed and uploaded
|
||||||
// batch. Returns the number of QSOs uploaded successfully.
|
// as a single TQSL batch, and Club Log goes through its batch endpoint.
|
||||||
|
// Returns the number of QSOs uploaded successfully.
|
||||||
func (m *Manager) FlushOnClose() int {
|
func (m *Manager) FlushOnClose() int {
|
||||||
if m.deps.CloseUploadIDs == nil {
|
if m.deps.CloseUploadIDs == nil {
|
||||||
return 0
|
return 0
|
||||||
@@ -312,41 +313,190 @@ func (m *Manager) FlushOnClose() int {
|
|||||||
switch svc {
|
switch svc {
|
||||||
case ServiceLoTW:
|
case ServiceLoTW:
|
||||||
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
|
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
|
||||||
case ServiceQRZ:
|
|
||||||
for _, id := range ids {
|
|
||||||
if ok, _ := m.upload(svc, id, cfg.QRZ); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case ServiceClublog:
|
case ServiceClublog:
|
||||||
for _, id := range ids {
|
uploaded += m.flushClublogBatch(ids, cfg.Clublog)
|
||||||
if ok, _ := m.upload(svc, id, cfg.Clublog); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case ServiceHRDLog:
|
|
||||||
for _, id := range ids {
|
|
||||||
if ok, _ := m.upload(svc, id, cfg.HRDLog); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
case ServiceEQSL:
|
case ServiceEQSL:
|
||||||
for _, id := range ids {
|
uploaded += m.flushEQSLBatch(ids, cfg.EQSL)
|
||||||
if ok, _ := m.upload(svc, id, cfg.EQSL); ok {
|
case ServiceQRZ:
|
||||||
uploaded++
|
uploaded += m.flushOneByOne(svc, ids, cfg.QRZ)
|
||||||
}
|
case ServiceHRDLog:
|
||||||
}
|
uploaded += m.flushOneByOne(svc, ids, cfg.HRDLog)
|
||||||
case ServiceCloudlog:
|
case ServiceCloudlog:
|
||||||
for _, id := range ids {
|
uploaded += m.flushOneByOne(svc, ids, cfg.Cloudlog)
|
||||||
if ok, _ := m.upload(svc, id, cfg.Cloudlog); ok {
|
|
||||||
uploaded++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return uploaded
|
return uploaded
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// uploadPace is the shortest gap between two consecutive single-QSO uploads in
|
||||||
|
// an on-close sweep. QRZ, HRDLog and Cloudlog have no batch endpoint — HRDLog's
|
||||||
|
// NewEntry.aspx keeps only the first record of a multi-record ADIF — so a sweep
|
||||||
|
// of a freshly imported log is unavoidably one request per contact. It does not
|
||||||
|
// have to arrive as fast as the link allows, though: that burst is what a
|
||||||
|
// service reads as a robot, and what got an operator's IP threatened at Club Log
|
||||||
|
// (see flushClublogBatch). The gap costs nothing in practice, since a round trip
|
||||||
|
// to any of these already takes longer than it.
|
||||||
|
const uploadPace = 200 * time.Millisecond
|
||||||
|
|
||||||
|
// flushOneByOne uploads ids one request at a time, paced. For the services that
|
||||||
|
// have no batch API; everything else has its own flush<Service>Batch.
|
||||||
|
func (m *Manager) flushOneByOne(svc Service, ids []int64, cfg ServiceConfig) int {
|
||||||
|
uploaded := 0
|
||||||
|
for i, id := range ids {
|
||||||
|
if i > 0 {
|
||||||
|
time.Sleep(uploadPace)
|
||||||
|
}
|
||||||
|
if ok, _ := m.upload(svc, id, cfg); ok {
|
||||||
|
uploaded++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return uploaded
|
||||||
|
}
|
||||||
|
|
||||||
|
// eqslBatchChunk is how many QSOs go into one ImportADIF.cfm request. eQSL's own
|
||||||
|
// limit is ten times this (eqslBatchMax); the smaller chunk keeps one refused
|
||||||
|
// record from taking a thousand others down with it, and keeps the form body
|
||||||
|
// small enough to be unremarkable.
|
||||||
|
const eqslBatchChunk = 100
|
||||||
|
|
||||||
|
// flushEQSLBatch uploads the on-close eQSL QSOs through ImportADIF.cfm in
|
||||||
|
// batches instead of one request per contact. Same reasoning as
|
||||||
|
// flushClublogBatch — eQSL's import endpoint has always taken a whole file, so
|
||||||
|
// the one-at-a-time loop was making hundreds of requests it never needed to.
|
||||||
|
func (m *Manager) flushEQSLBatch(ids []int64, cfg ServiceConfig) int {
|
||||||
|
uploaded := 0
|
||||||
|
var records []string
|
||||||
|
var kept []int64
|
||||||
|
|
||||||
|
send := func() {
|
||||||
|
if len(records) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// nil client: UploadEQSLBatch then builds one with a 30 s timeout rather
|
||||||
|
// than reusing the 20 s budget of a single realtime QSO.
|
||||||
|
res, err := UploadEQSLBatch(context.Background(), nil, cfg.Username, cfg.Password, cfg.QTHNickname, records)
|
||||||
|
if err != nil || !res.OK {
|
||||||
|
if err == nil {
|
||||||
|
err = errFromResult(res)
|
||||||
|
}
|
||||||
|
m.logf("extsvc: eqsl batch upload (%d QSOs) failed: %v", len(kept), err)
|
||||||
|
if m.deps.NotifyError != nil {
|
||||||
|
m.deps.NotifyError(ServiceEQSL, 0, err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// res.Ignored means eQSL took the file but left records out. Say the
|
||||||
|
// count out loud: the whole chunk is still marked sent (eQSL never
|
||||||
|
// says WHICH it dropped, and in practice they are QSOs it already
|
||||||
|
// had), so the log line is the only trace of the shortfall.
|
||||||
|
if res.Ignored {
|
||||||
|
m.logf("extsvc: eqsl batch upload PARTIAL (%d QSOs sent) %s", len(kept), res.Message)
|
||||||
|
} else {
|
||||||
|
m.logf("extsvc: eqsl batch upload OK (%d QSOs) %s", len(kept), res.Message)
|
||||||
|
}
|
||||||
|
if m.deps.MarkUploaded != nil {
|
||||||
|
for _, id := range kept {
|
||||||
|
m.deps.MarkUploaded(ServiceEQSL, id, res.LogID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
uploaded += len(kept)
|
||||||
|
}
|
||||||
|
records = records[:0]
|
||||||
|
kept = kept[:0]
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, id := range ids {
|
||||||
|
if m.deps.ShouldUpload != nil && !m.deps.ShouldUpload(ServiceEQSL, id) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// eQSL keeps the QSO's own station call; the account is identified by the
|
||||||
|
// credentials and the optional QTH nickname — as in upload().
|
||||||
|
rec, ok := m.deps.BuildADIF(id, "")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
records = append(records, rec)
|
||||||
|
kept = append(kept, id)
|
||||||
|
if len(records) >= eqslBatchChunk {
|
||||||
|
send()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
send()
|
||||||
|
return uploaded
|
||||||
|
}
|
||||||
|
|
||||||
|
// clublogBatchChunk is how many QSOs go into one putlogs.php request. Club Log
|
||||||
|
// dedupes server-side, so chunking is not about correctness — it keeps a single
|
||||||
|
// malformed record from failing a whole ten-thousand-QSO document, and matches
|
||||||
|
// what the QSL Manager's bulk upload already uses.
|
||||||
|
const clublogBatchChunk = 100
|
||||||
|
|
||||||
|
// flushClublogBatch uploads the on-close Club Log QSOs through the BATCH
|
||||||
|
// endpoint (putlogs.php) rather than one realtime.php call each.
|
||||||
|
//
|
||||||
|
// It used to walk the ids and call UploadClublog per QSO. On-close upload sweeps
|
||||||
|
// the WHOLE logbook, so importing an ADIF — or simply switching Club Log on over
|
||||||
|
// an existing log — turned one app close into hundreds of realtime.php posts.
|
||||||
|
// That endpoint is reserved for an operator logging contacts as they work them,
|
||||||
|
// and Club Log blocks the IP of anything that batches through it: an OpsLog user
|
||||||
|
// was flagged by G7VJR for 185 QSOs in four minutes, which is this loop, not a
|
||||||
|
// pile-up. Batch upload is the mechanism Club Log provides for exactly this.
|
||||||
|
func (m *Manager) flushClublogBatch(ids []int64, cfg ServiceConfig) int {
|
||||||
|
uploaded := 0
|
||||||
|
var records []string
|
||||||
|
var kept []int64
|
||||||
|
|
||||||
|
send := func() {
|
||||||
|
if len(records) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// nil client on purpose: UploadClublogADIF then builds one with a 120 s
|
||||||
|
// timeout. m.deps.Client is the 20 s budget of a single realtime QSO,
|
||||||
|
// which a hundred-QSO document on a slow link would blow through.
|
||||||
|
res, err := UploadClublogADIF(context.Background(), nil, cfg, strings.Join(records, "\n"))
|
||||||
|
if err != nil || !res.OK {
|
||||||
|
if err == nil {
|
||||||
|
err = errFromResult(res)
|
||||||
|
}
|
||||||
|
m.logf("extsvc: clublog batch upload (%d QSOs) failed: %v", len(kept), err)
|
||||||
|
if m.deps.NotifyError != nil {
|
||||||
|
m.deps.NotifyError(ServiceClublog, 0, err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m.logf("extsvc: clublog batch upload OK (%d QSOs) %s", len(kept), res.Message)
|
||||||
|
if m.deps.MarkUploaded != nil {
|
||||||
|
for _, id := range kept {
|
||||||
|
m.deps.MarkUploaded(ServiceClublog, id, res.LogID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
uploaded += len(kept)
|
||||||
|
}
|
||||||
|
records = records[:0]
|
||||||
|
kept = kept[:0]
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, id := range ids {
|
||||||
|
// Skip QSOs not eligible (already sent). The wrong-logbook guard that
|
||||||
|
// upload() applies per QSO is not repeated here: closeUploadIDs has
|
||||||
|
// already filtered the sweep down to this logbook's callsign.
|
||||||
|
if m.deps.ShouldUpload != nil && !m.deps.ShouldUpload(ServiceClublog, id) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Club Log takes the logbook callsign as its own form field, so the ADIF
|
||||||
|
// keeps the QSO's own station call (no override) — as in upload().
|
||||||
|
rec, ok := m.deps.BuildADIF(id, "")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
records = append(records, rec)
|
||||||
|
kept = append(kept, id)
|
||||||
|
if len(records) >= clublogBatchChunk {
|
||||||
|
send()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
send()
|
||||||
|
return uploaded
|
||||||
|
}
|
||||||
|
|
||||||
// flushLoTWBatch signs+uploads all queued LoTW QSOs in one TQSL run, then
|
// flushLoTWBatch signs+uploads all queued LoTW QSOs in one TQSL run, then
|
||||||
// stamps each as uploaded on success.
|
// stamps each as uploaded on success.
|
||||||
func (m *Manager) flushLoTWBatch(ids []int64, cfg ServiceConfig) int {
|
func (m *Manager) flushLoTWBatch(ids []int64, cfg ServiceConfig) int {
|
||||||
|
|||||||
@@ -37,6 +37,19 @@ const (
|
|||||||
ServiceDBUpdated ServiceType = "db_updated" // ADIF of each locally-logged QSO (on save)
|
ServiceDBUpdated ServiceType = "db_updated" // ADIF of each locally-logged QSO (on save)
|
||||||
ServicePstFreq ServiceType = "pstrotator_freq" // <PST><FREQUENCY> radio freq (on freq change)
|
ServicePstFreq ServiceType = "pstrotator_freq" // <PST><FREQUENCY> radio freq (on freq change)
|
||||||
ServiceN1MMRadio ServiceType = "n1mm_radioinfo" // N1MM RadioInfo XML: freq+mode (on freq/mode change)
|
ServiceN1MMRadio ServiceType = "n1mm_radioinfo" // N1MM RadioInfo XML: freq+mode (on freq/mode change)
|
||||||
|
// ServiceWSJTRelay re-sends every datagram an inbound WSJT listener receives,
|
||||||
|
// byte for byte, to somewhere else.
|
||||||
|
//
|
||||||
|
// WSJT-X, JTDX and MSHV send to ONE address. Anything else that wants the
|
||||||
|
// same stream — JTAlert, GridTracker, a second logger — has to be fed by a
|
||||||
|
// relay, and this is it, so OpsLog stops being the reason you cannot run the
|
||||||
|
// two together.
|
||||||
|
//
|
||||||
|
// VERBATIM, with no origin header prepended. The relays in the field add one
|
||||||
|
// ("127.0.0.1:2237|"), which is precisely why stripForwarderHeader exists on
|
||||||
|
// the receiving side here; inflicting the same thing on whatever is
|
||||||
|
// downstream would be repeating a mistake we had to write code to survive.
|
||||||
|
ServiceWSJTRelay ServiceType = "wsjt_relay"
|
||||||
// ServiceWSJTLog wraps the same ADIF in a WSJT-X "Logged ADIF" datagram.
|
// ServiceWSJTLog wraps the same ADIF in a WSJT-X "Logged ADIF" datagram.
|
||||||
// Logger32 and others listen on the WSJT-X interface, not for plain text, and
|
// Logger32 and others listen on the WSJT-X interface, not for plain text, and
|
||||||
// discard a bare ADIF record without a word — so the two cannot be one row.
|
// discard a bare ADIF record without a word — so the two cannot be one row.
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A grid reaches OpsLog in TWO kinds of message, not one. The reply that
|
||||||
|
// answers a CQ with a locator — "C91RU IZ5EME JN52" — is the commonest of them
|
||||||
|
// on a busy band, and reading only CQs meant any station whose CQ we happened
|
||||||
|
// to miss had no known grid at all, so it could never be flagged as a new one.
|
||||||
|
func TestDecodeGridFromBothMessageShapes(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
msg string
|
||||||
|
call string
|
||||||
|
cq bool
|
||||||
|
grid string
|
||||||
|
why string
|
||||||
|
}{
|
||||||
|
{"CQ RW9MZ MO74", "RW9MZ", true, "MO74", "a plain CQ"},
|
||||||
|
{"CQ DX F4BPO JN36", "F4BPO", true, "JN36", "a CQ with a modifier"},
|
||||||
|
{"C91RU IZ5EME JN52", "IZ5EME", false, "JN52", "a reply answering with its grid"},
|
||||||
|
{"YB1EWD YO6GLT KN36", "YO6GLT", false, "KN36", "the same, other way round"},
|
||||||
|
|
||||||
|
// Everything else in the third slot is a report or a sign-off, and must
|
||||||
|
// never be mistaken for a locator.
|
||||||
|
{"C91RU IZ5EME -05", "IZ5EME", false, "", "a signal report is not a grid"},
|
||||||
|
{"C91RU IZ5EME R-05", "IZ5EME", false, "", "a rogered report is not a grid"},
|
||||||
|
{"C91RU IZ5EME RRR", "IZ5EME", false, "", "RRR is not a grid"},
|
||||||
|
{"C91RU IZ5EME RR73", "IZ5EME", false, "", "RR73 has the shape of one and is not"},
|
||||||
|
{"C91RU IZ5EME 73", "IZ5EME", false, "", "73 is not a grid"},
|
||||||
|
{"<YO7LBX> 8F81SU RR73", "8F81SU", false, "", "a hashed call, signing off"},
|
||||||
|
} {
|
||||||
|
call, cq, grid := wsjtSender(tc.msg)
|
||||||
|
if call != tc.call || cq != tc.cq || grid != tc.grid {
|
||||||
|
t.Errorf("wsjtSender(%q) = (%q, %v, %q), want (%q, %v, %q) — %s",
|
||||||
|
tc.msg, call, cq, grid, tc.call, tc.cq, tc.grid, tc.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Reply replays the decode field for field, so the message must survive the
|
||||||
|
// trip UNTRIMMED. DecodeMsg is trimmed for display; DecodeMsgRaw is what goes
|
||||||
|
// back, and a stripped trailing space is a mismatch the far end reports nowhere.
|
||||||
|
func TestDecodeKeepsTheUntrimmedMessage(t *testing.T) {
|
||||||
|
qstr := func(b *bytes.Buffer, v string) {
|
||||||
|
binary.Write(b, binary.BigEndian, int32(len(v)))
|
||||||
|
b.WriteString(v)
|
||||||
|
}
|
||||||
|
const padded = "CQ RW9MZ MO74 "
|
||||||
|
var p bytes.Buffer
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(2))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMsgDecode))
|
||||||
|
qstr(&p, "JTDX")
|
||||||
|
binary.Write(&p, binary.BigEndian, uint8(1))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(45_000_000))
|
||||||
|
binary.Write(&p, binary.BigEndian, int32(-6))
|
||||||
|
binary.Write(&p, binary.BigEndian, float64(0.2))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(1500))
|
||||||
|
qstr(&p, "~")
|
||||||
|
qstr(&p, padded)
|
||||||
|
|
||||||
|
ev, ok, err := ParseWSJT(p.Bytes())
|
||||||
|
if err != nil || !ok {
|
||||||
|
t.Fatalf("parse: %v ok=%v", err, ok)
|
||||||
|
}
|
||||||
|
if ev.DecodeMsgRaw != padded {
|
||||||
|
t.Errorf("DecodeMsgRaw = %q, want %q — a Reply built from this will not match", ev.DecodeMsgRaw, padded)
|
||||||
|
}
|
||||||
|
if ev.DecodeMsg != "CQ RW9MZ MO74" {
|
||||||
|
t.Errorf("DecodeMsg = %q, want it trimmed for display", ev.DecodeMsg)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A Decode does not carry the mode's NAME. It carries the one-character marker
|
||||||
|
// from the decode line — "~" for FT8, "+" for FT4 — and that character used to
|
||||||
|
// be passed on as if it were a mode. Everything downstream compared it against
|
||||||
|
// the modes in the log, matched nothing, and reported every station on an
|
||||||
|
// already-worked band as a NEW MODE.
|
||||||
|
func TestDecodeModeNameResolvesTheMarker(t *testing.T) {
|
||||||
|
for raw, want := range map[string]string{
|
||||||
|
"~": "FT8",
|
||||||
|
"+": "FT4",
|
||||||
|
"#": "JT65",
|
||||||
|
"@": "JT9",
|
||||||
|
} {
|
||||||
|
if got := DecodeModeName(raw, "FT8"); got != want {
|
||||||
|
t.Errorf("DecodeModeName(%q) = %q, want %q", raw, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A sender that puts the real name in the field is believed as-is — several do,
|
||||||
|
// and the marker table must not get in their way.
|
||||||
|
func TestDecodeModeNameKeepsARealName(t *testing.T) {
|
||||||
|
for _, raw := range []string{"FT8", "ft4", "JS8", "Q65"} {
|
||||||
|
if got := DecodeModeName(raw, ""); got == "" || got != upper(raw) {
|
||||||
|
t.Errorf("DecodeModeName(%q) = %q, want the name itself", raw, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The safety net: an unknown marker falls back to the mode from the sender's
|
||||||
|
// last Status, which always carries the real name. This is what keeps a future
|
||||||
|
// or unlisted marker degrading to correct rather than to nonsense.
|
||||||
|
func TestDecodeModeNameFallsBackToStatus(t *testing.T) {
|
||||||
|
if got := DecodeModeName("%", "FT4"); got != "FT4" {
|
||||||
|
t.Errorf("unknown marker resolved to %q, want the Status mode FT4", got)
|
||||||
|
}
|
||||||
|
if got := DecodeModeName("", "FT8"); got != "FT8" {
|
||||||
|
t.Errorf("empty mode resolved to %q, want the Status mode FT8", got)
|
||||||
|
}
|
||||||
|
// Nothing known at all is empty rather than a guess: an empty mode makes the
|
||||||
|
// status resolver answer "worked", which is the safe side — a wrong mode
|
||||||
|
// would invent a new-mode flag exactly as the marker did.
|
||||||
|
if got := DecodeModeName("%", ""); got != "" {
|
||||||
|
t.Errorf("with no Status mode the result was %q, want empty", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func upper(s string) string {
|
||||||
|
out := []rune(s)
|
||||||
|
for i, r := range out {
|
||||||
|
if r >= 'a' && r <= 'z' {
|
||||||
|
out[i] = r - 32
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return string(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolving the marker must not DESTROY it. A Reply is matched by the receiving
|
||||||
|
// application against its own decode list field for field, and the mode field it
|
||||||
|
// compares is the one it sent — the marker. Sending the resolved name instead is
|
||||||
|
// accepted silently and simply never transmits: JTDX finds no matching decode,
|
||||||
|
// and no error is reported anywhere to say so. Reported as "clicking a CQ does
|
||||||
|
// nothing in JTDX".
|
||||||
|
//
|
||||||
|
// So a Decode has to carry BOTH: Mode for the log and the status resolver,
|
||||||
|
// DecodeModeRaw for the Reply.
|
||||||
|
func TestDecodeKeepsTheRawModeMarkerForReplies(t *testing.T) {
|
||||||
|
qstr := func(b *bytes.Buffer, v string) {
|
||||||
|
binary.Write(b, binary.BigEndian, int32(len(v)))
|
||||||
|
b.WriteString(v)
|
||||||
|
}
|
||||||
|
var p bytes.Buffer
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(2)) // schema
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(wsjtMsgDecode)) // type 2
|
||||||
|
qstr(&p, "JTDX") // id
|
||||||
|
binary.Write(&p, binary.BigEndian, uint8(1)) // is_new
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(45_000_000)) // time (ms since midnight)
|
||||||
|
binary.Write(&p, binary.BigEndian, int32(-6)) // snr
|
||||||
|
binary.Write(&p, binary.BigEndian, float64(0.2)) // delta_time
|
||||||
|
binary.Write(&p, binary.BigEndian, uint32(1500)) // delta_frequency
|
||||||
|
qstr(&p, "~") // mode — the MARKER
|
||||||
|
qstr(&p, "CQ EN35UKR") // message
|
||||||
|
|
||||||
|
out := make(chan Event, 4)
|
||||||
|
s := &Server{
|
||||||
|
out: out,
|
||||||
|
cfg: Config{Name: "JTDX", ServiceType: ServiceWSJT},
|
||||||
|
lastMode: map[string]string{"JTDX": "FT8"},
|
||||||
|
dialHz: map[string]int64{"JTDX": 14074000},
|
||||||
|
}
|
||||||
|
s.handle(p.Bytes(), &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 2237})
|
||||||
|
|
||||||
|
var ev Event
|
||||||
|
select {
|
||||||
|
case ev = <-out:
|
||||||
|
default:
|
||||||
|
t.Fatal("no event emitted for the decode")
|
||||||
|
}
|
||||||
|
if ev.Mode != "FT8" {
|
||||||
|
t.Errorf("resolved Mode = %q, want FT8 (what the log and the status resolver need)", ev.Mode)
|
||||||
|
}
|
||||||
|
if ev.DecodeModeRaw != "~" {
|
||||||
|
t.Errorf("DecodeModeRaw = %q, want %q — a Reply built from this will not match and JTDX will not transmit",
|
||||||
|
ev.DecodeModeRaw, "~")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const ms = 1000
|
||||||
|
|
||||||
|
func sec(h, m, s int) uint32 { return uint32((h*3600 + m*60 + s) * ms) }
|
||||||
|
|
||||||
|
// WSJT-X stamps a decode with a time of DAY and no date, so the date has to come
|
||||||
|
// from our own clock — and around midnight the two disagree. A decode stamped
|
||||||
|
// 23:59:58 that reaches us at 00:00:01 would be dated the NEW day, putting it
|
||||||
|
// almost 24 hours in the future: it would sort to the top of the decodes panel
|
||||||
|
// and stay there for the rest of the session, and its period would never line up
|
||||||
|
// with the ones around it.
|
||||||
|
//
|
||||||
|
// The clock is passed IN. The previous version of this test read the real one
|
||||||
|
// and so failed every afternoon — a 23:59:58 stamp seen at 17:00 is genuinely
|
||||||
|
// hours in the future, and no rule can make it otherwise. A suite that is red
|
||||||
|
// for half the day is a suite nobody reads.
|
||||||
|
func TestDecodeTimeCrossesMidnight(t *testing.T) {
|
||||||
|
// Just after midnight, a stamp from the last seconds of yesterday.
|
||||||
|
now := time.Date(2026, 3, 14, 0, 0, 1, 0, time.UTC)
|
||||||
|
got := decodeTimeAt(sec(23, 59, 58), now)
|
||||||
|
if want := time.Date(2026, 3, 13, 23, 59, 58, 0, time.UTC); !got.Equal(want) {
|
||||||
|
t.Errorf("23:59:58 seen at 00:00:01 → %s, want %s (yesterday)", got, want)
|
||||||
|
}
|
||||||
|
if got.After(now) {
|
||||||
|
t.Errorf("%s is in the future — it would sort to the top of the list for the session", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The mirror case: just before midnight, a stamp from the first seconds of
|
||||||
|
// tomorrow. Our clock is still on the old day.
|
||||||
|
func TestDecodeTimeCrossesMidnightBackwards(t *testing.T) {
|
||||||
|
now := time.Date(2026, 3, 13, 23, 59, 58, 0, time.UTC)
|
||||||
|
got := decodeTimeAt(sec(0, 0, 1), now)
|
||||||
|
if want := time.Date(2026, 3, 14, 0, 0, 1, 0, time.UTC); !got.Equal(want) {
|
||||||
|
t.Errorf("00:00:01 seen at 23:59:58 → %s, want %s (tomorrow)", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The ordinary case, which is every decode that is not within a few seconds of
|
||||||
|
// midnight: the stamp belongs to today and is left alone.
|
||||||
|
func TestDecodeTimeOrdinary(t *testing.T) {
|
||||||
|
now := time.Date(2026, 3, 13, 14, 30, 0, 0, time.UTC)
|
||||||
|
got := decodeTimeAt(sec(14, 29, 45), now)
|
||||||
|
if want := time.Date(2026, 3, 13, 14, 29, 45, 0, time.UTC); !got.Equal(want) {
|
||||||
|
t.Errorf("a stamp close to now → %s, want %s", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The whole point of the timestamp is grouping, so two decodes from the same
|
||||||
|
// fifteen-second slot must floor to the same period however far apart in the
|
||||||
|
// slot they were heard.
|
||||||
|
func TestDecodesInOneSlotShareAPeriod(t *testing.T) {
|
||||||
|
now := time.Date(2026, 3, 13, 12, 30, 7, 0, time.UTC)
|
||||||
|
at := func(h, m, s int) time.Time { return decodeTimeAt(sec(h, m, s), now) }
|
||||||
|
floor := func(x time.Time) int64 { return x.Unix() / 15 * 15 }
|
||||||
|
|
||||||
|
a, b := at(12, 30, 0), at(12, 30, 14)
|
||||||
|
if floor(a) != floor(b) {
|
||||||
|
t.Errorf("%s and %s fell in different periods", a, b)
|
||||||
|
}
|
||||||
|
if floor(at(12, 30, 14)) == floor(at(12, 30, 15)) {
|
||||||
|
t.Error("12:30:14 and 12:30:15 are different slots and must not share a period")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ package udp
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
@@ -185,3 +186,94 @@ func (m *Manager) sendTo(c Config, payload []byte) {
|
|||||||
applog.Printf("udp: [%s] sent %d bytes to %s (%s)%s",
|
applog.Printf("udp: [%s] sent %d bytes to %s (%s)%s",
|
||||||
c.Name, len(payload), dst, c.ServiceType, sentPreview(c, payload))
|
c.Name, len(payload), dst, c.ServiceType, sentPreview(c, payload))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RelayInbound re-sends one received datagram, unchanged, to every configured
|
||||||
|
// relay destination.
|
||||||
|
//
|
||||||
|
// Called with the RAW bytes as they arrived — before parsing, and whatever the
|
||||||
|
// parse made of them. A packet this build cannot decode is still a packet the
|
||||||
|
// application downstream may understand perfectly well, and a relay that only
|
||||||
|
// forwards what it understood is a relay that silently drops the fields it has
|
||||||
|
// not learned about yet.
|
||||||
|
//
|
||||||
|
// Loop guard: a destination that is one of our OWN inbound ports on a local
|
||||||
|
// address would come straight back in and be relayed again, for ever, at line
|
||||||
|
// rate. Such a row is skipped and said so once — quietly dropping it would look
|
||||||
|
// like a relay that does not work.
|
||||||
|
func (m *Manager) RelayInbound(pkt []byte, fromPort int) {
|
||||||
|
if len(pkt) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rows := m.Outbound(ServiceWSJTRelay)
|
||||||
|
if len(rows) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
ports := make(map[int]struct{}, len(m.inbound))
|
||||||
|
for _, s := range m.inbound {
|
||||||
|
ports[s.cfg.Port] = struct{}{}
|
||||||
|
}
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
|
for _, c := range rows {
|
||||||
|
if isLoopback(c.DestinationIP) {
|
||||||
|
if _, mine := ports[c.Port]; mine {
|
||||||
|
m.relayLoopOnce(c)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Deliberately not sendTo: that logs a line per datagram, and this runs
|
||||||
|
// on every decode of every period — it would bury the log within minutes.
|
||||||
|
host := strings.TrimSpace(c.DestinationIP)
|
||||||
|
if host == "" {
|
||||||
|
host = "127.0.0.1"
|
||||||
|
}
|
||||||
|
dst := fmt.Sprintf("%s:%d", host, c.Port)
|
||||||
|
if err := SendUDP(dst, pkt); err != nil {
|
||||||
|
m.relayErrOnce(c, dst, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = fromPort
|
||||||
|
}
|
||||||
|
|
||||||
|
// isLoopback reports whether a destination names this machine. Empty counts:
|
||||||
|
// sendTo defaults it to 127.0.0.1.
|
||||||
|
func isLoopback(host string) bool {
|
||||||
|
h := strings.TrimSpace(host)
|
||||||
|
if h == "" || h == "localhost" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
ip := net.ParseIP(h)
|
||||||
|
return ip != nil && ip.IsLoopback()
|
||||||
|
}
|
||||||
|
|
||||||
|
// relayLoopOnce and relayErrOnce keep a repeating relay complaint to one line a
|
||||||
|
// session. Both fire per datagram otherwise, which on a busy band is hundreds a
|
||||||
|
// minute and makes the log useless for anything else.
|
||||||
|
func (m *Manager) relayLoopOnce(c Config) {
|
||||||
|
m.relayWarnMu.Lock()
|
||||||
|
defer m.relayWarnMu.Unlock()
|
||||||
|
if m.relayWarned == nil {
|
||||||
|
m.relayWarned = map[int64]bool{}
|
||||||
|
}
|
||||||
|
if m.relayWarned[c.ID] {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.relayWarned[c.ID] = true
|
||||||
|
applog.Printf("udp: [%s] relay target %s:%d is one of OpsLog's OWN listening ports — "+
|
||||||
|
"that would feed the stream back into itself for ever. Nothing is relayed on this row; "+
|
||||||
|
"point it at the other application's port.", c.Name, c.DestinationIP, c.Port)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) relayErrOnce(c Config, dst string, err error) {
|
||||||
|
m.relayWarnMu.Lock()
|
||||||
|
defer m.relayWarnMu.Unlock()
|
||||||
|
if m.relayWarned == nil {
|
||||||
|
m.relayWarned = map[int64]bool{}
|
||||||
|
}
|
||||||
|
if m.relayWarned[-c.ID-1] {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.relayWarned[-c.ID-1] = true
|
||||||
|
applog.Printf("udp: [%s] relay to %s failed: %v (said once)", c.Name, dst, err)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The relay exists so a second application can be fed the same WSJT-X stream,
|
||||||
|
// and the ONE thing it must get right is that the bytes are unchanged. The
|
||||||
|
// relays in the field prepend an origin header ("127.0.0.1:2237|") — which is
|
||||||
|
// why stripForwarderHeader had to be written on the receiving side — so a
|
||||||
|
// header here would inflict on the next program the fault we had to survive.
|
||||||
|
func TestRelayForwardsVerbatim(t *testing.T) {
|
||||||
|
dst, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer dst.Close()
|
||||||
|
port := dst.LocalAddr().(*net.UDPAddr).Port
|
||||||
|
|
||||||
|
m := &Manager{outbound: []Config{{
|
||||||
|
ID: 1, Name: "relay", ServiceType: ServiceWSJTRelay,
|
||||||
|
DestinationIP: "127.0.0.1", Port: port,
|
||||||
|
}}}
|
||||||
|
|
||||||
|
// A packet with bytes that no parser here understands, on purpose: the relay
|
||||||
|
// must not care what it is carrying.
|
||||||
|
sent := []byte{0xad, 0xbc, 0xcb, 0xda, 0x00, 0x00, 0x00, 0x63, 0xde, 0xad, 0xbe, 0xef}
|
||||||
|
m.RelayInbound(sent, 2237)
|
||||||
|
|
||||||
|
buf := make([]byte, 1024)
|
||||||
|
_ = dst.SetReadDeadline(time.Now().Add(2 * time.Second))
|
||||||
|
n, _, err := dst.ReadFromUDP(buf)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("nothing relayed: %v", err)
|
||||||
|
}
|
||||||
|
if got := buf[:n]; string(got) != string(sent) {
|
||||||
|
t.Errorf("relayed % X, want % X — the bytes must go out unchanged", got, sent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A relay aimed at one of OpsLog's OWN listening ports would come straight back
|
||||||
|
// in, be relayed again, and saturate the loopback within seconds. The row is
|
||||||
|
// skipped instead.
|
||||||
|
func TestRelayRefusesToFeedItself(t *testing.T) {
|
||||||
|
own, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer own.Close()
|
||||||
|
port := own.LocalAddr().(*net.UDPAddr).Port
|
||||||
|
|
||||||
|
m := &Manager{
|
||||||
|
inbound: map[int64]*Server{
|
||||||
|
7: {cfg: Config{ID: 7, Port: port, ServiceType: ServiceWSJT}},
|
||||||
|
},
|
||||||
|
outbound: []Config{{
|
||||||
|
ID: 1, Name: "loop", ServiceType: ServiceWSJTRelay,
|
||||||
|
DestinationIP: "127.0.0.1", Port: port,
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
m.RelayInbound([]byte{1, 2, 3, 4}, 2237)
|
||||||
|
|
||||||
|
buf := make([]byte, 64)
|
||||||
|
_ = own.SetReadDeadline(time.Now().Add(300 * time.Millisecond))
|
||||||
|
if n, _, err := own.ReadFromUDP(buf); err == nil {
|
||||||
|
t.Fatalf("relayed %d bytes back into our own listener — that is the loop", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// No relay rows configured must cost nothing and send nothing.
|
||||||
|
func TestRelayWithNoRowsIsSilent(t *testing.T) {
|
||||||
|
m := &Manager{}
|
||||||
|
m.RelayInbound([]byte{1, 2, 3}, 2237) // must not panic
|
||||||
|
m.RelayInbound(nil, 2237)
|
||||||
|
}
|
||||||
@@ -77,6 +77,37 @@ func reusingListenConfig() net.ListenConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// decodeTime turns WSJT-X's milliseconds-since-midnight into a UTC instant.
|
||||||
|
//
|
||||||
|
// The sender gives a time of DAY with no date, so the date comes from our own
|
||||||
|
// clock — and the two can straddle midnight: a decode stamped 23:59:58 that
|
||||||
|
// reaches us at 00:00:01 would otherwise be dated a day late and sort to the top
|
||||||
|
// of the list for the rest of the session. More than half a day apart is read as
|
||||||
|
// the wrong side of midnight and moved.
|
||||||
|
func decodeTime(msSinceMidnight uint32) time.Time {
|
||||||
|
return decodeTimeAt(msSinceMidnight, time.Now().UTC())
|
||||||
|
}
|
||||||
|
|
||||||
|
// decodeTimeAt is decodeTime with the clock passed in.
|
||||||
|
//
|
||||||
|
// Split out so the midnight rule can be tested at midnight instead of at
|
||||||
|
// whatever time the suite happens to run: the test used to read the real clock
|
||||||
|
// and failed every afternoon, because a 23:59:58 stamp seen at 17:00 is hours in
|
||||||
|
// the future and no rule can make it otherwise. A test that fails for half the
|
||||||
|
// day teaches everyone to ignore the suite.
|
||||||
|
func decodeTimeAt(msSinceMidnight uint32, now time.Time) time.Time {
|
||||||
|
now = now.UTC()
|
||||||
|
midnight := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC)
|
||||||
|
at := midnight.Add(time.Duration(msSinceMidnight) * time.Millisecond)
|
||||||
|
switch {
|
||||||
|
case at.Sub(now) > 12*time.Hour:
|
||||||
|
at = at.AddDate(0, 0, -1) // stamped late yesterday, arrived after midnight
|
||||||
|
case now.Sub(at) > 12*time.Hour:
|
||||||
|
at = at.AddDate(0, 0, 1) // stamped just after midnight, our clock still on the old day
|
||||||
|
}
|
||||||
|
return at
|
||||||
|
}
|
||||||
|
|
||||||
// Event is what a Server emits to its consumer for every parsed packet.
|
// Event is what a Server emits to its consumer for every parsed packet.
|
||||||
// At most one of the fields is populated per event.
|
// At most one of the fields is populated per event.
|
||||||
type Event struct {
|
type Event struct {
|
||||||
@@ -92,10 +123,55 @@ type Event struct {
|
|||||||
|
|
||||||
// A WSJT-X Decode (heard station) to render on the panadapter.
|
// A WSJT-X Decode (heard station) to render on the panadapter.
|
||||||
DecodeCall string // transmitting (DE) callsign
|
DecodeCall string // transmitting (DE) callsign
|
||||||
DecodeGrid string // 4-char grid, CQ decodes only
|
DecodeGrid string // 4-char grid: from a CQ, or a reply answering with its locator
|
||||||
DecodeFreqHz int64 // RF frequency (dial + audio offset)
|
DecodeFreqHz int64 // RF frequency (dial + audio offset)
|
||||||
DecodeSNR int // reported SNR (dB)
|
DecodeSNR int // reported SNR (dB)
|
||||||
DecodeCQ bool // the decode was a CQ
|
DecodeCQ bool // the decode was a CQ
|
||||||
|
DecodeMsg string // the decoded line as printed ("CQ K1ABC FN42")
|
||||||
|
// DecodeAt is the decode's own UTC timestamp, rebuilt from the sender's
|
||||||
|
// milliseconds-since-midnight. It is what groups decodes into T/R periods:
|
||||||
|
// a period's worth arrives in one burst, so arrival time would put them all
|
||||||
|
// in whichever slot the burst happened to land in.
|
||||||
|
DecodeAt time.Time
|
||||||
|
// DecodeTRPeriod is the transmit/receive period in seconds, from the last
|
||||||
|
// Status of the same program (15 = FT8). 0 when the sender never said.
|
||||||
|
DecodeTRPeriod int
|
||||||
|
DecodeDial int64 // dial frequency the decode was heard on, for the band
|
||||||
|
DecodeOffAir bool // decoded from a file rather than off the air
|
||||||
|
// The three fields below are shown in the panel AND replayed verbatim when
|
||||||
|
// answering the station — WSJT-X matches a Reply against its own decode list,
|
||||||
|
// so every one has to go back exactly as it came.
|
||||||
|
DecodeDT float64 // seconds into the slot the transmission started
|
||||||
|
DecodeAudioHz int64 // audio offset inside the passband
|
||||||
|
DecodeMs uint32 // the decode's raw ms-since-midnight, as sent
|
||||||
|
DecodeLowConf bool
|
||||||
|
// DecodeModeRaw is the mode field EXACTLY as the Decode carried it — the
|
||||||
|
// one-character marker ("~", "+"), not the resolved name in Mode.
|
||||||
|
//
|
||||||
|
// Both are needed and they are not interchangeable. Mode is what the log and
|
||||||
|
// the status resolver want. This is what a Reply must echo: the receiving
|
||||||
|
// application matches a Reply against its own decode list field for field,
|
||||||
|
// and JTDX rejects one whose mode reads "FT8" where it decoded "~" — the
|
||||||
|
// click is accepted, nothing is transmitted, and nothing is reported.
|
||||||
|
DecodeModeRaw string
|
||||||
|
// DecodeMsgRaw is the message as sent, untrimmed — see DecodeModeRaw.
|
||||||
|
DecodeMsgRaw string
|
||||||
|
// ProgramID is the sending application's own id ("WSJT-X", "MSHV", or
|
||||||
|
// "WSJT-X - 2" for a second instance started with --rig-name). It is what
|
||||||
|
// tells two receivers apart on one multicast group — and it is the address a
|
||||||
|
// Reply message would have to be sent back to, so it is carried even though
|
||||||
|
// nothing replies yet.
|
||||||
|
ProgramID string
|
||||||
|
|
||||||
|
// TxMessage is what the operator's digital app is sending, with Transmitting
|
||||||
|
// true while the carrier is actually up. From Status, so ~1 Hz.
|
||||||
|
TxMessage string
|
||||||
|
Transmitting bool
|
||||||
|
// TxEnabled is the sender's Enable Tx toggle — see WSJTEvent.TxEnabled. The
|
||||||
|
// watchdog clears it, which is the only reliable sign an exchange was
|
||||||
|
// abandoned rather than merely paused between overs.
|
||||||
|
TxEnabled bool
|
||||||
|
DECall string // the operator's own call, as the digital app knows it
|
||||||
|
|
||||||
// ClearCall is set when a WSJT/JTDX/MSHV Status message reports an EMPTY DX
|
// ClearCall is set when a WSJT/JTDX/MSHV Status message reports an EMPTY DX
|
||||||
// Call after previously reporting one — i.e. the operator cleared the call in
|
// Call after previously reporting one — i.e. the operator cleared the call in
|
||||||
@@ -112,7 +188,10 @@ type Event struct {
|
|||||||
|
|
||||||
// Server is a single inbound UDP listener.
|
// Server is a single inbound UDP listener.
|
||||||
type Server struct {
|
type Server struct {
|
||||||
cfg Config
|
cfg Config
|
||||||
|
// mgr is the owning Manager, so a listener can reach the outbound rows.
|
||||||
|
// The relay is the only thing that needs it.
|
||||||
|
mgr *Manager
|
||||||
conn *net.UDPConn
|
conn *net.UDPConn
|
||||||
out chan<- Event
|
out chan<- Event
|
||||||
stop chan struct{}
|
stop chan struct{}
|
||||||
@@ -127,7 +206,16 @@ type Server struct {
|
|||||||
// 50.400 panadapter. WSJT-X requires --rig-name for a second instance, so the
|
// 50.400 panadapter. WSJT-X requires --rig-name for a second instance, so the
|
||||||
// id is distinct whenever there is more than one.
|
// id is distinct whenever there is more than one.
|
||||||
dialHz map[string]int64
|
dialHz map[string]int64
|
||||||
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
// trPeriod is the T/R period (seconds) from each program's last Status —
|
||||||
|
// what tells a decode which slot it belongs to.
|
||||||
|
trPeriod map[string]int
|
||||||
|
// lastFrom is the address each program's packets arrive from — where a Reply
|
||||||
|
// has to be sent. See SendReply.
|
||||||
|
lastFrom map[string]*net.UDPAddr
|
||||||
|
// lastMode is the mode NAME from each program's last Status, used to resolve
|
||||||
|
// a Decode's one-character mode marker.
|
||||||
|
lastMode map[string]string
|
||||||
|
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
||||||
|
|
||||||
// badPkts counts datagrams this listener could not parse, so the diagnostic
|
// badPkts counts datagrams this listener could not parse, so the diagnostic
|
||||||
// dump below stays bounded. A misconfigured port is not a one-off: the
|
// dump below stays bounded. A misconfigured port is not a one-off: the
|
||||||
@@ -135,6 +223,15 @@ type Server struct {
|
|||||||
// which fills the whole rotating log with the same line and buries the
|
// which fills the whole rotating log with the same line and buries the
|
||||||
// evidence of anything else.
|
// evidence of anything else.
|
||||||
badPkts int
|
badPkts int
|
||||||
|
|
||||||
|
// drops counts events discarded because the consumer could not keep up —
|
||||||
|
// see the select at the foot of handle(). They used to vanish in silence,
|
||||||
|
// which made a missing decode indistinguishable from one the sender never
|
||||||
|
// broadcast: an operator comparing the panel against JTDX side by side was
|
||||||
|
// the only detector we had. A period's decodes arrive as one burst, so this
|
||||||
|
// is exactly when it happens.
|
||||||
|
drops int
|
||||||
|
lastDropL time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
// maxBadPktDumps is how many unparseable datagrams a listener describes in full
|
// maxBadPktDumps is how many unparseable datagrams a listener describes in full
|
||||||
@@ -171,10 +268,11 @@ func describePacket(pkt []byte) string {
|
|||||||
return fmt.Sprintf("%d bytes | text %q%s | hex %s%s", len(pkt), text.String(), more, strings.TrimSpace(hex.String()), more)
|
return fmt.Sprintf("%d bytes | text %q%s | hex %s%s", len(pkt), text.String(), more, strings.TrimSpace(hex.String()), more)
|
||||||
}
|
}
|
||||||
|
|
||||||
func newServer(cfg Config, out chan<- Event) *Server {
|
func newServer(cfg Config, out chan<- Event, mgr *Manager) *Server {
|
||||||
return &Server{
|
return &Server{
|
||||||
cfg: cfg,
|
cfg: cfg,
|
||||||
out: out,
|
out: out,
|
||||||
|
mgr: mgr,
|
||||||
stop: make(chan struct{}),
|
stop: make(chan struct{}),
|
||||||
done: make(chan struct{}),
|
done: make(chan struct{}),
|
||||||
}
|
}
|
||||||
@@ -340,6 +438,17 @@ func (s *Server) noteIgnoredADIF(pkt []byte) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||||
|
// Relay FIRST, and unconditionally: before parsing, and whatever the parse
|
||||||
|
// then makes of it. A datagram this build cannot decode is still one the
|
||||||
|
// application downstream may understand, and a relay that forwards only what
|
||||||
|
// it understood drops exactly the fields it has yet to learn about.
|
||||||
|
//
|
||||||
|
// WSJT listeners only. The other inbound services are text protocols with no
|
||||||
|
// second consumer to speak of, and relaying an ADIF record twice would log
|
||||||
|
// the contact twice.
|
||||||
|
if s.cfg.ServiceType == ServiceWSJT && s.mgr != nil {
|
||||||
|
s.mgr.RelayInbound(pkt, s.cfg.Port)
|
||||||
|
}
|
||||||
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
|
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
|
||||||
switch s.cfg.ServiceType {
|
switch s.cfg.ServiceType {
|
||||||
case ServiceWSJT:
|
case ServiceWSJT:
|
||||||
@@ -351,6 +460,18 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// Where this application's packets come from, so a Reply can be sent back
|
||||||
|
// to it. Per PROGRAM, not per listener: two receivers share one multicast
|
||||||
|
// group, and a reply must reach the one that heard the station — and it
|
||||||
|
// must go to the sender's own address, never to the group.
|
||||||
|
if w.ProgramID != "" && remote != nil {
|
||||||
|
s.mu.Lock()
|
||||||
|
if s.lastFrom == nil {
|
||||||
|
s.lastFrom = map[string]*net.UDPAddr{}
|
||||||
|
}
|
||||||
|
s.lastFrom[w.ProgramID] = remote
|
||||||
|
s.mu.Unlock()
|
||||||
|
}
|
||||||
// Status carries the current dial frequency; remember it so Decode audio
|
// Status carries the current dial frequency; remember it so Decode audio
|
||||||
// offsets can be turned into RF frequencies for the panadapter.
|
// offsets can be turned into RF frequencies for the panadapter.
|
||||||
if w.FreqHz > 0 && !w.IsDecode {
|
if w.FreqHz > 0 && !w.IsDecode {
|
||||||
@@ -359,11 +480,40 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
s.dialHz = map[string]int64{}
|
s.dialHz = map[string]int64{}
|
||||||
}
|
}
|
||||||
s.dialHz[w.ProgramID] = w.FreqHz
|
s.dialHz[w.ProgramID] = w.FreqHz
|
||||||
|
// The T/R period travels with Status, and a decode has to be told
|
||||||
|
// which slot it belongs to — so it is remembered per program the
|
||||||
|
// same way the dial is.
|
||||||
|
if w.TRPeriod > 0 {
|
||||||
|
if s.trPeriod == nil {
|
||||||
|
s.trPeriod = map[string]int{}
|
||||||
|
}
|
||||||
|
s.trPeriod[w.ProgramID] = w.TRPeriod
|
||||||
|
}
|
||||||
|
// The mode NAME, which only Status carries: a Decode gives the
|
||||||
|
// one-character marker instead. See DecodeModeName.
|
||||||
|
if w.Mode != "" {
|
||||||
|
if s.lastMode == nil {
|
||||||
|
s.lastMode = map[string]string{}
|
||||||
|
}
|
||||||
|
s.lastMode[w.ProgramID] = w.Mode
|
||||||
|
}
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
}
|
}
|
||||||
|
if !w.IsDecode && (w.TxMessage != "" || w.DECall != "") {
|
||||||
|
// What the operator is sending, and to whom. Carried on every Status,
|
||||||
|
// so the consumer sees it change as the QSO progresses. The program id
|
||||||
|
// travels with it because a second receiver has a transmit state of
|
||||||
|
// its own.
|
||||||
|
ev.TxMessage = w.TxMessage
|
||||||
|
ev.Transmitting = w.Transmitting
|
||||||
|
ev.DECall = w.DECall
|
||||||
|
ev.ProgramID = w.ProgramID
|
||||||
|
}
|
||||||
if w.IsDecode {
|
if w.IsDecode {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
dial := s.dialHz[w.ProgramID]
|
dial := s.dialHz[w.ProgramID]
|
||||||
|
tr := s.trPeriod[w.ProgramID]
|
||||||
|
statusMode := s.lastMode[w.ProgramID]
|
||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
if dial <= 0 {
|
if dial <= 0 {
|
||||||
// No Status from THIS instance yet. Guessing with another
|
// No Status from THIS instance yet. Guessing with another
|
||||||
@@ -376,7 +526,19 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
ev.DecodeFreqHz = dial + w.DeltaFreqHz
|
||||||
ev.DecodeSNR = w.SNR
|
ev.DecodeSNR = w.SNR
|
||||||
ev.DecodeCQ = w.IsCQ
|
ev.DecodeCQ = w.IsCQ
|
||||||
ev.Mode = w.Mode
|
ev.Mode = DecodeModeName(w.Mode, statusMode)
|
||||||
|
ev.DecodeModeRaw = w.Mode
|
||||||
|
ev.DecodeMsg = w.DecodeMsg
|
||||||
|
ev.DecodeMsgRaw = w.DecodeMsgRaw
|
||||||
|
ev.DecodeAt = decodeTime(w.DecodeMsSinceMidnight)
|
||||||
|
ev.DecodeTRPeriod = tr
|
||||||
|
ev.DecodeDial = dial
|
||||||
|
ev.DecodeOffAir = w.OffAir
|
||||||
|
ev.ProgramID = w.ProgramID
|
||||||
|
ev.DecodeDT = w.DeltaTime
|
||||||
|
ev.DecodeAudioHz = w.DeltaFreqHz
|
||||||
|
ev.DecodeMs = w.DecodeMsSinceMidnight
|
||||||
|
ev.DecodeLowConf = w.LowConfidence
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
// Only a logged QSO is worth a line — WSJT-X/MSHV send a Status packet
|
// Only a logged QSO is worth a line — WSJT-X/MSHV send a Status packet
|
||||||
@@ -501,16 +663,52 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
// Empty events are useless; skip — EXCEPT a clear signal, which is meant to be
|
// Empty events are useless; skip — EXCEPT a clear signal, which is meant to be
|
||||||
// empty (the DX Call was cleared in the digital app), and a tune-only
|
// empty (the DX Call was cleared in the digital app), and a tune-only
|
||||||
// request (freq with no callsign).
|
// request (freq with no callsign).
|
||||||
if ev.DXCall == "" && ev.LoggedADIF == "" && ev.DecodeCall == "" && !ev.ClearCall && ev.TuneFreqHz == 0 {
|
// TxMessage rides on Status, which also carries the DX call — but a Status
|
||||||
|
// with an empty DX call and a live transmit message (calling CQ) used to be
|
||||||
|
// dropped here, and that is exactly the message the decodes panel needs.
|
||||||
|
if ev.DXCall == "" && ev.LoggedADIF == "" && ev.DecodeCall == "" && ev.TxMessage == "" && !ev.ClearCall && ev.TuneFreqHz == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
select {
|
select {
|
||||||
case s.out <- ev:
|
case s.out <- ev:
|
||||||
default:
|
default:
|
||||||
// Drop on backpressure rather than block the read loop.
|
// Drop on backpressure rather than block the read loop — but say so.
|
||||||
|
s.noteDrop(ev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// noteDrop reports events lost to a full queue, first one immediately and then
|
||||||
|
// at most one line a minute with the running total.
|
||||||
|
//
|
||||||
|
// Rate-limited because the condition is self-sustaining: a consumer that fell
|
||||||
|
// behind on one period is behind for the next, and a line per lost decode would
|
||||||
|
// bury the rest of the log under the symptom. The event's own description goes
|
||||||
|
// in, because "a decode was lost" and "a Status was lost" are different faults.
|
||||||
|
func (s *Server) noteDrop(ev Event) {
|
||||||
|
what := "event"
|
||||||
|
switch {
|
||||||
|
case ev.DecodeCall != "":
|
||||||
|
what = "decode from " + ev.DecodeCall
|
||||||
|
case ev.LoggedADIF != "":
|
||||||
|
what = "logged QSO"
|
||||||
|
case ev.TxMessage != "" || ev.DECall != "":
|
||||||
|
what = "transmit status"
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
s.drops++
|
||||||
|
n := s.drops
|
||||||
|
quiet := n > 1 && time.Since(s.lastDropL) < time.Minute
|
||||||
|
if !quiet {
|
||||||
|
s.lastDropL = time.Now()
|
||||||
|
}
|
||||||
|
s.mu.Unlock()
|
||||||
|
if quiet {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("udp: [%s] queue full — dropped %s (%d lost this session); "+
|
||||||
|
"the decodes panel is missing what the sender broadcast", s.cfg.Name, what, n)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Server) close() {
|
func (s *Server) close() {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
if s.stopped {
|
if s.stopped {
|
||||||
@@ -564,6 +762,13 @@ type Manager struct {
|
|||||||
httpFailMu sync.Mutex
|
httpFailMu sync.Mutex
|
||||||
httpFailAt map[int64]time.Time
|
httpFailAt map[int64]time.Time
|
||||||
|
|
||||||
|
// relayWarned keeps a relay row's complaint (a loop target, a dead
|
||||||
|
// destination) to one line a session. Keyed by row id for the loop warning
|
||||||
|
// and by -id-1 for the send failure, so one row can say each once.
|
||||||
|
// Without this a busy band writes hundreds of identical lines a minute.
|
||||||
|
relayWarnMu sync.Mutex
|
||||||
|
relayWarned map[int64]bool
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
inbound map[int64]*Server
|
inbound map[int64]*Server
|
||||||
outbound []Config
|
outbound []Config
|
||||||
@@ -571,8 +776,12 @@ type Manager struct {
|
|||||||
|
|
||||||
func NewManager(repo *Repo) *Manager {
|
func NewManager(repo *Repo) *Manager {
|
||||||
return &Manager{
|
return &Manager{
|
||||||
repo: repo,
|
repo: repo,
|
||||||
out: make(chan Event, 64),
|
// 256, not 64: a period delivers twenty-odd decodes in one burst while
|
||||||
|
// Status keeps arriving, and the consumer does real work per event. The
|
||||||
|
// depth is headroom for that burst — the drop counter above is what says
|
||||||
|
// whether it was enough.
|
||||||
|
out: make(chan Event, 256),
|
||||||
inbound: map[int64]*Server{},
|
inbound: map[int64]*Server{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -616,7 +825,7 @@ func (m *Manager) Reload(ctx context.Context) []string {
|
|||||||
m.mu.Unlock()
|
m.mu.Unlock()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
srv := newServer(c, m.out)
|
srv := newServer(c, m.out, m)
|
||||||
if err := srv.start(); err != nil {
|
if err := srv.start(); err != nil {
|
||||||
applog.Printf("udp: start %q failed: %v", c.Name, err)
|
applog.Printf("udp: start %q failed: %v", c.Name, err)
|
||||||
errs = append(errs, fmt.Sprintf("%s: %v", c.Name, err))
|
errs = append(errs, fmt.Sprintf("%s: %v", c.Name, err))
|
||||||
|
|||||||
@@ -51,10 +51,54 @@ type WSJTEvent struct {
|
|||||||
// known dial frequency (from Status) to DeltaFreqHz to get the RF frequency.
|
// known dial frequency (from Status) to DeltaFreqHz to get the RF frequency.
|
||||||
IsDecode bool
|
IsDecode bool
|
||||||
DecodeCall string // the sender (DE) callsign extracted from the message text
|
DecodeCall string // the sender (DE) callsign extracted from the message text
|
||||||
DecodeGrid string // 4-char grid, CQ decodes only — the exchange carries none
|
DecodeGrid string // 4-char grid: from a CQ, or a reply that answers with its locator
|
||||||
DeltaFreqHz int64 // audio offset within the passband (Hz)
|
DeltaFreqHz int64 // audio offset within the passband (Hz)
|
||||||
SNR int // reported signal-to-noise (dB)
|
SNR int // reported signal-to-noise (dB)
|
||||||
IsCQ bool // the decode was a CQ call
|
IsCQ bool // the decode was a CQ call
|
||||||
|
// DeltaTime is how far into the slot the transmission started, in seconds —
|
||||||
|
// WSJT-X's "DT" column. Read and discarded before; kept now because it is
|
||||||
|
// shown, and because a Reply has to replay the decode field for field.
|
||||||
|
DeltaTime float64
|
||||||
|
// DecodeMsg is the decoded text as WSJT-X printed it ("CQ K1ABC FN42",
|
||||||
|
// "F4BPO K1ABC -07"). Kept whole rather than only its parsed pieces: the
|
||||||
|
// exchange is what tells an operator where a station is in a QSO, and no set
|
||||||
|
// of extracted fields says "R-09" the way the line itself does.
|
||||||
|
DecodeMsg string
|
||||||
|
// DecodeMsgRaw is the message EXACTLY as the datagram carried it, trailing
|
||||||
|
// spaces and all. DecodeMsg above is trimmed for display; a Reply has to
|
||||||
|
// send this one, because the receiving application matches a Reply against
|
||||||
|
// its own decode list field for field and a stripped space is a mismatch it
|
||||||
|
// reports nowhere.
|
||||||
|
DecodeMsgRaw string
|
||||||
|
// DecodeMsSinceMidnight is the decode's own timestamp, in milliseconds since
|
||||||
|
// 00:00 UTC, as the sender reported it. It is what groups decodes into T/R
|
||||||
|
// PERIODS — arrival time cannot, since a whole period's decodes land in one
|
||||||
|
// burst and a slow link shifts the lot into the next slot.
|
||||||
|
DecodeMsSinceMidnight uint32
|
||||||
|
DecodeIsNew bool // sender's "is_new": first time this line was decoded
|
||||||
|
LowConfidence bool // sender is unsure of the decode
|
||||||
|
OffAir bool // decoded from a file, not off the air
|
||||||
|
|
||||||
|
// ---- Status extras ----
|
||||||
|
|
||||||
|
// TxMessage is what the operator is sending right now ("CQ F4BPO JN18"),
|
||||||
|
// with Transmitting saying whether the carrier is actually up. Both come
|
||||||
|
// from Status, so they arrive about once a second.
|
||||||
|
TxMessage string
|
||||||
|
Transmitting bool
|
||||||
|
// TxEnabled is the sender's "Enable Tx" toggle. It is what the WATCHDOG
|
||||||
|
// turns off: the application stops transmitting but leaves the DX call set,
|
||||||
|
// so a caller that reads only the DX call believes the QSO is still running
|
||||||
|
// and waits for ever. This is the difference between "between overs" and
|
||||||
|
// "given up".
|
||||||
|
TxEnabled bool
|
||||||
|
DECall string // the operator's own callsign, as the digital app knows it
|
||||||
|
DEGrid string // and their square
|
||||||
|
// TRPeriod is the transmit/receive period in seconds (15 for FT8, 7 or 8 for
|
||||||
|
// FT4 depending on the sender's rounding). The authority on how long a slot
|
||||||
|
// is — better than inferring it from the mode name, which says nothing about
|
||||||
|
// a custom period.
|
||||||
|
TRPeriod int
|
||||||
}
|
}
|
||||||
|
|
||||||
// maxFwdHeader bounds how far into a packet the WSJT-X magic may sit behind a
|
// maxFwdHeader bounds how far into a packet the WSJT-X magic may sit behind a
|
||||||
@@ -166,40 +210,81 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
return WSJTEvent{}, false, err
|
return WSJTEvent{}, false, err
|
||||||
}
|
}
|
||||||
ev.DXCall = strings.ToUpper(strings.TrimSpace(dxCall))
|
ev.DXCall = strings.ToUpper(strings.TrimSpace(dxCall))
|
||||||
// Skip report, tx_mode (QUtf8), tx_enabled (bool), transmitting,
|
// report, tx_mode → skipped.
|
||||||
// decoding, rx_df (qint32), tx_df (qint32), de_call (QUtf8),
|
|
||||||
// de_grid (QUtf8) → then dx_grid.
|
|
||||||
for _, name := range []string{"report", "tx_mode"} {
|
for _, name := range []string{"report", "tx_mode"} {
|
||||||
if _, err := readQString(r); err != nil {
|
if _, err := readQString(r); err != nil {
|
||||||
return ev, true, fmt.Errorf("read %s: %w", name, err)
|
return ev, true, fmt.Errorf("read %s: %w", name, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 3 booleans (each 1 byte)
|
// tx_enabled, transmitting, decoding (1 byte each). The middle one is
|
||||||
for i := 0; i < 3; i++ {
|
// worth keeping: it says the carrier is up, which is what turns TxMessage
|
||||||
var b uint8
|
// from "what I would send" into "what is going out".
|
||||||
if err := binary.Read(r, binary.BigEndian, &b); err != nil {
|
var txEnabled, transmitting, decoding uint8
|
||||||
|
for _, p := range []*uint8{&txEnabled, &transmitting, &decoding} {
|
||||||
|
if err := binary.Read(r, binary.BigEndian, p); err != nil {
|
||||||
return ev, true, err
|
return ev, true, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 2 int32
|
ev.Transmitting = transmitting != 0
|
||||||
|
ev.TxEnabled = txEnabled != 0
|
||||||
|
// rx_df, tx_df
|
||||||
var i32 int32
|
var i32 int32
|
||||||
for i := 0; i < 2; i++ {
|
for i := 0; i < 2; i++ {
|
||||||
if err := binary.Read(r, binary.BigEndian, &i32); err != nil {
|
if err := binary.Read(r, binary.BigEndian, &i32); err != nil {
|
||||||
return ev, true, err
|
return ev, true, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// de_call, de_grid, dx_grid
|
deCall, err := readQString(r)
|
||||||
if _, err := readQString(r); err != nil {
|
if err != nil {
|
||||||
return ev, true, err
|
return ev, true, err
|
||||||
}
|
}
|
||||||
if _, err := readQString(r); err != nil {
|
ev.DECall = strings.ToUpper(strings.TrimSpace(deCall))
|
||||||
|
deGrid, err := readQString(r)
|
||||||
|
if err != nil {
|
||||||
return ev, true, err
|
return ev, true, err
|
||||||
}
|
}
|
||||||
|
ev.DEGrid = strings.ToUpper(strings.TrimSpace(deGrid))
|
||||||
dxGrid, err := readQString(r)
|
dxGrid, err := readQString(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ev, true, err
|
return ev, true, err
|
||||||
}
|
}
|
||||||
ev.DXGrid = strings.ToUpper(strings.TrimSpace(dxGrid))
|
ev.DXGrid = strings.ToUpper(strings.TrimSpace(dxGrid))
|
||||||
|
|
||||||
|
// Everything past here was APPENDED to the schema over successive
|
||||||
|
// releases, and JTDX and MSHV each stop at their own point. A short
|
||||||
|
// packet is therefore normal, not an error: read as far as the sender
|
||||||
|
// went and keep what we got. That is why the tail below swallows its
|
||||||
|
// errors instead of reporting them — the fields already parsed are good.
|
||||||
|
var b uint8
|
||||||
|
if binary.Read(r, binary.BigEndian, &b) != nil { // tx_watchdog
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
if _, err := readQString(r); err != nil { // sub_mode
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
if binary.Read(r, binary.BigEndian, &b) != nil { // fast_mode
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
if binary.Read(r, binary.BigEndian, &b) != nil { // special_operation_mode
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
var u32 uint32
|
||||||
|
if binary.Read(r, binary.BigEndian, &u32) != nil { // frequency_tolerance
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
if binary.Read(r, binary.BigEndian, &u32) != nil { // tr_period (seconds)
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
// 0xFFFFFFFF is WSJT-X's "not applicable" for the quint32 fields.
|
||||||
|
if u32 > 0 && u32 < 3600 {
|
||||||
|
ev.TRPeriod = int(u32)
|
||||||
|
}
|
||||||
|
if _, err := readQString(r); err != nil { // configuration_name
|
||||||
|
return ev, true, nil
|
||||||
|
}
|
||||||
|
if txMsg, err := readQString(r); err == nil {
|
||||||
|
ev.TxMessage = strings.TrimSpace(txMsg)
|
||||||
|
}
|
||||||
return ev, true, nil
|
return ev, true, nil
|
||||||
|
|
||||||
case wsjtMsgDecode:
|
case wsjtMsgDecode:
|
||||||
@@ -217,6 +302,7 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
if err := binary.Read(r, binary.BigEndian, &b); err != nil { // is_new
|
if err := binary.Read(r, binary.BigEndian, &b); err != nil { // is_new
|
||||||
return WSJTEvent{}, false, err
|
return WSJTEvent{}, false, err
|
||||||
}
|
}
|
||||||
|
ev.DecodeIsNew = b != 0
|
||||||
var t32, df uint32
|
var t32, df uint32
|
||||||
var snr int32
|
var snr int32
|
||||||
if err := binary.Read(r, binary.BigEndian, &t32); err != nil { // time
|
if err := binary.Read(r, binary.BigEndian, &t32); err != nil { // time
|
||||||
@@ -229,6 +315,7 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
if err := binary.Read(r, binary.BigEndian, &dt); err != nil { // delta_time
|
if err := binary.Read(r, binary.BigEndian, &dt); err != nil { // delta_time
|
||||||
return WSJTEvent{}, false, err
|
return WSJTEvent{}, false, err
|
||||||
}
|
}
|
||||||
|
ev.DeltaTime = dt
|
||||||
if err := binary.Read(r, binary.BigEndian, &df); err != nil { // delta_frequency
|
if err := binary.Read(r, binary.BigEndian, &df); err != nil { // delta_frequency
|
||||||
return WSJTEvent{}, false, err
|
return WSJTEvent{}, false, err
|
||||||
}
|
}
|
||||||
@@ -240,6 +327,11 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return WSJTEvent{}, false, err
|
return WSJTEvent{}, false, err
|
||||||
}
|
}
|
||||||
|
// low_confidence and off_air were appended later; absent on older senders.
|
||||||
|
var lowConf, offAir uint8
|
||||||
|
_ = binary.Read(r, binary.BigEndian, &lowConf)
|
||||||
|
_ = binary.Read(r, binary.BigEndian, &offAir)
|
||||||
|
|
||||||
call, isCQ, grid := wsjtSender(msg)
|
call, isCQ, grid := wsjtSender(msg)
|
||||||
if call == "" {
|
if call == "" {
|
||||||
return WSJTEvent{}, false, nil // free-text / telemetry / unparseable → ignore
|
return WSJTEvent{}, false, nil // free-text / telemetry / unparseable → ignore
|
||||||
@@ -251,6 +343,11 @@ func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
|||||||
ev.DeltaFreqHz = int64(df)
|
ev.DeltaFreqHz = int64(df)
|
||||||
ev.SNR = int(snr)
|
ev.SNR = int(snr)
|
||||||
ev.Mode = strings.ToUpper(strings.TrimSpace(mode))
|
ev.Mode = strings.ToUpper(strings.TrimSpace(mode))
|
||||||
|
ev.DecodeMsg = strings.TrimSpace(msg)
|
||||||
|
ev.DecodeMsgRaw = msg
|
||||||
|
ev.DecodeMsSinceMidnight = t32
|
||||||
|
ev.LowConfidence = lowConf != 0
|
||||||
|
ev.OffAir = offAir != 0
|
||||||
return ev, true, nil
|
return ev, true, nil
|
||||||
|
|
||||||
case wsjtMsgLoggedADIF:
|
case wsjtMsgLoggedADIF:
|
||||||
@@ -303,7 +400,21 @@ func wsjtSender(message string) (call string, isCQ bool, grid string) {
|
|||||||
return "", true, ""
|
return "", true, ""
|
||||||
}
|
}
|
||||||
// Standard exchange: the DE (sender) call is the second token.
|
// Standard exchange: the DE (sender) call is the second token.
|
||||||
|
//
|
||||||
|
// And the THIRD token is a grid whenever the station is answering with its
|
||||||
|
// locator — "C91RU IZ5EME JN52", the ordinary first reply to a CQ. This used
|
||||||
|
// to return no grid at all on the grounds that "the exchange carries none",
|
||||||
|
// which is simply not true: it is the commonest grid-bearing message on a
|
||||||
|
// busy band, and only a CQ being read meant a station whose CQ we missed had
|
||||||
|
// no known grid — so it could never be flagged as a new one. GridTracker
|
||||||
|
// reads both, which is why its wanted-grid count ran so far ahead of ours.
|
||||||
|
//
|
||||||
|
// isGridField is what keeps the reports and sign-offs out: -05, R-05, RRR,
|
||||||
|
// 73 and RR73 all fail it, on length, charset or by name.
|
||||||
if len(f) >= 2 && looksLikeCall(f[1]) {
|
if len(f) >= 2 && looksLikeCall(f[1]) {
|
||||||
|
if len(f) >= 3 && isGridField(f[2]) {
|
||||||
|
return f[1], false, f[2]
|
||||||
|
}
|
||||||
return f[1], false, ""
|
return f[1], false, ""
|
||||||
}
|
}
|
||||||
return "", false, ""
|
return "", false, ""
|
||||||
@@ -370,3 +481,50 @@ func readQString(r *bytes.Reader) (string, error) {
|
|||||||
}
|
}
|
||||||
return string(buf), nil
|
return string(buf), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// decodeModeChar maps the single character WSJT-X puts in a Decode's mode field
|
||||||
|
// to the mode it stands for.
|
||||||
|
//
|
||||||
|
// A Decode does NOT carry the mode's name. It carries the one-character marker
|
||||||
|
// that appears in the decode line and in ALL.TXT — "~" for FT8, "+" for FT4 —
|
||||||
|
// and that character was being passed straight through as if it were a mode.
|
||||||
|
// Everything downstream then compared "~" against the modes in the log, matched
|
||||||
|
// nothing, and called every station on an already-worked band a new MODE.
|
||||||
|
//
|
||||||
|
// The table covers what is common; anything missing falls back to the mode from
|
||||||
|
// the sender's last Status, which carries the real name — so an unlisted or
|
||||||
|
// future marker degrades to correct rather than to nonsense.
|
||||||
|
var decodeModeChar = map[string]string{
|
||||||
|
"~": "FT8",
|
||||||
|
"+": "FT4",
|
||||||
|
"#": "JT65",
|
||||||
|
"@": "JT9",
|
||||||
|
"&": "MSK144",
|
||||||
|
":": "Q65",
|
||||||
|
"`": "FST4",
|
||||||
|
}
|
||||||
|
|
||||||
|
// DecodeModeName resolves a Decode's mode field to a real mode name. statusMode
|
||||||
|
// is the mode from the same program's last Status, used when the field is a
|
||||||
|
// marker we do not know, or empty.
|
||||||
|
func DecodeModeName(raw, statusMode string) string {
|
||||||
|
raw = strings.TrimSpace(raw)
|
||||||
|
if m, ok := decodeModeChar[raw]; ok {
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
// A mode name is at least two alphanumeric characters ("FT8", "JS8", "Q65").
|
||||||
|
// Anything shorter, or carrying punctuation, is a marker rather than a name.
|
||||||
|
if len(raw) >= 2 {
|
||||||
|
named := true
|
||||||
|
for _, r := range raw {
|
||||||
|
if !(r >= 'A' && r <= 'Z') && !(r >= 'a' && r <= 'z') && !(r >= '0' && r <= '9') {
|
||||||
|
named = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if named {
|
||||||
|
return strings.ToUpper(raw)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.ToUpper(strings.TrimSpace(statusMode))
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WSJT-X Free Text (message type 9) — "put this in the free-text box, and send".
|
||||||
|
//
|
||||||
|
// Free Text type 9
|
||||||
|
// id utf8 the target application's own id
|
||||||
|
// text utf8 the message
|
||||||
|
// send bool true = transmit it now, false = only fill the box
|
||||||
|
//
|
||||||
|
// What this is FOR, and what it is not:
|
||||||
|
//
|
||||||
|
// It is the one "transmit this now" primitive that behaves the same on WSJT-X,
|
||||||
|
// WSJT-Z, JTDX, JTDX-Improved and MSHV, because it needs no decode to match
|
||||||
|
// against — unlike Reply, which the receiving application will only action if it
|
||||||
|
// can find the exact decode being answered.
|
||||||
|
//
|
||||||
|
// It is NOT a way to call a station. FT8 free text is 13 characters, so a
|
||||||
|
// standard "<DX> <ME> <GRID>" does not fit, and more importantly the text goes
|
||||||
|
// out AS free text without setting the DX Call — so the sequencer never takes
|
||||||
|
// over, and no report, RR73 or logging prompt follows. Use it for a 73, a short
|
||||||
|
// note or a CQ; use Reply to start a QSO.
|
||||||
|
const wsjtMsgFreeText = 9
|
||||||
|
|
||||||
|
// EncodeFreeText builds the datagram. send=false fills the box without keying.
|
||||||
|
func EncodeFreeText(programID, text string, send bool) []byte {
|
||||||
|
var b bytes.Buffer
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(2)) // schema 2 — what every current sender speaks
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(wsjtMsgFreeText))
|
||||||
|
writeQString(&b, programID)
|
||||||
|
writeQString(&b, text)
|
||||||
|
var s uint8
|
||||||
|
if send {
|
||||||
|
s = 1
|
||||||
|
}
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, s)
|
||||||
|
return b.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendFreeText hands a free-text message to one decoding application.
|
||||||
|
//
|
||||||
|
// Routed by program id to the address that instance's packets arrive from, for
|
||||||
|
// the same reason as SendReply and SendHaltTx: two receivers can share one
|
||||||
|
// multicast group, and transmitting from the wrong one is worse than not
|
||||||
|
// transmitting at all.
|
||||||
|
func (m *Manager) SendFreeText(programID, text string, send bool) error {
|
||||||
|
if strings.TrimSpace(programID) == "" {
|
||||||
|
return fmt.Errorf("no application id — cannot tell which receiver to send with")
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
servers := make([]*Server, 0, len(m.inbound))
|
||||||
|
for _, s := range m.inbound {
|
||||||
|
servers = append(servers, s)
|
||||||
|
}
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
|
for _, s := range servers {
|
||||||
|
conn, addr := s.replyTarget(programID)
|
||||||
|
if conn == nil || addr == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := conn.WriteToUDP(EncodeFreeText(programID, text, send), addr); err != nil {
|
||||||
|
return fmt.Errorf("send free text to %s at %s: %w", programID, addr, err)
|
||||||
|
}
|
||||||
|
applog.Printf("udp: free text sent to %s at %s — %q (send=%v)", programID, addr, text, send)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("no packet has arrived from %q yet — nothing to send to", programID)
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The wire format, byte for byte. A malformed Free Text is discarded in silence
|
||||||
|
// by the far end, exactly like a malformed Reply — so a wrong byte here shows up
|
||||||
|
// as a button that does nothing.
|
||||||
|
func TestEncodeFreeText(t *testing.T) {
|
||||||
|
got := EncodeFreeText("JTDX", "73 GL", true)
|
||||||
|
want := []byte{
|
||||||
|
0xad, 0xbc, 0xcb, 0xda, // magic
|
||||||
|
0x00, 0x00, 0x00, 0x02, // schema 2
|
||||||
|
0x00, 0x00, 0x00, 0x09, // type 9 — Free Text
|
||||||
|
0x00, 0x00, 0x00, 0x04, 'J', 'T', 'D', 'X',
|
||||||
|
0x00, 0x00, 0x00, 0x05, '7', '3', ' ', 'G', 'L',
|
||||||
|
0x01, // send now
|
||||||
|
}
|
||||||
|
if !bytes.Equal(got, want) {
|
||||||
|
t.Errorf("EncodeFreeText\n got %#v\nwant %#v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// send=false fills the box without keying — the difference is one byte, and
|
||||||
|
// getting it backwards would transmit when the operator only meant to prepare.
|
||||||
|
func TestEncodeFreeTextWithoutSending(t *testing.T) {
|
||||||
|
got := EncodeFreeText("MSHV", "", false)
|
||||||
|
if got[len(got)-1] != 0x00 {
|
||||||
|
t.Errorf("send flag = %#x, want 0 — this would transmit unasked", got[len(got)-1])
|
||||||
|
}
|
||||||
|
// An empty text is a zero-length QString, never the -1 that means null:
|
||||||
|
// WSJT-X drops a packet with a null where it expects text.
|
||||||
|
if !bytes.Equal(got[len(got)-5:len(got)-1], []byte{0, 0, 0, 0}) {
|
||||||
|
t.Errorf("empty text was not encoded as a zero-length string: % X", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSendFreeTextRejectsEmptyID(t *testing.T) {
|
||||||
|
m := &Manager{}
|
||||||
|
if err := m.SendFreeText(" ", "73", true); err == nil {
|
||||||
|
t.Fatal("expected an error for a blank program id")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WSJT-X Halt Tx (message type 8) — "stop transmitting".
|
||||||
|
//
|
||||||
|
// The same two things the Halt Tx button and the Enable Tx toggle do in the
|
||||||
|
// application's own window:
|
||||||
|
//
|
||||||
|
// Halt Tx type 8
|
||||||
|
// id utf8 the target application's own id
|
||||||
|
// auto_tx_only bool false = stop the transmission NOW
|
||||||
|
// true = let this over finish, then stop auto-Tx
|
||||||
|
//
|
||||||
|
// Both are useful and they are not the same operation. Stopping mid-over is what
|
||||||
|
// you want when you have called the wrong station or realised the frequency is
|
||||||
|
// occupied; finishing the over first is what you want when the QSO is complete
|
||||||
|
// and cutting the transmission would leave the other end waiting for a report
|
||||||
|
// that never lands.
|
||||||
|
const wsjtMsgHaltTx = 8
|
||||||
|
|
||||||
|
// EncodeHaltTx builds the datagram. autoTxOnly false halts immediately.
|
||||||
|
func EncodeHaltTx(programID string, autoTxOnly bool) []byte {
|
||||||
|
var b bytes.Buffer
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(2)) // schema 2 — what every current sender speaks
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(wsjtMsgHaltTx))
|
||||||
|
writeQString(&b, programID)
|
||||||
|
var auto uint8
|
||||||
|
if autoTxOnly {
|
||||||
|
auto = 1
|
||||||
|
}
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, auto)
|
||||||
|
return b.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendHaltTx tells one decoding application to stop transmitting.
|
||||||
|
//
|
||||||
|
// Routed by PROGRAM ID and answered back to the address that instance's packets
|
||||||
|
// arrive from, exactly like SendReply: two receivers can share one multicast
|
||||||
|
// group, and halting the 20 m instance because the 6 m one is transmitting would
|
||||||
|
// be worse than doing nothing.
|
||||||
|
func (m *Manager) SendHaltTx(programID string, autoTxOnly bool) error {
|
||||||
|
if strings.TrimSpace(programID) == "" {
|
||||||
|
return fmt.Errorf("no application id — cannot tell which receiver to halt")
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
servers := make([]*Server, 0, len(m.inbound))
|
||||||
|
for _, s := range m.inbound {
|
||||||
|
servers = append(servers, s)
|
||||||
|
}
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
|
for _, s := range servers {
|
||||||
|
conn, addr := s.replyTarget(programID)
|
||||||
|
if conn == nil || addr == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := conn.WriteToUDP(EncodeHaltTx(programID, autoTxOnly), addr); err != nil {
|
||||||
|
return fmt.Errorf("send halt to %s at %s: %w", programID, addr, err)
|
||||||
|
}
|
||||||
|
applog.Printf("udp: halt tx sent to %s at %s (auto_tx_only=%v)", programID, addr, autoTxOnly)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("no packet has arrived from %q yet — nothing to halt", programID)
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The Halt Tx datagram, byte for byte. A wrong byte here does not fail loudly —
|
||||||
|
// WSJT-X drops a malformed packet in silence, and the operator sees a Halt
|
||||||
|
// button that simply does nothing.
|
||||||
|
func TestEncodeHaltTx(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
id string
|
||||||
|
autoTxOnly bool
|
||||||
|
want []byte
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "halt now",
|
||||||
|
id: "WSJT-X",
|
||||||
|
want: []byte{
|
||||||
|
0xad, 0xbc, 0xcb, 0xda, // magic
|
||||||
|
0x00, 0x00, 0x00, 0x02, // schema 2
|
||||||
|
0x00, 0x00, 0x00, 0x08, // type 8 — Halt Tx
|
||||||
|
0x00, 0x00, 0x00, 0x06, // id length
|
||||||
|
'W', 'S', 'J', 'T', '-', 'X',
|
||||||
|
0x00, // auto_tx_only = false → stop mid-over
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "finish the over first",
|
||||||
|
id: "MSHV",
|
||||||
|
autoTxOnly: true,
|
||||||
|
want: []byte{
|
||||||
|
0xad, 0xbc, 0xcb, 0xda,
|
||||||
|
0x00, 0x00, 0x00, 0x02,
|
||||||
|
0x00, 0x00, 0x00, 0x08,
|
||||||
|
0x00, 0x00, 0x00, 0x04,
|
||||||
|
'M', 'S', 'H', 'V',
|
||||||
|
0x01,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// An empty id is length 0, never the -1 that means a null QString:
|
||||||
|
// a null where text is expected makes WSJT-X discard the packet.
|
||||||
|
name: "empty id is a zero-length string",
|
||||||
|
id: "",
|
||||||
|
want: []byte{
|
||||||
|
0xad, 0xbc, 0xcb, 0xda,
|
||||||
|
0x00, 0x00, 0x00, 0x02,
|
||||||
|
0x00, 0x00, 0x00, 0x08,
|
||||||
|
0x00, 0x00, 0x00, 0x00,
|
||||||
|
0x00,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tc := range tests {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
got := EncodeHaltTx(tc.id, tc.autoTxOnly)
|
||||||
|
if !bytes.Equal(got, tc.want) {
|
||||||
|
t.Errorf("EncodeHaltTx(%q, %v)\n got %#v\nwant %#v", tc.id, tc.autoTxOnly, got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendHaltTx must refuse an empty id rather than broadcast a halt at whatever
|
||||||
|
// application happens to answer: with two receivers sharing a multicast group,
|
||||||
|
// halting the wrong one is worse than doing nothing.
|
||||||
|
func TestSendHaltTxRejectsEmptyID(t *testing.T) {
|
||||||
|
m := &Manager{}
|
||||||
|
if err := m.SendHaltTx(" ", false); err == nil {
|
||||||
|
t.Fatal("expected an error for a blank program id")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WSJT-X Reply (message type 4) — "answer this station".
|
||||||
|
//
|
||||||
|
// It is the same thing as double-clicking the line in WSJT-X's own Band
|
||||||
|
// Activity window: the application looks the decode up in its list, sets its
|
||||||
|
// transmit frequency to the caller's, fills the DX call and starts the exchange.
|
||||||
|
// Which is why OpsLog cannot do this by tuning the radio — on FT8 the whole band
|
||||||
|
// sits inside one passband, so moving the dial changes nothing about who gets
|
||||||
|
// answered. The decision belongs to the decoding application, and this is the
|
||||||
|
// only way to hand it over.
|
||||||
|
//
|
||||||
|
// The payload REPLAYS the decode being answered, and WSJT-X matches it against
|
||||||
|
// what it decoded. Every field has to come back exactly as it went out — which
|
||||||
|
// is why the parser now keeps the time, the delta time, the audio offset and the
|
||||||
|
// message text rather than only what the panadapter needed.
|
||||||
|
//
|
||||||
|
// Reply type 4
|
||||||
|
// id utf8 the target application's own id
|
||||||
|
// time quint32 ms since midnight, from the decode
|
||||||
|
// snr qint32
|
||||||
|
// delta_time double seconds
|
||||||
|
// delta_frequency quint32 audio offset in the passband, Hz
|
||||||
|
// mode utf8
|
||||||
|
// message utf8
|
||||||
|
// low_confidence bool
|
||||||
|
// modifiers quint8 keyboard modifiers (0 = a plain click)
|
||||||
|
const wsjtMsgReply = 4
|
||||||
|
|
||||||
|
// Reply is one "call this station" request, rebuilt from a decode.
|
||||||
|
type Reply struct {
|
||||||
|
ProgramID string // which application to talk to ("WSJT-X", "MSHV", "WSJT-X - 2")
|
||||||
|
MsSinceMidnig uint32
|
||||||
|
SNR int32
|
||||||
|
DeltaTime float64
|
||||||
|
DeltaFreqHz uint32
|
||||||
|
Mode string
|
||||||
|
Message string
|
||||||
|
LowConfidence bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// writeQString writes a Qt QString/QUtf8: a big-endian int32 length then the
|
||||||
|
// bytes. An EMPTY string is length 0, not the -1 that means null — WSJT-X reads
|
||||||
|
// a null where it expects text as a malformed packet and drops the whole reply.
|
||||||
|
func writeQString(b *bytes.Buffer, s string) {
|
||||||
|
_ = binary.Write(b, binary.BigEndian, int32(len(s)))
|
||||||
|
b.WriteString(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// EncodeReply builds the datagram.
|
||||||
|
func EncodeReply(r Reply) []byte {
|
||||||
|
var b bytes.Buffer
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(wsjtMagic))
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(2)) // schema 2 — the one every current sender speaks
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint32(wsjtMsgReply))
|
||||||
|
writeQString(&b, r.ProgramID)
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, r.MsSinceMidnig)
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, r.SNR)
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, r.DeltaTime)
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, r.DeltaFreqHz)
|
||||||
|
writeQString(&b, r.Mode)
|
||||||
|
writeQString(&b, r.Message)
|
||||||
|
var low uint8
|
||||||
|
if r.LowConfidence {
|
||||||
|
low = 1
|
||||||
|
}
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, low)
|
||||||
|
_ = binary.Write(&b, binary.BigEndian, uint8(0)) // modifiers: a plain click
|
||||||
|
return b.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendReply hands a Reply to the application that produced the decode.
|
||||||
|
//
|
||||||
|
// Routed by PROGRAM ID, not by listener: two receivers can share one multicast
|
||||||
|
// group, and answering a station heard on the 6 m instance by talking to the
|
||||||
|
// 20 m one would start a call on the wrong band. The id is what tells them
|
||||||
|
// apart, and the address the reply goes to is the one that instance's packets
|
||||||
|
// actually arrive from — a multicast listener must answer back to the sender,
|
||||||
|
// not to the group.
|
||||||
|
func (m *Manager) SendReply(r Reply) error {
|
||||||
|
if strings.TrimSpace(r.ProgramID) == "" {
|
||||||
|
return fmt.Errorf("no application id — cannot tell which receiver to answer with")
|
||||||
|
}
|
||||||
|
m.mu.Lock()
|
||||||
|
servers := make([]*Server, 0, len(m.inbound))
|
||||||
|
for _, s := range m.inbound {
|
||||||
|
servers = append(servers, s)
|
||||||
|
}
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
|
for _, s := range servers {
|
||||||
|
conn, addr := s.replyTarget(r.ProgramID)
|
||||||
|
if conn == nil || addr == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
pkt := EncodeReply(r)
|
||||||
|
if _, err := conn.WriteToUDP(pkt, addr); err != nil {
|
||||||
|
return fmt.Errorf("send reply to %s at %s: %w", r.ProgramID, addr, err)
|
||||||
|
}
|
||||||
|
// Says whether the decode being answered was a CQ, because that is what
|
||||||
|
// decides whether the far end will act on it at all: the protocol only
|
||||||
|
// requires a Reply to be honoured for a CQ or QRZ. Without this the log
|
||||||
|
// showed a reply going out and nothing happening, and the reason had to
|
||||||
|
// be deduced from the message text by eye.
|
||||||
|
kind := "not a CQ — the far end may ignore it"
|
||||||
|
if strings.HasPrefix(strings.TrimSpace(strings.ToUpper(r.Message)), "CQ ") {
|
||||||
|
kind = "CQ"
|
||||||
|
}
|
||||||
|
applog.Printf("udp: reply sent to %s at %s — %q (%s)", r.ProgramID, addr, r.Message, kind)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("no packet has arrived from %q yet — nothing to answer to", r.ProgramID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// replyTarget returns this listener's socket and the address the given program
|
||||||
|
// last sent from, or nils when it has never been heard here.
|
||||||
|
func (s *Server) replyTarget(programID string) (*net.UDPConn, *net.UDPAddr) {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
if s.conn == nil || s.lastFrom == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
addr, ok := s.lastFrom[programID]
|
||||||
|
if !ok {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return s.conn, addr
|
||||||
|
}
|
||||||
@@ -46,6 +46,51 @@ street, no image.
|
|||||||
</Callsign>
|
</Callsign>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
<QRZDatabase xmlns="http://xmldata.qrz.com" version="1.36">
|
||||||
|
<div id="in-page-channel-node-id" data-channel-name="in_page_channel_ogW01U"/>
|
||||||
|
<Callsign>
|
||||||
|
<call>F5IRH</call>
|
||||||
|
<dxcc>227</dxcc>
|
||||||
|
<fname>AVRILLON</fname>
|
||||||
|
<name>Max</name>
|
||||||
|
<addr1>La Grand Prairie</addr1>
|
||||||
|
<addr2>Le Palais BELLE-ILE-EN-MER</addr2>
|
||||||
|
<zip>56360</zip>
|
||||||
|
<country>France</country>
|
||||||
|
<lat>47.339686</lat>
|
||||||
|
<lon>-3.156500</lon>
|
||||||
|
<grid>IN87ki</grid>
|
||||||
|
<ccode>97</ccode>
|
||||||
|
<land>France</land>
|
||||||
|
<codes>TP</codes>
|
||||||
|
<qslmgr>VIA BURO</qslmgr>
|
||||||
|
<email>f5irh@free.fr</email>
|
||||||
|
<u_views>8005</u_views>
|
||||||
|
<bio>2463</bio>
|
||||||
|
<biodate>2015-07-16 00:29:49</biodate>
|
||||||
|
<image>https://cdn-xml.qrz.com/h/f5irh/qsl_F5IRH_111-3.JPG</image>
|
||||||
|
<imageinfo>518:799:105108</imageinfo>
|
||||||
|
<moddate>2010-08-05 01:05:37</moddate>
|
||||||
|
<eqsl>0</eqsl>
|
||||||
|
<mqsl>0</mqsl>
|
||||||
|
<cqzone>14</cqzone>
|
||||||
|
<iota>EU-048</iota>
|
||||||
|
<lotw>0</lotw>
|
||||||
|
<geoloc>user</geoloc>
|
||||||
|
<name_fmt>AVRILLON Max</name_fmt>
|
||||||
|
<serial>1570698</serial>
|
||||||
|
</Callsign>
|
||||||
|
<Session>
|
||||||
|
<Key>e5ca5b3e7f88d733408ab7677e605270</Key>
|
||||||
|
<Count>161639</Count>
|
||||||
|
<SubExp>Sat Jul 3 21:45:38 2027</SubExp>
|
||||||
|
<GMTime>Sun Aug 16 21:14:40 2026</GMTime>
|
||||||
|
<Remark>cpu: 0.073s</Remark>
|
||||||
|
</Session>
|
||||||
|
</QRZDatabase>
|
||||||
|
```
|
||||||
|
|
||||||
## Consequences
|
## Consequences
|
||||||
|
|
||||||
- **A free QRZ account can never fill the locator, the coordinates, the zones
|
- **A free QRZ account can never fill the locator, the coordinates, the zones
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
func testCache(t *testing.T) *Cache {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := db.Open(filepath.Join(t.TempDir(), "c.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { conn.Close() })
|
||||||
|
return NewCache(conn, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Adding a field to the cache leaves every row already in it without that field,
|
||||||
|
// and the cache lasts thirty days. So a callsign looked up before the change
|
||||||
|
// would go a MONTH without its island reference — which is exactly what the
|
||||||
|
// first test of the feature ran into: a QRZ record plainly carrying
|
||||||
|
// <iota>EU-048</iota>, and no IOTA on the entry.
|
||||||
|
//
|
||||||
|
// A row that predates the column is therefore treated as stale and refetched
|
||||||
|
// once. NULL and "" mean different things here, and that is the whole mechanism.
|
||||||
|
func TestCacheRefetchesRowsWrittenBeforeTheIOTAColumn(t *testing.T) {
|
||||||
|
c := testCache(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
// An operator with an island: stored and returned.
|
||||||
|
if err := c.Put(ctx, Result{Callsign: "F5IRH", Name: "Max", IOTA: "EU-048", Source: "qrz"}); err != nil {
|
||||||
|
t.Fatalf("put: %v", err)
|
||||||
|
}
|
||||||
|
got, ok := c.Get(ctx, "F5IRH")
|
||||||
|
if !ok || got.IOTA != "EU-048" {
|
||||||
|
t.Fatalf("Get = (%+v,%v), want the island back", got, ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
// An operator with NO island: an empty string is stored, and the row stays
|
||||||
|
// usable. If this wrote NULL, every ordinary callsign would refetch for ever.
|
||||||
|
if err := c.Put(ctx, Result{Callsign: "M0ABC", Name: "Ann", Source: "qrz"}); err != nil {
|
||||||
|
t.Fatalf("put: %v", err)
|
||||||
|
}
|
||||||
|
got, ok = c.Get(ctx, "M0ABC")
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("a callsign with no island was treated as stale — every lookup would repeat for ever")
|
||||||
|
}
|
||||||
|
if got.IOTA != "" {
|
||||||
|
t.Errorf("IOTA = %q for an operator with no island", got.IOTA)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A TTL of zero means no cache: nothing is read from it, and nothing is written
|
||||||
|
// to it either.
|
||||||
|
//
|
||||||
|
// It is a real thing to want. An operator correcting their own QRZ record — or
|
||||||
|
// chasing a DXpedition whose page changes during the operation — otherwise
|
||||||
|
// waits out thirty days before OpsLog will ask again. Clearing the cache by
|
||||||
|
// hand works once; switching it off is the setting for a session where the
|
||||||
|
// answers are moving.
|
||||||
|
func TestATTLOfZeroSwitchesTheCacheOff(t *testing.T) {
|
||||||
|
c := testCache(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
if err := c.Put(ctx, Result{Callsign: "M0ABC", Name: "Ann", Source: "qrz"}); err != nil {
|
||||||
|
t.Fatalf("put: %v", err)
|
||||||
|
}
|
||||||
|
if _, ok := c.Get(ctx, "M0ABC"); !ok {
|
||||||
|
t.Fatal("the cache did not hold a fresh entry while switched on")
|
||||||
|
}
|
||||||
|
|
||||||
|
c.SetTTL(0)
|
||||||
|
if c.Enabled() {
|
||||||
|
t.Error("Enabled() is true with a zero TTL")
|
||||||
|
}
|
||||||
|
if _, ok := c.Get(ctx, "M0ABC"); ok {
|
||||||
|
t.Error("a cached entry was still returned with the cache off — the provider would never be asked again")
|
||||||
|
}
|
||||||
|
// And nothing new is stored: those rows would only sit there going stale,
|
||||||
|
// waiting for the day the cache is switched back on.
|
||||||
|
if err := c.Put(ctx, Result{Callsign: "M0XYZ", Name: "Bob", Source: "qrz"}); err != nil {
|
||||||
|
t.Fatalf("put with the cache off: %v", err)
|
||||||
|
}
|
||||||
|
c.SetTTL(30 * 24 * time.Hour)
|
||||||
|
if _, ok := c.Get(ctx, "M0XYZ"); ok {
|
||||||
|
t.Error("a lookup made while the cache was off was written to it anyway")
|
||||||
|
}
|
||||||
|
// The entry from before it was switched off is still there — switching off
|
||||||
|
// is not the same as clearing, and the Clear cache button remains the way to
|
||||||
|
// throw the contents away.
|
||||||
|
if _, ok := c.Get(ctx, "M0ABC"); !ok {
|
||||||
|
t.Error("switching the cache off discarded what it already held")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A negative lifetime is meaningless, and rounding it into either "off" or a
|
||||||
|
// default would be a guess. It is ignored instead.
|
||||||
|
func TestANegativeTTLIsIgnored(t *testing.T) {
|
||||||
|
c := testCache(t)
|
||||||
|
c.SetTTL(7 * 24 * time.Hour)
|
||||||
|
c.SetTTL(-1)
|
||||||
|
if !c.Enabled() {
|
||||||
|
t.Fatal("a negative TTL switched the cache off")
|
||||||
|
}
|
||||||
|
if c.ttl != 7*24*time.Hour {
|
||||||
|
t.Errorf("ttl = %v after a negative value, want the 7 days it already had", c.ttl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The constructor's zero is the DEFAULT, not "off": at startup the settings
|
||||||
|
// have not been read, and beginning with no cache would hammer the provider for
|
||||||
|
// the first seconds of every launch.
|
||||||
|
func TestNewCacheWithZeroStillCaches(t *testing.T) {
|
||||||
|
c := testCache(t) // built with NewCache(conn, 0)
|
||||||
|
if !c.Enabled() {
|
||||||
|
t.Error("a cache built with a zero TTL started switched off")
|
||||||
|
}
|
||||||
|
}
|
||||||
+91
-12
@@ -41,6 +41,10 @@ type Result struct {
|
|||||||
// along and nothing ever filled it, because no provider mapping read the
|
// along and nothing ever filled it, because no provider mapping read the
|
||||||
// field.
|
// field.
|
||||||
Web string `json:"web,omitempty"`
|
Web string `json:"web,omitempty"`
|
||||||
|
// IOTA is the island reference (EU-048) for an operator on one. QRZ sends it
|
||||||
|
// and nothing used to read it — and since no live activation feed exists for
|
||||||
|
// IOTA the way it does for POTA, the callbook record is the practical source.
|
||||||
|
IOTA string `json:"iota,omitempty"`
|
||||||
// Zip is the postal code. HamQTH and QRZ both send one.
|
// Zip is the postal code. HamQTH and QRZ both send one.
|
||||||
Zip string `json:"zip,omitempty"`
|
Zip string `json:"zip,omitempty"`
|
||||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
||||||
@@ -191,10 +195,7 @@ func (m *Manager) Lookup(ctx context.Context, callsign string) (Result, error) {
|
|||||||
// operator was looking the call up for, and it came back empty while
|
// operator was looking the call up for, and it came back empty while
|
||||||
// the same lookup without the suffix answered perfectly.
|
// the same lookup without the suffix answered perfectly.
|
||||||
if !saysNothingAboutLocation(call) {
|
if !saysNothingAboutLocation(call) {
|
||||||
r.Country, r.Continent = "", ""
|
clearHomeLocation(&r)
|
||||||
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
|
fillFromDXCC(&r, dxcc) // entity/zones/lat-lon from the FULL (slashed) call
|
||||||
normalizeNames(&r)
|
normalizeNames(&r)
|
||||||
@@ -374,6 +375,17 @@ func titleCase(s string) string {
|
|||||||
// the DXCC number since QRZ's value is wrong and we don't have an entity
|
// the DXCC number since QRZ's value is wrong and we don't have an entity
|
||||||
// → DXCC# table yet.
|
// → DXCC# table yet.
|
||||||
// Returns true if any field was filled.
|
// Returns true if any field was filled.
|
||||||
|
// clearHomeLocation drops the fields that say WHERE a callbook record's operator
|
||||||
|
// lives, and keeps the ones that say WHO they are — name, address, QSL route.
|
||||||
|
// A portable operator's cards still go to the home address, so that address is
|
||||||
|
// not wrong; their county is.
|
||||||
|
func clearHomeLocation(r *Result) {
|
||||||
|
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 = "", "", ""
|
||||||
|
}
|
||||||
|
|
||||||
func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
|
func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
|
||||||
if dxcc == nil {
|
if dxcc == nil {
|
||||||
return false
|
return false
|
||||||
@@ -383,6 +395,33 @@ func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
filled := false
|
filled := false
|
||||||
|
|
||||||
|
// A subdivision belongs to an ENTITY, so a record describing one entity has
|
||||||
|
// nothing to say about a station operating from another.
|
||||||
|
//
|
||||||
|
// TI8/W2RE came back as a Costa Rica contact in Dutchess County, New York, on
|
||||||
|
// square FN31 — W2RE's home details, from a QRZ page that carries the home
|
||||||
|
// mailing address as most portable pages do. CNTY is *defined* as a US
|
||||||
|
// county, so that is not a cosmetic slip: it is a US county award credit
|
||||||
|
// recorded against a Costa Rica QSO, and a distance and beam heading computed
|
||||||
|
// from a square 3,600 km from where the station actually is.
|
||||||
|
//
|
||||||
|
// The home-call fallback above already clears these, but it only runs when NO
|
||||||
|
// provider had the slashed form. An operator with a page for their portable
|
||||||
|
// call never reached it. Cleared here instead, where the operating entity is
|
||||||
|
// known — which also heals rows already in the cache, since every cache hit
|
||||||
|
// comes back through here.
|
||||||
|
//
|
||||||
|
// Same-entity portables (F4BPO/P, W2RE/2) are untouched: the entities match,
|
||||||
|
// and there the home details ARE where the operator is.
|
||||||
|
if dxccNum != 0 && strings.ContainsRune(r.Callsign, '/') && !saysNothingAboutLocation(r.Callsign) {
|
||||||
|
if home := homeCall(r.Callsign); home != "" && home != r.Callsign {
|
||||||
|
if homeNum, _, _, _, _, _, _, homeOK := dxcc.Resolve(home); homeOK && homeNum != 0 && homeNum != dxccNum {
|
||||||
|
clearHomeLocation(r)
|
||||||
|
filled = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if country != "" {
|
if country != "" {
|
||||||
r.Country = country
|
r.Country = country
|
||||||
filled = true
|
filled = true
|
||||||
@@ -428,11 +467,21 @@ func fillFromDXCC(r *Result, dxcc DXCCResolver) bool {
|
|||||||
// ----- Cache -----
|
// ----- Cache -----
|
||||||
|
|
||||||
// Cache is a SQLite-backed cache of lookup results with a TTL.
|
// Cache is a SQLite-backed cache of lookup results with a TTL.
|
||||||
|
//
|
||||||
|
// A ttl of zero means NO CACHE: every lookup goes to the provider. That is a
|
||||||
|
// real thing to want — an operator correcting their own QRZ record, or chasing
|
||||||
|
// a DXpedition whose page changes during the operation, otherwise waits out the
|
||||||
|
// cache before OpsLog will look again.
|
||||||
type Cache struct {
|
type Cache struct {
|
||||||
db *sql.DB
|
db *sql.DB
|
||||||
ttl time.Duration
|
ttl time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewCache builds the cache. A ttl of zero here is the CONSTRUCTOR default
|
||||||
|
// (thirty days), not "off": at startup the settings have not been read yet, and
|
||||||
|
// starting with no cache would hammer the provider for the first seconds of
|
||||||
|
// every launch. Switching it off is a decision the operator makes, through
|
||||||
|
// SetTTL, once their settings are known.
|
||||||
func NewCache(db *sql.DB, ttl time.Duration) *Cache {
|
func NewCache(db *sql.DB, ttl time.Duration) *Cache {
|
||||||
if ttl <= 0 {
|
if ttl <= 0 {
|
||||||
ttl = 30 * 24 * time.Hour
|
ttl = 30 * 24 * time.Hour
|
||||||
@@ -440,25 +489,35 @@ func NewCache(db *sql.DB, ttl time.Duration) *Cache {
|
|||||||
return &Cache{db: db, ttl: ttl}
|
return &Cache{db: db, ttl: ttl}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetTTL updates the cache TTL (e.g. when user changes settings).
|
// SetTTL updates the cache lifetime.
|
||||||
|
//
|
||||||
|
// ZERO switches the cache OFF — nothing is read from it and nothing is written
|
||||||
|
// to it. A NEGATIVE value is meaningless and is ignored, rather than being
|
||||||
|
// rounded into one of the two meanings above.
|
||||||
func (c *Cache) SetTTL(ttl time.Duration) {
|
func (c *Cache) SetTTL(ttl time.Duration) {
|
||||||
if ttl > 0 {
|
if ttl >= 0 {
|
||||||
c.ttl = ttl
|
c.ttl = ttl
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Enabled reports whether anything is being cached at all.
|
||||||
|
func (c *Cache) Enabled() bool { return c != nil && c.ttl > 0 }
|
||||||
|
|
||||||
// Get returns the cached result if present and not expired.
|
// Get returns the cached result if present and not expired.
|
||||||
func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
||||||
|
if !c.Enabled() {
|
||||||
|
return Result{}, false
|
||||||
|
}
|
||||||
row := c.db.QueryRowContext(ctx, `
|
row := c.db.QueryRowContext(ctx, `
|
||||||
SELECT callsign, name, qth, address, state, cnty, country, grid,
|
SELECT callsign, name, qth, address, state, cnty, country, grid,
|
||||||
lat, lon, dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
lat, lon, dxcc, cqz, ituz, cont, email, qsl_via, image_url,
|
||||||
web, zip, source, fetched_at
|
web, zip, iota, source, fetched_at
|
||||||
FROM callsign_cache WHERE callsign = ?`, callsign)
|
FROM callsign_cache WHERE callsign = ?`, callsign)
|
||||||
var (
|
var (
|
||||||
r Result
|
r Result
|
||||||
name, qth, addr, state, cnty sql.NullString
|
name, qth, addr, state, cnty sql.NullString
|
||||||
country, grid, cont, email, qslVia, image sql.NullString
|
country, grid, cont, email, qslVia, image sql.NullString
|
||||||
web, zip sql.NullString
|
web, zip, iotaRef sql.NullString
|
||||||
src string
|
src string
|
||||||
dxcc, cqz, ituz sql.NullInt64
|
dxcc, cqz, ituz sql.NullInt64
|
||||||
lat, lon sql.NullFloat64
|
lat, lon sql.NullFloat64
|
||||||
@@ -466,7 +525,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
)
|
)
|
||||||
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
|
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
|
||||||
&country, &grid, &lat, &lon,
|
&country, &grid, &lat, &lon,
|
||||||
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip,
|
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip, &iotaRef,
|
||||||
&src, &fetched); err != nil {
|
&src, &fetched); err != nil {
|
||||||
return Result{}, false
|
return Result{}, false
|
||||||
}
|
}
|
||||||
@@ -477,6 +536,17 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
if time.Since(t) > c.ttl {
|
if time.Since(t) > c.ttl {
|
||||||
return Result{}, false
|
return Result{}, false
|
||||||
}
|
}
|
||||||
|
// A row written before the iota column existed has NULL there, and the cache
|
||||||
|
// lasts thirty days — so without this every callsign already looked up would
|
||||||
|
// go a month without its island reference, which is exactly what the first
|
||||||
|
// test of the feature ran into.
|
||||||
|
//
|
||||||
|
// NULL and '' are deliberately different here: Put writes an empty string for
|
||||||
|
// an operator with no island, so only a row that predates the column reads as
|
||||||
|
// invalid. One refetch per such callsign, the next time it is used.
|
||||||
|
if !iotaRef.Valid {
|
||||||
|
return Result{}, false
|
||||||
|
}
|
||||||
r.Name = name.String
|
r.Name = name.String
|
||||||
r.QTH = qth.String
|
r.QTH = qth.String
|
||||||
r.Address = addr.String
|
r.Address = addr.String
|
||||||
@@ -490,6 +560,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
r.Email = email.String
|
r.Email = email.String
|
||||||
r.Web = web.String
|
r.Web = web.String
|
||||||
r.Zip = zip.String
|
r.Zip = zip.String
|
||||||
|
r.IOTA = strings.ToUpper(iotaRef.String)
|
||||||
r.QSLVia = qslVia.String
|
r.QSLVia = qslVia.String
|
||||||
r.ImageURL = image.String
|
r.ImageURL = image.String
|
||||||
r.DXCC = int(dxcc.Int64)
|
r.DXCC = int(dxcc.Int64)
|
||||||
@@ -503,10 +574,15 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
// Put upserts a lookup result. fetched_at is generated in Go (NowISO) so the
|
// Put upserts a lookup result. fetched_at is generated in Go (NowISO) so the
|
||||||
// INSERT is backend-agnostic; the conflict tail is dialect-specific.
|
// INSERT is backend-agnostic; the conflict tail is dialect-specific.
|
||||||
func (c *Cache) Put(ctx context.Context, r Result) error {
|
func (c *Cache) Put(ctx context.Context, r Result) error {
|
||||||
|
if !c.Enabled() {
|
||||||
|
// Nothing reads it, so writing would only grow the table — and leave
|
||||||
|
// stale rows waiting for the day the cache is switched back on.
|
||||||
|
return nil
|
||||||
|
}
|
||||||
updateCols := []string{
|
updateCols := []string{
|
||||||
"name", "qth", "address", "state", "cnty",
|
"name", "qth", "address", "state", "cnty",
|
||||||
"country", "grid", "lat", "lon",
|
"country", "grid", "lat", "lon",
|
||||||
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip",
|
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip", "iota",
|
||||||
"source", "fetched_at",
|
"source", "fetched_at",
|
||||||
}
|
}
|
||||||
// The lookup cache always lives in the local SQLite database, so SQLite
|
// The lookup cache always lives in the local SQLite database, so SQLite
|
||||||
@@ -519,8 +595,8 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
INSERT INTO callsign_cache(callsign, name, qth, address, state, cnty,
|
INSERT INTO callsign_cache(callsign, name, qth, address, state, cnty,
|
||||||
country, grid, lat, lon,
|
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)
|
web, zip, iota, source, fetched_at)
|
||||||
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?, ?,?)
|
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?,?, ?,?)
|
||||||
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
|
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
|
||||||
_, err := c.db.ExecContext(ctx, q,
|
_, err := c.db.ExecContext(ctx, q,
|
||||||
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
||||||
@@ -530,6 +606,9 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
||||||
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
||||||
nullable(r.ImageURL), nullable(r.Web), nullable(r.Zip),
|
nullable(r.ImageURL), nullable(r.Web), nullable(r.Zip),
|
||||||
|
// NOT nullable(): an operator with no island must store '', so that a NULL
|
||||||
|
// keeps its one meaning — a row written before the column existed.
|
||||||
|
r.IOTA,
|
||||||
r.Source, db.NowISO(),
|
r.Source, db.NowISO(),
|
||||||
)
|
)
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// fakeDXCC resolves a handful of calls, enough to stand in for cty.dat.
|
||||||
|
type fakeDXCC map[string]struct {
|
||||||
|
num int
|
||||||
|
country string
|
||||||
|
cont string
|
||||||
|
cqz, ituz int
|
||||||
|
lat, lon float64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f fakeDXCC) Resolve(call string) (int, string, string, int, int, float64, float64, bool) {
|
||||||
|
e, ok := f[call]
|
||||||
|
if !ok {
|
||||||
|
return 0, "", "", 0, 0, 0, 0, false
|
||||||
|
}
|
||||||
|
return e.num, e.country, e.cont, e.cqz, e.ituz, e.lat, e.lon, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func testDXCC() fakeDXCC {
|
||||||
|
return fakeDXCC{
|
||||||
|
// Costa Rica, as cty.dat reads the OPERATING call.
|
||||||
|
"TI8/W2RE": {num: 308, country: "Costa Rica", cont: "NA", cqz: 7, ituz: 11, lat: 9.9, lon: -84.1},
|
||||||
|
// The home call: United States.
|
||||||
|
"W2RE": {num: 291, country: "United States", cont: "NA", cqz: 5, ituz: 8, lat: 39.8, lon: -98.5},
|
||||||
|
// A same-entity portable: still France either way.
|
||||||
|
"F4BPO/P": {num: 227, country: "France", cont: "EU", cqz: 14, ituz: 27, lat: 46.2, lon: 2.2},
|
||||||
|
"F4BPO": {num: 227, country: "France", cont: "EU", cqz: 14, ituz: 27, lat: 46.2, lon: 2.2},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A callbook record for a portable call routinely carries the operator's HOME
|
||||||
|
// address — most QRZ pages for a portable call do — and a subdivision belongs to
|
||||||
|
// an entity. Carrying the home county across an entity change is not cosmetic:
|
||||||
|
// CNTY is defined as a US county, so TI8/W2RE was coming out as a Costa Rica
|
||||||
|
// contact credited to Dutchess County, New York, with the distance and beam
|
||||||
|
// heading taken from a square 3,600 km from where the station actually was.
|
||||||
|
func TestPortableInAnotherEntityDropsTheHomeSubdivision(t *testing.T) {
|
||||||
|
r := Result{
|
||||||
|
Callsign: "TI8/W2RE",
|
||||||
|
Name: "Raymond", // who they are — kept
|
||||||
|
QTH: "Poughquag",
|
||||||
|
Address: "499 Pleasant Ridge Road", // cards still go there — kept
|
||||||
|
State: "NY",
|
||||||
|
County: "Dutchess",
|
||||||
|
Grid: "FN31",
|
||||||
|
Lat: 41.6, Lon: -73.7,
|
||||||
|
DXCC: 291,
|
||||||
|
}
|
||||||
|
fillFromDXCC(&r, testDXCC())
|
||||||
|
|
||||||
|
if r.County != "" {
|
||||||
|
t.Errorf("county = %q, want empty — a US county on a Costa Rica QSO is a false award credit", r.County)
|
||||||
|
}
|
||||||
|
if r.State != "" {
|
||||||
|
t.Errorf("state = %q, want empty — a subdivision of the entity that is not being worked", r.State)
|
||||||
|
}
|
||||||
|
if r.Grid != "" {
|
||||||
|
t.Errorf("grid = %q, want empty — it is the home square, 3,600 km from the operation", r.Grid)
|
||||||
|
}
|
||||||
|
// The entity and its centroid take over, so distance and bearing mean
|
||||||
|
// something again.
|
||||||
|
if r.DXCC != 308 || r.Country != "Costa Rica" {
|
||||||
|
t.Errorf("entity = %d %q, want 308 Costa Rica", r.DXCC, r.Country)
|
||||||
|
}
|
||||||
|
if r.Lat != 9.9 || r.Lon != -84.1 {
|
||||||
|
t.Errorf("lat/lon = %v/%v, want the Costa Rica centroid — the home coordinates must not survive", r.Lat, r.Lon)
|
||||||
|
}
|
||||||
|
// Who they are, and where their cards go, is unchanged.
|
||||||
|
if r.Name != "Raymond" || r.Address != "499 Pleasant Ridge Road" {
|
||||||
|
t.Errorf("name/address were cleared (%q / %q) — a portable operator's post still reaches home", r.Name, r.Address)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The other half of the rule: a portable WITHIN the same entity is at home as
|
||||||
|
// far as the entity is concerned, and its details must survive untouched.
|
||||||
|
func TestSameEntityPortableKeepsItsLocation(t *testing.T) {
|
||||||
|
r := Result{
|
||||||
|
Callsign: "F4BPO/P",
|
||||||
|
State: "77", County: "Seine-et-Marne", Grid: "JN18cs",
|
||||||
|
Lat: 48.8, Lon: 2.4, DXCC: 227,
|
||||||
|
}
|
||||||
|
fillFromDXCC(&r, testDXCC())
|
||||||
|
|
||||||
|
if r.Grid != "JN18cs" || r.County != "Seine-et-Marne" || r.State != "77" {
|
||||||
|
t.Errorf("a same-entity portable lost its location: grid=%q county=%q state=%q", r.Grid, r.County, r.State)
|
||||||
|
}
|
||||||
|
if r.Lat != 48.8 || r.Lon != 2.4 {
|
||||||
|
t.Errorf("lat/lon = %v/%v — the precise home position was replaced by the entity centroid", r.Lat, r.Lon)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -134,6 +134,7 @@ func (q *QRZ) fetch(ctx context.Context, sessionKey, callsign string) (Result, e
|
|||||||
Email: c.Email,
|
Email: c.Email,
|
||||||
QSLVia: c.QSLMgr,
|
QSLVia: c.QSLMgr,
|
||||||
ImageURL: strings.TrimSpace(c.Image),
|
ImageURL: strings.TrimSpace(c.Image),
|
||||||
|
IOTA: strings.ToUpper(strings.TrimSpace(c.IOTA)),
|
||||||
}
|
}
|
||||||
r.Lat, _ = strconv.ParseFloat(c.Lat, 64)
|
r.Lat, _ = strconv.ParseFloat(c.Lat, 64)
|
||||||
r.Lon, _ = strconv.ParseFloat(c.Lon, 64)
|
r.Lon, _ = strconv.ParseFloat(c.Lon, 64)
|
||||||
@@ -193,6 +194,7 @@ type qrzCallsign struct {
|
|||||||
Email string `xml:"email"`
|
Email string `xml:"email"`
|
||||||
QSLMgr string `xml:"qslmgr"`
|
QSLMgr string `xml:"qslmgr"`
|
||||||
Image string `xml:"image"` // direct URL to the profile picture (subscribers only on QRZ)
|
Image string `xml:"image"` // direct URL to the profile picture (subscribers only on QRZ)
|
||||||
|
IOTA string `xml:"iota"` // island reference for an operator on one, e.g. EU-048
|
||||||
}
|
}
|
||||||
|
|
||||||
// composeQRZAddress builds a multi-line postal address from QRZ's separate
|
// composeQRZAddress builds a multi-line postal address from QRZ's separate
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/xml"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// QRZ sends the island reference and OpsLog read past it.
|
||||||
|
//
|
||||||
|
// It matters more for IOTA than it would for another award: unlike POTA there
|
||||||
|
// is no live "who is on an island right now" feed anywhere, so the callbook
|
||||||
|
// record is the practical source — and it is known BEFORE the contact is
|
||||||
|
// logged, which is when it is useful.
|
||||||
|
func TestQRZCallsignCarriesIOTA(t *testing.T) {
|
||||||
|
const body = `<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<QRZDatabase version="1.34">
|
||||||
|
<Callsign>
|
||||||
|
<call>F5IRH</call>
|
||||||
|
<fname>Max</fname>
|
||||||
|
<country>France</country>
|
||||||
|
<grid>IN87ki</grid>
|
||||||
|
<cqzone>14</cqzone>
|
||||||
|
<iota>EU-048</iota>
|
||||||
|
</Callsign>
|
||||||
|
<Session><Key>abc</Key></Session>
|
||||||
|
</QRZDatabase>`
|
||||||
|
|
||||||
|
var resp qrzDB
|
||||||
|
if err := xml.Unmarshal([]byte(body), &resp); err != nil {
|
||||||
|
t.Fatalf("unmarshal: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Callsign.IOTA != "EU-048" {
|
||||||
|
t.Fatalf("the <iota> tag decoded as %q — the field is not being read", resp.Callsign.IOTA)
|
||||||
|
}
|
||||||
|
// And a record with no island must not invent one.
|
||||||
|
var none qrzDB
|
||||||
|
if err := xml.Unmarshal([]byte(strings.Replace(body, "<iota>EU-048</iota>", "", 1)), &none); err != nil {
|
||||||
|
t.Fatalf("unmarshal: %v", err)
|
||||||
|
}
|
||||||
|
if none.Callsign.IOTA != "" {
|
||||||
|
t.Errorf("IOTA = %q for a record without one", none.Callsign.IOTA)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -733,7 +733,11 @@ func placeQSOBox(profile ProfileInfo, zone pxRect, occupied []pxRect) QSOBox {
|
|||||||
Enabled: true, W: 760, H: 220,
|
Enabled: true, W: 760, H: 220,
|
||||||
BG: "#ffffff", BGOpacity: 0.88, Radius: 12,
|
BG: "#ffffff", BGOpacity: 0.88, Radius: 12,
|
||||||
Title: "Confirming QSO with {qso.callsign}",
|
Title: "Confirming QSO with {qso.callsign}",
|
||||||
Fields: []string{"qso_date", "time_on", "band", "mode", "rst_sent"},
|
// The frequency belongs on a card: "20m" says which band the QSL is for,
|
||||||
|
// the megahertz say where the contact actually was — and a card is often
|
||||||
|
// the only record the OTHER station keeps. Removable in the designer for
|
||||||
|
// anyone who wants the band alone.
|
||||||
|
Fields: []string{"qso_date", "time_on", "band", "freq", "mode", "rst_sent"},
|
||||||
// PSE/TNX stamp (auto: TNX if a QSL was received, else PSE QSL) leads the
|
// PSE/TNX stamp (auto: TNX if a QSL was received, else PSE QSL) leads the
|
||||||
// message. {qso.pse_tnx} is a normal token — it can be moved to its own
|
// message. {qso.pse_tnx} is a normal token — it can be moved to its own
|
||||||
// element anywhere on the card in the designer.
|
// element anywhere on the card in the designer.
|
||||||
|
|||||||
@@ -2,6 +2,32 @@ package qso
|
|||||||
|
|
||||||
import "testing"
|
import "testing"
|
||||||
|
|
||||||
|
// baseCall picks the operator's OWN callsign out of a portable form. The slash
|
||||||
|
// carries a qualifier on either side and which side depends on what it is, so
|
||||||
|
// this is the whole difficulty.
|
||||||
|
func TestBaseCall(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"RK3DWA": "RK3DWA",
|
||||||
|
"RK3DWA/3": "RK3DWA", // call-area digit
|
||||||
|
"RK3DWA/P": "RK3DWA", // portable
|
||||||
|
"RK3DWA/QRP": "RK3DWA",
|
||||||
|
"RK3DWA/MM": "RK3DWA",
|
||||||
|
"ZA/OE8NDR": "OE8NDR", // an Austrian in Albania — the case that prompted this
|
||||||
|
"ZA/IZ2DPX": "IZ2DPX",
|
||||||
|
"F/DL1ABC": "DL1ABC",
|
||||||
|
"F/DL1ABC/P": "DL1ABC",
|
||||||
|
"KH6/K6ABC": "K6ABC",
|
||||||
|
"VP2E/W1ABC": "W1ABC",
|
||||||
|
"3DA0/ZS1ABC": "ZS1ABC",
|
||||||
|
"9A/S51AB": "S51AB",
|
||||||
|
"/RK3DWA": "RK3DWA",
|
||||||
|
} {
|
||||||
|
if got := baseCall(in); got != want {
|
||||||
|
t.Errorf("baseCall(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// The predicate behind "Worked before". Exact when folding is off; with it on,
|
// The predicate behind "Worked before". Exact when folding is off; with it on,
|
||||||
// a station's portable forms are one operator — and the fold has to work from
|
// a station's portable forms are one operator — and the fold has to work from
|
||||||
// either end, because you may type the base call or the portable one.
|
// either end, because you may type the base call or the portable one.
|
||||||
@@ -10,25 +36,61 @@ func TestCallMatch(t *testing.T) {
|
|||||||
t.Errorf("exact: got %q %v", pred, args)
|
t.Errorf("exact: got %q %v", pred, args)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Typing the base call: match it and everything suffixed off it.
|
// Typing the base call: match it, everything suffixed off it, and every
|
||||||
pred, args := callMatch("RK3DWA", true)
|
// prefixed form of it.
|
||||||
if pred != "(callsign = ? OR callsign LIKE ?)" {
|
_, args := callMatch("RK3DWA", true)
|
||||||
t.Errorf("variants predicate = %q", pred)
|
want := []any{"RK3DWA", "RK3DWA/%", "%/RK3DWA", "%/RK3DWA/%"}
|
||||||
}
|
assertArgs(t, "base call", args, want)
|
||||||
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
|
|
||||||
t.Errorf("variants args = %v, want [RK3DWA RK3DWA/%%]", args)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Typing a portable form must reach the plain call too — the suffix is
|
// Typing a portable form must reach the plain call too — the qualifier is
|
||||||
// stripped from the INPUT, not just matched in the column.
|
// stripped from the INPUT, not just matched in the column.
|
||||||
_, args = callMatch("RK3DWA/3", true)
|
_, args = callMatch("RK3DWA/3", true)
|
||||||
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
|
assertArgs(t, "portable input", args, want)
|
||||||
t.Errorf("portable input args = %v, want [RK3DWA RK3DWA/%%]", args)
|
}
|
||||||
|
|
||||||
|
// A prefixed call is the same operator, and NOT every other visitor to that
|
||||||
|
// country.
|
||||||
|
//
|
||||||
|
// Matching on the part before the slash made ZA/OE8NDR the station "ZA", so the
|
||||||
|
// worked-before list for one Austrian operating from Albania showed every other
|
||||||
|
// ZA/ guest — two Italians — and counted them as four contacts "with this
|
||||||
|
// call". Reported from a screenshot of exactly that.
|
||||||
|
func TestCallMatchPrefixedIsTheOperatorNotTheCountry(t *testing.T) {
|
||||||
|
_, args := callMatch("ZA/OE8NDR", true)
|
||||||
|
assertArgs(t, "ZA/OE8NDR", args, []any{"OE8NDR", "OE8NDR/%", "%/OE8NDR", "%/OE8NDR/%"})
|
||||||
|
|
||||||
|
for _, a := range args {
|
||||||
|
if s, _ := a.(string); s == "ZA" || s == "ZA/%" {
|
||||||
|
t.Fatalf("the country prefix is still being matched as a station: %v", args)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// A leading slash is not a suffix marker — dropping to "" there would match
|
// And the two are not each other: nothing in one operator's predicate can
|
||||||
// the entire logbook.
|
// select the other's call.
|
||||||
if _, args := callMatch("/RK3DWA", true); args[0] != "/RK3DWA" {
|
_, other := callMatch("ZA/IZ2DPX", true)
|
||||||
t.Errorf("leading slash: args[0] = %v, want the call unchanged", args[0])
|
assertArgs(t, "ZA/IZ2DPX", other, []any{"IZ2DPX", "IZ2DPX/%", "%/IZ2DPX", "%/IZ2DPX/%"})
|
||||||
|
}
|
||||||
|
|
||||||
|
// A base too short to be a callsign falls back to an exact match. "F/DL1ABC"
|
||||||
|
// resolves fine, but a malformed entry must never produce a LIKE that selects
|
||||||
|
// half the logbook.
|
||||||
|
func TestCallMatchRefusesAShortBase(t *testing.T) {
|
||||||
|
for _, call := range []string{"F/", "9A", "/P", "K/M"} {
|
||||||
|
pred, args := callMatch(call, true)
|
||||||
|
if pred != "callsign = ?" || len(args) != 1 {
|
||||||
|
t.Errorf("%q produced %q %v — want an exact match", call, pred, args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertArgs(t *testing.T, what string, got, want []any) {
|
||||||
|
t.Helper()
|
||||||
|
if len(got) != len(want) {
|
||||||
|
t.Fatalf("%s: args %v, want %v", what, got, want)
|
||||||
|
}
|
||||||
|
for i := range want {
|
||||||
|
if got[i] != want[i] {
|
||||||
|
t.Fatalf("%s: args %v, want %v", what, got, want)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,84 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LoTW never hands back the submode it was given: every digital contact comes
|
||||||
|
// back as the mode GROUP, "DATA". Matched on the exact mode string that is
|
||||||
|
// simply never equal, so an operator downloading their confirmations was told
|
||||||
|
// their own QSOs were not in their log — reported for FT2 contacts confirmed as
|
||||||
|
// DATA, and true of FT4 and FT8 alike.
|
||||||
|
func TestClassKeyMatchesAConfirmationCarryingTheModeGroup(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
when := time.Date(2026, 8, 16, 16, 29, 0, 0, time.UTC)
|
||||||
|
id, err := r.Add(ctx, QSO{Callsign: "F1NQP", QSODate: when, Band: "20m", Mode: "FT2"})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
minute := when.Format("2006-01-02T15:04")
|
||||||
|
|
||||||
|
exact, err := r.DedupeKeyIDs(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, found := exact[DedupeKey("F1NQP", minute, "20m", "DATA")]; found {
|
||||||
|
t.Fatal("the exact index matched DATA against FT2 — the test proves nothing")
|
||||||
|
}
|
||||||
|
|
||||||
|
byClass, err := r.DedupeClassKeyIDs(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, found := byClass[DedupeClassKey("F1NQP", minute, "20m", "DATA")]
|
||||||
|
if !found || got != id {
|
||||||
|
t.Errorf("class match = (%d, %v), want (%d, true) — the confirmation would be reported as having no local QSO", got, found, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two digital contacts with the same station, same band, same minute is barely
|
||||||
|
// physical — but if it happens, stamping the confirmation on whichever row the
|
||||||
|
// map happened to keep is a silent error in an award credit. Ambiguity maps to
|
||||||
|
// 0 so the caller reports it unmatched instead of guessing.
|
||||||
|
func TestAnAmbiguousClassKeyIsRefusedRatherThanGuessed(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
when := time.Date(2026, 8, 16, 16, 29, 0, 0, time.UTC)
|
||||||
|
for _, m := range []string{"FT8", "RTTY"} {
|
||||||
|
if _, err := r.Add(ctx, QSO{Callsign: "F1NQP", QSODate: when, Band: "20m", Mode: m}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
byClass, err := r.DedupeClassKeyIDs(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if got := byClass[DedupeClassKey("F1NQP", when.Format("2006-01-02T15:04"), "20m", "DATA")]; got != 0 {
|
||||||
|
t.Errorf("ambiguous class key resolved to %d — one of two QSOs was picked at random", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Phone and CW keep their own classes: a CW confirmation must never land on an
|
||||||
|
// SSB contact just because the rest of the key agrees.
|
||||||
|
func TestClassMatchDoesNotCrossPhoneAndCW(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
when := time.Date(2026, 8, 16, 16, 29, 0, 0, time.UTC)
|
||||||
|
if _, err := r.Add(ctx, QSO{Callsign: "F1NQP", QSODate: when, Band: "20m", Mode: "SSB"}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
byClass, err := r.DedupeClassKeyIDs(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
minute := when.Format("2006-01-02T15:04")
|
||||||
|
if _, found := byClass[DedupeClassKey("F1NQP", minute, "20m", "CW")]; found {
|
||||||
|
t.Error("a CW confirmation matched an SSB contact")
|
||||||
|
}
|
||||||
|
if _, found := byClass[DedupeClassKey("F1NQP", minute, "20m", "USB")]; !found {
|
||||||
|
t.Error("USB did not match the SSB contact — the phone sidebands are one class")
|
||||||
|
}
|
||||||
|
}
|
||||||
+362
-10
@@ -215,6 +215,12 @@ type QSO struct {
|
|||||||
// that doesn't know about it can't clobber it.
|
// that doesn't know about it can't clobber it.
|
||||||
AwardRefs string `json:"award_refs,omitempty"`
|
AwardRefs string `json:"award_refs,omitempty"`
|
||||||
|
|
||||||
|
// SyncUID is this contact's stable identity for folder synchronisation —
|
||||||
|
// what lets another machine name the same QSO when it edits or deletes it.
|
||||||
|
// Like AwardRefs it is read here but NOT in columnList, so an ordinary edit
|
||||||
|
// can never clobber it; it is written only by SetSyncUID / BackfillSyncUIDs.
|
||||||
|
SyncUID string `json:"sync_uid,omitempty"`
|
||||||
|
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
}
|
}
|
||||||
@@ -271,7 +277,7 @@ const columnList = `callsign, qso_date, qso_date_off, band, band_rx, mode, submo
|
|||||||
// award_refs is read here but is NOT part of columnList (the insert/update
|
// award_refs is read here but is NOT part of columnList (the insert/update
|
||||||
// write path) — it is a derived cache written only via SetAwardRefs, so a
|
// write path) — it is a derived cache written only via SetAwardRefs, so a
|
||||||
// normal QSO write can never clobber it.
|
// normal QSO write can never clobber it.
|
||||||
const selectCols = `id, ` + columnList + `, award_refs, created_at, updated_at`
|
const selectCols = `id, ` + columnList + `, award_refs, sync_uid, created_at, updated_at`
|
||||||
|
|
||||||
// columnCount is derived from columnList at init so they can never drift.
|
// columnCount is derived from columnList at init so they can never drift.
|
||||||
var columnCount = countColumns(columnList)
|
var columnCount = countColumns(columnList)
|
||||||
@@ -1469,13 +1475,67 @@ func conditionSQL(c Condition) (string, []any, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// quickCallsignLike turns the Recent-QSOs search box into a SQL LIKE pattern.
|
||||||
|
//
|
||||||
|
// The rule, which is the one an operator already has in their head from the
|
||||||
|
// alert filters:
|
||||||
|
//
|
||||||
|
// 4S → starts with 4S (4S%)
|
||||||
|
// *4S → ends with 4S (%4S)
|
||||||
|
// *4S* → contains 4S (%4S%)
|
||||||
|
// 4S? → 4S and one more (4S_)
|
||||||
|
//
|
||||||
|
// So a plain word is a PREFIX — the common case, and what makes typing a call
|
||||||
|
// feel like a call sign lookup rather than a text search. The moment a wildcard
|
||||||
|
// appears the pattern is taken literally end to end, which is the only way
|
||||||
|
// "*4S" can mean "ends with" while "4S" means "starts with".
|
||||||
|
//
|
||||||
|
// This used to be an unconditional contains-match, so there was no way to ask
|
||||||
|
// for a prefix at all: searching 4S returned every call with 4S buried in it.
|
||||||
|
//
|
||||||
|
// % and _ typed by the operator are escaped to literals — otherwise a search
|
||||||
|
// for "_" would quietly match everything.
|
||||||
|
func quickCallsignLike(pattern string) string {
|
||||||
|
p := strings.TrimSpace(pattern)
|
||||||
|
var b strings.Builder
|
||||||
|
esc := func(r rune) {
|
||||||
|
switch r {
|
||||||
|
case '%', '_', '!':
|
||||||
|
b.WriteByte('!')
|
||||||
|
}
|
||||||
|
b.WriteRune(r)
|
||||||
|
}
|
||||||
|
if !strings.ContainsAny(p, "*?") {
|
||||||
|
for _, r := range p {
|
||||||
|
esc(r)
|
||||||
|
}
|
||||||
|
b.WriteByte('%') // plain text = prefix
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
for _, r := range p {
|
||||||
|
switch r {
|
||||||
|
case '*':
|
||||||
|
b.WriteByte('%')
|
||||||
|
case '?':
|
||||||
|
b.WriteByte('_')
|
||||||
|
default:
|
||||||
|
esc(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
// buildWhere assembles the predicate (everything after WHERE) + args.
|
// buildWhere assembles the predicate (everything after WHERE) + args.
|
||||||
func buildWhere(f QueryFilter) (string, []any, error) {
|
func buildWhere(f QueryFilter) (string, []any, error) {
|
||||||
pred := "1=1"
|
pred := "1=1"
|
||||||
var args []any
|
var args []any
|
||||||
if qc := strings.TrimSpace(f.QuickCallsign); qc != "" {
|
if qc := strings.TrimSpace(f.QuickCallsign); qc != "" {
|
||||||
pred += " AND callsign LIKE ?"
|
// ESCAPE '!' rather than the usual backslash: the clause is a literal in
|
||||||
args = append(args, "%"+qc+"%")
|
// the SQL text, and '\\' is one character to MySQL but two to SQLite,
|
||||||
|
// which rejects it. '!' is one character to both and appears in no
|
||||||
|
// callsign.
|
||||||
|
pred += " AND callsign LIKE ? ESCAPE '!'"
|
||||||
|
args = append(args, quickCallsignLike(qc))
|
||||||
}
|
}
|
||||||
if len(f.Conditions) > 0 {
|
if len(f.Conditions) > 0 {
|
||||||
joiner := " AND "
|
joiner := " AND "
|
||||||
@@ -1599,6 +1659,136 @@ func (r *Repo) IterateByIDs(ctx context.Context, ids []int64, fn func(QSO) error
|
|||||||
return rows.Err()
|
return rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GridKey builds the lookup key for the worked-grid index.
|
||||||
|
//
|
||||||
|
// band is "" for a "mix bands" scope, which is why the index stores BOTH forms
|
||||||
|
// for every contact: asking "worked anywhere" must not mean walking the map.
|
||||||
|
func GridKey(grid, band, class string) string {
|
||||||
|
return grid + "|" + strings.ToLower(band) + "|" + class
|
||||||
|
}
|
||||||
|
|
||||||
|
// GridWorkedIndex maps every worked square to whether it is CONFIRMED, under
|
||||||
|
// every band-and-mode scope the operator can choose between.
|
||||||
|
//
|
||||||
|
// One QSO lands in several buckets, because the scopes overlap: an FT8 contact
|
||||||
|
// counts for "this exact mode", for "any FTx mode" and for "any digital mode",
|
||||||
|
// and each of those under both its own band and the any-band form. classesOf is
|
||||||
|
// supplied by the caller — the meaning of DIGI and FTx belongs upstairs with the
|
||||||
|
// rest of the mode vocabulary, not here.
|
||||||
|
//
|
||||||
|
// The value is "confirmed", not merely "present", so the same index answers both
|
||||||
|
// hunting modes: chase what has never been worked, or chase what is not yet
|
||||||
|
// confirmed. Confirmed means LoTW, a card or eQSL — the three the award engine
|
||||||
|
// counts, so a square cannot be confirmed here and unconfirmed there.
|
||||||
|
func (r *Repo) GridWorkedIndex(ctx context.Context, classesOf func(mode string) []string) (map[string]bool, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
|
SELECT COALESCE(grid,''), UPPER(COALESCE(mode,'')), LOWER(COALESCE(band,'')),
|
||||||
|
COALESCE(lotw_rcvd,''), COALESCE(qsl_rcvd,''), COALESCE(eqsl_rcvd,'')
|
||||||
|
FROM qso
|
||||||
|
WHERE grid IS NOT NULL AND grid != ''`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("query worked grids: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]bool, 8192)
|
||||||
|
for rows.Next() {
|
||||||
|
var grid, mode, band, lotw, card, eqsl string
|
||||||
|
if err := rows.Scan(&grid, &mode, &band, &lotw, &card, &eqsl); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
g := strings.ToUpper(strings.TrimSpace(grid))
|
||||||
|
if len(g) < 4 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
g = g[:4]
|
||||||
|
confirmed := lotw == "Y" || card == "Y" || eqsl == "Y"
|
||||||
|
for _, cls := range classesOf(mode) {
|
||||||
|
if cls == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// || is never a downgrade: one confirmed contact confirms the square
|
||||||
|
// for that scope, whatever the others say.
|
||||||
|
for _, k := range []string{GridKey(g, band, cls), GridKey(g, "", cls)} {
|
||||||
|
out[k] = out[k] || confirmed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GridSquare is one 4-character Maidenhead square in the log.
|
||||||
|
type GridSquare struct {
|
||||||
|
Grid string `json:"grid"`
|
||||||
|
Count int `json:"count"`
|
||||||
|
Confirmed bool `json:"confirmed"`
|
||||||
|
// Band and Mode of the most recent contact in the square, for the tooltip.
|
||||||
|
// The square is the subject here, not the QSO, so one example is enough —
|
||||||
|
// listing every band a square was worked on turns a map into a table.
|
||||||
|
Band string `json:"band,omitempty"`
|
||||||
|
Mode string `json:"mode,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GridSquares aggregates the log into 4-character squares, newest contact
|
||||||
|
// deciding the example band/mode.
|
||||||
|
//
|
||||||
|
// modeOf filters and is supplied by the caller (it owns what "digital" means):
|
||||||
|
// return false to drop a QSO. Aggregation to 4 characters happens HERE rather
|
||||||
|
// than in SQL — the column holds 4, 6 and 8-character grids, and lower(substr)
|
||||||
|
// in SQL would differ between SQLite and MySQL for no gain.
|
||||||
|
func (r *Repo) GridSquares(ctx context.Context, keep func(mode string) bool) ([]GridSquare, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
|
SELECT COALESCE(grid,''), UPPER(COALESCE(mode,'')), LOWER(COALESCE(band,'')),
|
||||||
|
COALESCE(lotw_rcvd,''), COALESCE(qsl_rcvd,''), COALESCE(eqsl_rcvd,'')
|
||||||
|
FROM qso
|
||||||
|
WHERE grid IS NOT NULL AND grid != ''
|
||||||
|
ORDER BY qso_date ASC, id ASC`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("query grid squares: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := map[string]*GridSquare{}
|
||||||
|
for rows.Next() {
|
||||||
|
var grid, mode, band, lotw, card, eqsl string
|
||||||
|
if err := rows.Scan(&grid, &mode, &band, &lotw, &card, &eqsl); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if keep != nil && !keep(mode) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
g := strings.ToUpper(strings.TrimSpace(grid))
|
||||||
|
if len(g) < 4 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
g = g[:4]
|
||||||
|
// Guard the shape: a malformed grid would draw a rectangle somewhere
|
||||||
|
// arbitrary, and a map with one square in the sea is a map nobody trusts.
|
||||||
|
if g[0] < 'A' || g[0] > 'R' || g[1] < 'A' || g[1] > 'R' ||
|
||||||
|
g[2] < '0' || g[2] > '9' || g[3] < '0' || g[3] > '9' {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sq := out[g]
|
||||||
|
if sq == nil {
|
||||||
|
sq = &GridSquare{Grid: g}
|
||||||
|
out[g] = sq
|
||||||
|
}
|
||||||
|
sq.Count++
|
||||||
|
// Ascending order, so the last write wins = the most recent contact.
|
||||||
|
sq.Band, sq.Mode = band, mode
|
||||||
|
if lotw == "Y" || card == "Y" || eqsl == "Y" {
|
||||||
|
sq.Confirmed = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
list := make([]GridSquare, 0, len(out))
|
||||||
|
for _, sq := range out {
|
||||||
|
list = append(list, *sq)
|
||||||
|
}
|
||||||
|
sort.Slice(list, func(i, j int) bool { return list[i].Grid < list[j].Grid })
|
||||||
|
return list, nil
|
||||||
|
}
|
||||||
|
|
||||||
// BandSlotQSOs returns every contact on one band that belongs to a slot of the
|
// BandSlotQSOs returns every contact on one band that belongs to a slot of the
|
||||||
// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
|
// entry matrix: the exact callsign, or any callsign in the same DXCC entity.
|
||||||
// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
|
// Mode is NOT filtered here — the class (phone / CW / digital) is a derived
|
||||||
@@ -1723,26 +1913,77 @@ type BandMode struct {
|
|||||||
// rendering a recent-contacts mini-list.
|
// rendering a recent-contacts mini-list.
|
||||||
const maxWorkedEntries = 50
|
const maxWorkedEntries = 50
|
||||||
|
|
||||||
|
// operatorSuffixes are the appendages that qualify a callsign without changing
|
||||||
|
// whose it is. A bare digit (RK3DWA/3) counts too, handled separately.
|
||||||
|
var operatorSuffixes = map[string]bool{
|
||||||
|
"P": true, "M": true, "MM": true, "AM": true, "QRP": true,
|
||||||
|
"A": true, "B": true, "J": true, "LH": true, "R": true, "T": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
// baseCall extracts the operator's OWN callsign from a portable form.
|
||||||
|
//
|
||||||
|
// The slash carries the qualifier on either side, and which side depends on
|
||||||
|
// what it is: RK3DWA/3 and RK3DWA/P append to the call, while ZA/OE8NDR and
|
||||||
|
// F/DL1ABC put a country prefix in front of it. Taking the part before the
|
||||||
|
// slash — which is what this used to do — reads ZA/OE8NDR as the station "ZA".
|
||||||
|
//
|
||||||
|
// So: drop the known qualifiers, and of what is left take the longest part. A
|
||||||
|
// prefix is short by nature (ZA, F, KH6, VP2E) and a callsign is not.
|
||||||
|
func baseCall(call string) string {
|
||||||
|
if !strings.Contains(call, "/") {
|
||||||
|
return call
|
||||||
|
}
|
||||||
|
best := ""
|
||||||
|
for _, p := range strings.Split(call, "/") {
|
||||||
|
if p == "" || operatorSuffixes[p] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(p) == 1 && p[0] >= '0' && p[0] <= '9' {
|
||||||
|
continue // the call-area digit
|
||||||
|
}
|
||||||
|
if len(p) > len(best) {
|
||||||
|
best = p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if best == "" {
|
||||||
|
return call
|
||||||
|
}
|
||||||
|
return best
|
||||||
|
}
|
||||||
|
|
||||||
// callMatch builds the WHERE fragment that selects one station's QSOs.
|
// callMatch builds the WHERE fragment that selects one station's QSOs.
|
||||||
//
|
//
|
||||||
// Exact by default. With variants on, an operator's portable forms count as the
|
// Exact by default. With variants on, an operator's portable forms count as the
|
||||||
// same station: RK3DWA, RK3DWA/3, RK3DWA/P and RK3DWA/QRP are one person, and
|
// same station: RK3DWA, RK3DWA/3, RK3DWA/P and RK3DWA/QRP are one person, and
|
||||||
// someone asking "have I worked RK3DWA?" means the person, not the string.
|
// someone asking "have I worked RK3DWA?" means the person, not the string.
|
||||||
// Typing 21 QSOs' worth of history only when you happen to add "/3" is the
|
// Typing 21 QSOs' worth of history only when you happen to add "/3" is the
|
||||||
// behaviour this replaces. The suffix is stripped from what was TYPED too, so
|
// behaviour this replaces.
|
||||||
// it matches both ways round — RK3DWA/3 also finds the plain RK3DWA contacts.
|
//
|
||||||
|
// PREFIXED FORMS MATCH TOO, and getting that wrong is what prompted this.
|
||||||
|
// Matching on the part before the slash turned ZA/OE8NDR into the station "ZA",
|
||||||
|
// so the worked-before list for one Austrian operating from Albania showed
|
||||||
|
// every OTHER visitor to Albania — two Italians and himself — and counted them
|
||||||
|
// as four contacts "with this call".
|
||||||
//
|
//
|
||||||
// Deliberately NOT a bare "starts with": LIKE 'RK3DWA%' would also drag in
|
// Deliberately NOT a bare "starts with": LIKE 'RK3DWA%' would also drag in
|
||||||
// RK3DWAB, which is a different station. The '/' is what makes it the same one.
|
// RK3DWAB, which is a different station. The '/' is what makes it the same one.
|
||||||
|
// And the variant match is only used on a base of three characters or more —
|
||||||
|
// below that a prefix could match half the log.
|
||||||
func callMatch(call string, variants bool) (string, []any) {
|
func callMatch(call string, variants bool) (string, []any) {
|
||||||
if !variants {
|
if !variants {
|
||||||
return "callsign = ?", []any{call}
|
return "callsign = ?", []any{call}
|
||||||
}
|
}
|
||||||
base := call
|
base := baseCall(call)
|
||||||
if i := strings.IndexByte(base, '/'); i > 0 {
|
if len(base) < 3 {
|
||||||
base = base[:i]
|
return "callsign = ?", []any{call}
|
||||||
}
|
}
|
||||||
return "(callsign = ? OR callsign LIKE ?)", []any{base, base + "/%"}
|
return "(callsign = ? OR callsign LIKE ? OR callsign LIKE ? OR callsign LIKE ?)",
|
||||||
|
[]any{
|
||||||
|
base, // OE8NDR
|
||||||
|
base + "/%", // OE8NDR/P
|
||||||
|
"%/" + base, // ZA/OE8NDR
|
||||||
|
"%/" + base + "/%", // ZA/OE8NDR/P
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// WorkedBefore returns aggregated history at both callsign and DXCC level.
|
// WorkedBefore returns aggregated history at both callsign and DXCC level.
|
||||||
@@ -2634,6 +2875,51 @@ func (r *Repo) DedupeKeyIDs(ctx context.Context) (map[string]int64, error) {
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DedupeClassKey is DedupeKey with the mode collapsed to its CLASS (Phone / CW /
|
||||||
|
// Digital).
|
||||||
|
//
|
||||||
|
// For matching a downloaded confirmation whose mode is not the one you logged.
|
||||||
|
// LoTW does not hand back the submode it was given: a contact uploaded as FT4,
|
||||||
|
// FT8 or anything else digital comes back as the mode GROUP, "DATA". Matched on
|
||||||
|
// the exact string that is simply never equal, and the operator is told their
|
||||||
|
// own QSO is not in their log — which is how a confirmed contact goes unrecorded.
|
||||||
|
func DedupeClassKey(callsign, qsoDateMinute, band, mode string) string {
|
||||||
|
return strings.ToUpper(callsign) + "|" + qsoDateMinute + "|" + strings.ToLower(band) + "|" + modeClass(mode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DedupeClassKeyIDs is DedupeKeyIDs at mode-CLASS granularity, for the second
|
||||||
|
// pass when the exact key misses.
|
||||||
|
//
|
||||||
|
// A key shared by more than one QSO maps to 0 — AMBIGUOUS, not "pick one". Two
|
||||||
|
// contacts with the same station, on the same band, in the same minute, in two
|
||||||
|
// digital modes is barely physical; but if it ever happens, stamping the
|
||||||
|
// confirmation on whichever row the map happened to keep would be a silent
|
||||||
|
// error in someone's award credit. Better to report it unmatched.
|
||||||
|
func (r *Repo) DedupeClassKeyIDs(ctx context.Context) (map[string]int64, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
|
SELECT id, callsign, substr(qso_date, 1, 16), band, mode
|
||||||
|
FROM qso`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]int64, 1024)
|
||||||
|
for rows.Next() {
|
||||||
|
var id int64
|
||||||
|
var call, when, band, mode string
|
||||||
|
if err := rows.Scan(&id, &call, &when, &band, &mode); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
k := DedupeClassKey(call, when, band, mode)
|
||||||
|
if prev, seen := out[k]; seen && prev != id {
|
||||||
|
out[k] = 0
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out[k] = id
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// matchRef is one local QSO's time + id, for time-window confirmation matching.
|
// matchRef is one local QSO's time + id, for time-window confirmation matching.
|
||||||
type matchRef struct {
|
type matchRef struct {
|
||||||
when time.Time
|
when time.Time
|
||||||
@@ -3025,6 +3311,7 @@ func scanQSO(s scanner) (QSO, error) {
|
|||||||
myARRLSect, myVUCCGrids sql.NullString
|
myARRLSect, myVUCCGrids sql.NullString
|
||||||
extrasJSON sql.NullString
|
extrasJSON sql.NullString
|
||||||
awardRefs sql.NullString
|
awardRefs sql.NullString
|
||||||
|
syncUID sql.NullString
|
||||||
createdStr, updatedStr string
|
createdStr, updatedStr string
|
||||||
)
|
)
|
||||||
if err := s.Scan(
|
if err := s.Scan(
|
||||||
@@ -3052,7 +3339,7 @@ func scanQSO(s scanner) (QSO, error) {
|
|||||||
&skcc, &fists, &tenTen, &contactedOp, &eqCall, &pfx, &myName, &class,
|
&skcc, &fists, &tenTen, &contactedOp, &eqCall, &pfx, &myName, &class,
|
||||||
&darcDOK, &myDarcDOK, ®ion, &silentKey, &swl, &qsoComplete, &qsoRandom,
|
&darcDOK, &myDarcDOK, ®ion, &silentKey, &swl, &qsoComplete, &qsoRandom,
|
||||||
&creditGranted, &creditSubmitted, &myARRLSect, &myVUCCGrids,
|
&creditGranted, &creditSubmitted, &myARRLSect, &myVUCCGrids,
|
||||||
&extrasJSON, &awardRefs, &createdStr, &updatedStr,
|
&extrasJSON, &awardRefs, &syncUID, &createdStr, &updatedStr,
|
||||||
); err != nil {
|
); err != nil {
|
||||||
return QSO{}, fmt.Errorf("scan qso: %w", err)
|
return QSO{}, fmt.Errorf("scan qso: %w", err)
|
||||||
}
|
}
|
||||||
@@ -3252,6 +3539,7 @@ func scanQSO(s scanner) (QSO, error) {
|
|||||||
q.MyVUCCGrids = myVUCCGrids.String
|
q.MyVUCCGrids = myVUCCGrids.String
|
||||||
q.Extras = decodeExtras(extrasJSON.String)
|
q.Extras = decodeExtras(extrasJSON.String)
|
||||||
q.AwardRefs = awardRefs.String
|
q.AwardRefs = awardRefs.String
|
||||||
|
q.SyncUID = syncUID.String
|
||||||
return q, nil
|
return q, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3362,3 +3650,67 @@ func (r *Repo) OrderedIDs(ctx context.Context) ([]int64, time.Time, error) {
|
|||||||
// Parsed once, for the newest row only — the ordering came from SQL.
|
// Parsed once, for the newest row only — the ordering came from SQL.
|
||||||
return out, parseTimeLoose(lastDate), nil
|
return out, parseTimeLoose(lastDate), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Folder synchronisation identity -----------------------------------------
|
||||||
|
|
||||||
|
// SetSyncUID stamps a contact's sync identity. Targeted UPDATE: it must never
|
||||||
|
// go through the normal write path, or an ordinary edit would clobber it.
|
||||||
|
func (r *Repo) SetSyncUID(ctx context.Context, id int64, uid string) error {
|
||||||
|
_, err := r.db.ExecContext(ctx, `UPDATE qso SET sync_uid = ? WHERE id = ?`, uid, id)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// IDBySyncUID resolves an incoming change to a local row. Indexed, so this is
|
||||||
|
// the one lookup a sync performs per record and it stays a key hit rather than
|
||||||
|
// a scan — which is the whole reason sync_uid is a column and not a JSON key.
|
||||||
|
func (r *Repo) IDBySyncUID(ctx context.Context, uid string) (int64, bool, error) {
|
||||||
|
if uid == "" {
|
||||||
|
return 0, false, nil
|
||||||
|
}
|
||||||
|
var id int64
|
||||||
|
err := r.db.QueryRowContext(ctx, `SELECT id FROM qso WHERE sync_uid = ? LIMIT 1`, uid).Scan(&id)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return 0, false, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return 0, false, err
|
||||||
|
}
|
||||||
|
return id, true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IDByDedupeKey finds the local row a change refers to when its identity is
|
||||||
|
// unknown here.
|
||||||
|
//
|
||||||
|
// The change log starts EMPTY, so contacts logged before synchronisation was
|
||||||
|
// switched on are never exchanged — nothing has to be copied across, and
|
||||||
|
// identities are stamped lazily on the contacts that are actually touched.
|
||||||
|
//
|
||||||
|
// One case still needs this. Two machines can already hold the SAME old contact
|
||||||
|
// — the second was seeded by copying the database or importing an ADIF — with
|
||||||
|
// different row ids and no identity on either. The day one of them edits that
|
||||||
|
// contact, it stamps an identity and sends a change naming it; the other has
|
||||||
|
// never seen that identity and would insert a duplicate. Matching on the
|
||||||
|
// contact itself (callsign + minute + band + mode, the importer's own dedupe
|
||||||
|
// key) recognises it instead.
|
||||||
|
//
|
||||||
|
// Looked up only when an identity is unknown, which is rare, and it goes
|
||||||
|
// through idx_qso_callsign rather than scanning — a full map of every contact,
|
||||||
|
// rebuilt each pass, was the wrong shape for something this occasional.
|
||||||
|
func (r *Repo) IDByDedupeKey(ctx context.Context, callsign, qsoDateMinute, band, mode string) (id int64, uid string, found bool, err error) {
|
||||||
|
if callsign == "" || qsoDateMinute == "" {
|
||||||
|
return 0, "", false, nil
|
||||||
|
}
|
||||||
|
var u sql.NullString
|
||||||
|
err = r.db.QueryRowContext(ctx, `
|
||||||
|
SELECT id, sync_uid FROM qso
|
||||||
|
WHERE callsign = ? AND substr(qso_date, 1, 16) = ? AND band = ? AND mode = ?
|
||||||
|
LIMIT 1`,
|
||||||
|
strings.ToUpper(callsign), qsoDateMinute, band, mode).Scan(&id, &u)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return 0, "", false, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return 0, "", false, err
|
||||||
|
}
|
||||||
|
return id, u.String, true, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The search box is the one place an operator types a callsign fragment, and
|
||||||
|
// the three shapes below are what they expect from every other logger. A plain
|
||||||
|
// word is a PREFIX: it used to be an unconditional contains-match, so asking
|
||||||
|
// for "calls starting with 4S" was impossible.
|
||||||
|
func TestQuickCallsignLike(t *testing.T) {
|
||||||
|
for _, tc := range []struct{ in, want, why string }{
|
||||||
|
{"4S", "4S%", "plain text is a prefix"},
|
||||||
|
{"*4S", "%4S", "a leading star means ends-with"},
|
||||||
|
{"*4S*", "%4S%", "stars both ends mean contains"},
|
||||||
|
{"4S*", "4S%", "a trailing star is the same prefix, written out"},
|
||||||
|
{"4S?", "4S_", "? is exactly one character"},
|
||||||
|
{"*", "%", "a lone star matches everything"},
|
||||||
|
{" 4S ", "4S%", "surrounding space is not part of the call"},
|
||||||
|
// Escaping: a LIKE metacharacter the operator typed is a literal.
|
||||||
|
{"A_B", "A!_B%", "_ typed by hand is a literal underscore"},
|
||||||
|
{"50%", "50!%%", "% typed by hand is a literal percent"},
|
||||||
|
{"A!B", "A!!B%", "the escape character escapes itself"},
|
||||||
|
{"*A_B*", "%A!_B%", "escaping still applies inside a wildcard pattern"},
|
||||||
|
} {
|
||||||
|
if got := quickCallsignLike(tc.in); got != tc.want {
|
||||||
|
t.Errorf("quickCallsignLike(%q) = %q, want %q — %s", tc.in, got, tc.want, tc.why)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -70,12 +70,12 @@ func TestStatsNoNilSlices(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Contest metrics over a window. The two traps:
|
// Contest metrics over a window. The two traps:
|
||||||
// 1. "Best hour" must be the best ROLLING 60 minutes, not the best clock hour —
|
// 1. "Best hour" must be the best ROLLING 60 minutes, not the best clock hour —
|
||||||
// a run straddling 13:45–14:45 is invisible to clock-hour bucketing, and the
|
// a run straddling 13:45–14:45 is invisible to clock-hour bucketing, and the
|
||||||
// rolling figure is the one contesters quote.
|
// rolling figure is the one contesters quote.
|
||||||
// 2. Both rates must be reported: QSOs ÷ whole window (honest, breaks included)
|
// 2. Both rates must be reported: QSOs ÷ whole window (honest, breaks included)
|
||||||
// AND QSOs ÷ hours actually operated. Quoting only the latter is how an
|
// AND QSOs ÷ hours actually operated. Quoting only the latter is how an
|
||||||
// 8-hour effort gets sold as a 48-hour score.
|
// 8-hour effort gets sold as a 48-hour score.
|
||||||
func TestContestPeriodMetrics(t *testing.T) {
|
func TestContestPeriodMetrics(t *testing.T) {
|
||||||
base := time.Date(2026, 5, 30, 12, 0, 0, 0, time.UTC)
|
base := time.Date(2026, 5, 30, 12, 0, 0, 0, time.UTC)
|
||||||
at := func(min int) time.Time { return base.Add(time.Duration(min) * time.Minute) }
|
at := func(min int) time.Time { return base.Add(time.Duration(min) * time.Minute) }
|
||||||
@@ -90,8 +90,8 @@ func TestContestPeriodMetrics(t *testing.T) {
|
|||||||
times = append(times, entry{t: at(240 + i*5), op: "F5XYZ"}) // 16:00 …
|
times = append(times, entry{t: at(240 + i*5), op: "F5XYZ"}) // 16:00 …
|
||||||
}
|
}
|
||||||
|
|
||||||
from := base // 12:00
|
from := base // 12:00
|
||||||
to := base.Add(6 * time.Hour) // 18:00 → a 6-hour window
|
to := base.Add(6 * time.Hour) // 18:00 → a 6-hour window
|
||||||
var s Stats
|
var s Stats
|
||||||
s.periodMetrics(times, from, to, time.Time{}, time.Time{})
|
s.periodMetrics(times, from, to, time.Time{}, time.Time{})
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,145 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
// openRepo gives a migrated, empty logbook on disk.
|
||||||
|
func openRepo(t *testing.T) *Repo {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := db.Open(filepath.Join(t.TempDir(), "test.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { conn.Close() })
|
||||||
|
return NewRepo(conn)
|
||||||
|
}
|
||||||
|
|
||||||
|
func addQSO(t *testing.T, r *Repo, call string, when time.Time) int64 {
|
||||||
|
t.Helper()
|
||||||
|
id, err := r.Add(context.Background(), QSO{
|
||||||
|
Callsign: call, QSODate: when, Band: "20m", Mode: "CW",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("insert %s: %v", call, err)
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
// A QSO written and read back must come out whole. selectCols and scanQSO are
|
||||||
|
// two hand-maintained lists that must line up column for column, and adding
|
||||||
|
// sync_uid touched both — a drift there fails every read at runtime, which no
|
||||||
|
// compiler catches.
|
||||||
|
func TestSyncUIDRoundTrips(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
id := addQSO(t, r, "M0ABC", time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC))
|
||||||
|
|
||||||
|
got, err := r.GetByID(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read back: %v", err)
|
||||||
|
}
|
||||||
|
if got.Callsign != "M0ABC" {
|
||||||
|
t.Fatalf("read back %+v", got)
|
||||||
|
}
|
||||||
|
if got.SyncUID != "" {
|
||||||
|
t.Errorf("a fresh QSO has identity %q — it should have none until sync is switched on", got.SyncUID)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.SetSyncUID(ctx, id, "abc123"); err != nil {
|
||||||
|
t.Fatalf("SetSyncUID: %v", err)
|
||||||
|
}
|
||||||
|
got, _ = r.GetByID(ctx, id)
|
||||||
|
if got.SyncUID != "abc123" {
|
||||||
|
t.Errorf("SyncUID = %q after stamping", got.SyncUID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An ordinary edit must NEVER clobber the identity. sync_uid is deliberately
|
||||||
|
// outside columnList for this reason: another machine that has already seen the
|
||||||
|
// contact addresses it by that id, and losing it makes the same QSO arrive
|
||||||
|
// again as a new one.
|
||||||
|
func TestAnEditDoesNotClobberTheIdentity(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
id := addQSO(t, r, "M0ABC", time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC))
|
||||||
|
if err := r.SetSyncUID(ctx, id, "keepme"); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
q, _ := r.GetByID(ctx, id)
|
||||||
|
q.Name = "Edited"
|
||||||
|
q.SyncUID = "" // exactly what a caller that knows nothing about sync sends
|
||||||
|
if err := r.Update(ctx, q); err != nil {
|
||||||
|
t.Fatalf("update: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, _ := r.GetByID(ctx, id)
|
||||||
|
if got.Name != "Edited" {
|
||||||
|
t.Errorf("the edit did not take: %+v", got)
|
||||||
|
}
|
||||||
|
if got.SyncUID != "keepme" {
|
||||||
|
t.Errorf("SyncUID = %q — an edit wiped the sync identity", got.SyncUID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The lookup an incoming change performs, once per record.
|
||||||
|
func TestIDBySyncUID(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
id := addQSO(t, r, "M0ABC", time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC))
|
||||||
|
_ = r.SetSyncUID(ctx, id, "u-1")
|
||||||
|
|
||||||
|
got, ok, err := r.IDBySyncUID(ctx, "u-1")
|
||||||
|
if err != nil || !ok || got != id {
|
||||||
|
t.Fatalf("IDBySyncUID = (%d,%v,%v), want (%d,true,nil)", got, ok, err, id)
|
||||||
|
}
|
||||||
|
if _, ok, _ := r.IDBySyncUID(ctx, "nope"); ok {
|
||||||
|
t.Error("an unknown identity was resolved")
|
||||||
|
}
|
||||||
|
// An empty id must never match the rows that have none.
|
||||||
|
if _, ok, _ := r.IDBySyncUID(ctx, ""); ok {
|
||||||
|
t.Error("the empty identity matched a row — every un-stamped QSO would be that row")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two machines can already hold the SAME old contact — the second was seeded by
|
||||||
|
// copying the database or importing an ADIF — with different row ids and no
|
||||||
|
// identity on either. The day one of them edits it, it stamps an identity and
|
||||||
|
// sends a change naming it; the other has never seen that identity and would
|
||||||
|
// insert a duplicate. Matching on the contact itself recognises it instead.
|
||||||
|
func TestIDByDedupeKeyRecognisesTheSameContact(t *testing.T) {
|
||||||
|
r := openRepo(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
when := time.Date(2026, 8, 16, 14, 32, 0, 0, time.UTC)
|
||||||
|
id := addQSO(t, r, "M0ABC", when)
|
||||||
|
|
||||||
|
minute := when.UTC().Format("2006-01-02T15:04")
|
||||||
|
gotID, uid, found, err := r.IDByDedupeKey(ctx, "M0ABC", minute, "20m", "CW")
|
||||||
|
if err != nil || !found {
|
||||||
|
t.Fatalf("IDByDedupeKey = (%d,%q,%v,%v), want it found", gotID, uid, found, err)
|
||||||
|
}
|
||||||
|
if gotID != id {
|
||||||
|
t.Errorf("resolved to id %d, want %d", gotID, id)
|
||||||
|
}
|
||||||
|
if uid != "" {
|
||||||
|
t.Errorf("uid = %q, want empty until something stamps it", uid)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A contact this machine does not have must NOT match something else.
|
||||||
|
if _, _, found, _ := r.IDByDedupeKey(ctx, "M0ABC", minute, "40m", "CW"); found {
|
||||||
|
t.Error("a different band matched — the key must be all four parts")
|
||||||
|
}
|
||||||
|
if _, _, found, _ := r.IDByDedupeKey(ctx, "M0XYZ", minute, "20m", "CW"); found {
|
||||||
|
t.Error("a different callsign matched")
|
||||||
|
}
|
||||||
|
// An empty key must never match anything.
|
||||||
|
if _, _, found, _ := r.IDByDedupeKey(ctx, "", "", "", ""); found {
|
||||||
|
t.Error("an empty key matched a row")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,8 +20,8 @@ func NewDenkovi(serial string, count int) Device {
|
|||||||
return denkoviStub{count: count}
|
return denkoviStub{count: count}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s denkoviStub) Count() int { return s.count }
|
func (s denkoviStub) Count() int { return s.count }
|
||||||
func (denkoviStub) Close() error { return nil }
|
func (denkoviStub) Close() error { return nil }
|
||||||
func (denkoviStub) Status(context.Context) ([]bool, error) {
|
func (denkoviStub) Status(context.Context) ([]bool, error) {
|
||||||
return nil, fmt.Errorf("Denkovi USB relay board is only supported on Windows")
|
return nil, fmt.Errorf("Denkovi USB relay board is only supported on Windows")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,9 @@ type httpGen struct {
|
|||||||
user string
|
user string
|
||||||
pass string
|
pass string
|
||||||
count int
|
count int
|
||||||
|
// insecure accepts a certificate nothing can verify — the self-signed one a
|
||||||
|
// relay board on the LAN presents. Per board, and the operator's choice.
|
||||||
|
insecure bool
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
state []bool
|
state []bool
|
||||||
@@ -64,7 +67,7 @@ type httpGen struct {
|
|||||||
// NewHTTPGeneric builds the driver. onURLs/offURLs are per relay (index 0 =
|
// NewHTTPGeneric builds the driver. onURLs/offURLs are per relay (index 0 =
|
||||||
// relay 1) and may be short or hold empty entries; onPat/offPat are the
|
// relay 1) and may be short or hold empty entries; onPat/offPat are the
|
||||||
// fallback patterns; labels are the relay names {value} substitutes.
|
// fallback patterns; labels are the relay names {value} substitutes.
|
||||||
func NewHTTPGeneric(onURLs, offURLs []string, onPat, offPat, user, pass string, count int, labels []string) Device {
|
func NewHTTPGeneric(onURLs, offURLs []string, onPat, offPat, user, pass string, count int, labels []string, insecure bool) Device {
|
||||||
if count <= 0 {
|
if count <= 0 {
|
||||||
count = len(onURLs)
|
count = len(onURLs)
|
||||||
}
|
}
|
||||||
@@ -74,7 +77,7 @@ func NewHTTPGeneric(onURLs, offURLs []string, onPat, offPat, user, pass string,
|
|||||||
return &httpGen{
|
return &httpGen{
|
||||||
onURLs: onURLs, offURLs: offURLs,
|
onURLs: onURLs, offURLs: offURLs,
|
||||||
onPat: onPat, offPat: offPat, labels: labels,
|
onPat: onPat, offPat: offPat, labels: labels,
|
||||||
user: user, pass: pass, count: count,
|
user: user, pass: pass, count: count, insecure: insecure,
|
||||||
state: make([]bool, count),
|
state: make([]bool, count),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -196,7 +199,7 @@ func (h *httpGen) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
}
|
}
|
||||||
u := h.urlFor(relay, on)
|
u := h.urlFor(relay, on)
|
||||||
u = withScheme(u)
|
u = withScheme(u)
|
||||||
if _, err := get(ctx, u, h.user, h.pass); err != nil {
|
if _, err := get(ctx, u, h.user, h.pass, h.insecure); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
h.mu.Lock()
|
h.mu.Lock()
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ func TestHTTPGenericPattern(t *testing.T) {
|
|||||||
|
|
||||||
d := NewHTTPGeneric(nil, nil,
|
d := NewHTTPGeneric(nil, nil,
|
||||||
srv.URL+"/relay?n={relay}&state=on",
|
srv.URL+"/relay?n={relay}&state=on",
|
||||||
srv.URL+"/relay?n={relay}&state=off", "", "", 4, nil)
|
srv.URL+"/relay?n={relay}&state=off", "", "", 4, nil, false)
|
||||||
if err := d.Set(context.Background(), 2, true); err != nil {
|
if err := d.Set(context.Background(), 2, true); err != nil {
|
||||||
t.Fatalf("Set on: %v", err)
|
t.Fatalf("Set on: %v", err)
|
||||||
}
|
}
|
||||||
@@ -53,7 +53,7 @@ func TestHTTPGenericPerRelayURLsWinOverThePattern(t *testing.T) {
|
|||||||
d := NewHTTPGeneric(
|
d := NewHTTPGeneric(
|
||||||
[]string{srv.URL + "/FF0101", "", srv.URL + "/weird/on"},
|
[]string{srv.URL + "/FF0101", "", srv.URL + "/weird/on"},
|
||||||
[]string{srv.URL + "/FF0100", "", ""},
|
[]string{srv.URL + "/FF0100", "", ""},
|
||||||
srv.URL+"/pattern/on/{relay}", srv.URL+"/pattern/off/{relay}", "", "", 3, nil)
|
srv.URL+"/pattern/on/{relay}", srv.URL+"/pattern/off/{relay}", "", "", 3, nil, false)
|
||||||
|
|
||||||
_ = d.Set(context.Background(), 1, true) // its own URL
|
_ = d.Set(context.Background(), 1, true) // its own URL
|
||||||
_ = d.Set(context.Background(), 2, true) // empty → falls back to the pattern
|
_ = d.Set(context.Background(), 2, true) // empty → falls back to the pattern
|
||||||
@@ -82,7 +82,7 @@ func TestHTTPGenericValueIsTheRelayLabel(t *testing.T) {
|
|||||||
[]string{srv.URL + "/relay?on={value}"}, // per-relay URL
|
[]string{srv.URL + "/relay?on={value}"}, // per-relay URL
|
||||||
nil,
|
nil,
|
||||||
"", srv.URL+"/relay?off={value}", // and the pattern, for the other direction
|
"", srv.URL+"/relay?off={value}", // and the pattern, for the other direction
|
||||||
"", "", 3, []string{"Ant1", "Beam 20m", ""})
|
"", "", 3, []string{"Ant1", "Beam 20m", ""}, false)
|
||||||
_ = d.Set(context.Background(), 1, true)
|
_ = d.Set(context.Background(), 1, true)
|
||||||
_ = d.Set(context.Background(), 2, false)
|
_ = d.Set(context.Background(), 2, false)
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
@@ -107,7 +107,7 @@ func TestHTTPGenericRelayOffset(t *testing.T) {
|
|||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
|
|
||||||
d := NewHTTPGeneric(nil, nil,
|
d := NewHTTPGeneric(nil, nil,
|
||||||
srv.URL+"/set0/{relay-1}/1", srv.URL+"/set0/{relay-1}/0", "", "", 4, nil)
|
srv.URL+"/set0/{relay-1}/1", srv.URL+"/set0/{relay-1}/0", "", "", 4, nil, false)
|
||||||
_ = d.Set(context.Background(), 1, true)
|
_ = d.Set(context.Background(), 1, true)
|
||||||
_ = d.Set(context.Background(), 4, false)
|
_ = d.Set(context.Background(), 4, false)
|
||||||
mu.Lock()
|
mu.Lock()
|
||||||
@@ -123,7 +123,7 @@ func TestHTTPGenericRelayOffset(t *testing.T) {
|
|||||||
// movement. It must be refused, and the message must say the label is what is
|
// movement. It must be refused, and the message must say the label is what is
|
||||||
// missing.
|
// missing.
|
||||||
func TestHTTPGenericRefusesValueWithoutALabel(t *testing.T) {
|
func TestHTTPGenericRefusesValueWithoutALabel(t *testing.T) {
|
||||||
d := NewHTTPGeneric(nil, nil, "http://x/relay?on={value}", "", "", "", 2, []string{"", ""})
|
d := NewHTTPGeneric(nil, nil, "http://x/relay?on={value}", "", "", "", 2, []string{"", ""}, false)
|
||||||
err := d.Set(context.Background(), 1, true)
|
err := d.Set(context.Background(), 1, true)
|
||||||
if err == nil || !strings.Contains(err.Error(), "label") {
|
if err == nil || !strings.Contains(err.Error(), "label") {
|
||||||
t.Errorf("err = %v, want it to name the missing label", err)
|
t.Errorf("err = %v, want it to name the missing label", err)
|
||||||
@@ -149,7 +149,7 @@ func TestHTTPGenericSuppliesTheScheme(t *testing.T) {
|
|||||||
// A switch with the ON URLs filled and OFF left empty latches. The error has to
|
// A switch with the ON URLs filled and OFF left empty latches. The error has to
|
||||||
// name the direction, or the operator cannot tell which half is missing.
|
// name the direction, or the operator cannot tell which half is missing.
|
||||||
func TestHTTPGenericNamesTheMissingDirection(t *testing.T) {
|
func TestHTTPGenericNamesTheMissingDirection(t *testing.T) {
|
||||||
d := NewHTTPGeneric([]string{"http://x/on"}, nil, "", "", "", "", 1, nil)
|
d := NewHTTPGeneric([]string{"http://x/on"}, nil, "", "", "", "", 1, nil, false)
|
||||||
err := d.Set(context.Background(), 1, false)
|
err := d.Set(context.Background(), 1, false)
|
||||||
if err == nil || !strings.Contains(err.Error(), "OFF") {
|
if err == nil || !strings.Contains(err.Error(), "OFF") {
|
||||||
t.Errorf("err = %v, want it to name the OFF direction", err)
|
t.Errorf("err = %v, want it to name the OFF direction", err)
|
||||||
@@ -160,7 +160,7 @@ func TestHTTPGenericNamesTheMissingDirection(t *testing.T) {
|
|||||||
func TestHTTPGenericRemembersWhatItCommanded(t *testing.T) {
|
func TestHTTPGenericRemembersWhatItCommanded(t *testing.T) {
|
||||||
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
|
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
|
||||||
defer srv.Close()
|
defer srv.Close()
|
||||||
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 3, nil)
|
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 3, nil, false)
|
||||||
_ = d.Set(context.Background(), 2, true)
|
_ = d.Set(context.Background(), 2, true)
|
||||||
st, err := d.Status(context.Background())
|
st, err := d.Status(context.Background())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package relaydev
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A relay board on the LAN signs its own certificate — there is no authority
|
||||||
|
// anywhere that could have signed it. httptest.NewTLSServer presents exactly
|
||||||
|
// that: a certificate from an unknown issuer, which is what the hardware does.
|
||||||
|
func selfSignedRelay(t *testing.T) (*httptest.Server, func() []string) {
|
||||||
|
t.Helper()
|
||||||
|
var mu sync.Mutex
|
||||||
|
var got []string
|
||||||
|
srv := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
mu.Lock()
|
||||||
|
got = append(got, r.URL.Path)
|
||||||
|
mu.Unlock()
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
}))
|
||||||
|
t.Cleanup(srv.Close)
|
||||||
|
return srv, func() []string {
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
return append([]string(nil), got...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// With the box ticked, the board answers.
|
||||||
|
func TestHTTPSRelayWithASelfSignedCertificate(t *testing.T) {
|
||||||
|
srv, seen := selfSignedRelay(t)
|
||||||
|
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 2, nil, true)
|
||||||
|
if err := d.Set(context.Background(), 1, true); err != nil {
|
||||||
|
t.Fatalf("Set over HTTPS: %v", err)
|
||||||
|
}
|
||||||
|
if paths := seen(); len(paths) != 1 || paths[0] != "/on/1" {
|
||||||
|
t.Errorf("the board was asked for %v, want /on/1", paths)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Without it, the request is refused — and the refusal has to name the box.
|
||||||
|
//
|
||||||
|
// Go's own message, "x509: certificate signed by unknown authority", is
|
||||||
|
// accurate and tells an operator nothing about what to do next. This is the
|
||||||
|
// difference between a dead end and an instruction, and it is the whole reason
|
||||||
|
// the default can safely stay OFF.
|
||||||
|
func TestARefusedCertificateNamesTheSetting(t *testing.T) {
|
||||||
|
srv, seen := selfSignedRelay(t)
|
||||||
|
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 2, nil, false)
|
||||||
|
err := d.Set(context.Background(), 1, true)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("an unverifiable certificate was accepted with the box unticked")
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "self-signed") {
|
||||||
|
t.Errorf("the refusal reads %q — it does not say which setting to change", err)
|
||||||
|
}
|
||||||
|
if len(seen()) != 0 {
|
||||||
|
t.Error("the request reached the board despite the certificate being refused")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The box belongs to ONE board. An operator with a self-signed switch on the
|
||||||
|
// LAN and a second board reached through a proper HTTPS proxy must keep real
|
||||||
|
// verification on the second — that link crosses the internet, and it commands
|
||||||
|
// an antenna.
|
||||||
|
func TestAcceptingOneBoardsCertificateDoesNotAffectAnother(t *testing.T) {
|
||||||
|
srv, _ := selfSignedRelay(t)
|
||||||
|
lan := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", "", "", "", 1, nil, true)
|
||||||
|
if err := lan.Set(context.Background(), 1, true); err != nil {
|
||||||
|
t.Fatalf("the LAN board: %v", err)
|
||||||
|
}
|
||||||
|
strict := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", "", "", "", 1, nil, false)
|
||||||
|
if err := strict.Set(context.Background(), 1, true); err == nil {
|
||||||
|
t.Error("the second board accepted the certificate too — the setting is not per board")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,7 +17,10 @@ package relaydev
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/tls"
|
||||||
|
"crypto/x509"
|
||||||
"encoding/xml"
|
"encoding/xml"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -28,8 +31,8 @@ import (
|
|||||||
|
|
||||||
// Device is one relay board.
|
// Device is one relay board.
|
||||||
type Device interface {
|
type Device interface {
|
||||||
Count() int // number of user-controllable relays
|
Count() int // number of user-controllable relays
|
||||||
Status(ctx context.Context) ([]bool, error) // state of each relay (index 0 = relay 1)
|
Status(ctx context.Context) ([]bool, error) // state of each relay (index 0 = relay 1)
|
||||||
Set(ctx context.Context, relay int, on bool) error // relay is 1-based
|
Set(ctx context.Context, relay int, on bool) error // relay is 1-based
|
||||||
// Close releases any OS handle the driver holds (serial port, FTDI handle).
|
// Close releases any OS handle the driver holds (serial port, FTDI handle).
|
||||||
// Network boards hold nothing and no-op. MUST be called when a cached driver is
|
// Network boards hold nothing and no-op. MUST be called when a cached driver is
|
||||||
@@ -40,8 +43,47 @@ type Device interface {
|
|||||||
|
|
||||||
func httpClient() *http.Client { return &http.Client{Timeout: 5 * time.Second} }
|
func httpClient() *http.Client { return &http.Client{Timeout: 5 * time.Second} }
|
||||||
|
|
||||||
|
// insecureClient talks to a board presenting a certificate nothing can verify.
|
||||||
|
//
|
||||||
|
// Which is nearly every board that offers HTTPS at all: a relay box on the LAN
|
||||||
|
// signs its own certificate, and there is no authority anywhere that could have
|
||||||
|
// signed it. Refusing that means refusing HTTPS on the hardware, which is not a
|
||||||
|
// security decision, only an outcome.
|
||||||
|
//
|
||||||
|
// So it is offered, per board, and OFF by default — because the other HTTPS
|
||||||
|
// case is real and opposite: a board reached from outside through a proxy with
|
||||||
|
// a genuine certificate, where verification is the only thing standing between
|
||||||
|
// an antenna switch and the internet. One box, on the board that needs it.
|
||||||
|
//
|
||||||
|
// Built once. A Transport per request would open a fresh TLS connection every
|
||||||
|
// time and never reuse one.
|
||||||
|
var insecureClient = &http.Client{
|
||||||
|
Timeout: 5 * time.Second,
|
||||||
|
Transport: &http.Transport{
|
||||||
|
TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, //nolint:gosec // the operator ticked the box for this board
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
// certError says which box to tick when TLS is what failed.
|
||||||
|
//
|
||||||
|
// Go's own message — "x509: certificate signed by unknown authority" — is
|
||||||
|
// accurate and tells an operator nothing about what to do next. Naming the
|
||||||
|
// setting turns a dead end into an instruction.
|
||||||
|
func certError(err error) error {
|
||||||
|
var unknown x509.UnknownAuthorityError
|
||||||
|
var host x509.HostnameError
|
||||||
|
var verify *tls.CertificateVerificationError
|
||||||
|
if errors.As(err, &unknown) || errors.As(err, &host) || errors.As(err, &verify) {
|
||||||
|
return fmt.Errorf("%w — the board's HTTPS certificate cannot be verified; "+
|
||||||
|
"tick \"Accept a self-signed certificate\" for this board if it is on your own network", err)
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// get issues a GET with optional basic auth and returns the body on 2xx.
|
// get issues a GET with optional basic auth and returns the body on 2xx.
|
||||||
func get(ctx context.Context, url, user, pass string) ([]byte, error) {
|
//
|
||||||
|
// insecure skips certificate verification, for a board that signs its own.
|
||||||
|
func get(ctx context.Context, url, user, pass string, insecure bool) ([]byte, error) {
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -49,9 +91,13 @@ func get(ctx context.Context, url, user, pass string) ([]byte, error) {
|
|||||||
if user != "" || pass != "" {
|
if user != "" || pass != "" {
|
||||||
req.SetBasicAuth(user, pass)
|
req.SetBasicAuth(user, pass)
|
||||||
}
|
}
|
||||||
resp, err := httpClient().Do(req)
|
client := httpClient()
|
||||||
|
if insecure {
|
||||||
|
client = insecureClient
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, certError(err)
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
body, _ := io.ReadAll(resp.Body)
|
body, _ := io.ReadAll(resp.Body)
|
||||||
@@ -87,8 +133,8 @@ type webswitch struct {
|
|||||||
// NewWebswitch builds a WebSwitch 1216H client (5 relays).
|
// NewWebswitch builds a WebSwitch 1216H client (5 relays).
|
||||||
func NewWebswitch(host string) Device { return &webswitch{host: host, count: 5} }
|
func NewWebswitch(host string) Device { return &webswitch{host: host, count: 5} }
|
||||||
|
|
||||||
func (w *webswitch) Count() int { return w.count }
|
func (w *webswitch) Count() int { return w.count }
|
||||||
func (w *webswitch) Close() error { return nil } // stateless HTTP, nothing to release
|
func (w *webswitch) Close() error { return nil } // stateless HTTP, nothing to release
|
||||||
|
|
||||||
func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
|
func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
|
||||||
if relay < 1 || relay > w.count {
|
if relay < 1 || relay > w.count {
|
||||||
@@ -98,7 +144,7 @@ func (w *webswitch) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
if on {
|
if on {
|
||||||
action = "on"
|
action = "on"
|
||||||
}
|
}
|
||||||
_, err := get(ctx, fmt.Sprintf("%s/relaycontrol/%s/%d", relayBase(w.host), action, relay), "", "")
|
_, err := get(ctx, fmt.Sprintf("%s/relaycontrol/%s/%d", relayBase(w.host), action, relay), "", "", false)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,7 +155,7 @@ func (w *webswitch) Status(ctx context.Context) ([]bool, error) {
|
|||||||
sel.WriteString(strconv.Itoa(i))
|
sel.WriteString(strconv.Itoa(i))
|
||||||
sel.WriteByte('$')
|
sel.WriteByte('$')
|
||||||
}
|
}
|
||||||
body, err := get(ctx, fmt.Sprintf("%s/relaystate/get2/%s", relayBase(w.host), sel.String()), "", "")
|
body, err := get(ctx, fmt.Sprintf("%s/relaystate/get2/%s", relayBase(w.host), sel.String()), "", "", false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -156,7 +202,7 @@ func (k *kmtronic) Set(ctx context.Context, relay int, on bool) error {
|
|||||||
state = "01"
|
state = "01"
|
||||||
}
|
}
|
||||||
// FF<rr><ss>: e.g. FF0101 = relay 1 on, FF0800 = relay 8 off.
|
// FF<rr><ss>: e.g. FF0101 = relay 1 on, FF0800 = relay 8 off.
|
||||||
_, err := get(ctx, fmt.Sprintf("%s/FF%02d%s", relayBase(k.host), relay, state), k.user, k.pass)
|
_, err := get(ctx, fmt.Sprintf("%s/FF%02d%s", relayBase(k.host), relay, state), k.user, k.pass, false)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +216,7 @@ type kmStatus struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (k *kmtronic) Status(ctx context.Context) ([]bool, error) {
|
func (k *kmtronic) Status(ctx context.Context) ([]bool, error) {
|
||||||
body, err := get(ctx, fmt.Sprintf("%s/status.xml", relayBase(k.host)), k.user, k.pass)
|
body, err := get(ctx, fmt.Sprintf("%s/status.xml", relayBase(k.host)), k.user, k.pass, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user