Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8113557015 | ||
|
|
3def789742 | ||
|
|
92ea98bcfa | ||
|
|
15649a4e92 | ||
|
|
a6842382b2 | ||
|
|
5bf7eb45d7 | ||
|
|
09f3ddaacb | ||
|
|
ca8617c891 | ||
|
|
e2c442552b | ||
|
|
bb75c6f23f | ||
|
|
5c958572dc | ||
|
|
26b8dade20 | ||
|
|
ffd6bcf54b | ||
|
|
6c2c1f106a | ||
|
|
03d5376d01 | ||
|
|
dc14990b44 | ||
|
|
d95c998081 | ||
|
|
c5c9d355ec | ||
|
|
7470ebf47e | ||
|
|
2cd1274975 | ||
|
|
61006d8155 | ||
|
|
94cba2592e | ||
|
|
9b1faada38 | ||
|
|
e67f57fee7 | ||
|
|
a9e3a159d9 | ||
|
|
7c781bf793 | ||
|
|
4f9a366884 | ||
|
|
db87ef39c0 | ||
|
|
3ce930e9cc | ||
|
|
aca4dc5678 | ||
|
|
c495dced0f | ||
|
|
1b736272c9 | ||
|
|
05fc8ad80c | ||
|
|
4e88bdfaa7 | ||
|
|
30143b01bf | ||
|
|
fbd62fda30 | ||
|
|
ab0db0ef3a | ||
|
|
380472bda8 | ||
|
|
4e2a5877d6 | ||
|
|
d44a971acf | ||
|
|
fabd1becce | ||
|
|
345be94c65 | ||
|
|
d0c6e420d2 | ||
|
|
f0026b8bd3 | ||
|
|
2007479da6 | ||
|
|
4ba5569ca8 | ||
|
|
dc0b00b474 | ||
|
|
2695747db6 | ||
|
|
eba54344b0 | ||
|
|
93879a0ce1 | ||
|
|
8fccfa29b1 | ||
|
|
784d809290 | ||
|
|
700b688fc0 | ||
|
|
03598cfaff | ||
|
|
ed517eb8d3 | ||
|
|
1cfba19ed2 | ||
|
|
b18f5c491e | ||
|
|
741364bf99 | ||
|
|
d0f06d9670 | ||
|
|
8e49d37cbd | ||
|
|
b2382a6135 | ||
|
|
f8fb57210f | ||
|
|
8762131248 | ||
|
|
e5f79b18c2 | ||
|
|
1605e30f60 | ||
|
|
6aff322be6 | ||
|
|
ed3c132f70 | ||
|
|
385e8c4c86 | ||
|
|
61e5736f1e | ||
|
|
6ca808a6c9 | ||
|
|
f698096f53 | ||
|
|
ef628e066a | ||
|
|
4ffdfc2548 | ||
|
|
83e7727aab | ||
|
|
1348dc2177 | ||
|
|
57ac382f91 | ||
|
|
858c04d267 | ||
|
|
2484cd2515 | ||
|
|
62256942a1 | ||
|
|
3c8aadf41f | ||
|
|
2f5fd63afd | ||
|
|
4f3c3edaee | ||
|
|
7d33379fe1 | ||
|
|
82a49150d2 | ||
|
|
1ef9e553f7 | ||
|
|
39fab68bd4 |
@@ -0,0 +1,63 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The coupling is a SET, not a global switch.
|
||||||
|
//
|
||||||
|
// A station can run a combiner pair AND a third amplifier that has nothing to
|
||||||
|
// do with it — two SPE on the combiner, a PowerGenius on another antenna. A
|
||||||
|
// global flag would send that third one into OPERATE alongside them.
|
||||||
|
func TestAmpTargetsFollowTheGroup(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.ampInsts = map[string]*ampInst{"spe1": {}, "spe2": {}, "pgxl": {}}
|
||||||
|
group := []string{"spe1", "spe2"}
|
||||||
|
|
||||||
|
// A member commands the whole group, itself first.
|
||||||
|
got := a.ampTargets("spe2", group)
|
||||||
|
if len(got) != 2 || got[0] != "spe2" || got[1] != "spe1" {
|
||||||
|
t.Errorf("member = %v, want [spe2 spe1] — the clicked one first", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The amplifier OUTSIDE the group keeps its buttons to itself.
|
||||||
|
if got := a.ampTargets("pgxl", group); len(got) != 1 || got[0] != "pgxl" {
|
||||||
|
t.Errorf("outsider = %v, want just [pgxl]", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// No group at all: everyone is on their own.
|
||||||
|
if got := a.ampTargets("spe1", nil); len(got) != 1 || got[0] != "spe1" {
|
||||||
|
t.Errorf("no group = %v, want just [spe1]", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A group remembering an amplifier that is gone must not carry it: it would
|
||||||
|
// fail the command for a member that no longer exists.
|
||||||
|
if got := a.ampTargets("spe1", []string{"spe1", "deleted"}); len(got) != 1 || got[0] != "spe1" {
|
||||||
|
t.Errorf("stale member = %v, want it dropped", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One amplifier coupled to itself is not a group — storing it would make every
|
||||||
|
// command fan out to a single member for ever, which is just noise.
|
||||||
|
func TestLinkedAmpsNeedsTwo(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
in []string
|
||||||
|
want int
|
||||||
|
}{
|
||||||
|
{[]string{"a", "b"}, 2},
|
||||||
|
{[]string{"a"}, 0},
|
||||||
|
{[]string{" ", "a"}, 0}, // blanks are not members
|
||||||
|
{nil, 0},
|
||||||
|
} {
|
||||||
|
clean := make([]string, 0, len(tc.in))
|
||||||
|
for _, id := range tc.in {
|
||||||
|
if id != "" && id != " " {
|
||||||
|
clean = append(clean, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(clean) < 2 {
|
||||||
|
clean = nil
|
||||||
|
}
|
||||||
|
if len(clean) != tc.want {
|
||||||
|
t.Errorf("SetLinkedAmps(%v) would keep %d, want %d", tc.in, len(clean), tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -748,3 +748,165 @@ func sampleQSO() qso.QSO {
|
|||||||
QSLMsg: "TNX FB QSO — 73!",
|
QSLMsg: "TNX FB QSO — 73!",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// QSLForeignTemplate is one card design belonging to ANOTHER profile, offered
|
||||||
|
// for copying into the active one.
|
||||||
|
type QSLForeignTemplate struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
ProfileID int64 `json:"profile_id"`
|
||||||
|
ProfileName string `json:"profile_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// QSLListOtherProfileTemplates lists the designs the ACTIVE profile cannot see.
|
||||||
|
//
|
||||||
|
// A second profile is usually the same operator with a different rig or a
|
||||||
|
// different locator — same callsign, same cards. Redrawing a design because the
|
||||||
|
// antenna changed is work nobody should have to do, and the designs a profile
|
||||||
|
// already sees (its own, and the shared ones) are deliberately left out: they
|
||||||
|
// are not something to copy.
|
||||||
|
func (a *App) QSLListOtherProfileTemplates() ([]QSLForeignTemplate, error) {
|
||||||
|
if a.qslTemplates == nil || a.profiles == nil {
|
||||||
|
return nil, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
active := int64(-1)
|
||||||
|
if p, err := a.profiles.Active(a.ctx); err == nil {
|
||||||
|
active = p.ID
|
||||||
|
}
|
||||||
|
names := map[int64]string{}
|
||||||
|
if list, err := a.ListProfiles(); err == nil {
|
||||||
|
for _, p := range list {
|
||||||
|
names[p.ID] = p.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
all, err := a.qslTemplates.List(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out := []QSLForeignTemplate{}
|
||||||
|
for _, r := range all {
|
||||||
|
// Shared designs (no profile) already appear in every profile's list.
|
||||||
|
if r.ProfileID == nil || *r.ProfileID == active {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, QSLForeignTemplate{
|
||||||
|
ID: r.ID, Name: r.Name, ProfileID: *r.ProfileID,
|
||||||
|
ProfileName: firstNonEmptyStr(names[*r.ProfileID], fmt.Sprintf("profile %d", *r.ProfileID)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// QSLCopyTemplateToActiveProfile duplicates another profile's design into the
|
||||||
|
// active one and returns the new id.
|
||||||
|
//
|
||||||
|
// A COPY, not a move or a share. The original profile keeps its design
|
||||||
|
// untouched, and the copy is free to diverge — a second profile usually exists
|
||||||
|
// because something differs, and that something often ends up on the card.
|
||||||
|
func (a *App) QSLCopyTemplateToActiveProfile(id int64) (int64, error) {
|
||||||
|
if a.qslTemplates == nil {
|
||||||
|
return 0, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
src, err := a.qslTemplates.Get(a.ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
// The stored document references photos by NAME, relative to the template's
|
||||||
|
// own asset folder — so copying the JSON alone would point the new design at
|
||||||
|
// files that are not in its folder, and the save would fail validation.
|
||||||
|
//
|
||||||
|
// The files are copied too, giving the duplicate its own folder. Sharing the
|
||||||
|
// source's would mean deleting one design silently emptied the other.
|
||||||
|
rec := qslcard.Record{Name: src.Name + " (copy)", JSON: src.JSON}
|
||||||
|
if p, e := a.profiles.Active(a.ctx); e == nil {
|
||||||
|
rec.ProfileID = &p.ID
|
||||||
|
}
|
||||||
|
// Saved first: a new template needs its id before it can own a folder.
|
||||||
|
if err := a.qslTemplates.Save(a.ctx, &rec); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
srcDir := qslcard.TemplateDir(a.qslDir(), id)
|
||||||
|
dstDir := qslcard.TemplateDir(a.qslDir(), rec.ID)
|
||||||
|
// A design with no pictures at all has no folder, and that is not a failure.
|
||||||
|
// Anything else IS: this used to be written as "ignore os.IsNotExist", which
|
||||||
|
// also swallowed every ENOENT raised while copying — so a failed copy looked
|
||||||
|
// like a design that had nothing to copy, and the operator got "hero photo
|
||||||
|
// not found" with no clue why.
|
||||||
|
if _, statErr := os.Stat(srcDir); statErr == nil {
|
||||||
|
if err := copyDirContents(srcDir, dstDir); err != nil {
|
||||||
|
// Roll back rather than leave a design whose pictures are missing.
|
||||||
|
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
|
||||||
|
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
|
||||||
|
return 0, fmt.Errorf("copy template assets: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Every failure from here rolls back BOTH halves: deleting only the row would
|
||||||
|
// leave the copied pictures on disk under an id nothing refers to.
|
||||||
|
rollback := func() {
|
||||||
|
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
|
||||||
|
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
|
||||||
|
}
|
||||||
|
t, err := qslcard.Parse([]byte(rec.JSON))
|
||||||
|
if err != nil {
|
||||||
|
rollback()
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
if err := qslcard.Validate(t, qslcard.PhotoExistsIn(dstDir)); err != nil {
|
||||||
|
rollback()
|
||||||
|
return 0, fmt.Errorf("copied design is incomplete: %w", err)
|
||||||
|
}
|
||||||
|
applog.Printf("qsl: copied template %q (id %d) into the active profile as %q (id %d)",
|
||||||
|
src.Name, id, rec.Name, rec.ID)
|
||||||
|
return rec.ID, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// copyQSLTemplatesToProfile duplicates one profile's QSL designs into another,
|
||||||
|
// PICTURES INCLUDED.
|
||||||
|
//
|
||||||
|
// This was an INSERT … SELECT, which cloned the rows and nothing else. A design
|
||||||
|
// references its photos by name, relative to its own asset folder, so every
|
||||||
|
// duplicated design pointed at a folder that did not exist: no thumbnail in the
|
||||||
|
// designer, and nothing to print. The rows looked right, which is why it went
|
||||||
|
// unnoticed — the damage is entirely on disk.
|
||||||
|
//
|
||||||
|
// Row by row rather than in one statement, because each new design needs its id
|
||||||
|
// before it can own a folder. A design whose files cannot be copied is dropped
|
||||||
|
// rather than kept empty: an operator who sees the design listed will believe
|
||||||
|
// it works.
|
||||||
|
func (a *App) copyQSLTemplatesToProfile(fromProfile, toProfile int64) error {
|
||||||
|
if a.qslTemplates == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
all, err := a.qslTemplates.List(a.ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, src := range all {
|
||||||
|
if src.ProfileID == nil || *src.ProfileID != fromProfile {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
rec := qslcard.Record{Name: src.Name, JSON: src.JSON, IsDefault: src.IsDefault}
|
||||||
|
to := toProfile
|
||||||
|
rec.ProfileID = &to
|
||||||
|
if err := a.qslTemplates.Save(a.ctx, &rec); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
srcDir := qslcard.TemplateDir(a.qslDir(), src.ID)
|
||||||
|
if _, statErr := os.Stat(srcDir); statErr != nil {
|
||||||
|
continue // a design with no pictures at all — nothing to carry over
|
||||||
|
}
|
||||||
|
if err := copyDirContents(srcDir, qslcard.TemplateDir(a.qslDir(), rec.ID)); err != nil {
|
||||||
|
_ = a.qslTemplates.Delete(a.ctx, rec.ID)
|
||||||
|
_ = qslcard.RemoveTemplateDir(a.qslDir(), rec.ID)
|
||||||
|
return fmt.Errorf("copy assets of %q: %w", src.Name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstNonEmptyStr(a, b string) string {
|
||||||
|
if strings.TrimSpace(a) != "" {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|||||||
+159
@@ -0,0 +1,159 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Row colouring for the log grid, by QSL / LoTW status — the thing Logger32 does
|
||||||
|
// and the reason an operator can tell at a glance what still needs sending.
|
||||||
|
//
|
||||||
|
// Rules are ORDERED and the first match wins, because a contact is usually
|
||||||
|
// several things at once: one confirmed on LoTW and by card is confirmed, not
|
||||||
|
// "sent, awaiting reply". Putting the order in the data rather than in a chain
|
||||||
|
// of ifs is what lets the settings panel show it in the same order it applies.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RowColorRule is one status and the colour it paints.
|
||||||
|
type RowColorRule struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Color string `json:"color"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
// Channels this rule looks at: qsl (paper), lotw, eqsl, qrz.
|
||||||
|
//
|
||||||
|
// Empty means ALL of them — what an operator expects from a rule they have
|
||||||
|
// not narrowed, and what keeps a config written before this field meaningful.
|
||||||
|
Channels []string `json:"channels"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// The QSL channels a rule can be scoped to.
|
||||||
|
var rowColorChannels = []string{"qsl", "lotw", "eqsl", "qrz"}
|
||||||
|
|
||||||
|
// RowColorSettings is the whole appearance block.
|
||||||
|
type RowColorSettings struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
// Style is how the colour is shown: "bar" paints a stripe down the left edge,
|
||||||
|
// "tint" washes the row, "both" does each.
|
||||||
|
//
|
||||||
|
// A bar is the default because a filled row is a poor signal in a log where
|
||||||
|
// nearly every contact has SOME QSL state: colour that is always present
|
||||||
|
// stops being information and becomes a striped background, with the data
|
||||||
|
// behind it. The stripe says the same thing and costs nothing to read.
|
||||||
|
Style string `json:"style"`
|
||||||
|
// Intensity is the tint strength in percent. Only used by "tint"/"both".
|
||||||
|
Intensity int `json:"intensity"`
|
||||||
|
// BandMapLotw marks stations that upload to LoTW on the band map, with the
|
||||||
|
// same "L" badge the cluster list uses — one visual vocabulary across the two
|
||||||
|
// views rather than a second invention.
|
||||||
|
BandMapLotw bool `json:"bandmap_lotw"`
|
||||||
|
// Configured distinguishes "saved with this off" from "saved before the
|
||||||
|
// option existed", so a new marker can default ON without silently turning
|
||||||
|
// itself back on for an operator who switched it off.
|
||||||
|
Configured bool `json:"configured"`
|
||||||
|
Rules []RowColorRule `json:"rules"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// The rule ids, in priority order. The frontend matches on these and holds the
|
||||||
|
// labels, so a translated name never has to travel through the settings.
|
||||||
|
// The four categories, in the order they are tested — first match wins.
|
||||||
|
//
|
||||||
|
// "To send" comes FIRST on purpose. A contact can be confirmed on LoTW and
|
||||||
|
// still owe a paper card, and the colour an operator scans for is the one that
|
||||||
|
// means "there is something left to do here". Put after "confirmed", that row
|
||||||
|
// would go green and the card would never be printed.
|
||||||
|
//
|
||||||
|
// "Worked" is the catch-all: a contact with nothing sent, nothing asked for and
|
||||||
|
// nothing back. Off by default — with it on, every remaining row is painted.
|
||||||
|
var rowColorOrder = []string{
|
||||||
|
"to_send", // requested or queued on a watched channel, not gone out
|
||||||
|
"confirmed", // a watched channel has a confirmation back
|
||||||
|
"sent", // gone out on a watched channel, nothing back yet
|
||||||
|
"worked", // none of the above
|
||||||
|
}
|
||||||
|
|
||||||
|
// Defaults: green for done, amber for waiting, blue for owed. Deliberately
|
||||||
|
// muted — they are composited at low opacity over a dark grid, and a saturated
|
||||||
|
// value there reads as an error state rather than a status.
|
||||||
|
var rowColorDefaults = map[string]string{
|
||||||
|
"to_send": "#a855f7",
|
||||||
|
"confirmed": "#16a34a",
|
||||||
|
"sent": "#f59e0b",
|
||||||
|
"worked": "#64748b",
|
||||||
|
}
|
||||||
|
|
||||||
|
// hexColor guards what reaches the stylesheet. The value is interpolated into a
|
||||||
|
// CSS color-mix() by the grid, so anything that is not plainly a hex colour is
|
||||||
|
// refused rather than passed through.
|
||||||
|
var hexColor = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
|
||||||
|
|
||||||
|
func normRowColors(s RowColorSettings) RowColorSettings {
|
||||||
|
byID := map[string]RowColorRule{}
|
||||||
|
for _, r := range s.Rules {
|
||||||
|
byID[r.ID] = r
|
||||||
|
}
|
||||||
|
out := RowColorSettings{
|
||||||
|
Enabled: s.Enabled, Style: s.Style, Intensity: s.Intensity,
|
||||||
|
BandMapLotw: s.BandMapLotw, Configured: true,
|
||||||
|
}
|
||||||
|
if !s.Configured {
|
||||||
|
out.BandMapLotw = true // new option, on unless the operator says otherwise
|
||||||
|
}
|
||||||
|
switch out.Style {
|
||||||
|
case "bar", "tint", "both":
|
||||||
|
default:
|
||||||
|
out.Style = "bar"
|
||||||
|
}
|
||||||
|
// Clamped rather than rejected: the value only shapes a colour-mix, and a
|
||||||
|
// number outside the range is a slider that got away, not a fault worth
|
||||||
|
// resetting the operator's whole choice for.
|
||||||
|
if out.Intensity < 5 {
|
||||||
|
out.Intensity = 12
|
||||||
|
} else if out.Intensity > 45 {
|
||||||
|
out.Intensity = 45
|
||||||
|
}
|
||||||
|
ok := map[string]bool{}
|
||||||
|
for _, c := range rowColorChannels {
|
||||||
|
ok[c] = true
|
||||||
|
}
|
||||||
|
for _, id := range rowColorOrder {
|
||||||
|
r := byID[id]
|
||||||
|
r.ID = id
|
||||||
|
if !hexColor.MatchString(strings.TrimSpace(r.Color)) {
|
||||||
|
r.Color = rowColorDefaults[id]
|
||||||
|
}
|
||||||
|
// Keep only channels we know, in the canonical order, de-duplicated.
|
||||||
|
want := map[string]bool{}
|
||||||
|
for _, c := range r.Channels {
|
||||||
|
want[strings.ToLower(strings.TrimSpace(c))] = true
|
||||||
|
}
|
||||||
|
chans := []string{}
|
||||||
|
for _, c := range rowColorChannels {
|
||||||
|
if want[c] {
|
||||||
|
chans = append(chans, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r.Channels = chans
|
||||||
|
out.Rules = append(out.Rules, r)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRowColors returns the row-colouring configuration, defaults included so the
|
||||||
|
// panel never has to invent one.
|
||||||
|
func (a *App) GetRowColors() RowColorSettings {
|
||||||
|
var s RowColorSettings
|
||||||
|
if raw := a.settingOr(keyRowColors, ""); raw != "" {
|
||||||
|
_ = json.Unmarshal([]byte(raw), &s)
|
||||||
|
}
|
||||||
|
return normRowColors(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveRowColors persists it.
|
||||||
|
func (a *App) SaveRowColors(s RowColorSettings) error {
|
||||||
|
b, err := json.Marshal(normRowColors(s))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.setSetting(keyRowColors, string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The colour is interpolated into a CSS color-mix() by the grid, so anything
|
||||||
|
// that is not plainly a hex colour has to be refused rather than passed on.
|
||||||
|
func TestRowColorsRefuseAnythingButHex(t *testing.T) {
|
||||||
|
in := RowColorSettings{Enabled: true, Rules: []RowColorRule{
|
||||||
|
{ID: "confirmed", Color: "#123abc", Enabled: true},
|
||||||
|
{ID: "sent", Color: "red; background:url(x)", Enabled: true},
|
||||||
|
{ID: "to_send", Color: "", Enabled: true},
|
||||||
|
}}
|
||||||
|
got := normRowColors(in)
|
||||||
|
|
||||||
|
byID := map[string]RowColorRule{}
|
||||||
|
for _, r := range got.Rules {
|
||||||
|
byID[r.ID] = r
|
||||||
|
}
|
||||||
|
if byID["confirmed"].Color != "#123abc" {
|
||||||
|
t.Errorf("a valid colour was rewritten: %q", byID["confirmed"].Color)
|
||||||
|
}
|
||||||
|
if byID["sent"].Color != rowColorDefaults["sent"] {
|
||||||
|
t.Errorf("an injection attempt survived: %q", byID["sent"].Color)
|
||||||
|
}
|
||||||
|
if byID["to_send"].Color != rowColorDefaults["to_send"] {
|
||||||
|
t.Errorf("an empty colour was kept: %q", byID["to_send"].Color)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Priority lives in the data, not in a chain of ifs: a contact confirmed on
|
||||||
|
// LoTW AND by card is confirmed, not "sent, awaiting reply". The panel shows
|
||||||
|
// the rules in the order they apply, so that order must survive a round trip.
|
||||||
|
func TestRowColorsKeepPriorityOrder(t *testing.T) {
|
||||||
|
// Saved in a jumbled order, as a hand-edited settings row could be.
|
||||||
|
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||||
|
{ID: "to_send", Color: "#111111"},
|
||||||
|
{ID: "confirmed", Color: "#222222"},
|
||||||
|
}})
|
||||||
|
if len(got.Rules) != len(rowColorOrder) {
|
||||||
|
t.Fatalf("got %d rules, want every one present", len(got.Rules))
|
||||||
|
}
|
||||||
|
for i, id := range rowColorOrder {
|
||||||
|
if got.Rules[i].ID != id {
|
||||||
|
t.Errorf("rule %d is %q, want %q", i, got.Rules[i].ID, id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// The saved colours survived the reordering: each stayed with its own rule.
|
||||||
|
byID := map[string]string{}
|
||||||
|
for _, r := range got.Rules {
|
||||||
|
byID[r.ID] = r.Color
|
||||||
|
}
|
||||||
|
if byID["to_send"] != "#111111" || byID["confirmed"] != "#222222" {
|
||||||
|
t.Errorf("colours moved between rules: %v", byID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Style and strength are normalised, not rejected: they only shape a colour, and
|
||||||
|
// a value that got away is a slider, not a fault worth resetting the operator's
|
||||||
|
// whole choice for.
|
||||||
|
func TestRowColorsNormaliseStyleAndIntensity(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
inStyle string
|
||||||
|
inPct int
|
||||||
|
wantStyle string
|
||||||
|
wantPct int
|
||||||
|
}{
|
||||||
|
{"bar", 12, "bar", 12},
|
||||||
|
{"tint", 30, "tint", 30},
|
||||||
|
{"both", 45, "both", 45},
|
||||||
|
{"", 0, "bar", 12}, // never configured
|
||||||
|
{"wallpaper", 12, "bar", 12}, // not a style we draw
|
||||||
|
{"tint", 900, "tint", 45}, // clamped, not reset
|
||||||
|
{"tint", -5, "tint", 12},
|
||||||
|
} {
|
||||||
|
got := normRowColors(RowColorSettings{Style: tc.inStyle, Intensity: tc.inPct})
|
||||||
|
if got.Style != tc.wantStyle || got.Intensity != tc.wantPct {
|
||||||
|
t.Errorf("(%q,%d) -> (%q,%d), want (%q,%d)",
|
||||||
|
tc.inStyle, tc.inPct, got.Style, got.Intensity, tc.wantStyle, tc.wantPct)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Channels are normalised to the canonical order, and anything unknown is
|
||||||
|
// dropped. Empty stays empty, because empty means "every channel" — a rule the
|
||||||
|
// operator has not narrowed must not silently become a rule about nothing.
|
||||||
|
func TestRowColorChannelsNormalise(t *testing.T) {
|
||||||
|
got := normRowColors(RowColorSettings{Rules: []RowColorRule{
|
||||||
|
{ID: "confirmed", Color: "#111111", Channels: []string{"LOTW", "pigeon", "qsl", "lotw"}},
|
||||||
|
{ID: "sent", Color: "#222222"},
|
||||||
|
}})
|
||||||
|
byID := map[string][]string{}
|
||||||
|
for _, r := range got.Rules {
|
||||||
|
byID[r.ID] = r.Channels
|
||||||
|
}
|
||||||
|
if len(byID["confirmed"]) != 2 || byID["confirmed"][0] != "qsl" || byID["confirmed"][1] != "lotw" {
|
||||||
|
t.Errorf("confirmed channels = %v, want [qsl lotw] — canonical order, deduped, unknown dropped", byID["confirmed"])
|
||||||
|
}
|
||||||
|
if len(byID["sent"]) != 0 {
|
||||||
|
t.Errorf("sent channels = %v, want empty (meaning every channel)", byID["sent"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The order IS the priority, and "to send" leads. A contact confirmed on LoTW
|
||||||
|
// that still owes a paper card must read as owing the card — put after
|
||||||
|
// "confirmed" it would go green and never be printed.
|
||||||
|
func TestToSendOutranksConfirmed(t *testing.T) {
|
||||||
|
got := normRowColors(RowColorSettings{})
|
||||||
|
if got.Rules[0].ID != "to_send" {
|
||||||
|
t.Errorf("first rule is %q, want to_send", got.Rules[0].ID)
|
||||||
|
}
|
||||||
|
if got.Rules[len(got.Rules)-1].ID != "worked" {
|
||||||
|
t.Errorf("last rule is %q, want worked as the catch-all", got.Rules[len(got.Rules)-1].ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
+49
-5
@@ -21,6 +21,8 @@ import (
|
|||||||
"hamlog/internal/applog"
|
"hamlog/internal/applog"
|
||||||
"hamlog/internal/bandopen"
|
"hamlog/internal/bandopen"
|
||||||
"hamlog/internal/cluster"
|
"hamlog/internal/cluster"
|
||||||
|
"hamlog/internal/geo"
|
||||||
|
"hamlog/internal/gridcache"
|
||||||
"hamlog/internal/pskr"
|
"hamlog/internal/pskr"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -127,23 +129,61 @@ func (a *App) startBandOpenFeed() {
|
|||||||
}
|
}
|
||||||
s := a.GetBandOpenSettings()
|
s := a.GetBandOpenSettings()
|
||||||
a.bandOpen.on.Store(s.Enabled)
|
a.bandOpen.on.Store(s.Enabled)
|
||||||
|
a.setBandOpenBands(s.Bands)
|
||||||
if !s.Enabled {
|
if !s.Enabled {
|
||||||
// Put out whatever is currently lit. Leaving the badges up would keep
|
// Put out whatever is currently lit. Leaving the badges up would keep
|
||||||
// announcing an opening from a watch that is now off, and they only fade
|
// announcing an opening from a watch that is now off, and they only fade
|
||||||
// on a timer fed by spots this path no longer looks at — so they would
|
// on a timer fed by spots this path no longer looks at — so they would
|
||||||
// hang there until the app restarted.
|
// hang there until the app restarted.
|
||||||
a.clearBandOpenings()
|
a.clearBandOpenings()
|
||||||
|
}
|
||||||
|
chaseGrids := a.gridStore != nil
|
||||||
|
chaseNew := a.chaseNewEnabled()
|
||||||
|
// Three consumers, one feed. Any one of them is reason enough to bring it up,
|
||||||
|
// and turning one off must not cut the others loose.
|
||||||
|
if !s.Enabled && !chaseGrids && !chaseNew {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// Every spot is measured from the operator's position. Without one there is
|
// Every spot is measured from the operator's position. Without one there is
|
||||||
// nothing to measure, and a detector fed unmeasurable spots reports nothing
|
// nothing to measure, and a detector fed unmeasurable spots reports nothing
|
||||||
// while looking like it is working.
|
// while looking like it is working.
|
||||||
if !a.opSet {
|
if !a.opSet {
|
||||||
applog.Printf("bandopen: no station grid set — the opening watch needs one to measure a path")
|
applog.Printf("pskr: no station grid set — the feed needs one to measure a path")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Grid chasing and new-chasing want every band; the opening watch wants its
|
||||||
|
// four. "+" is the MQTT single-level wildcard, so one subscription per square
|
||||||
|
// covers the lot.
|
||||||
|
bands := s.Bands
|
||||||
|
if chaseGrids || chaseNew {
|
||||||
|
bands = []string{"+"}
|
||||||
|
}
|
||||||
|
// Filter at the BROKER on the receiver's square rather than receiving the
|
||||||
|
// world and discarding it here. Measured on the live feed: the four opening
|
||||||
|
// bands unfiltered are 83 messages a second, of which roughly one in a
|
||||||
|
// hundred survived the NearKm test below. One ring of squares — about the
|
||||||
|
// same 300 km — is 0.2 to 1.2 a second, and the same for every operator,
|
||||||
|
// where filtering by DXCC ranged from 1.2 (OH) to 72.5 (K).
|
||||||
|
rxGrids := geo.NeighbourGrids(a.opLat, a.opLon, 1)
|
||||||
|
|
||||||
|
var onGrid func(call, grid string)
|
||||||
|
if chaseGrids {
|
||||||
|
onGrid = func(call, grid string) { a.rememberDecodeGrid(call, grid, gridcache.SourceMQTT) }
|
||||||
|
}
|
||||||
|
var onSpot func(pskr.Spot)
|
||||||
|
switch {
|
||||||
|
case s.Enabled && chaseNew:
|
||||||
|
onSpot = func(sp pskr.Spot) { a.feedBandOpen(sp); a.feedChaseNew(sp) }
|
||||||
|
case s.Enabled:
|
||||||
|
onSpot = a.feedBandOpen
|
||||||
|
case chaseNew:
|
||||||
|
onSpot = a.feedChaseNew
|
||||||
|
}
|
||||||
|
|
||||||
a.pskr = pskr.New(pskr.Config{
|
a.pskr = pskr.New(pskr.Config{
|
||||||
Bands: s.Bands,
|
Bands: bands,
|
||||||
|
RxGrids: rxGrids,
|
||||||
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)
|
||||||
@@ -156,12 +196,16 @@ func (a *App) startBandOpenFeed() {
|
|||||||
b := int(initialBearingDeg(a.opLat, a.opLon, lat, lon) + 0.5)
|
b := int(initialBearingDeg(a.opLat, a.opLon, lat, lon) + 0.5)
|
||||||
return d, b, true
|
return d, b, true
|
||||||
},
|
},
|
||||||
OnSpot: a.feedBandOpen,
|
OnSpot: onSpot,
|
||||||
|
OnGrid: onGrid,
|
||||||
Logf: applog.Printf,
|
Logf: applog.Printf,
|
||||||
})
|
})
|
||||||
if err := a.pskr.Start(); err != nil {
|
if err := a.pskr.Start(); err != nil {
|
||||||
applog.Printf("bandopen: PSK Reporter feed did not start: %v", err)
|
applog.Printf("pskr: feed did not start: %v", err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
applog.Printf("pskr: feed up — bands %v, %d receiver squares (openings=%v, grids=%v, chase-new=%v)",
|
||||||
|
bands, len(rxGrids), s.Enabled, chaseGrids, chaseNew)
|
||||||
}
|
}
|
||||||
|
|
||||||
// feedBandOpen hands one PSK Reporter decode to the detector.
|
// feedBandOpen hands one PSK Reporter decode to the detector.
|
||||||
@@ -170,7 +214,7 @@ func (a *App) startBandOpenFeed() {
|
|||||||
// so it does the least possible: the detector's own window and de-duplication
|
// so it does the least possible: the detector's own window and de-duplication
|
||||||
// by callsign are what turn that flood into one announcement.
|
// by callsign are what turn that flood into one announcement.
|
||||||
func (a *App) feedBandOpen(s pskr.Spot) {
|
func (a *App) feedBandOpen(s pskr.Spot) {
|
||||||
if !bandopen.Watched(s.Band) {
|
if !a.bandOpenWanted(s.Band) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
a.bandOpen.mu.Lock()
|
a.bandOpen.mu.Lock()
|
||||||
|
|||||||
+43
-1
@@ -29,6 +29,13 @@ type bandOpenState struct {
|
|||||||
// startBandOpenFeed owns it — it runs at startup and again on every save, so
|
// startBandOpenFeed owns it — it runs at startup and again on every save, so
|
||||||
// the switch takes effect without a restart.
|
// the switch takes effect without a restart.
|
||||||
on atomic.Bool
|
on atomic.Bool
|
||||||
|
// bands is the operator's SELECTED set, held as map[string]bool.
|
||||||
|
//
|
||||||
|
// bandopen.Watched only says which bands the detector is capable of; it
|
||||||
|
// knows nothing about the chips in Settings. Nothing checked the selection
|
||||||
|
// on either feed path, so unticking 10 m and 2 m changed the subscription and
|
||||||
|
// left the cluster path announcing them anyway.
|
||||||
|
bands atomic.Value
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
det *bandopen.Detector
|
det *bandopen.Detector
|
||||||
last []bandopen.Opening // most recent first, for the UI
|
last []bandopen.Opening // most recent first, for the UI
|
||||||
@@ -60,7 +67,7 @@ func (a *App) detectBandOpening(s cluster.Spot) {
|
|||||||
// itself ran on every ordinary cluster spot. So an operator who had never
|
// itself ran on every ordinary cluster spot. So an operator who had never
|
||||||
// enabled the watch still got opening banners, from a feature they had
|
// enabled the watch still got opening banners, from a feature they had
|
||||||
// deliberately left off.
|
// deliberately left off.
|
||||||
if !a.bandOpen.on.Load() {
|
if !a.bandOpen.on.Load() || !a.bandOpenWanted(s.Band) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// No operator grid = no distance and no bearing on the spot, and the whole
|
// No operator grid = no distance and no bearing on the spot, and the whole
|
||||||
@@ -140,6 +147,41 @@ func (a *App) GetLiveOpenings() []bandopen.Opening {
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bandOpenWanted reports whether the operator has this band ticked. Falls back
|
||||||
|
// to the detector's own set until a selection has been stored, so a band is
|
||||||
|
// never silently dropped before the settings have been read.
|
||||||
|
func (a *App) bandOpenWanted(band string) bool {
|
||||||
|
if !bandopen.Watched(band) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
sel, ok := a.bandOpen.bands.Load().(map[string]bool)
|
||||||
|
if !ok || len(sel) == 0 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return sel[strings.ToLower(strings.TrimSpace(band))]
|
||||||
|
}
|
||||||
|
|
||||||
|
// setBandOpenBands records the selection and puts out badges for bands that
|
||||||
|
// have just been unticked — they fade on a timer fed by spots the detector no
|
||||||
|
// longer looks at, so they would otherwise stay lit until the next restart.
|
||||||
|
func (a *App) setBandOpenBands(bands []string) {
|
||||||
|
sel := make(map[string]bool, len(bands))
|
||||||
|
for _, b := range bands {
|
||||||
|
sel[strings.ToLower(strings.TrimSpace(b))] = true
|
||||||
|
}
|
||||||
|
a.bandOpen.bands.Store(sel)
|
||||||
|
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
defer a.bandOpen.mu.Unlock()
|
||||||
|
for b := range a.bandOpen.live {
|
||||||
|
if len(sel) > 0 && !sel[b] {
|
||||||
|
delete(a.bandOpen.live, b)
|
||||||
|
delete(a.bandOpen.aliveUntil, b)
|
||||||
|
applog.Printf("bandopen: %s is no longer watched — badge cleared", strings.ToUpper(b))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// clearBandOpenings puts out every lit badge and forgets the detector's window.
|
// clearBandOpenings puts out every lit badge and forgets the detector's window.
|
||||||
// Called when the watch is switched off: the badges fade on a timer fed by
|
// Called when the watch is switched off: the badges fade on a timer fed by
|
||||||
// spots the detector no longer looks at, so without this they would stay up
|
// spots the detector no longer looks at, so without this they would stay up
|
||||||
|
|||||||
@@ -63,3 +63,56 @@ func TestClearBandOpeningsPutsTheBadgesOut(t *testing.T) {
|
|||||||
t.Error("the remembered openings were thrown away")
|
t.Error("the remembered openings were thrown away")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Unticking a band in Settings must actually stop its announcements.
|
||||||
|
//
|
||||||
|
// Nothing checked the operator's selection on either feed path: bandopen.Watched
|
||||||
|
// only says which bands the detector is CAPABLE of. So a station with just 6 m
|
||||||
|
// ticked still got 10 m and 2 m badges, from the cluster path and — once grid
|
||||||
|
// chasing widened the subscription to every band — from PSK Reporter too.
|
||||||
|
func TestBandOpenHonoursTheSelectedBands(t *testing.T) {
|
||||||
|
a := &App{opSet: true, opLat: 48, opLon: 2}
|
||||||
|
a.bandOpen.on.Store(true)
|
||||||
|
a.setBandOpenBands([]string{"6m"})
|
||||||
|
|
||||||
|
if !a.bandOpenWanted("6m") {
|
||||||
|
t.Error("6m is ticked and was refused")
|
||||||
|
}
|
||||||
|
for _, b := range []string{"10m", "2m", "4m"} {
|
||||||
|
if a.bandOpenWanted(b) {
|
||||||
|
t.Errorf("%s is not ticked and was accepted", b)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A band the detector cannot watch at all stays out whatever is stored.
|
||||||
|
if a.bandOpenWanted("20m") {
|
||||||
|
t.Error("20m is not a watched band and was accepted")
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the cluster path must obey it too.
|
||||||
|
a.detectBandOpening(cluster.Spot{
|
||||||
|
DXCall: "K1ABC", Band: "10m", DistanceKm: 6000, ShortPath: 280, ReceivedAt: time.Now(),
|
||||||
|
})
|
||||||
|
if a.bandOpen.det != nil {
|
||||||
|
t.Error("a spot on an unticked band reached the detector")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unticking a band puts its badge out. They fade on a timer fed by spots the
|
||||||
|
// detector no longer looks at, so it would otherwise stay lit until a restart.
|
||||||
|
func TestUntickingABandClearsItsBadge(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.bandOpen.live = map[string]bandopen.Opening{
|
||||||
|
"6m": {Band: "6m", Calls: 9},
|
||||||
|
"10m": {Band: "10m", Calls: 5},
|
||||||
|
}
|
||||||
|
a.bandOpen.aliveUntil = map[string]time.Time{
|
||||||
|
"6m": time.Now().Add(time.Hour),
|
||||||
|
"10m": time.Now().Add(time.Hour),
|
||||||
|
}
|
||||||
|
a.setBandOpenBands([]string{"6m"})
|
||||||
|
|
||||||
|
live := a.GetLiveOpenings()
|
||||||
|
if len(live) != 1 || live[0].Band != "6m" {
|
||||||
|
t.Errorf("live openings = %v, want only 6m", live)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
-18902
File diff suppressed because it is too large
Load Diff
+144
@@ -1,4 +1,148 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.25.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"WinKeyer: the opening probe goes out as one write, matching a capture of a client that talks to the same K3NG keyer, and the handshake bytes are always logged so a keyer that stays silent can be diagnosed."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"WinKeyer : la sonde d’ouverture part en un seul envoi, calquée sur la capture d’un client qui dialogue avec le même manipulateur K3NG, et les octets de la poignée de main sont toujours journalisés pour diagnostiquer un manipulateur muet."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.3",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Confirmations: a LoTW contact marked V (verified) counted for the awards but nowhere else — the band/mode matrix, the slot statistics, the row colours and the QSL Info table all read it as unconfirmed, the last one showing it as “No”. It now reads as Verified everywhere.",
|
||||||
|
"Rotators: SPID / AlfaSpid controllers are driven natively over their own COM port — Rot2Prog and Rot1Prog — so PstRotator is no longer needed in between. Two towers means two rotors, as before."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Confirmations : un contact LoTW marqué V (vérifié) comptait pour les diplômes et nulle part ailleurs — la matrice bande/mode, les statistiques de créneaux, la coloration des lignes et le tableau Infos QSL le lisaient comme non confirmé, le dernier l’affichant même « Non ». Il s’affiche désormais « Vérifié » partout.",
|
||||||
|
"Rotors : les contrôleurs SPID / AlfaSpid sont pilotés nativement par leur propre port COM — Rot2Prog et Rot1Prog — sans passer par PstRotator. Deux pylônes restent deux rotors, comme avant."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.2",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Send Spot: the comment now carries the award references after the mode — the ones you assigned (POTA, SOTA, IOTA…), not the DXCC, zone and prefix every reader works out from the callsign. A self-spot carries your OWN activation references.",
|
||||||
|
"Modes: a fresh install now starts with SSB, CW, FT8, FT4, FT2, RTTY, PSK31 and FM. AM and DIGITALVOICE stay in the available list but are no longer selected by default.",
|
||||||
|
"Chase new: a panel listing the stations PSK Reporter is hearing within about 300 km of you that are new against your log — on FT8, FT4, FT2, PSK31 and RTTY, and only on the bands you have selected. One badge per row, the most valuable first (entity, band, mode, slot, prefix, square), with a filter for each, a toolbar button to show it and a cross to close it. Click a row to put the callsign in the entry and tune the rig.",
|
||||||
|
"QSL Manager, paper QSL: the route is set per direction — bureau, direct or electronic, beside the sent status and beside the received one — and applies to the whole selection at once.",
|
||||||
|
"Connections (was “UDP integrations”): two new outbound services. “WSJT-X logged QSO” announces each contact on the WSJT-X UDP interface, both messages WSJT-X itself sends, for loggers that listen there rather than for plain-text ADIF (Logger32 among them). “Custom message” lets you choose what fires it — band change, QSO logged, rotator command, callsign lookup — and what it says, sent as a UDP datagram or an HTTP request.",
|
||||||
|
"Connections: everything sent is now written to the log. Outbound messages say where they went and, for custom ones, what they contained; a message that came out empty says so instead of vanishing; a password in a URL is hidden; and an ADIF listener sharing a port with a WSJT source now names that traffic once rather than a line per decode.",
|
||||||
|
"Station relays: new “HTTP relay” device for home-made and generic switches — an ON and an OFF URL, either one pattern with {relay} or one pair per relay, with a channel count from 1 to 16. It then follows the same per-band rules as the named boards.",
|
||||||
|
"Serial ports: a port claimed by two devices in the Windows port map was listed twice in every port dropdown, and showed as “COM3COM3”. Listed once now, and in natural order — COM4 between COM3 and COM8, not after COM9.",
|
||||||
|
"Motorized antenna: an antenna that lost its serial port stopped answering with nothing at all in the log, and a controller that settled somewhere other than where it was sent looked exactly the same. Both now say what happened, once.",
|
||||||
|
"Appearance: the Sahara theme is lighter, parchment rather than deep sand, with a terracotta accent."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Envoi de spot : le commentaire porte désormais les références de diplôme après le mode — celles que vous avez attribuées (POTA, SOTA, IOTA…), pas le DXCC, la zone et le préfixe que chacun déduit de l’indicatif. Un auto-spot porte VOS références d’activation.",
|
||||||
|
"Modes : une installation neuve démarre avec SSB, CW, FT8, FT4, FT2, RTTY, PSK31 et FM. AM et DIGITALVOICE restent dans la liste disponible mais ne sont plus sélectionnés par défaut.",
|
||||||
|
"Chasse au nouveau : un panneau listant les stations que PSK Reporter entend à moins de 300 km de chez vous et qui sont nouvelles par rapport à votre log — en FT8, FT4, FT2, PSK31 et RTTY, et seulement sur les bandes que vous avez sélectionnées. Une seule indication par ligne, la plus précieuse d’abord (entité, bande, mode, créneau, préfixe, carré), avec un filtre pour chacune, un bouton dans la barre pour l’afficher et une croix pour le fermer. Un clic met l’indicatif en saisie et accorde la radio.",
|
||||||
|
"Gestionnaire QSL, QSL papier : la voie se règle par sens — bureau, direct ou électronique, à côté du statut envoyé et à côté du statut reçu — et s’applique à toute la sélection d’un coup.",
|
||||||
|
"Connexions (ex-« Intégrations UDP ») : deux nouvelles sorties. « QSO enregistré WSJT-X » annonce chaque contact sur l’interface UDP WSJT-X, les deux messages que WSJT-X émet lui-même, pour les loggers qui écoutent là plutôt que l’ADIF en texte brut (Logger32 entre autres). « Message personnalisé » vous laisse choisir ce qui la déclenche — changement de bande, QSO enregistré, commande de rotor, recherche d’indicatif — et ce qu’elle dit, en datagramme UDP ou en requête HTTP.",
|
||||||
|
"Connexions : tout ce qui part est désormais inscrit au journal. Les messages sortants indiquent leur destination et, pour les personnalisés, leur contenu ; un message rendu vide le signale au lieu de disparaître ; un mot de passe dans une URL est masqué ; et un écouteur ADIF partageant un port avec une source WSJT nomme ce trafic une fois au lieu d’écrire une ligne par décodage.",
|
||||||
|
"Relais de station : nouveau périphérique « Relais HTTP » pour les commutateurs faits main ou génériques — une URL ON et une URL OFF, soit un modèle avec {relay}, soit une paire par relais, avec un nombre de voies de 1 à 16. Il suit ensuite les mêmes règles par bande que les cartes reconnues.",
|
||||||
|
"Ports série : un port revendiqué par deux périphériques dans la table Windows apparaissait en double dans toutes les listes, et s’affichait « COM3COM3 ». Une seule fois désormais, et dans l’ordre naturel — COM4 entre COM3 et COM8, pas après COM9.",
|
||||||
|
"Antenne motorisée : une antenne ayant perdu son port série cessait de répondre sans rien laisser dans le journal, et un contrôleur qui se fixait ailleurs que là où on l’avait envoyé ressemblait exactement à ça. Les deux disent maintenant ce qui s’est passé, une fois.",
|
||||||
|
"Apparence : le thème Sahara s’éclaircit, parchemin plutôt que sable profond, avec un accent terre cuite."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.1",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Amplifiers: tick the ones sharing a combiner and ON, OFF and OPERATE act on all of them at once. Each keeps its own meters.",
|
||||||
|
"Shared CAT: JTDX and WSJT-X no longer get an error for turning split off or setting the transmit mode — which made JTDX abandon a transmission — and the wire trace now logs every exchange.",
|
||||||
|
"QSL designer: a card design can be copied from another profile, pictures included, and duplicating a profile now carries its designs’ pictures too instead of leaving cards that cannot be printed.",
|
||||||
|
"Appearance: new Sahara theme, warm sand tones for long sessions in daylight.",
|
||||||
|
"US counties: Connecticut returned the census planning regions, and San Francisco, Doña Ana, Baltimore city and several Alaska boroughs matched nothing at all. The cluster now shows the same county as the Info panel. Re-download the county database.",
|
||||||
|
"QSL: the manager (QSL_VIA) and the sending method (QSL_SENT_VIA / QSL_RCVD_VIA) are separate fields at last, as ADIF defines them. Imports keep both, exports write both, and a log where they were mixed is offered a correction at startup.",
|
||||||
|
"WinKeyer: the opening handshake follows K1EL’s own sequence (RTS off, parser resync, echo test), which wakes keyers that stayed silent, and a port where nothing answers now says so instead of showing “connected”. A keyer that reboots when the port opens — K3NG and other Arduino builds — is waited out and remembered, so it opens directly next time."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Amplificateurs : cochez ceux qui partagent un combineur et ON, OFF et OPERATE agissent sur tous à la fois. Chacun garde ses propres mesures.",
|
||||||
|
"CAT partagé : JTDX et WSJT-X ne reçoivent plus d’erreur en coupant le split ou en réglant le mode d’émission — ce qui faisait abandonner une transmission à JTDX — et la trace consigne désormais chaque échange.",
|
||||||
|
"Concepteur QSL : un design peut être copié depuis un autre profil, images comprises, et dupliquer un profil emporte aussi les images de ses designs au lieu de laisser des cartes impossibles à imprimer.",
|
||||||
|
"Apparence : nouveau thème Sahara, tons sable chauds pour les longues sessions en plein jour.",
|
||||||
|
"Comtés US : le Connecticut renvoyait les planning regions du recensement, et San Francisco, Doña Ana, Baltimore city et plusieurs districts d’Alaska ne correspondaient à rien. Le cluster affiche maintenant le même comté que le panneau Info. Rechargez la base des comtés.",
|
||||||
|
"QSL : le manager (QSL_VIA) et le mode d’envoi (QSL_SENT_VIA / QSL_RCVD_VIA) sont enfin deux champs distincts, comme le veut l’ADIF. Les imports gardent les deux, les exports les écrivent, et un log où ils étaient mélangés se voit proposer une correction au démarrage.",
|
||||||
|
"WinKeyer : la séquence d’ouverture suit celle de K1EL (RTS bas, resynchronisation, test d’écho), ce qui réveille les manipulateurs muets, et un port où rien ne répond le dit au lieu d’afficher « connecté ». Un manipulateur qui redémarre à l’ouverture du port — K3NG et autres montages Arduino — est attendu puis mémorisé, pour s’ouvrir directement ensuite."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.25.0",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Cluster: \"Hide worked\" no longer hides a spot that is a new prefix, county, grid or park in an entity already worked.",
|
||||||
|
"DX Cluster: a spot lifetime can be set — 5, 10, 15 minutes or your own value — after which spots leave the list and the band maps.",
|
||||||
|
"Call lookup: QRZ.com now fills Name with the first name only, and optionally with the operator nickname instead.",
|
||||||
|
"Entry form: a narrower left column, State beside the locator, and a new line with County, CQ, ITU and DXCC.",
|
||||||
|
"Station Control: the short and long path headings are repeated under the compass, at a readable size and clickable.",
|
||||||
|
"Compact mode: the window now fits the entry strip instead of leaving a band of empty space below it.",
|
||||||
|
"HRDLog: an ON AIR option publishes your live frequency, mode and rig on hrdlog.net.",
|
||||||
|
"ADIF: the county is exported as STATE,COUNTY as the standard requires, and a county imported that way now fills the state too.",
|
||||||
|
"A /MM or /AM callsign no longer resolves to a country — RI1FJL/MM read as Franz Josef Land while the expedition was still sailing there."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cluster : « Masquer les contactés » ne masque plus un spot qui est un nouveau préfixe, comté, carré ou parc dans une contrée déjà faite.",
|
||||||
|
"Cluster DX : on peut fixer une durée de vie des spots — 5, 10, 15 minutes ou une valeur libre — au-delà de laquelle ils quittent la liste et les band maps.",
|
||||||
|
"Recherche d indicatif : QRZ.com remplit désormais Nom avec le seul prénom, et au choix avec le surnom de l opérateur.",
|
||||||
|
"Saisie : colonne de gauche plus étroite, État à côté du locator, et une nouvelle ligne Comté, CQ, ITU et DXCC.",
|
||||||
|
"Contrôle station : les azimuts court et long chemin sont repris sous la boussole, lisibles et cliquables.",
|
||||||
|
"Mode compact : la fenêtre épouse la bande de saisie au lieu de laisser une bande vide en dessous.",
|
||||||
|
"HRDLog : une option ON AIR publie ta fréquence, ton mode et ta radio en direct sur hrdlog.net.",
|
||||||
|
"ADIF : le comté est exporté sous la forme ÉTAT,COMTÉ comme l exige le standard, et un comté importé ainsi remplit aussi l état.",
|
||||||
|
"Un indicatif en /MM ou /AM ne se résout plus en pays — RI1FJL/MM affichait Franz Josef Land alors que l expédition faisait encore route."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.9",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Appearance: row colouring now defaults to a left stripe, with a filled row and its strength offered as choices.",
|
||||||
|
"The band map now follows the cluster filters — LoTW only, spotter continent, hide worked, status and mode chips.",
|
||||||
|
"Band map: stations that upload to LoTW now carry the same L badge as the cluster list, switchable in Appearance.",
|
||||||
|
"LoTW: contacts TQSL leaves out — already uploaded, or outside the certificate date range — are no longer reported as uploaded.",
|
||||||
|
"FT8: a contact is logged with the grid the station actually sent, not the home square from QRZ — expeditions were logged in the wrong place.",
|
||||||
|
"SPE amplifier: switching it off is shown at once, instead of needing a second press of OFF.",
|
||||||
|
"Appearance: row colouring is now Worked / Confirmed / QSL sent / To be sent, each scoped to the channels you pick — paper, LoTW, eQSL, QRZ.com."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Apparence : la coloration des lignes se fait par défaut sur une barre à gauche, la ligne remplie et son intensité restant proposées.",
|
||||||
|
"La band map suit désormais les filtres du cluster — LoTW seulement, continent du spotter, masquer les contactés, statuts et modes.",
|
||||||
|
"Band map : les stations qui utilisent LoTW portent le même badge L que la liste du cluster, activable dans Apparence.",
|
||||||
|
"LoTW : les contacts que TQSL écarte — déjà envoyés, ou hors de la plage de dates du certificat — ne sont plus annoncés comme envoyés.",
|
||||||
|
"FT8 : un contact est enregistré avec le locator réellement émis par la station, et non le carré du domicile depuis QRZ — les expéditions étaient logguées au mauvais endroit.",
|
||||||
|
"Amplificateur SPE : l extinction s affiche immédiatement, au lieu de demander un second appui sur OFF.",
|
||||||
|
"Apparence : la coloration des lignes devient Contacté / Confirmé / QSL envoyée / À envoyer, chacune limitée aux canaux choisis — papier, LoTW, eQSL, QRZ.com."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.8",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Cluster: the grid cache now holds 100,000 callsigns and rotates instead of emptying itself, so locators stop vanishing from the list.",
|
||||||
|
"New option \"Chase new grids\": locators learnt from your decodes and from PSK Reporter are kept in their own database, with their source.",
|
||||||
|
"Band openings: the PSK Reporter feed is now filtered at the broker, which cuts it from about 83 messages a second to under two.",
|
||||||
|
"Band openings: unticking a band now actually stops its announcements, and puts its badge out.",
|
||||||
|
"Callsign lookup: the website, postal code and HamQTH profile picture are now read — the QSO web column was never filled by any lookup.",
|
||||||
|
"New selectable column \"QSO number\": position in the log, 1 for the oldest contact.",
|
||||||
|
"New Appearance settings: colour whole log rows by QSL status, with your own colours from a palette.",
|
||||||
|
"The QSO number was missing on contacts logged from WSJT-X — that path bypassed the numbering."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cluster : le cache de locators garde 100 000 indicatifs et tourne au lieu de se vider, les locators ne disparaissent donc plus de la liste.",
|
||||||
|
"Nouvelle option « Chasse aux nouveaux carrés » : les locators appris de tes décodes et de PSK Reporter sont conservés dans leur propre base, avec leur source.",
|
||||||
|
"Ouvertures de bande : le flux PSK Reporter est désormais filtré chez le broker, ce qui le fait passer d environ 83 messages par seconde à moins de deux.",
|
||||||
|
"Ouvertures de bande : décocher une bande arrête réellement ses annonces et éteint son badge.",
|
||||||
|
"Recherche d indicatif : le site web, le code postal et la photo de profil HamQTH sont désormais lus — la colonne web du QSO n était jamais remplie.",
|
||||||
|
"Nouvelle colonne sélectionnable « Numéro de QSO » : position dans le log, 1 pour le contact le plus ancien.",
|
||||||
|
"Nouveaux réglages Apparence : colorer les lignes entières du log selon le statut QSL, avec tes couleurs choisies dans une palette.",
|
||||||
|
"Le numéro de QSO manquait sur les contacts enregistrés depuis WSJT-X — ce chemin contournait la numérotation."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.24.7",
|
"version": "0.24.7",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
"unicode/utf8"
|
||||||
|
|
||||||
"hamlog/internal/award"
|
"hamlog/internal/award"
|
||||||
)
|
)
|
||||||
@@ -58,6 +59,15 @@ func main() {
|
|||||||
sc.Scan() // header
|
sc.Scan() // header
|
||||||
for sc.Scan() {
|
for sc.Scan() {
|
||||||
line := sc.Text()
|
line := sc.Text()
|
||||||
|
// The FIPS CSV is not reliably UTF-8, and the one county whose name is
|
||||||
|
// not ASCII (Doña Ana, NM) came through mangled once already — it landed
|
||||||
|
// in the reference as "NM/DO̱AANA", a code no log could ever match,
|
||||||
|
// silently costing that county for every operator. Refuse the row rather
|
||||||
|
// than emit a broken one.
|
||||||
|
if !utf8.ValidString(line) {
|
||||||
|
fmt.Fprintf(os.Stderr, "cntygen: skipping non-UTF-8 line: %q\n", line)
|
||||||
|
continue
|
||||||
|
}
|
||||||
parts := strings.SplitN(line, ",", 3)
|
parts := strings.SplitN(line, ",", 3)
|
||||||
if len(parts) < 3 {
|
if len(parts) < 3 {
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -0,0 +1,203 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// One-shot generator: emits internal/uls/ctcounty_gen.go, the Connecticut
|
||||||
|
// ZIP → legal county table. Not part of the build.
|
||||||
|
//
|
||||||
|
// Why it has to exist
|
||||||
|
// -------------------
|
||||||
|
// internal/uls resolves a US callsign to a county through GeoNames' ZIP table.
|
||||||
|
// The Census replaced Connecticut's eight counties with nine PLANNING REGIONS
|
||||||
|
// as county-equivalents in 2022, and GeoNames followed: 418 of Connecticut's
|
||||||
|
// 429 ZIPs now report "Capitol Region", "Lower Connecticut River Valley" and
|
||||||
|
// so on. CQ's USA-CA award did not follow, callbooks did not follow, and no
|
||||||
|
// operator's log did either — so every Connecticut station resolved to a name
|
||||||
|
// nothing could match, showed as a new county for ever, and counted for no
|
||||||
|
// award. Roughly 15 000 US callsigns.
|
||||||
|
//
|
||||||
|
// A planning region is NOT a renamed county — it is built from towns drawn
|
||||||
|
// from several different counties — so there is no name-to-name mapping to be
|
||||||
|
// had. The ZIP is the only handle, hence this table.
|
||||||
|
//
|
||||||
|
// Sources (both public, both free)
|
||||||
|
// --------------------------------
|
||||||
|
// geonames US.txt from https://download.geonames.org/export/zip/US.zip
|
||||||
|
// — the ZIP list itself, and each ZIP's centroid.
|
||||||
|
// crosswalk https://www2.census.gov/geo/docs/maps-data/data/rel2020/
|
||||||
|
// zcta520/tab20_zcta520_county20_natl.txt
|
||||||
|
// — the 2020 ZCTA↔county relationship file, which predates the
|
||||||
|
// change and therefore still carries the eight real counties.
|
||||||
|
//
|
||||||
|
// The crosswalk covers 278 of the 418 affected ZIPs. The rest are PO-box-only
|
||||||
|
// ZIPs, which have no ZCTA at all; each is given the county of the nearest
|
||||||
|
// resolved ZIP centroid. That is sound here because a PO-box ZIP sits inside
|
||||||
|
// the town it serves, and Connecticut's counties are tens of kilometres across
|
||||||
|
// — the fallback can only err on a ZIP that straddles a county line, which the
|
||||||
|
// ZIP-to-county approach is already documented as accepting (~98%).
|
||||||
|
//
|
||||||
|
// Usage:
|
||||||
|
//
|
||||||
|
// go run ./cmd/ctzipgen US.txt tab20_zcta520_county20_natl.txt > internal/uls/ctcounty_gen.go
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
|
"os"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type zipPt struct {
|
||||||
|
zip string
|
||||||
|
lat, lon float64
|
||||||
|
county string // from the crosswalk, "" if the ZIP has no ZCTA
|
||||||
|
geoName string // what GeoNames says today
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
if len(os.Args) < 3 {
|
||||||
|
fmt.Fprintln(os.Stderr, "usage: ctzipgen US.txt tab20_zcta520_county20_natl.txt")
|
||||||
|
os.Exit(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Every Connecticut ZIP, with its centroid, from GeoNames.
|
||||||
|
var pts []*zipPt
|
||||||
|
byZip := map[string]*zipPt{}
|
||||||
|
f, err := os.Open(os.Args[1])
|
||||||
|
must(err)
|
||||||
|
sc := bufio.NewScanner(f)
|
||||||
|
sc.Buffer(make([]byte, 0, 64*1024), 256*1024)
|
||||||
|
for sc.Scan() {
|
||||||
|
c := strings.Split(sc.Text(), "\t")
|
||||||
|
if len(c) < 11 || strings.ToUpper(strings.TrimSpace(c[4])) != "CT" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
z := strings.TrimSpace(c[1])
|
||||||
|
if z == "" || byZip[z] != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
p := &zipPt{zip: z, lat: atof(c[9]), lon: atof(c[10]), geoName: strings.TrimSpace(c[5])}
|
||||||
|
byZip[z] = p
|
||||||
|
pts = append(pts, p)
|
||||||
|
}
|
||||||
|
must(sc.Err())
|
||||||
|
f.Close()
|
||||||
|
|
||||||
|
// 2. The 2020 county for each ZCTA. A ZCTA can straddle a county line, so
|
||||||
|
// keep the county holding the largest share of its land area.
|
||||||
|
best := map[string]float64{}
|
||||||
|
f2, err := os.Open(os.Args[2])
|
||||||
|
must(err)
|
||||||
|
sc2 := bufio.NewScanner(f2)
|
||||||
|
sc2.Buffer(make([]byte, 0, 64*1024), 1<<20)
|
||||||
|
sc2.Scan() // header
|
||||||
|
for sc2.Scan() {
|
||||||
|
c := strings.Split(sc2.Text(), "|")
|
||||||
|
if len(c) < 18 || !strings.HasPrefix(c[9], "09") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
p := byZip[strings.TrimSpace(c[1])]
|
||||||
|
if p == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
area := atof(c[16])
|
||||||
|
if p.county != "" && area <= best[p.zip] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
best[p.zip] = area
|
||||||
|
p.county = strings.TrimSuffix(strings.TrimSpace(c[10]), " County")
|
||||||
|
}
|
||||||
|
must(sc2.Err())
|
||||||
|
f2.Close()
|
||||||
|
|
||||||
|
// 3. Fill the PO-box-only ZIPs from the nearest ZIP the crosswalk resolved.
|
||||||
|
var anchors []*zipPt
|
||||||
|
for _, p := range pts {
|
||||||
|
if p.county != "" {
|
||||||
|
anchors = append(anchors, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(anchors) == 0 {
|
||||||
|
fmt.Fprintln(os.Stderr, "ctzipgen: crosswalk resolved nothing — wrong file?")
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
filled := 0
|
||||||
|
for _, p := range pts {
|
||||||
|
if p.county != "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
nearest, bestD := "", math.MaxFloat64
|
||||||
|
for _, a := range anchors {
|
||||||
|
if d := haversine(p.lat, p.lon, a.lat, a.lon); d < bestD {
|
||||||
|
bestD, nearest = d, a.county
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.county = nearest
|
||||||
|
filled++
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Self-check: the ZIPs GeoNames still labels with a real county must
|
||||||
|
// agree with what we derived, or the derivation is wrong.
|
||||||
|
real := map[string]bool{
|
||||||
|
"Fairfield": true, "Hartford": true, "Litchfield": true, "Middlesex": true,
|
||||||
|
"New Haven": true, "New London": true, "Tolland": true, "Windham": true,
|
||||||
|
}
|
||||||
|
checked, bad := 0, 0
|
||||||
|
for _, p := range pts {
|
||||||
|
if !real[p.geoName] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
checked++
|
||||||
|
if p.geoName != p.county {
|
||||||
|
bad++
|
||||||
|
fmt.Fprintf(os.Stderr, "MISMATCH %s: geonames %q, derived %q\n", p.zip, p.geoName, p.county)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fmt.Fprintf(os.Stderr, "ctzipgen: %d zips, %d from crosswalk, %d by nearest; cross-check %d/%d agree\n",
|
||||||
|
len(pts), len(pts)-filled, filled, checked-bad, checked)
|
||||||
|
if bad > 0 {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
sort.Slice(pts, func(i, j int) bool { return pts[i].zip < pts[j].zip })
|
||||||
|
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("// Code generated by cmd/ctzipgen. DO NOT EDIT.\n\n")
|
||||||
|
b.WriteString("package uls\n\n")
|
||||||
|
b.WriteString("// ctCounty maps a Connecticut ZIP to its legal county.\n")
|
||||||
|
b.WriteString("//\n")
|
||||||
|
b.WriteString("// GeoNames reports Connecticut's 2022 planning regions instead, which no\n")
|
||||||
|
b.WriteString("// award, callbook or log uses. See cmd/ctzipgen for how this was built and\n")
|
||||||
|
b.WriteString("// why a name-to-name mapping cannot work.\n")
|
||||||
|
fmt.Fprintf(&b, "var ctCounty = map[string]string{\n")
|
||||||
|
for _, p := range pts {
|
||||||
|
fmt.Fprintf(&b, "\t%q: %q,\n", p.zip, p.county)
|
||||||
|
}
|
||||||
|
b.WriteString("}\n")
|
||||||
|
fmt.Print(b.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
func atof(s string) float64 {
|
||||||
|
v, _ := strconv.ParseFloat(strings.TrimSpace(s), 64)
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
|
||||||
|
// haversine returns the great-circle distance in km. Connecticut is small
|
||||||
|
// enough that a flat approximation would do, but this costs nothing and cannot
|
||||||
|
// be wrong near the state's edges.
|
||||||
|
func haversine(lat1, lon1, lat2, lon2 float64) float64 {
|
||||||
|
const r = 6371.0
|
||||||
|
dLat := (lat2 - lat1) * math.Pi / 180
|
||||||
|
dLon := (lon2 - lon1) * math.Pi / 180
|
||||||
|
a := math.Sin(dLat/2)*math.Sin(dLat/2) +
|
||||||
|
math.Cos(lat1*math.Pi/180)*math.Cos(lat2*math.Pi/180)*math.Sin(dLon/2)*math.Sin(dLon/2)
|
||||||
|
return 2 * r * math.Asin(math.Sqrt(a))
|
||||||
|
}
|
||||||
|
|
||||||
|
func must(err error) {
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintln(os.Stderr, "ctzipgen:", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -109,9 +109,9 @@ func probeWB(conn *sql.DB, call string, dxcc int) {
|
|||||||
SELECT band, mode,
|
SELECT band, mode,
|
||||||
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
|
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
|
||||||
MAX(CASE WHEN callsign = ?
|
MAX(CASE WHEN callsign = ?
|
||||||
AND (lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y')
|
AND (lotw_rcvd IN ('Y','V') OR qsl_rcvd IN ('Y','V') OR eqsl_rcvd IN ('Y','V'))
|
||||||
THEN 1 ELSE 0 END),
|
THEN 1 ELSE 0 END),
|
||||||
MAX(CASE WHEN lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y'
|
MAX(CASE WHEN lotw_rcvd IN ('Y','V') OR qsl_rcvd IN ('Y','V') OR eqsl_rcvd IN ('Y','V')
|
||||||
THEN 1 ELSE 0 END)
|
THEN 1 ELSE 0 END)
|
||||||
FROM qso WHERE dxcc = ?
|
FROM qso WHERE dxcc = ?
|
||||||
GROUP BY band, mode
|
GROUP BY band, mode
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestCopyDirContentsCreatesDestination pins the bug that broke copying a QSL
|
||||||
|
// design between profiles.
|
||||||
|
//
|
||||||
|
// copyDirContents wrote straight into dst without creating it, so the first
|
||||||
|
// os.Create failed with ENOENT. The caller was written as "ignore
|
||||||
|
// os.IsNotExist", meaning "the source has no assets, that is fine" — and ENOENT
|
||||||
|
// from the failed write matched it exactly. Nothing was copied, no error was
|
||||||
|
// reported, and the operator saw "copied design is incomplete: hero photo file
|
||||||
|
// … not found" from the validation two lines later.
|
||||||
|
func TestCopyDirContentsCreatesDestination(t *testing.T) {
|
||||||
|
base := t.TempDir()
|
||||||
|
src := filepath.Join(base, "src")
|
||||||
|
if err := os.MkdirAll(filepath.Join(src, "sub"), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(filepath.Join(src, "img_25c06bda.jpg"), []byte("hero"), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(filepath.Join(src, "sub", "back.png"), []byte("back"), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dst does not exist — the case of every first copy.
|
||||||
|
dst := filepath.Join(base, "dst")
|
||||||
|
if err := copyDirContents(src, dst); err != nil {
|
||||||
|
t.Fatalf("copyDirContents: %v", err)
|
||||||
|
}
|
||||||
|
for name, want := range map[string]string{
|
||||||
|
"img_25c06bda.jpg": "hero",
|
||||||
|
"sub/back.png": "back",
|
||||||
|
} {
|
||||||
|
got, err := os.ReadFile(filepath.Join(dst, filepath.FromSlash(name)))
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("%s: %v", name, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if string(got) != want {
|
||||||
|
t.Errorf("%s = %q, want %q", name, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A missing SOURCE is still an error from copyDirContents itself — it is the
|
||||||
|
// caller that decides whether a design with no pictures is acceptable, and it
|
||||||
|
// can only decide that if this does not quietly succeed.
|
||||||
|
func TestCopyDirContentsMissingSource(t *testing.T) {
|
||||||
|
base := t.TempDir()
|
||||||
|
if err := copyDirContents(filepath.Join(base, "nope"), filepath.Join(base, "dst")); err == nil {
|
||||||
|
t.Fatal("copying a missing source returned no error")
|
||||||
|
} else if !os.IsNotExist(err) {
|
||||||
|
t.Fatalf("want a not-exist error, got %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/gridcache"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The grid cache used to drop EVERYTHING at its ceiling. That was survivable
|
||||||
|
// while the only feed was this station's own decodes, which never reached it.
|
||||||
|
// Fed by anything larger it is a cliff: every locator in the cluster list
|
||||||
|
// disappears at once, periodically, and the operator sees the column empty
|
||||||
|
// itself for no reason.
|
||||||
|
//
|
||||||
|
// Rotation keeps the previous generation, so a full cache costs the older half
|
||||||
|
// and nothing more.
|
||||||
|
func TestDecodeGridRotationKeepsThePreviousGeneration(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
|
||||||
|
// Fill exactly one generation.
|
||||||
|
for i := 0; i < decodeGridsCap; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("CALL%06d", i), "JN36", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||||
|
t.Fatalf("first entry lost before any rotation: %q", got)
|
||||||
|
}
|
||||||
|
if a.decodeGridsOld != nil {
|
||||||
|
t.Fatal("rotated early — the cap is the ceiling of ONE generation")
|
||||||
|
}
|
||||||
|
|
||||||
|
// One more entry rotates.
|
||||||
|
a.rememberDecodeGrid("NEWCALL", "IO91", gridcache.SourceDecode)
|
||||||
|
if a.decodeGridsOld == nil {
|
||||||
|
t.Fatal("did not rotate at the cap")
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("NEWCALL"); got != "IO91" {
|
||||||
|
t.Errorf("the entry that caused the rotation was lost: %q", got)
|
||||||
|
}
|
||||||
|
// The whole previous generation is still readable — this is the point.
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||||
|
t.Errorf("a locator from the previous generation was dropped: %q — that is the cliff again", got)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL099999"); got != "JN36" {
|
||||||
|
t.Errorf("previous generation incomplete: %q", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A second rotation is what finally retires the oldest half.
|
||||||
|
for i := 0; i < decodeGridsCap; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("SECOND%06d", i), "KP20", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "" {
|
||||||
|
t.Errorf("the cache is unbounded: %q survived two rotations", got)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("NEWCALL"); got != "IO91" {
|
||||||
|
t.Errorf("an entry one generation old was retired too early: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Callsigns are normalised on the way in AND on the way out, or a spot for
|
||||||
|
// "f4bpo" would miss a grid learnt as "F4BPO".
|
||||||
|
func TestDecodeGridCaseAndBlanks(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
a.rememberDecodeGrid(" f4bpo ", "JN36", gridcache.SourceDecode)
|
||||||
|
if got := a.lookupDecodeGrid("F4BPO"); got != "JN36" {
|
||||||
|
t.Errorf("lookup of the upper-case form failed: %q", got)
|
||||||
|
}
|
||||||
|
a.rememberDecodeGrid("", "JN36", gridcache.SourceDecode)
|
||||||
|
a.rememberDecodeGrid("K1ABC", "", gridcache.SourceDecode)
|
||||||
|
if got := a.lookupDecodeGrid("K1ABC"); got != "" {
|
||||||
|
t.Errorf("stored an empty grid: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The write path runs on the decode goroutine while the cluster status builder
|
||||||
|
// reads. Rotation swaps the map headers, so an unguarded read is a data race
|
||||||
|
// rather than a stale value.
|
||||||
|
//
|
||||||
|
// This build is CGO-free, so -race is not available here; the test exercises the
|
||||||
|
// interleaving and would fault on a concurrent map access even without it.
|
||||||
|
func TestDecodeGridConcurrentAccess(t *testing.T) {
|
||||||
|
a := &App{}
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
wg.Add(2)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 20000; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("W%05d", i), "FN31", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
for i := 0; i < 20000; i++ {
|
||||||
|
_ = a.lookupDecodeGrid(fmt.Sprintf("W%05d", i))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only a CHANGE may reach the write batch.
|
||||||
|
//
|
||||||
|
// The feeds repeat themselves — the same station is reported by dozens of
|
||||||
|
// receivers a minute — so queueing every report would put the whole stream in
|
||||||
|
// the batch instead of the news in it, and turn a cache into a write amplifier.
|
||||||
|
func TestOnlyChangesAreQueued(t *testing.T) {
|
||||||
|
st, err := gridcache.Open(filepath.Join(t.TempDir(), "grids.db"), nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
a := &App{gridStore: st}
|
||||||
|
|
||||||
|
a.rememberDecodeGrid("F4BPO", "JN36", gridcache.SourceDecode)
|
||||||
|
if n := st.Pending(); n != 1 {
|
||||||
|
t.Fatalf("a new locator queued %d writes, want 1", n)
|
||||||
|
}
|
||||||
|
if err := st.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The same report, a hundred times over, is not news.
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
a.rememberDecodeGrid("F4BPO", "JN36", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if n := st.Pending(); n != 0 {
|
||||||
|
t.Errorf("unchanged reports queued %d writes — the batch would carry the whole feed", n)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A station that moved is.
|
||||||
|
a.rememberDecodeGrid("F4BPO", "KP30", gridcache.SourceDecode)
|
||||||
|
if n := st.Pending(); n != 1 {
|
||||||
|
t.Errorf("a changed locator queued %d writes, want 1", n)
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("F4BPO"); got != "KP30" {
|
||||||
|
t.Errorf("the map kept the old locator: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rotation must be OFF while a store is attached: it would discard callsigns the
|
||||||
|
// database still holds, and the lookup would then miss something we know.
|
||||||
|
func TestNoRotationWhilePersisting(t *testing.T) {
|
||||||
|
st, err := gridcache.Open(filepath.Join(t.TempDir(), "grids.db"), nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
a := &App{gridStore: st}
|
||||||
|
|
||||||
|
for i := 0; i < decodeGridsCap+10; i++ {
|
||||||
|
a.rememberDecodeGrid(fmt.Sprintf("CALL%06d", i), "JN36", gridcache.SourceDecode)
|
||||||
|
}
|
||||||
|
if a.decodeGridsOld != nil {
|
||||||
|
t.Error("rotated while a store was attached — locators the database holds would go missing")
|
||||||
|
}
|
||||||
|
if got := a.lookupDecodeGrid("CALL000000"); got != "JN36" {
|
||||||
|
t.Errorf("the first entry was dropped: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
+283
-27
@@ -1,7 +1,7 @@
|
|||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
Activity, AlertCircle, Antenna, Bell, Check, CheckCircle2, ChevronDown, Clock, CloudOff, Compass, Database, Ear, Eraser, Flame, Gauge, Hash, Loader2, Lock,
|
Activity, AlertCircle, Antenna, Bell, Check, CheckCircle2, ChevronDown, Clock, CloudOff, Compass, Database, Ear, Eraser, Flame, Gauge, Hash, Loader2, Lock,
|
||||||
Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, SpellCheck, Square, Terminal, Trash2, Unlock, X, Zap,
|
Maximize2, Minimize2, Mic, MessageSquare, Pencil, Radar, Radio, RadioTower, RefreshCw, Satellite, Send, Settings, SlidersHorizontal, SpellCheck, Square, Terminal, Trash2, Unlock, X, Zap,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -16,7 +16,8 @@ import {
|
|||||||
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
|
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
|
||||||
SMTPConfigured, SendLogToDeveloper,
|
SMTPConfigured, SendLogToDeveloper,
|
||||||
WorkedBefore,
|
WorkedBefore,
|
||||||
SetCompactMode,
|
SetCompactMode, SetCompactHeight,
|
||||||
|
RotatorGoToPath,
|
||||||
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
||||||
GetSecretStatus, UnlockSecrets,
|
GetSecretStatus, UnlockSecrets,
|
||||||
RefreshCtyDat, DownloadAllReferenceLists,
|
RefreshCtyDat, DownloadAllReferenceLists,
|
||||||
@@ -51,10 +52,11 @@ import {
|
|||||||
ReportLiveActivity, LiveLastQSOAgeSec,
|
ReportLiveActivity, LiveLastQSOAgeSec,
|
||||||
GetAmpStatuses, AmpOperate,
|
GetAmpStatuses, AmpOperate,
|
||||||
GetFlexState, FlexAmpOperate,
|
GetFlexState, FlexAmpOperate,
|
||||||
GetPSKReporterStatus, GetLiveOpenings,
|
GetPSKReporterStatus, GetLiveOpenings, GetChaseNew,
|
||||||
|
QSLViaRepairStatus, RepairQSLVia, DismissQSLViaRepair,
|
||||||
} from '../wailsjs/go/main/App';
|
} from '../wailsjs/go/main/App';
|
||||||
import { Combobox } from '@/components/ui/combobox';
|
import { Combobox } from '@/components/ui/combobox';
|
||||||
import { applyAwardRefs } from '@/lib/awardRefs';
|
import { applyAwardRefs, parseAwardRefs as parseManualRefs, spotRefList } from '@/lib/awardRefs';
|
||||||
import { EventsOn, BrowserOpenURL, WindowMinimise, WindowToggleMaximise, WindowIsMaximised, Quit } from '../wailsjs/runtime/runtime';
|
import { EventsOn, BrowserOpenURL, WindowMinimise, WindowToggleMaximise, WindowIsMaximised, Quit } from '../wailsjs/runtime/runtime';
|
||||||
import type { adif as adifModels, lookup as lookupModels, cat as catModels } from '../wailsjs/go/models';
|
import type { adif as adifModels, lookup as lookupModels, cat as catModels } from '../wailsjs/go/models';
|
||||||
import type { QSOForm, WorkedBeforeView, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
import type { QSOForm, WorkedBeforeView, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||||
@@ -81,6 +83,7 @@ import { AntGeniusPanel, type AGStatus } from '@/components/AntGeniusPanel';
|
|||||||
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
|
import { TunerGeniusPanel, type TGStatus } from '@/components/TunerGeniusPanel';
|
||||||
import { AmpWidget } from '@/components/AmpWidget';
|
import { AmpWidget } from '@/components/AmpWidget';
|
||||||
import { ScpPanel, type ScpResult } from '@/components/ScpPanel';
|
import { ScpPanel, type ScpResult } from '@/components/ScpPanel';
|
||||||
|
import { ChaseNewPanel } from '@/components/ChaseNewPanel';
|
||||||
import { FilterBuilder, type QueryFilter } from '@/components/FilterBuilder';
|
import { FilterBuilder, type QueryFilter } from '@/components/FilterBuilder';
|
||||||
import { AwardsPanel } from '@/components/AwardsPanel';
|
import { AwardsPanel } from '@/components/AwardsPanel';
|
||||||
import { StatsPanel } from '@/components/StatsPanel';
|
import { StatsPanel } from '@/components/StatsPanel';
|
||||||
@@ -90,7 +93,8 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
|
|||||||
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
||||||
import { ClusterGrid } from '@/components/ClusterGrid';
|
import { ClusterGrid } from '@/components/ClusterGrid';
|
||||||
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
||||||
import { applySpotDisplay, readSpotDisplayOptions, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
import { applySpotDisplay, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||||
|
import { GetRowColors, GetSpotTTLMinutes, IsNewUSCounty } from '../wailsjs/go/main/App';
|
||||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||||
import { NetControlPanel } from '@/components/NetControlPanel';
|
import { NetControlPanel } from '@/components/NetControlPanel';
|
||||||
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
||||||
@@ -139,7 +143,9 @@ type CATState = Omit<catModels.RigState, 'convertValues'>;
|
|||||||
// threshold is bypassed while filtering — see buildActiveFilter).
|
// threshold is bypassed while filtering — see buildActiveFilter).
|
||||||
const FILTERED_LIMIT_CAP = 10000;
|
const FILTERED_LIMIT_CAP = 10000;
|
||||||
const DEFAULT_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm','23cm'];
|
const DEFAULT_BANDS = ['160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','2m','70cm','23cm'];
|
||||||
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE'];
|
// Mirrors defaultModes in app.go — the fallback used before the backend answers.
|
||||||
|
// AM and DIGITALVOICE stay in the catalogue but are not offered by default.
|
||||||
|
const DEFAULT_MODES = ['SSB','CW','FT8','FT4','FT2','RTTY','PSK31','FM'];
|
||||||
// Modes the QSO recorder captures (phone only). Mirrors recordableMode() in
|
// Modes the QSO recorder captures (phone only). Mirrors recordableMode() in
|
||||||
// app.go — digital modes carry no useful audio, and CW has no DAX audio on Flex,
|
// app.go — digital modes carry no useful audio, and CW has no DAX audio on Flex,
|
||||||
// so neither is recorded (no REC badge / timer for them).
|
// so neither is recorded (no REC badge / timer for them).
|
||||||
@@ -309,7 +315,7 @@ function modeAccent(mode?: string): string {
|
|||||||
type RSTLists = { phone: string[]; cw: string[]; digital: string[] };
|
type RSTLists = { phone: string[]; cw: string[]; digital: string[] };
|
||||||
function rstCategory(mode: string): keyof RSTLists {
|
function rstCategory(mode: string): keyof RSTLists {
|
||||||
const m = (mode || '').toUpperCase();
|
const m = (mode || '').toUpperCase();
|
||||||
const digital = ['FT8', 'FT4', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
|
const digital = ['FT8', 'FT4', 'FT2', 'JT65', 'JT9', 'JS8', 'Q65', 'MSK144', 'FST4', 'FST4W', 'MFSK', 'OLIVIA', 'JT4', 'WSPR'];
|
||||||
if (digital.includes(m)) return 'digital';
|
if (digital.includes(m)) return 'digital';
|
||||||
if (['CW', 'RTTY', 'PSK31', 'PSK63', 'PSK', 'PSK125'].includes(m)) return 'cw';
|
if (['CW', 'RTTY', 'PSK31', 'PSK63', 'PSK', 'PSK125'].includes(m)) return 'cw';
|
||||||
return 'phone';
|
return 'phone';
|
||||||
@@ -528,6 +534,28 @@ export default function App() {
|
|||||||
setCompact(next);
|
setCompact(next);
|
||||||
SetCompactMode(next);
|
SetCompactMode(next);
|
||||||
}
|
}
|
||||||
|
// Fit the compact window to what was actually rendered.
|
||||||
|
//
|
||||||
|
// The height was a constant "tuned so the compact entry strip fits in a single
|
||||||
|
// row". A constant tuned against a layout stops being true the moment the
|
||||||
|
// layout changes, and this one outlived a strip that had since lost a row —
|
||||||
|
// leaving a band of empty window under the fields. Measure instead.
|
||||||
|
const compactRootRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!compact) return;
|
||||||
|
const fit = () => {
|
||||||
|
const el = compactRootRef.current;
|
||||||
|
if (!el) return;
|
||||||
|
// Rounded, so a sub-pixel reflow cannot start a resize loop.
|
||||||
|
// + the compact topbar, which is a fixed h-8 (32px), + a couple of pixels
|
||||||
|
// for the border so the strip is never clipped by one row of anti-aliasing.
|
||||||
|
SetCompactHeight(Math.round(el.getBoundingClientRect().height) + 32 + 2);
|
||||||
|
};
|
||||||
|
const id = window.setTimeout(fit, 60); // let the strip paint first
|
||||||
|
const ro = new ResizeObserver(fit);
|
||||||
|
if (compactRootRef.current) ro.observe(compactRootRef.current);
|
||||||
|
return () => { window.clearTimeout(id); ro.disconnect(); };
|
||||||
|
}, [compact]);
|
||||||
|
|
||||||
// CAT — receives live rig state via Wails events.
|
// CAT — receives live rig state via Wails events.
|
||||||
const [catState, setCatState] = useState<CATState>({ enabled: false, connected: false } as any);
|
const [catState, setCatState] = useState<CATState>({ enabled: false, connected: false } as any);
|
||||||
@@ -1770,6 +1798,20 @@ export default function App() {
|
|||||||
// close so the next plain "Preferences" launch reverts to default.
|
// close so the next plain "Preferences" launch reverts to default.
|
||||||
const [settingsSection, setSettingsSection] = useState<string | undefined>(undefined);
|
const [settingsSection, setSettingsSection] = useState<string | undefined>(undefined);
|
||||||
const [showDeleteAll, setShowDeleteAll] = useState(false);
|
const [showDeleteAll, setShowDeleteAll] = useState(false);
|
||||||
|
// How many QSOs hold a QSL routing word where the manager belongs — null when
|
||||||
|
// there is nothing to offer, or the operator has already answered. Asked once
|
||||||
|
// per log, a moment after startup so it does not race the first paint.
|
||||||
|
const [qslViaRepair, setQslViaRepair] = useState<number | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const id = window.setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const s: any = await QSLViaRepairStatus();
|
||||||
|
if (alive && !s?.asked && (s?.affected ?? 0) > 0) setQslViaRepair(s.affected);
|
||||||
|
} catch { /* a log we cannot query yet will be offered next start */ }
|
||||||
|
}, 4000);
|
||||||
|
return () => { alive = false; window.clearTimeout(id); };
|
||||||
|
}, []);
|
||||||
const [showAbout, setShowAbout] = useState(false);
|
const [showAbout, setShowAbout] = useState(false);
|
||||||
// "What's new": the changelog for the version(s) since the operator last ran,
|
// "What's new": the changelog for the version(s) since the operator last ran,
|
||||||
// shown once on the first launch after an update (EN/FR per the UI language).
|
// shown once on the first launch after an update (EN/FR per the UI language).
|
||||||
@@ -1923,6 +1965,35 @@ export default function App() {
|
|||||||
// change). The grid reads them straight from the row — no per-page backend
|
// change). The grid reads them straight from the row — no per-page backend
|
||||||
// recompute — so here we just parse the stored JSON string into the code→ref
|
// recompute — so here we just parse the stored JSON string into the code→ref
|
||||||
// object the award columns expect (keys are already upper-case).
|
// object the award columns expect (keys are already upper-case).
|
||||||
|
// Row colouring by QSL status (Settings → Appearance). Reloaded when the
|
||||||
|
// settings dialog closes, which is the only place it changes.
|
||||||
|
const [rowColors, setRowColors] = useState<any>(null);
|
||||||
|
useEffect(() => { GetRowColors().then(setRowColors).catch(() => {}); }, [showSettings]);
|
||||||
|
// Spot lifetime (Settings → DX Cluster). Spots are actually REMOVED rather
|
||||||
|
// than filtered at render: the cluster list, every band map and the counts all
|
||||||
|
// read the same array, so pruning it once is what makes the setting mean the
|
||||||
|
// same thing everywhere — and it gives the memory back.
|
||||||
|
const [spotTTLMin, setSpotTTLMin] = useState(0);
|
||||||
|
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
|
||||||
|
const sweep = () => {
|
||||||
|
const cutoff = Date.now() - spotTTLMin * 60_000;
|
||||||
|
setSpots((arr) => {
|
||||||
|
const kept = arr.filter((sp) => {
|
||||||
|
const t = Date.parse((sp as any).received_at ?? '');
|
||||||
|
return isNaN(t) || t >= cutoff; // an unparseable stamp is never a reason to drop a spot
|
||||||
|
});
|
||||||
|
return kept.length === arr.length ? arr : kept;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
sweep();
|
||||||
|
// Half a minute: fine enough that a 5-minute setting is honoured closely,
|
||||||
|
// coarse enough to be invisible next to the spot stream itself.
|
||||||
|
const id = window.setInterval(sweep, 30_000);
|
||||||
|
return () => window.clearInterval(id);
|
||||||
|
}, [spotTTLMin]);
|
||||||
|
|
||||||
const qsosWithAwards = useMemo(
|
const qsosWithAwards = useMemo(
|
||||||
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
|
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
|
||||||
[qsos],
|
[qsos],
|
||||||
@@ -2017,21 +2088,49 @@ export default function App() {
|
|||||||
const [showAntGenius, setShowAntGenius] = useState(() => localStorage.getItem('opslog.showAntGenius') !== '0');
|
const [showAntGenius, setShowAntGenius] = useState(() => localStorage.getItem('opslog.showAntGenius') !== '0');
|
||||||
const [showTuner, setShowTuner] = useState(() => localStorage.getItem('opslog.showTuner') !== '0');
|
const [showTuner, setShowTuner] = useState(() => localStorage.getItem('opslog.showTuner') !== '0');
|
||||||
const [showScp, setShowScp] = useState(() => localStorage.getItem('opslog.showScp') !== '0');
|
const [showScp, setShowScp] = useState(() => localStorage.getItem('opslog.showScp') !== '0');
|
||||||
|
// The Chase New widget follows its own setting rather than a local toggle: the
|
||||||
|
// panel is only meaningful while the PSK Reporter feed is up, and that is what
|
||||||
|
// the setting decides.
|
||||||
|
const [chaseNewOn, setChaseNewOn] = useState(false);
|
||||||
|
// The setting decides whether the feature exists; this decides whether the
|
||||||
|
// panel is on screen — the same split the Super Check Partial panel uses.
|
||||||
|
const [showChaseNew, setShowChaseNew] = useState(() => localStorage.getItem('opslog.showChaseNew') !== '0');
|
||||||
|
const refreshChaseNew = useCallback(() => { GetChaseNew().then(setChaseNewOn).catch(() => {}); }, []);
|
||||||
|
useEffect(() => { refreshChaseNew(); }, [refreshChaseNew]);
|
||||||
const [showBeamOnMap, setShowBeamOnMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
|
const [showBeamOnMap, setShowBeamOnMap] = useState(() => localStorage.getItem('opslog.showBeamOnMap') !== '0');
|
||||||
|
|
||||||
// Award code → scanned field (e.g. POTA→pota_ref, WWFF→wwff). Used to route
|
// Award code → scanned field (e.g. POTA→pota_ref, WWFF→wwff). Used to route
|
||||||
// picked award references to the QSO field/extras each award actually reads.
|
// picked award references to the QSO field/extras each award actually reads.
|
||||||
const awardFieldRef = useRef<Record<string, string>>({});
|
const awardFieldRef = useRef<Record<string, string>>({});
|
||||||
|
// The same map as state, because the spot comment has to be recomputed once it
|
||||||
|
// arrives — a ref would leave the first Send Spot of a session with no
|
||||||
|
// references at all, or with the computed ones it is meant to filter out.
|
||||||
|
const [awardFields, setAwardFields] = useState<Record<string, string>>({});
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
GetAwardDefs()
|
GetAwardDefs()
|
||||||
.then((defs) => {
|
.then((defs) => {
|
||||||
const m: Record<string, string> = {};
|
const m: Record<string, string> = {};
|
||||||
for (const d of (defs ?? []) as any[]) m[String(d.code).toUpperCase()] = String(d.field || '').toLowerCase();
|
for (const d of (defs ?? []) as any[]) m[String(d.code).toUpperCase()] = String(d.field || '').toLowerCase();
|
||||||
awardFieldRef.current = m;
|
awardFieldRef.current = m;
|
||||||
|
setAwardFields(m);
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Award references offered to the Send Spot window, as cluster-ready strings.
|
||||||
|
//
|
||||||
|
// The entry panel holds them as "CODE@REF;CODE@REF" while the QSO is being
|
||||||
|
// typed; once it is logged they live on the row as the materialised award_refs
|
||||||
|
// object. Take the entry's when there is one — spotting usually happens with
|
||||||
|
// the station still in the field — and fall back to the last logged QSO, which
|
||||||
|
// is where the callsign and frequency defaults come from too.
|
||||||
|
const spotEntryRefs = useMemo(() => {
|
||||||
|
const entry = spotRefList(parseManualRefs(details.award_refs ?? ''), awardFields);
|
||||||
|
if (entry.length) return entry;
|
||||||
|
return spotRefList(parseAwardRefs(qsos[0]?.award_refs), awardFields);
|
||||||
|
}, [details.award_refs, qsos, awardFields]);
|
||||||
|
|
||||||
|
|
||||||
// === Clock ===
|
// === Clock ===
|
||||||
const [utcNow, setUtcNow] = useState('');
|
const [utcNow, setUtcNow] = useState('');
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -2550,6 +2649,9 @@ export default function App() {
|
|||||||
// case its one-shot fetch ran during the startup race (before the
|
// case its one-shot fetch ran during the startup race (before the
|
||||||
// backend was determined) and grabbed the wrong/stale value.
|
// backend was determined) and grabbed the wrong/stale value.
|
||||||
GetDBConnectionInfo().then((i) => { if (alive) setDbConn(i as any); }).catch(() => {});
|
GetDBConnectionInfo().then((i) => { if (alive) setDbConn(i as any); }).catch(() => {});
|
||||||
|
// Same race, same fix: the toolbar options were read once at mount,
|
||||||
|
// possibly before the profile was active, and a "no" then was final.
|
||||||
|
refreshChaseNew();
|
||||||
} else if (!ok && alive && tries++ < 360) {
|
} else if (!ok && alive && tries++ < 360) {
|
||||||
// Quick retries at first (normal startup connects in ~2 s); then keep
|
// Quick retries at first (normal startup connects in ~2 s); then keep
|
||||||
// trying for several minutes, because the very first migration against a
|
// trying for several minutes, because the very first migration against a
|
||||||
@@ -2562,7 +2664,7 @@ export default function App() {
|
|||||||
};
|
};
|
||||||
attempt();
|
attempt();
|
||||||
return () => { alive = false; if (timer) window.clearTimeout(timer); };
|
return () => { alive = false; if (timer) window.clearTimeout(timer); };
|
||||||
}, [refresh]);
|
}, [refresh, refreshChaseNew]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
try {
|
try {
|
||||||
@@ -2583,6 +2685,10 @@ export default function App() {
|
|||||||
loadStation();
|
loadStation();
|
||||||
loadLists();
|
loadLists();
|
||||||
loadCATCfg();
|
loadCATCfg();
|
||||||
|
// Options the toolbar reads. At mount the database may still be opening,
|
||||||
|
// and a one-shot read then answers "off" for everything — which is why the
|
||||||
|
// Chase New button only appeared after a trip through Settings.
|
||||||
|
refreshChaseNew();
|
||||||
})();
|
})();
|
||||||
// Poll the CAT state at launch until the rig reports a frequency: the
|
// Poll the CAT state at launch until the rig reports a frequency: the
|
||||||
// backend connects asynchronously and only PUSHES cat:state on change, so
|
// backend connects asynchronously and only PUSHES cat:state on change, so
|
||||||
@@ -3303,7 +3409,7 @@ export default function App() {
|
|||||||
sat_name: details.sat_name, sat_mode: details.sat_mode,
|
sat_name: details.sat_name, sat_mode: details.sat_mode,
|
||||||
contest_id: details.contest_id,
|
contest_id: details.contest_id,
|
||||||
srx: srxE.num, stx: stxE.num, srx_string: srxE.str, stx_string: stxE.str,
|
srx: srxE.num, stx: stxE.num, srx_string: srxE.str, stx_string: stxE.str,
|
||||||
email: details.email,
|
email: details.email, web: details.web,
|
||||||
};
|
};
|
||||||
applyAwardRefs(payload, details.award_refs ?? '', awardFieldRef.current);
|
applyAwardRefs(payload, details.award_refs ?? '', awardFieldRef.current);
|
||||||
// Contest mode overrides the exchange fields: CONTEST_ID, the sent
|
// Contest mode overrides the exchange fields: CONTEST_ID, the sent
|
||||||
@@ -3666,6 +3772,7 @@ export default function App() {
|
|||||||
ituz: d.ituz ?? (last.ituz || undefined),
|
ituz: d.ituz ?? (last.ituz || undefined),
|
||||||
cont: d.cont || last.cont || '',
|
cont: d.cont || last.cont || '',
|
||||||
email: d.email || last.email || '',
|
email: d.email || last.email || '',
|
||||||
|
web: d.web || last.web || '',
|
||||||
qsl_via: d.qsl_via || last.qsl_via || '',
|
qsl_via: d.qsl_via || last.qsl_via || '',
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@@ -3728,6 +3835,7 @@ export default function App() {
|
|||||||
ituz: d.ituz ?? (r.ituz || undefined),
|
ituz: d.ituz ?? (r.ituz || undefined),
|
||||||
cont: d.cont || (r.cont ?? ''),
|
cont: d.cont || (r.cont ?? ''),
|
||||||
email: d.email || (r.email ?? ''),
|
email: d.email || (r.email ?? ''),
|
||||||
|
web: d.web || (r.web ?? ''),
|
||||||
qsl_via: d.qsl_via || (r.qsl_via ?? ''),
|
qsl_via: d.qsl_via || (r.qsl_via ?? ''),
|
||||||
}));
|
}));
|
||||||
// Backfill anything the provider didn't supply from the last time we worked
|
// Backfill anything the provider didn't supply from the last time we worked
|
||||||
@@ -4407,6 +4515,67 @@ export default function App() {
|
|||||||
onBlur={() => setQth(titleCase)} />
|
onBlur={() => setQth(titleCase)} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
// State sits between QTH and the locator: it is part of the same "where is
|
||||||
|
// this station" reading, and it is what several awards key off (WAS, the US
|
||||||
|
// county work). Narrow — it holds two or three characters.
|
||||||
|
const stateBlock = (
|
||||||
|
<div className="flex flex-col w-[70px] shrink-0"><Label className="mb-1 h-3.5">{t('field.state')}</Label>
|
||||||
|
<Input value={details.state ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, state: e.target.value.toUpperCase() }))} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
// County beside State: the lookup fills QTH, State, County and the locator
|
||||||
|
// together, and they are read together. Wider than State because a county name
|
||||||
|
// is a name — "St. Tammany Parish", not a code.
|
||||||
|
// The row Comment/Note freed by moving onto one line: county, zones and the
|
||||||
|
// ADIF entity number. All four are filled by the lookup and were previously
|
||||||
|
// only visible after opening a tab — which is the wrong place for values an
|
||||||
|
// operator wants to SEE are right before pressing Log.
|
||||||
|
//
|
||||||
|
// A numeric field stores undefined when cleared, not 0: zero is a real DXCC
|
||||||
|
// number for "no entity" and a real answer for a zone, so an empty box must
|
||||||
|
// stay empty rather than assert something.
|
||||||
|
// NEW badge on the county — the same answer the Details tab gives, moved to
|
||||||
|
// where the county is now typed. Debounced: this field is typed into as well
|
||||||
|
// as filled by the lookup, and the check hits the database.
|
||||||
|
const [entryNewCounty, setEntryNewCounty] = useState(false);
|
||||||
|
useEffect(() => {
|
||||||
|
const cnty = (details.cnty ?? '').trim();
|
||||||
|
if (!cnty) { setEntryNewCounty(false); return; }
|
||||||
|
let alive = true;
|
||||||
|
const id = window.setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const isNew = await IsNewUSCounty(details.state ?? '', cnty);
|
||||||
|
if (alive) setEntryNewCounty(!!isNew);
|
||||||
|
} catch { if (alive) setEntryNewCounty(false); }
|
||||||
|
}, 300);
|
||||||
|
return () => { alive = false; window.clearTimeout(id); };
|
||||||
|
}, [details.state, details.cnty]);
|
||||||
|
|
||||||
|
const num = (v: string): number | undefined => {
|
||||||
|
const s = v.replace(/[^0-9]/g, '');
|
||||||
|
return s === '' ? undefined : parseInt(s, 10);
|
||||||
|
};
|
||||||
|
const geoDetailRow = (
|
||||||
|
<div className="flex gap-4 items-end">
|
||||||
|
<div className="flex flex-col flex-1 min-w-0"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
|
||||||
|
<Input value={details.cnty ?? ''}
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.cqz')}</Label>
|
||||||
|
<Input value={details.cqz ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, cqz: num(e.target.value) }))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.ituz')}</Label>
|
||||||
|
<Input value={details.ituz ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, ituz: num(e.target.value) }))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col w-[72px] shrink-0"><Label className="mb-1 h-3.5">{t('field.dxcc')}</Label>
|
||||||
|
<Input value={details.dxcc ?? ''} className="font-mono"
|
||||||
|
onChange={(e) => setDetails((d) => ({ ...d, dxcc: num(e.target.value) }))} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
const gridBlock = (
|
const gridBlock = (
|
||||||
<div className="flex flex-col w-[76px] shrink-0"><Label className="mb-1 h-3.5">{t('field.grid')}</Label>
|
<div className="flex flex-col w-[76px] shrink-0"><Label className="mb-1 h-3.5">{t('field.grid')}</Label>
|
||||||
<Input value={grid} placeholder="JN05" className="font-mono" onChange={(e) => { setGrid(e.target.value); markEdited('grid'); }} />
|
<Input value={grid} placeholder="JN05" className="font-mono" onChange={(e) => { setGrid(e.target.value); markEdited('grid'); }} />
|
||||||
@@ -4710,12 +4879,21 @@ export default function App() {
|
|||||||
// Cluster spots after every active filter (band / mode / status / search /
|
// Cluster spots after every active filter (band / mode / status / search /
|
||||||
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
|
// hide-worked / group). Shared by the Cluster tab and the Main-view cluster
|
||||||
// pane so both show exactly the same list.
|
// pane so both show exactly the same list.
|
||||||
const clusterRenderedRows = useMemo(() => {
|
// Everything the operator has said about WHICH STATIONS they care about —
|
||||||
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
// LoTW only, the spotter's continent, hide worked, the status and mode chips,
|
||||||
|
// the search box, the source node.
|
||||||
|
//
|
||||||
|
// Shared with the band map, which used to receive the raw stream filtered by
|
||||||
|
// band alone: switching on "LoTW users only" changed the cluster list and left
|
||||||
|
// the panadapter showing everyone. Two views of one spot stream disagreeing
|
||||||
|
// about the same spot is the fault lib/spotDisplay already exists to prevent.
|
||||||
|
//
|
||||||
|
// The BAND filter is deliberately not in here: a band map's band IS its
|
||||||
|
// filter, and applying the cluster's would empty every map but one.
|
||||||
|
const spotPassesStationFilters = useCallback((s: ClusterSpot): boolean => {
|
||||||
const search = clusterSearch.trim().toUpperCase();
|
const search = clusterSearch.trim().toUpperCase();
|
||||||
const list = spots.filter((s) => {
|
{
|
||||||
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
|
if (clusterFilterSource && s.source_id !== clusterFilterSource) return false;
|
||||||
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
|
||||||
if (search && !s.dx_call.includes(search)) return false;
|
if (search && !s.dx_call.includes(search)) return false;
|
||||||
if (clusterLockMode) {
|
if (clusterLockMode) {
|
||||||
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
const spotMode = inferSpotMode(s.comment ?? '', s.freq_hz);
|
||||||
@@ -4764,9 +4942,27 @@ export default function App() {
|
|||||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||||
const e = spotStatus[k];
|
const e = spotStatus[k];
|
||||||
if (!e) return false;
|
if (!e) return false;
|
||||||
if (e.worked_call || e.status === 'worked') return false;
|
// A spot that is NEW for something is not "worked", whatever the entity
|
||||||
|
// says. The extra markers are orthogonal to the entity status — the same
|
||||||
|
// rule the band map already states — so a new prefix, county, grid or
|
||||||
|
// park in an entity worked years ago is exactly what an operator is
|
||||||
|
// hunting, and hiding it is the opposite of what was asked.
|
||||||
|
//
|
||||||
|
// Reported on BH2SWB and 4X9AA: both flagged NEW PFX, neither ever
|
||||||
|
// worked, both vanished the moment "hide worked" went on.
|
||||||
|
const isNew = !!(e.new_pota || e.new_county || e.new_pfx || e.new_grid);
|
||||||
|
if (!isNew && (e.worked_call || e.status === 'worked')) return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
|
}, [clusterFilterSource, clusterSearch, clusterLockMode, mode, clusterModeFilter,
|
||||||
|
clusterStatusFilter, spotStatus, clusterLotwOnly, clusterSpotterConts, clusterHideWorked]);
|
||||||
|
|
||||||
|
const clusterRenderedRows = useMemo(() => {
|
||||||
|
const bandsActive = clusterLockBand ? new Set([band]) : clusterBands;
|
||||||
|
const list = spots.filter((s) => {
|
||||||
|
if (bandsActive.size > 0 && !bandsActive.has(s.band ?? '')) return false;
|
||||||
|
return spotPassesStationFilters(s);
|
||||||
});
|
});
|
||||||
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
let rendered = list as (ClusterSpot & { repeats?: number })[];
|
||||||
if (clusterGroup) {
|
if (clusterGroup) {
|
||||||
@@ -5068,6 +5264,7 @@ export default function App() {
|
|||||||
// rewrote the other's widths.
|
// rewrote the other's widths.
|
||||||
storageKey="mainpane"
|
storageKey="mainpane"
|
||||||
rows={qsosWithAwards as any}
|
rows={qsosWithAwards as any}
|
||||||
|
rowColors={rowColors}
|
||||||
myGrid={station.my_grid}
|
myGrid={station.my_grid}
|
||||||
total={total}
|
total={total}
|
||||||
awardCols={awardCols}
|
awardCols={awardCols}
|
||||||
@@ -5174,13 +5371,15 @@ export default function App() {
|
|||||||
{(() => {
|
{(() => {
|
||||||
const p = dxPath;
|
const p = dxPath;
|
||||||
const disabled = !p;
|
const disabled = !p;
|
||||||
const goto = (az: number) => RotatorGoTo(Math.round(az), -1).catch((err) => setError(String(err?.message ?? err)));
|
// The path is passed through so a custom outbound row can say which
|
||||||
|
// bearing was taken — 137° is short path to one station and long to another.
|
||||||
|
const goto = (az: number, path: 'SP' | 'LP') => RotatorGoToPath(Math.round(az), -1, path).catch((err) => setError(String(err?.message ?? err)));
|
||||||
return (
|
return (
|
||||||
<div className="inline-flex items-center rounded-full border border-info-border bg-info-muted overflow-hidden text-[11px] font-mono font-semibold">
|
<div className="inline-flex items-center rounded-full border border-info-border bg-info-muted overflow-hidden text-[11px] font-mono font-semibold">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onClick={() => p && goto(p.bearingShort)}
|
onClick={() => p && goto(p.bearingShort, 'SP')}
|
||||||
title={p
|
title={p
|
||||||
? `Rotate short-path · ${Math.round(p.distanceShort).toLocaleString()} km`
|
? `Rotate short-path · ${Math.round(p.distanceShort).toLocaleString()} km`
|
||||||
: (station.my_grid ? 'No remote grid' : 'Set your station grid in Preferences')}
|
: (station.my_grid ? 'No remote grid' : 'Set your station grid in Preferences')}
|
||||||
@@ -5197,7 +5396,7 @@ export default function App() {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onClick={() => p && goto(p.bearingLong)}
|
onClick={() => p && goto(p.bearingLong, 'LP')}
|
||||||
title={p ? `Rotate long-path · ${Math.round(p.distanceLong).toLocaleString()} km` : ''}
|
title={p ? `Rotate long-path · ${Math.round(p.distanceLong).toLocaleString()} km` : ''}
|
||||||
className={cn(
|
className={cn(
|
||||||
'px-1.5 py-0.5 border-l border-info-border text-[10px] transition-colors',
|
'px-1.5 py-0.5 border-l border-info-border text-[10px] transition-colors',
|
||||||
@@ -5393,6 +5592,20 @@ export default function App() {
|
|||||||
<SpellCheck className="size-4" />
|
<SpellCheck className="size-4" />
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
{chaseNewOn && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => { const v = !showChaseNew; setShowChaseNew(v); writeUiPref('opslog.showChaseNew', v ? '1' : '0'); }}
|
||||||
|
title={showChaseNew ? `${t('chn.toggle')} — ${t('chn.close')}` : t('chn.toggle')}
|
||||||
|
className={cn(
|
||||||
|
'relative inline-flex items-center justify-center size-7 rounded-md border transition-colors',
|
||||||
|
showChaseNew ? 'border-success-border bg-success-muted text-success-muted-foreground hover:bg-success-muted'
|
||||||
|
: 'border-border text-muted-foreground hover:bg-muted',
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<Radar className="size-4" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{chatAvailable && (
|
{chatAvailable && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -5771,7 +5984,7 @@ export default function App() {
|
|||||||
Enter from any <input> inside the strip logs the QSO. Radix Selects
|
Enter from any <input> inside the strip logs the QSO. Radix Selects
|
||||||
render as <button> elements and are ignored by this handler — they
|
render as <button> elements and are ignored by this handler — they
|
||||||
keep their own keyboard behaviour. */}
|
keep their own keyboard behaviour. */}
|
||||||
<div className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
|
<div ref={compactRootRef} className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
|
||||||
<section
|
<section
|
||||||
className={cn('bg-card shadow-sm border-border',
|
className={cn('bg-card shadow-sm border-border',
|
||||||
compact
|
compact
|
||||||
@@ -5826,25 +6039,30 @@ export default function App() {
|
|||||||
to be pushed outside the entry panel and clipped. Wrapping drops
|
to be pushed outside the entry panel and clipped. Wrapping drops
|
||||||
it to its own line instead, which stays readable. */}
|
it to its own line instead, which stays readable. */}
|
||||||
<div className="flex gap-4 items-end flex-wrap">
|
<div className="flex gap-4 items-end flex-wrap">
|
||||||
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
|
<div className="flex flex-col w-[230px] shrink-0"><Label className="mb-1 h-3.5">{t('field.name')}</Label>
|
||||||
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
|
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
|
||||||
onBlur={() => setName(titleCase)} />
|
onBlur={() => setName(titleCase)} />
|
||||||
</div>
|
</div>
|
||||||
{qthBlock}
|
{qthBlock}
|
||||||
|
{stateBlock}
|
||||||
{gridBlock}
|
{gridBlock}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Row 3: tight left detail column (Band/Mode/Country) and
|
{/* Row 3: tight left detail column (Band/Mode/Country) and
|
||||||
single-line Comment/Note on the right. */}
|
Comment/Note SIDE BY SIDE on the right — one line each was a lot
|
||||||
|
of vertical space for two fields that are usually short. */}
|
||||||
<div className="flex gap-4 items-start">
|
<div className="flex gap-4 items-start">
|
||||||
<div className="flex flex-col gap-1.5 w-[300px] shrink-0">
|
<div className="flex flex-col gap-1.5 w-[230px] shrink-0">
|
||||||
{bandRow}
|
{bandRow}
|
||||||
{modeRow}
|
{modeRow}
|
||||||
{countryRow}
|
{countryRow}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
||||||
{commentLine}
|
{geoDetailRow}
|
||||||
{noteLine}
|
<div className="flex gap-4">
|
||||||
|
<div className="flex-1 min-w-0">{commentLine}</div>
|
||||||
|
<div className="flex-1 min-w-0">{noteLine}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -5907,7 +6125,7 @@ export default function App() {
|
|||||||
{/* Reserved free space to the right. The WinKeyer CW keyer and/or the
|
{/* Reserved free space to the right. The WinKeyer CW keyer and/or the
|
||||||
Digital Voice Keyer take this slot when enabled (Log4OM-style);
|
Digital Voice Keyer take this slot when enabled (Log4OM-style);
|
||||||
otherwise it shows the QRZ profile photo. */}
|
otherwise it shows the QRZ profile photo. */}
|
||||||
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showTuner && tgEnabled) || (showAmpWidget && ampSts.length > 0) || (showScp && scpEnabled) || (showLiveStations && dbConn?.backend === 'mysql')) && (
|
{!compact && (chatShown || wkEnabled || dvkEnabled || lookupResult?.image_url || (showRotor && (rotatorHeading.enabled || dxPath)) || (showAntGenius && agEnabled) || (showTuner && tgEnabled) || (showAmpWidget && ampSts.length > 0) || (showScp && scpEnabled) || (chaseNewOn && showChaseNew) || (showLiveStations && dbConn?.backend === 'mysql')) && (
|
||||||
// relative + absolute inner (like the F1-F5 panel): a taller widget (e.g.
|
// relative + absolute inner (like the F1-F5 panel): a taller widget (e.g.
|
||||||
// the DVK with Auto CQ) can't grow the row — the row height stays set by
|
// the DVK with Auto CQ) can't grow the row — the row height stays set by
|
||||||
// the entry strip and each widget fills that height, scrolling inside.
|
// the entry strip and each widget fills that height, scrolling inside.
|
||||||
@@ -6033,6 +6251,16 @@ export default function App() {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{chaseNewOn && showChaseNew && (
|
||||||
|
<div className="w-[420px] shrink-0 min-h-0">
|
||||||
|
{/* Same reflex as clicking a cluster spot: the callsign into the
|
||||||
|
entry, and the rig onto the frequency it was decoded on. */}
|
||||||
|
<ChaseNewPanel onPick={(sp) => {
|
||||||
|
onCallsignInput(sp.call, { force: true });
|
||||||
|
if (sp.freq_hz) void tuneRigCAT(sp.freq_hz, sp.mode);
|
||||||
|
}} onClose={() => { setShowChaseNew(false); writeUiPref('opslog.showChaseNew', '0'); }} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{dvkEnabled && (
|
{dvkEnabled && (
|
||||||
<div className="w-[320px] shrink-0 min-h-0">
|
<div className="w-[320px] shrink-0 min-h-0">
|
||||||
<DvkPanel
|
<DvkPanel
|
||||||
@@ -6351,6 +6579,7 @@ export default function App() {
|
|||||||
<RecentQSOsGrid
|
<RecentQSOsGrid
|
||||||
key={`rqg2-${activeProfileId ?? 'x'}`}
|
key={`rqg2-${activeProfileId ?? 'x'}`}
|
||||||
rows={qsosWithAwards as any}
|
rows={qsosWithAwards as any}
|
||||||
|
rowColors={rowColors}
|
||||||
myGrid={station.my_grid}
|
myGrid={station.my_grid}
|
||||||
total={total}
|
total={total}
|
||||||
awardCols={awardCols}
|
awardCols={awardCols}
|
||||||
@@ -6766,13 +6995,14 @@ export default function App() {
|
|||||||
</div>
|
</div>
|
||||||
<BandMap
|
<BandMap
|
||||||
band={b}
|
band={b}
|
||||||
spots={spots.filter((s) => s.band === b)}
|
spots={spots.filter((s) => s.band === b && spotPassesStationFilters(s))}
|
||||||
spotStatus={spotStatus}
|
spotStatus={spotStatus}
|
||||||
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
currentFreqHz={band === b && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||||
onSpotClick={handleSpotClick}
|
onSpotClick={handleSpotClick}
|
||||||
onClose={() => toggleBandMapBand(b)}
|
onClose={() => toggleBandMapBand(b)}
|
||||||
hideDigital={bandMapHideFt}
|
hideDigital={bandMapHideFt}
|
||||||
fitToBand={bandMapFit}
|
fitToBand={bandMapFit}
|
||||||
|
showLotw={!!rowColors?.bandmap_lotw}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
@@ -6802,11 +7032,12 @@ export default function App() {
|
|||||||
side={bandMapSide}
|
side={bandMapSide}
|
||||||
onToggleSide={toggleBandMapSide}
|
onToggleSide={toggleBandMapSide}
|
||||||
band={band}
|
band={band}
|
||||||
spots={spots.filter((s) => s.band === band)}
|
spots={spots.filter((s) => s.band === band && spotPassesStationFilters(s))}
|
||||||
spotStatus={spotStatus}
|
spotStatus={spotStatus}
|
||||||
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
currentFreqHz={band && freqMhz ? Math.round(parseFloat(freqMhz) * 1_000_000) : 0}
|
||||||
onSpotClick={handleSpotClick}
|
onSpotClick={handleSpotClick}
|
||||||
onClose={() => setBandMapShown(false)}
|
onClose={() => setBandMapShown(false)}
|
||||||
|
showLotw={!!rowColors?.bandmap_lotw}
|
||||||
keyNav
|
keyNav
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -7050,6 +7281,9 @@ export default function App() {
|
|||||||
: (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0)
|
: (qsos[0]?.freq_hz ? Math.round((qsos[0].freq_hz / 1000) * 10) / 10 : 0)
|
||||||
}
|
}
|
||||||
defaultMode={mode || qsos[0]?.mode || ''}
|
defaultMode={mode || qsos[0]?.mode || ''}
|
||||||
|
// Award references: the ones on the QSO being entered, else those already
|
||||||
|
// logged for the last QSO — the same source the callsign above falls back to.
|
||||||
|
defaultRefs={spotEntryRefs}
|
||||||
targetName={
|
targetName={
|
||||||
clusterServers
|
clusterServers
|
||||||
.filter((s) => s.enabled)
|
.filter((s) => s.enabled)
|
||||||
@@ -7060,6 +7294,7 @@ export default function App() {
|
|||||||
freqKHz: q.freq_hz ? Math.round((q.freq_hz / 1000) * 10) / 10 : 0,
|
freqKHz: q.freq_hz ? Math.round((q.freq_hz / 1000) * 10) / 10 : 0,
|
||||||
mode: q.mode ?? '',
|
mode: q.mode ?? '',
|
||||||
band: q.band,
|
band: q.band,
|
||||||
|
refs: spotRefList(parseAwardRefs(q.award_refs), awardFields),
|
||||||
}))}
|
}))}
|
||||||
onSend={async (call, freqKHz, comment) => {
|
onSend={async (call, freqKHz, comment) => {
|
||||||
await SendClusterSpot(call, freqKHz, comment);
|
await SendClusterSpot(call, freqKHz, comment);
|
||||||
@@ -7073,7 +7308,7 @@ export default function App() {
|
|||||||
{showSettings && (
|
{showSettings && (
|
||||||
<SettingsModal
|
<SettingsModal
|
||||||
initialSection={settingsSection}
|
initialSection={settingsSection}
|
||||||
onClose={() => { setShowSettings(false); setSettingsSection(undefined); }}
|
onClose={() => { setShowSettings(false); setSettingsSection(undefined); refreshChaseNew(); }}
|
||||||
onSaved={() => {
|
onSaved={() => {
|
||||||
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
|
loadStation(); loadLists(); loadCATCfg(); reloadWk(); refreshManualRecReady();
|
||||||
// Drop the cached spot statuses. They are computed once per
|
// Drop the cached spot statuses. They are computed once per
|
||||||
@@ -7124,6 +7359,27 @@ export default function App() {
|
|||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})()}
|
})()}
|
||||||
|
{/* One-time offer to move QSL routing words out of the manager field.
|
||||||
|
Shown with a count and never acted on without an answer: it rewrites
|
||||||
|
what the operator sees in their own log. Either answer is final —
|
||||||
|
asking again after a "no" would be a nag. */}
|
||||||
|
{qslViaRepair !== null && (
|
||||||
|
<ConfirmDialog
|
||||||
|
title={t('qslvia.title')}
|
||||||
|
message={t('qslvia.body', { n: qslViaRepair.toLocaleString() })}
|
||||||
|
confirmLabel={t('qslvia.confirm')}
|
||||||
|
cancelLabel={t('qslvia.cancel')}
|
||||||
|
onConfirm={async () => {
|
||||||
|
const n = qslViaRepair;
|
||||||
|
setQslViaRepair(null);
|
||||||
|
try {
|
||||||
|
const r: any = await RepairQSLVia();
|
||||||
|
showToast(t('qslvia.done', { n: (r?.moved ?? n).toLocaleString() }));
|
||||||
|
} catch { /* the log keeps the reason; nothing to undo */ }
|
||||||
|
}}
|
||||||
|
onCancel={() => { setQslViaRepair(null); DismissQSLViaRepair().catch(() => {}); }}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{showDeleteAll && (
|
{showDeleteAll && (
|
||||||
<ConfirmDialog
|
<ConfirmDialog
|
||||||
title="Delete ALL QSOs?"
|
title="Delete ALL QSOs?"
|
||||||
|
|||||||
@@ -0,0 +1,153 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { GetRowColors, SaveRowColors } from '../../wailsjs/go/main/App';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import type { RowColorSettings } from '@/lib/rowColors';
|
||||||
|
|
||||||
|
// A fixed palette plus a free picker. Muted values on purpose: they are
|
||||||
|
// composited at low opacity over a dark grid, where a saturated colour reads as
|
||||||
|
// an error state rather than a status.
|
||||||
|
const PALETTE = [
|
||||||
|
'#16a34a', '#0ea5e9', '#f59e0b', '#a855f7',
|
||||||
|
'#dc2626', '#14b8a6', '#eab308', '#ec4899',
|
||||||
|
'#64748b', '#84cc16', '#6366f1', '#f97316',
|
||||||
|
];
|
||||||
|
|
||||||
|
// The rule ids the backend orders; the labels live here so a translation never
|
||||||
|
// travels through the settings row.
|
||||||
|
const LABELS: Record<string, string> = {
|
||||||
|
to_send: 'appr.ruleToSend',
|
||||||
|
confirmed: 'appr.ruleConfirmed',
|
||||||
|
sent: 'appr.ruleSent',
|
||||||
|
worked: 'appr.ruleWorked',
|
||||||
|
};
|
||||||
|
|
||||||
|
// The channels a rule can be scoped to. "worked" is the catch-all — it means
|
||||||
|
// nothing on ANY channel — so narrowing it would say nothing.
|
||||||
|
const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||||
|
const CHANNEL_LABELS: Record<string, string> = {
|
||||||
|
qsl: 'appr.chQsl', lotw: 'LoTW', eqsl: 'eQSL', qrz: 'QRZ.com',
|
||||||
|
};
|
||||||
|
|
||||||
|
export function AppearancePanel() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<RowColorSettings | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try { setCfg((await GetRowColors()) as any); } catch { /* defaults on the backend */ }
|
||||||
|
})();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const save = (next: RowColorSettings) => {
|
||||||
|
setCfg(next);
|
||||||
|
SaveRowColors(next as any).catch(() => {});
|
||||||
|
};
|
||||||
|
const patchRule = (id: string, patch: Partial<{ color: string; enabled: boolean; channels: string[] }>) => {
|
||||||
|
if (!cfg) return;
|
||||||
|
save({ ...cfg, rules: cfg.rules.map((r) => (r.id === id ? { ...r, ...patch } : r)) });
|
||||||
|
};
|
||||||
|
|
||||||
|
// The rule card shows the row exactly as the grid will draw it, so the choice
|
||||||
|
// is made by looking rather than by imagining.
|
||||||
|
const preview = (color: string): Record<string, string> => {
|
||||||
|
const st = cfg?.style ?? 'bar';
|
||||||
|
const pct = cfg?.intensity ?? 12;
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
if (st === 'tint' || st === 'both') out.backgroundColor = `color-mix(in srgb, ${color} ${pct}%, transparent)`;
|
||||||
|
if (st === 'bar' || st === 'both') out.boxShadow = `inset 3px 0 0 ${color}`;
|
||||||
|
return out;
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!cfg) return <div className="p-1 text-sm text-muted-foreground">…</div>;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={!!cfg.bandmap_lotw} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => save({ ...cfg, bandmap_lotw: !!c } as any)} />
|
||||||
|
<span>{t('appr.bandmapLotw')} <span className="text-xs text-muted-foreground">{t('appr.bandmapLotwHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => save({ ...cfg, enabled: !!c })} />
|
||||||
|
<span>{t('appr.enable')} <span className="text-xs text-muted-foreground">{t('appr.enableHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{cfg.enabled && (
|
||||||
|
<div className="space-y-3">
|
||||||
|
{/* Style first: it decides whether the colours below are a signal or a
|
||||||
|
wallpaper, which matters more than which hue they are. */}
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<span className="text-sm">{t('appr.style')}</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||||
|
{(['bar', 'tint', 'both'] as const).map((v) => (
|
||||||
|
<button key={v} type="button" onClick={() => save({ ...cfg, style: v })}
|
||||||
|
className={cn('px-3 py-1.5 font-medium', (cfg.style ?? 'bar') === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{t('appr.style' + v[0].toUpperCase() + v.slice(1))}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{(cfg.style ?? 'bar') !== 'bar' && (
|
||||||
|
<label className="flex items-center gap-2 text-sm">
|
||||||
|
{t('appr.intensity')}
|
||||||
|
<input type="range" min={5} max={45} step={1} value={cfg.intensity ?? 12}
|
||||||
|
onChange={(e) => save({ ...cfg, intensity: parseInt(e.target.value, 10) })}
|
||||||
|
className="w-32 accent-[var(--primary)]" />
|
||||||
|
<span className="font-mono text-xs text-muted-foreground w-8">{cfg.intensity ?? 12}%</span>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{/* Order matters and is shown: a contact is usually several of these at
|
||||||
|
once, and the first match wins. */}
|
||||||
|
<p className="text-xs text-muted-foreground">{t('appr.orderHint')}</p>
|
||||||
|
{cfg.rules.map((r, i) => (
|
||||||
|
<div key={r.id} className="rounded-lg border border-border/60 p-2.5 space-y-2"
|
||||||
|
style={r.enabled ? preview(r.color) : undefined}>
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={r.enabled} onCheckedChange={(c) => patchRule(r.id, { enabled: !!c })} />
|
||||||
|
<span className="font-mono text-xs text-muted-foreground">{i + 1}.</span>
|
||||||
|
<span className="font-medium">{t(LABELS[r.id] ?? r.id)}</span>
|
||||||
|
</label>
|
||||||
|
{/* Which channels this category looks at. None ticked = all of
|
||||||
|
them, which is what an unnarrowed rule should mean. */}
|
||||||
|
{r.enabled && r.id !== 'worked' && (
|
||||||
|
<div className="flex items-center gap-3 flex-wrap pl-6 text-xs">
|
||||||
|
{CHANNELS.map((c) => {
|
||||||
|
const on = !r.channels?.length || r.channels.includes(c);
|
||||||
|
return (
|
||||||
|
<label key={c} className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<Checkbox checked={on} onCheckedChange={(v) => {
|
||||||
|
const cur = r.channels?.length ? r.channels : [...CHANNELS];
|
||||||
|
const next = v ? [...new Set([...cur, c])] : cur.filter((x) => x !== c);
|
||||||
|
patchRule(r.id, { channels: next });
|
||||||
|
}} />
|
||||||
|
{CHANNEL_LABELS[c]?.startsWith('appr.') ? t(CHANNEL_LABELS[c]) : CHANNEL_LABELS[c]}
|
||||||
|
</label>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{r.enabled && (
|
||||||
|
<div className="flex items-center gap-1.5 flex-wrap pl-6">
|
||||||
|
{PALETTE.map((c) => (
|
||||||
|
<button key={c} type="button" title={c}
|
||||||
|
onClick={() => patchRule(r.id, { color: c })}
|
||||||
|
className={cn('size-6 rounded-md border-2 transition-transform hover:scale-110',
|
||||||
|
r.color.toLowerCase() === c ? 'border-foreground' : 'border-transparent')}
|
||||||
|
style={{ backgroundColor: c }} />
|
||||||
|
))}
|
||||||
|
<input type="color" value={r.color} title={t('appr.custom')}
|
||||||
|
onChange={(e) => patchRule(r.id, { color: e.target.value })}
|
||||||
|
className="size-6 rounded-md border border-border bg-transparent p-0 cursor-pointer" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@ import { Button } from '@/components/ui/button';
|
|||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
|
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
import { isQSLConfirmed } from '@/lib/qsl';
|
||||||
import { AwardEditor } from '@/components/AwardEditor';
|
import { AwardEditor } from '@/components/AwardEditor';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { writeUiPref } from '@/lib/uiPref';
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
@@ -818,7 +819,7 @@ function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell:
|
|||||||
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
||||||
<td className="py-1 pr-2">{q.band}</td>
|
<td className="py-1 pr-2">{q.band}</td>
|
||||||
<td className="py-1 pr-2">{q.mode}</td>
|
<td className="py-1 pr-2">{q.mode}</td>
|
||||||
<td className="py-1 pr-3 text-muted-foreground">{[q.lotw_rcvd === 'Y' && 'LoTW', q.qsl_rcvd === 'Y' && 'QSL', q.eqsl_rcvd === 'Y' && 'eQSL'].filter(Boolean).join(', ')}</td>
|
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|||||||
@@ -38,6 +38,9 @@ type SpotStatusEntry = {
|
|||||||
new_county?: boolean;
|
new_county?: boolean;
|
||||||
new_pota?: boolean;
|
new_pota?: boolean;
|
||||||
new_pfx?: boolean;
|
new_pfx?: boolean;
|
||||||
|
// Whether the station uploads to LoTW. Not a status — it says nothing about
|
||||||
|
// whether the spot is worth chasing — so it is drawn as a badge, never a colour.
|
||||||
|
lotw?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||||
@@ -79,6 +82,8 @@ interface Props {
|
|||||||
// globally from the band-map tab toolbar.
|
// globally from the band-map tab toolbar.
|
||||||
hideDigital?: boolean;
|
hideDigital?: boolean;
|
||||||
fitToBand?: boolean;
|
fitToBand?: boolean;
|
||||||
|
// Mark stations that upload to LoTW (Settings → Appearance).
|
||||||
|
showLotw?: boolean;
|
||||||
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
// keyNav enables Ctrl+↑ / Ctrl+↓ to hop to the next spot above / below the rig
|
||||||
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
// frequency (and tune to it). Only the docked Main-view band map sets this, so
|
||||||
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
// the multi-band Band Map tab (several maps) doesn't fight over the shortcut.
|
||||||
@@ -227,7 +232,7 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
|||||||
// last; ties broken by closeness to the rig freq).
|
// 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 }: Props) {
|
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false, showLotw = false }: Props) {
|
||||||
const { t } = useI18n();
|
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
|
||||||
@@ -649,6 +654,15 @@ export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz,
|
|||||||
})()}
|
})()}
|
||||||
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
||||||
<span>{p.spot.dx_call}</span>
|
<span>{p.spot.dx_call}</span>
|
||||||
|
{/* Same badge the cluster list draws, for the same reason: the
|
||||||
|
muted-blue of a confirmation, never a status colour —
|
||||||
|
whether a station uploads to LoTW says nothing about
|
||||||
|
whether the spot is worth chasing. A glyph rather than a
|
||||||
|
colour also keeps it off the channel the statuses use. */}
|
||||||
|
{showLotw && entry?.lotw && (
|
||||||
|
<span title={t('clu.lotwBadge')} className="text-[9px] font-normal rounded px-1 py-px"
|
||||||
|
style={{ background: 'color-mix(in srgb, var(--info) 22%, transparent)', color: 'var(--info)' }}>L</span>
|
||||||
|
)}
|
||||||
{mode && (
|
{mode && (
|
||||||
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
|
<span className="text-[9px] font-normal text-current/70 bg-current/10 rounded px-1 py-px">
|
||||||
{mode}
|
{mode}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { Star, Radio, Sunrise, Sunset, X, Loader2 } from 'lucide-react';
|
|||||||
import { Badge } from '@/components/ui/badge';
|
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 { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
import { BandSlotQSOs } from '../../wailsjs/go/main/App';
|
||||||
import type { WorkedBeforeView } from '@/types';
|
import type { WorkedBeforeView } from '@/types';
|
||||||
|
|
||||||
@@ -426,7 +427,7 @@ function SlotQSOModal({ call, dxcc, entity, band, cls, onClose, onEdit }: {
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{rows.map((q, i) => {
|
{rows.map((q, i) => {
|
||||||
const cfm = q.lotw_rcvd === 'Y' || q.eqsl_rcvd === 'Y' || q.qsl_rcvd === 'Y';
|
const cfm = isQSLConfirmed(q.lotw_rcvd) || isQSLConfirmed(q.eqsl_rcvd) || isQSLConfirmed(q.qsl_rcvd);
|
||||||
const mine = q.callsign === call;
|
const mine = q.callsign === call;
|
||||||
return (
|
return (
|
||||||
<tr key={q.id ?? i} className="border-t border-border/40 even:bg-muted/[0.06] hover:bg-primary/[0.06] transition-colors">
|
<tr key={q.id ?? i} className="border-t border-border/40 even:bg-muted/[0.06] hover:bg-primary/[0.06] transition-colors">
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ const FIELDS: FieldDef[] = [
|
|||||||
{ id: 'qsl_rcvd', label: 'bulk.fQslRcvd', group: 'QSL / upload', kind: 'status' },
|
{ id: 'qsl_rcvd', label: 'bulk.fQslRcvd', group: 'QSL / upload', kind: 'status' },
|
||||||
{ id: 'qsl_rcvd_date', label: 'bulk.fQslRcvdDate', group: 'QSL / upload', kind: 'date' },
|
{ id: 'qsl_rcvd_date', label: 'bulk.fQslRcvdDate', group: 'QSL / upload', kind: 'date' },
|
||||||
{ id: 'qsl_via', label: 'bulk.fQslVia', group: 'QSL / upload', kind: 'text' },
|
{ id: 'qsl_via', label: 'bulk.fQslVia', group: 'QSL / upload', kind: 'text' },
|
||||||
|
{ id: 'qsl_sent_via', label: 'bulk.fQslSentVia', group: 'QSL / upload', kind: 'text' },
|
||||||
|
{ id: 'qsl_rcvd_via', label: 'bulk.fQslRcvdVia', group: 'QSL / upload', kind: 'text' },
|
||||||
{ id: 'lotw_sent', label: 'bulk.fLotwSent', group: 'QSL / upload', kind: 'status' },
|
{ id: 'lotw_sent', label: 'bulk.fLotwSent', group: 'QSL / upload', kind: 'status' },
|
||||||
{ id: 'lotw_sent_date', label: 'bulk.fLotwSentDate', group: 'QSL / upload', kind: 'date' },
|
{ id: 'lotw_sent_date', label: 'bulk.fLotwSentDate', group: 'QSL / upload', kind: 'date' },
|
||||||
{ id: 'lotw_rcvd', label: 'bulk.fLotwRcvd', group: 'QSL / upload', kind: 'status' },
|
{ id: 'lotw_rcvd', label: 'bulk.fLotwRcvd', group: 'QSL / upload', kind: 'status' },
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Star } from 'lucide-react';
|
import { Star } from 'lucide-react';
|
||||||
import { Badge } from '@/components/ui/badge';
|
import { Badge } from '@/components/ui/badge';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { isQSLConfirmed } from '@/lib/qsl';
|
||||||
import type { WorkedBeforeView } from '@/types';
|
import type { WorkedBeforeView } from '@/types';
|
||||||
|
|
||||||
type WorkedBefore = WorkedBeforeView;
|
type WorkedBefore = WorkedBeforeView;
|
||||||
@@ -97,10 +98,10 @@ export function CallHistoryPanel({ wb, busy, currentCall }: Props) {
|
|||||||
<td className="px-2 py-1 font-mono border-b border-border/40 whitespace-nowrap">{e.rst_sent ?? ''}</td>
|
<td className="px-2 py-1 font-mono border-b border-border/40 whitespace-nowrap">{e.rst_sent ?? ''}</td>
|
||||||
<td className="px-2 py-1 font-mono border-b border-border/40 whitespace-nowrap">{e.rst_rcvd ?? ''}</td>
|
<td className="px-2 py-1 font-mono border-b border-border/40 whitespace-nowrap">{e.rst_rcvd ?? ''}</td>
|
||||||
<td className="px-2 py-1 border-b border-border/40 whitespace-nowrap text-muted-foreground">
|
<td className="px-2 py-1 border-b border-border/40 whitespace-nowrap text-muted-foreground">
|
||||||
{e.lotw_rcvd === 'Y' && (
|
{isQSLConfirmed(e.lotw_rcvd) && (
|
||||||
<span className="inline-block w-[14px] h-[14px] rounded text-center leading-[14px] text-[9px] font-bold text-info-foreground bg-info mr-0.5" title={t('chp.lotwRcvd')}>L</span>
|
<span className="inline-block w-[14px] h-[14px] rounded text-center leading-[14px] text-[9px] font-bold text-info-foreground bg-info mr-0.5" title={t('chp.lotwRcvd')}>L</span>
|
||||||
)}
|
)}
|
||||||
{e.qsl_rcvd === 'Y' && (
|
{isQSLConfirmed(e.qsl_rcvd) && (
|
||||||
<span className="inline-block w-[14px] h-[14px] rounded text-center leading-[14px] text-[9px] font-bold text-success-foreground bg-success mr-0.5" title={t('chp.bureauRcvd')}>B</span>
|
<span className="inline-block w-[14px] h-[14px] rounded text-center leading-[14px] text-[9px] font-bold text-success-foreground bg-success mr-0.5" title={t('chp.bureauRcvd')}>B</span>
|
||||||
)}
|
)}
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -0,0 +1,217 @@
|
|||||||
|
// ChaseNewPanel — the stations PSK Reporter is hearing NEAR HERE that are new
|
||||||
|
// against the log.
|
||||||
|
//
|
||||||
|
// A DX cluster tells you what somebody chose to spot. This tells you what is
|
||||||
|
// actually being decoded in your own region, which is a different and often
|
||||||
|
// larger set: nobody spots the FT8 caller running ten watts from a rare square.
|
||||||
|
//
|
||||||
|
// The one thing an operator has to know, and the reason for the line at the
|
||||||
|
// bottom: PSK Reporter carries DIGITAL MODES ONLY. An empty panel means nothing
|
||||||
|
// new is being decoded on FT8/FT4/JS8 near here — not that the band is dead.
|
||||||
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
import { Radar, Loader2, X } from 'lucide-react';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { markerColour } from '@/lib/spotMarkers';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { GetChaseNewSpots } from '../../wailsjs/go/main/App';
|
||||||
|
|
||||||
|
export interface ChaseNewSpot {
|
||||||
|
call: string;
|
||||||
|
band: string;
|
||||||
|
mode: string;
|
||||||
|
freq_hz?: number;
|
||||||
|
grid?: string;
|
||||||
|
country?: string;
|
||||||
|
cont?: string;
|
||||||
|
dist_km?: number;
|
||||||
|
bearing?: number;
|
||||||
|
status?: string;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
new_grid?: boolean;
|
||||||
|
lotw?: boolean;
|
||||||
|
at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
// Tuning the rig to a row is the whole point — a station heard on 14.074 is
|
||||||
|
// only useful if you can get there in one click.
|
||||||
|
onPick?: (s: ChaseNewSpot) => void;
|
||||||
|
onClose?: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The categories, in priority order. A station can be several at once — a new
|
||||||
|
// band AND a new prefix — but a row shows ONE, the first that matches here.
|
||||||
|
//
|
||||||
|
// The order is by what would make an operator leave what they are doing: a new
|
||||||
|
// entity beats a new band on it, which beats a new mode, which beats a new slot;
|
||||||
|
// a prefix or a square is worth knowing but never worth interrupting a QSO for.
|
||||||
|
// Two badges on one line also made the list unreadable at a glance, which is the
|
||||||
|
// only thing this panel is for.
|
||||||
|
type Category = 'dxcc' | 'band' | 'mode' | 'slot' | 'pfx' | 'grid';
|
||||||
|
|
||||||
|
const CATEGORIES: Array<{ key: Category; labelKey: string; colour: string }> = [
|
||||||
|
{ key: 'dxcc', labelKey: 'clg2.newDxcc', colour: 'var(--danger)' },
|
||||||
|
{ key: 'band', labelKey: 'clg2.newBand', colour: 'var(--danger)' },
|
||||||
|
{ key: 'mode', labelKey: 'clg2.newMode', colour: 'var(--danger)' },
|
||||||
|
{ key: 'slot', labelKey: 'clg2.newSlot', colour: 'var(--danger)' },
|
||||||
|
{ key: 'pfx', labelKey: 'clg2.newPfx', colour: markerColour('new_pfx') },
|
||||||
|
{ key: 'grid', labelKey: 'clg2.newGrid', colour: markerColour('new_grid') },
|
||||||
|
];
|
||||||
|
|
||||||
|
// categoryOf is the single thing a row says about a station.
|
||||||
|
function categoryOf(s: ChaseNewSpot): Category | null {
|
||||||
|
switch (s.status) {
|
||||||
|
case 'new': return 'dxcc';
|
||||||
|
case 'new-band': return 'band';
|
||||||
|
case 'new-mode': return 'mode';
|
||||||
|
case 'new-slot': return 'slot';
|
||||||
|
}
|
||||||
|
if (s.new_pfx) return 'pfx';
|
||||||
|
if (s.new_grid) return 'grid';
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const FILTER_KEY = 'opslog.chaseNewFilters';
|
||||||
|
|
||||||
|
function loadFilters(): Set<Category> {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(FILTER_KEY);
|
||||||
|
if (raw) {
|
||||||
|
const list = JSON.parse(raw) as Category[];
|
||||||
|
if (Array.isArray(list)) return new Set(list);
|
||||||
|
}
|
||||||
|
} catch { /* a corrupt preference is not worth a broken panel */ }
|
||||||
|
return new Set(CATEGORIES.map((c) => c.key));
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ChaseNewPanel({ onPick, onClose }: Props) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [spots, setSpots] = useState<ChaseNewSpot[]>([]);
|
||||||
|
const [loaded, setLoaded] = useState(false);
|
||||||
|
const [on, setOn] = useState<Set<Category>>(loadFilters);
|
||||||
|
|
||||||
|
// Polled rather than pushed: the feed can deliver several a second under an
|
||||||
|
// opening, and an event per row would be a redraw per row for a list nobody
|
||||||
|
// reads that fast.
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = async () => {
|
||||||
|
try {
|
||||||
|
const r = ((await GetChaseNewSpots()) ?? []) as ChaseNewSpot[];
|
||||||
|
if (alive) { setSpots(r); setLoaded(true); }
|
||||||
|
} catch { /* the feed may not be up yet */ }
|
||||||
|
};
|
||||||
|
tick();
|
||||||
|
const id = window.setInterval(tick, 5000);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
function toggle(k: Category) {
|
||||||
|
setOn((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
if (next.has(k)) next.delete(k); else next.add(k);
|
||||||
|
try { localStorage.setItem(FILTER_KEY, JSON.stringify([...next])); } catch { /* not worth failing over */ }
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const shown = useMemo(() => {
|
||||||
|
return spots.filter((s) => {
|
||||||
|
const c = categoryOf(s);
|
||||||
|
return c !== null && on.has(c);
|
||||||
|
});
|
||||||
|
}, [spots, on]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex h-full flex-col rounded-md border border-border bg-card overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 border-b border-border px-2 py-1.5">
|
||||||
|
<Radar className="size-3.5 shrink-0 text-primary" />
|
||||||
|
<span className="shrink-0 text-xs font-semibold">{t('chn.title')}</span>
|
||||||
|
|
||||||
|
{/* Filters, in the same order and colours as the badges they hide. */}
|
||||||
|
<div className="flex flex-1 flex-wrap items-center gap-1">
|
||||||
|
{CATEGORIES.map((c) => (
|
||||||
|
<button
|
||||||
|
key={c.key}
|
||||||
|
type="button"
|
||||||
|
onClick={() => toggle(c.key)}
|
||||||
|
title={t('chn.filterHint')}
|
||||||
|
className={cn(
|
||||||
|
'rounded border px-1 py-px text-[9px] font-bold uppercase tracking-wide transition-colors',
|
||||||
|
on.has(c.key) ? 'border-transparent' : 'border-border text-muted-foreground opacity-50',
|
||||||
|
)}
|
||||||
|
style={on.has(c.key) ? { color: c.colour, borderColor: c.colour } : undefined}
|
||||||
|
>
|
||||||
|
{t(c.labelKey).replace(/^(NEW|NOUV)\s+/i, '')}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<span className="shrink-0 text-[10px] text-muted-foreground">
|
||||||
|
{loaded ? t('chn.count', { n: shown.length }) : ''}
|
||||||
|
</span>
|
||||||
|
{onClose && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={onClose}
|
||||||
|
title={t('chn.close')}
|
||||||
|
className="shrink-0 rounded p-0.5 text-muted-foreground hover:bg-muted hover:text-foreground"
|
||||||
|
>
|
||||||
|
<X className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex-1 overflow-y-auto">
|
||||||
|
{!loaded ? (
|
||||||
|
<div className="flex items-center justify-center gap-2 p-3 text-[11px] text-muted-foreground">
|
||||||
|
<Loader2 className="size-3 animate-spin" /> {t('chn.loading')}
|
||||||
|
</div>
|
||||||
|
) : shown.length === 0 ? (
|
||||||
|
<p className="p-3 text-[11px] text-muted-foreground leading-relaxed">
|
||||||
|
{spots.length === 0 ? t('chn.empty') : t('chn.allFiltered')}
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
<div className="divide-y divide-border/60">
|
||||||
|
{shown.map((s, i) => {
|
||||||
|
const c = categoryOf(s);
|
||||||
|
const def = CATEGORIES.find((x) => x.key === c);
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={`${s.call}-${s.band}-${s.mode}-${i}`}
|
||||||
|
type="button"
|
||||||
|
onClick={() => onPick?.(s)}
|
||||||
|
className="flex w-full items-center gap-1.5 px-2 py-1 text-left text-[11px] hover:bg-accent/40"
|
||||||
|
title={[
|
||||||
|
s.country,
|
||||||
|
s.grid,
|
||||||
|
s.dist_km ? `${s.dist_km} km` : '',
|
||||||
|
s.freq_hz ? `${(s.freq_hz / 1000).toFixed(1)} kHz` : '',
|
||||||
|
].filter(Boolean).join(' · ')}
|
||||||
|
>
|
||||||
|
<span className="w-[84px] shrink-0 truncate font-mono font-bold">{s.call}</span>
|
||||||
|
<span className="w-9 shrink-0 font-mono text-muted-foreground">{s.band}</span>
|
||||||
|
<span className="w-10 shrink-0 truncate text-muted-foreground">{s.mode}</span>
|
||||||
|
{/* No frequency column: clicking the row tunes the rig to it,
|
||||||
|
so the number was a thing to read and never to use. It is
|
||||||
|
still carried on the spot — the click is what needs it —
|
||||||
|
and shows in the row's tooltip for anyone who wants it.
|
||||||
|
The country takes the space it freed. */}
|
||||||
|
<span className="min-w-0 flex-1 truncate text-muted-foreground">{s.country ?? ''}</span>
|
||||||
|
{def && (
|
||||||
|
<span className="shrink-0 text-[9px] font-bold" style={{ color: def.colour }}>
|
||||||
|
{t(def.labelKey)}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
{s.lotw && <span className="shrink-0 text-[9px] text-info" title="LoTW">L</span>}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p className="border-t border-border px-2 py-1 text-[10px] text-muted-foreground">{t('chn.digitalOnly')}</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -42,6 +42,7 @@ export interface DetailsState {
|
|||||||
srx_string?: string;
|
srx_string?: string;
|
||||||
stx_string?: string;
|
stx_string?: string;
|
||||||
email: string;
|
email: string;
|
||||||
|
web?: string;
|
||||||
// Award references for the contacted station (set via the Awards tab picker).
|
// Award references for the contacted station (set via the Awards tab picker).
|
||||||
// Semicolon-delimited "AWARD@REF" entries, e.g. "POTA@FR-11553;IOTA@EU-064".
|
// Semicolon-delimited "AWARD@REF" entries, e.g. "POTA@FR-11553;IOTA@EU-064".
|
||||||
// App.tsx maps these back to pota_ref/sota_ref/iota when saving the QSO.
|
// App.tsx maps these back to pota_ref/sota_ref/iota when saving the QSO.
|
||||||
@@ -498,8 +499,14 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
|||||||
<Field label="STX">
|
<Field label="STX">
|
||||||
<Input value={details.stx_string ?? ''} placeholder={t('detp.sentExchangePh')} onChange={(e) => onChange({ stx_string: e.target.value })} />
|
<Input value={details.stx_string ?? ''} placeholder={t('detp.sentExchangePh')} onChange={(e) => onChange({ stx_string: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
<Field label={t('detp.contactedEmail')} span={3}>
|
{/* No placeholder: a greyed-out sample address in an empty field reads
|
||||||
<Input value={details.email} placeholder="[email protected]" onChange={(e) => onChange({ email: e.target.value })} />
|
as a value the lookup found, and that is exactly the field an
|
||||||
|
operator checks to see whether it found one. */}
|
||||||
|
<Field label={t('detp.contactedEmail')} span={2}>
|
||||||
|
<Input value={details.email} onChange={(e) => onChange({ email: e.target.value })} />
|
||||||
|
</Field>
|
||||||
|
<Field label={t('detp.contactedWeb')}>
|
||||||
|
<Input value={details.web ?? ''} onChange={(e) => onChange({ web: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
|||||||
{ value: 'qsl_rcvd', label: 'fltb.fQslRcvd', type: 'text' },
|
{ value: 'qsl_rcvd', label: 'fltb.fQslRcvd', type: 'text' },
|
||||||
{ value: 'qsl_rcvd_date', label: 'fltb.fQslRcvdDate', type: 'adifdate' },
|
{ value: 'qsl_rcvd_date', label: 'fltb.fQslRcvdDate', type: 'adifdate' },
|
||||||
{ value: 'qsl_via', label: 'fltb.fQslVia', type: 'text' },
|
{ value: 'qsl_via', label: 'fltb.fQslVia', type: 'text' },
|
||||||
|
{ value: 'qsl_sent_via', label: 'fltb.fQslSentVia', type: 'text' },
|
||||||
|
{ value: 'qsl_rcvd_via', label: 'fltb.fQslRcvdVia', type: 'text' },
|
||||||
{ value: 'lotw_sent', label: 'fltb.fLotwSent', type: 'text' },
|
{ value: 'lotw_sent', label: 'fltb.fLotwSent', type: 'text' },
|
||||||
{ value: 'lotw_sent_date', label: 'fltb.fLotwSentDate', type: 'adifdate' },
|
{ value: 'lotw_sent_date', label: 'fltb.fLotwSentDate', type: 'adifdate' },
|
||||||
{ value: 'lotw_rcvd', label: 'fltb.fLotwRcvd', type: 'text' },
|
{ value: 'lotw_rcvd', label: 'fltb.fLotwRcvd', type: 'text' },
|
||||||
|
|||||||
@@ -54,12 +54,14 @@ const QSL_STATUSES = [
|
|||||||
{ v: 'I', label: 'qslm.ignore' },
|
{ v: 'I', label: 'qslm.ignore' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// QSL routing methods for the paper-QSL "Via" dropdown (was free text).
|
// QSL routing methods for the paper-QSL route dropdowns, one per direction.
|
||||||
|
// These are the ADIF QSL Via enumeration (B/D/E) and go to QSL_SENT_VIA and
|
||||||
|
// QSL_RCVD_VIA — NOT to QSL_VIA, which holds the manager's callsign.
|
||||||
const QSL_VIA_OPTIONS = [
|
const QSL_VIA_OPTIONS = [
|
||||||
{ v: '_', label: 'qslm.leave' },
|
{ v: '_', label: 'qslm.leave' },
|
||||||
{ v: 'Bureau', label: 'qslm.viaBureau' },
|
{ v: 'B', label: 'qslm.viaBureau' },
|
||||||
{ v: 'Direct', label: 'qslm.viaDirect' },
|
{ v: 'D', label: 'qslm.viaDirect' },
|
||||||
{ v: 'Electronic', label: 'qslm.viaElectronic' },
|
{ v: 'E', label: 'qslm.viaElectronic' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Maps a service value → its i18n label key (only for services with
|
// Maps a service value → its i18n label key (only for services with
|
||||||
@@ -149,7 +151,8 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
const [qslSent, setQslSent] = useState('_');
|
const [qslSent, setQslSent] = useState('_');
|
||||||
const [qslRcvdDate, setQslRcvdDate] = useState('');
|
const [qslRcvdDate, setQslRcvdDate] = useState('');
|
||||||
const [qslSentDate, setQslSentDate] = useState('');
|
const [qslSentDate, setQslSentDate] = useState('');
|
||||||
const [qslVia, setQslVia] = useState('_');
|
const [qslVia, setQslVia] = useState('_'); // how the card was SENT
|
||||||
|
const [qslRcvdVia, setQslRcvdVia] = useState('_'); // how it CAME BACK
|
||||||
const [qslNotes, setQslNotes] = useState('');
|
const [qslNotes, setQslNotes] = useState('');
|
||||||
const [qslComment, setQslComment] = useState('');
|
const [qslComment, setQslComment] = useState('');
|
||||||
|
|
||||||
@@ -181,6 +184,7 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
sent_date: ymd(qslSentDate),
|
sent_date: ymd(qslSentDate),
|
||||||
rcvd_date: ymd(qslRcvdDate),
|
rcvd_date: ymd(qslRcvdDate),
|
||||||
via: qslVia === '_' ? '' : qslVia,
|
via: qslVia === '_' ? '' : qslVia,
|
||||||
|
rcvd_via: qslRcvdVia === '_' ? '' : qslRcvdVia,
|
||||||
notes: qslNotes,
|
notes: qslNotes,
|
||||||
comment: qslComment,
|
comment: qslComment,
|
||||||
} as any);
|
} as any);
|
||||||
@@ -553,6 +557,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
{/* Paper-QSL apply form */}
|
{/* Paper-QSL apply form */}
|
||||||
{service === 'paper' && (
|
{service === 'paper' && (
|
||||||
<div className="flex items-end flex-wrap gap-3 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
|
<div className="flex items-end flex-wrap gap-3 px-3 py-2 border-t border-border bg-muted/20 shrink-0">
|
||||||
|
{/* Each direction carries its own route, and each sits with the status
|
||||||
|
and date it belongs to. A stack confirmed in one go usually arrived
|
||||||
|
the same way — a bureau delivery is exactly that — which is why the
|
||||||
|
route belongs on this form and not one QSO at a time in the editor. */}
|
||||||
<div className="flex flex-col gap-1">
|
<div className="flex flex-col gap-1">
|
||||||
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.qslReceived')}</label>
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.qslReceived')}</label>
|
||||||
<div className="flex gap-1.5">
|
<div className="flex gap-1.5">
|
||||||
@@ -561,6 +569,10 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
|
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
<Input type="date" className="h-8 w-36" value={qslRcvdDate} onChange={(e) => setQslRcvdDate(e.target.value)} title={t('qslm.qslRcvdDateTitle')} />
|
<Input type="date" className="h-8 w-36" value={qslRcvdDate} onChange={(e) => setQslRcvdDate(e.target.value)} title={t('qslm.qslRcvdDateTitle')} />
|
||||||
|
<Select value={qslRcvdVia} onValueChange={setQslRcvdVia}>
|
||||||
|
<SelectTrigger className="h-8 w-32" title={t('qslm.rcvdViaTitle')}><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
|
||||||
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex flex-col gap-1">
|
<div className="flex flex-col gap-1">
|
||||||
@@ -571,15 +583,12 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
|
<SelectContent>{QSL_STATUSES.map((s) => <SelectItem key={s.v} value={s.v}>{t(s.label)}</SelectItem>)}</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
<Input type="date" className="h-8 w-36" value={qslSentDate} onChange={(e) => setQslSentDate(e.target.value)} title={t('qslm.qslSentDateTitle')} />
|
<Input type="date" className="h-8 w-36" value={qslSentDate} onChange={(e) => setQslSentDate(e.target.value)} title={t('qslm.qslSentDateTitle')} />
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="flex flex-col gap-1">
|
|
||||||
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.via')}</label>
|
|
||||||
<Select value={qslVia} onValueChange={setQslVia}>
|
<Select value={qslVia} onValueChange={setQslVia}>
|
||||||
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-8 w-32" title={t('qslm.sentViaTitle')}><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
|
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{t(o.label)}</SelectItem>)}</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div className="flex flex-col gap-1">
|
<div className="flex flex-col gap-1">
|
||||||
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.notes')}</label>
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('qslm.notes')}</label>
|
||||||
<Input className="h-8 w-40" value={qslNotes} onChange={(e) => setQslNotes(e.target.value)} placeholder={t('qslm.notesPlaceholder')} />
|
<Input className="h-8 w-40" value={qslNotes} onChange={(e) => setQslNotes(e.target.value)} placeholder={t('qslm.notesPlaceholder')} />
|
||||||
|
|||||||
@@ -41,9 +41,14 @@ function pfxOf(call: string): string {
|
|||||||
const BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
|
const BANDS = ['2190m','630m','160m','80m','60m','40m','30m','20m','17m','15m','12m','10m','6m','4m','2m','1.25m','70cm','33cm','23cm','13cm','9cm','6cm','3cm','1.25cm','6mm','4mm','2.5mm','2mm','1mm'];
|
||||||
const MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE','MFSK','OLIVIA','JS8','JT65','JT9'];
|
const MODES = ['SSB','CW','FT8','FT4','RTTY','PSK31','AM','FM','DIGITALVOICE','MFSK','OLIVIA','JS8','JT65','JT9'];
|
||||||
// label holds an i18n key (resolved with t() at render time).
|
// label holds an i18n key (resolved with t() at render time).
|
||||||
|
// V is in the list because the log HOLDS it: a LoTW download writes "verified"
|
||||||
|
// rather than "yes". A dropdown without it renders a verified contact as blank,
|
||||||
|
// which reads as "nothing recorded" — and the operator's next click would replace
|
||||||
|
// the strongest confirmation they have with whatever they picked instead.
|
||||||
const QSL_STATUSES = [
|
const QSL_STATUSES = [
|
||||||
{ value: '_', label: 'qedit.qslDash' },
|
{ value: '_', label: 'qedit.qslDash' },
|
||||||
{ value: 'Y', label: 'qedit.qslYes' },
|
{ value: 'Y', label: 'qedit.qslYes' },
|
||||||
|
{ value: 'V', label: 'qedit.qslVerified' },
|
||||||
{ value: 'N', label: 'qedit.qslNo' },
|
{ value: 'N', label: 'qedit.qslNo' },
|
||||||
{ value: 'R', label: 'qedit.qslRequested' },
|
{ value: 'R', label: 'qedit.qslRequested' },
|
||||||
{ value: 'I', label: 'qedit.qslIgnore' },
|
{ value: 'I', label: 'qedit.qslIgnore' },
|
||||||
@@ -57,10 +62,12 @@ type ConfDef = {
|
|||||||
key: string; label: string;
|
key: string; label: string;
|
||||||
sent?: keyof QSOForm; rcvd?: keyof QSOForm;
|
sent?: keyof QSOForm; rcvd?: keyof QSOForm;
|
||||||
sentDate?: keyof QSOForm; rcvdDate?: keyof QSOForm;
|
sentDate?: keyof QSOForm; rcvdDate?: keyof QSOForm;
|
||||||
via?: keyof QSOForm;
|
// How the card travelled, each way (ADIF QSL_SENT_VIA / QSL_RCVD_VIA). Paper
|
||||||
|
// only — the electronic channels below ARE the route.
|
||||||
|
sentVia?: keyof QSOForm; rcvdVia?: keyof QSOForm;
|
||||||
};
|
};
|
||||||
const CONFIRMATIONS: ConfDef[] = [
|
const CONFIRMATIONS: ConfDef[] = [
|
||||||
{ key: 'QSL', label: 'QSL (paper)', sent: 'qsl_sent', rcvd: 'qsl_rcvd', sentDate: 'qsl_sent_date', rcvdDate: 'qsl_rcvd_date', via: 'qsl_via' },
|
{ key: 'QSL', label: 'QSL (paper)', sent: 'qsl_sent', rcvd: 'qsl_rcvd', sentDate: 'qsl_sent_date', rcvdDate: 'qsl_rcvd_date', sentVia: 'qsl_sent_via', rcvdVia: 'qsl_rcvd_via' },
|
||||||
{ key: 'LOTW', label: 'LoTW', sent: 'lotw_sent', rcvd: 'lotw_rcvd', sentDate: 'lotw_sent_date', rcvdDate: 'lotw_rcvd_date' },
|
{ key: 'LOTW', label: 'LoTW', sent: 'lotw_sent', rcvd: 'lotw_rcvd', sentDate: 'lotw_sent_date', rcvdDate: 'lotw_rcvd_date' },
|
||||||
{ key: 'EQSL', label: 'eQSL', sent: 'eqsl_sent', rcvd: 'eqsl_rcvd', sentDate: 'eqsl_sent_date', rcvdDate: 'eqsl_rcvd_date' },
|
{ key: 'EQSL', label: 'eQSL', sent: 'eqsl_sent', rcvd: 'eqsl_rcvd', sentDate: 'eqsl_sent_date', rcvdDate: 'eqsl_rcvd_date' },
|
||||||
{ key: 'QRZCOM', label: 'QRZ.com', sent: 'qrzcom_qso_upload_status' as any, sentDate: 'qrzcom_qso_upload_date' as any, rcvd: 'qrzcom_qso_download_status' as any, rcvdDate: 'qrzcom_qso_download_date' as any },
|
{ key: 'QRZCOM', label: 'QRZ.com', sent: 'qrzcom_qso_upload_status' as any, sentDate: 'qrzcom_qso_upload_date' as any, rcvd: 'qrzcom_qso_download_status' as any, rcvdDate: 'qrzcom_qso_download_date' as any },
|
||||||
@@ -97,9 +104,14 @@ function StatusCell({ value }: { value?: string }) {
|
|||||||
// every row; painting that orange (as it used to be, in the
|
// every row; painting that orange (as it used to be, in the
|
||||||
// same orange as Requested) made the table shout about a
|
// same orange as Requested) made the table shout about a
|
||||||
// non-problem and told you nothing apart.
|
// non-problem and told you nothing apart.
|
||||||
|
// Verified green — ADIF's V: confirmed AND validated by the awarding body.
|
||||||
|
// It is what a LoTW download writes, and this table used
|
||||||
|
// to fall through to "No" for it — reporting a verified
|
||||||
|
// contact as unconfirmed, in the one place an operator
|
||||||
|
// goes to check.
|
||||||
// Ignore dashed — deliberately excluded, on purpose.
|
// Ignore dashed — deliberately excluded, on purpose.
|
||||||
const label = v === 'Y' ? t('qedit.qslYes') : v === 'R' ? t('qedit.qslRequested') : v === 'I' ? t('qedit.qslIgnore') : v === 'M' ? t('qedit.statusModified') : t('qedit.qslNo');
|
const label = v === 'Y' ? t('qedit.qslYes') : v === 'V' ? t('qedit.qslVerified') : v === 'R' ? t('qedit.qslRequested') : v === 'I' ? t('qedit.qslIgnore') : v === 'M' ? t('qedit.statusModified') : t('qedit.qslNo');
|
||||||
const cls = v === 'Y' ? 'bg-success text-success-foreground border border-success'
|
const cls = v === 'Y' || v === 'V' ? 'bg-success text-success-foreground border border-success'
|
||||||
: v === 'R' ? 'bg-info-muted text-info-muted-foreground border border-info-border'
|
: v === 'R' ? 'bg-info-muted text-info-muted-foreground border border-info-border'
|
||||||
: v === 'M' ? 'bg-warning text-warning-foreground border border-warning'
|
: v === 'M' ? 'bg-warning text-warning-foreground border border-warning'
|
||||||
: v === 'I' ? 'bg-muted text-muted-foreground border border-dashed border-border italic'
|
: v === 'I' ? 'bg-muted text-muted-foreground border border-dashed border-border italic'
|
||||||
@@ -216,6 +228,28 @@ function QslSelect({ value, onChange }: { value?: string; onChange: (v: string)
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The ADIF QSL Via enumeration. M (manager) is import-only in the standard, so
|
||||||
|
// it is not offered here — a file that arrives carrying it keeps it, and this
|
||||||
|
// list is what an operator may choose.
|
||||||
|
const QSL_VIA_CHOICES = [
|
||||||
|
{ value: '_', label: 'qedit.qslDash' },
|
||||||
|
{ value: 'B', label: 'qedit.viaBureau' },
|
||||||
|
{ value: 'D', label: 'qedit.viaDirect' },
|
||||||
|
{ value: 'E', label: 'qedit.viaElectronic' },
|
||||||
|
];
|
||||||
|
|
||||||
|
function QslViaSelect({ value, onChange }: { value?: string; onChange: (v: string) => void }) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
return (
|
||||||
|
<Select value={value || '_'} onValueChange={(v) => onChange(v === '_' ? '' : v)}>
|
||||||
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{QSL_VIA_CHOICES.map((s) => <SelectItem key={s.value} value={s.value}>{t(s.label)}</SelectItem>)}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], bands, modes }: Props) {
|
export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], bands, modes }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
// Use the operator's configured band/mode lists (incl. custom ones like 13cm);
|
// Use the operator's configured band/mode lists (incl. custom ones like 13cm);
|
||||||
@@ -633,7 +667,12 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<Label>{t('qedit.qslMsg')}</Label>
|
<Label>{t('qedit.qslMsg')}</Label>
|
||||||
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
|
{/* The manager, and only the manager — ADIF QSL_VIA. How the
|
||||||
|
card travelled is a separate field, on the QSL Info tab. */}
|
||||||
|
<div>
|
||||||
|
<Label>{t('qedit.qslVia')}</Label>
|
||||||
|
<Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} placeholder={t('qedit.qslViaPlaceholder')} />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
@@ -734,8 +773,14 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
|
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
|
||||||
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
|
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
|
||||||
{def.via && (
|
{/* How the card travelled, each way — ADIF's QSL Via
|
||||||
<div className="col-span-2"><Label>{t('qedit.via')}</Label><Input value={val(def.via)} onChange={(e) => put(def.via, e.target.value)} placeholder={t('qedit.viaPlaceholder')} /></div>
|
enumeration. Not the manager: that is a callsign
|
||||||
|
and lives on the Contact's details tab. */}
|
||||||
|
{def.sentVia && (
|
||||||
|
<div><Label>{t('qedit.sentVia')}</Label><QslViaSelect value={val(def.sentVia)} onChange={(v) => put(def.sentVia, v)} /></div>
|
||||||
|
)}
|
||||||
|
{def.rcvdVia && (
|
||||||
|
<div><Label>{t('qedit.rcvdVia')}</Label><QslViaSelect value={val(def.rcvdVia)} onChange={(v) => put(def.rcvdVia, v)} /></div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<p className="text-[11px] text-muted-foreground">
|
<p className="text-[11px] text-muted-foreground">
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import { Checkbox } from '@/components/ui/checkbox';
|
|||||||
import { loadLocal, loadRemote, saveState, seedLocal } from '@/lib/gridPrefs';
|
import { loadLocal, loadRemote, saveState, seedLocal } from '@/lib/gridPrefs';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { gridToLatLon, pathBetweenLatLon } from '@/lib/maidenhead';
|
import { gridToLatLon, pathBetweenLatLon } from '@/lib/maidenhead';
|
||||||
|
import { rowStyleFor, type RowColorSettings } from '@/lib/rowColors';
|
||||||
|
|
||||||
// Register every Community feature once. v32+ requires explicit registration;
|
// Register every Community feature once. v32+ requires explicit registration;
|
||||||
// AllCommunityModule keeps it simple and pulls in sort/filter/resize/reorder/
|
// AllCommunityModule keeps it simple and pulls in sort/filter/resize/reorder/
|
||||||
@@ -80,6 +81,8 @@ type Props = {
|
|||||||
// One column per defined award; the cell shows the reference this QSO counts
|
// One column per defined award; the cell shows the reference this QSO counts
|
||||||
// for (from row.award_refs[CODE], attached by the parent). Hidden by default.
|
// for (from row.award_refs[CODE], attached by the parent). Hidden by default.
|
||||||
awardCols?: { code: string; name: string }[];
|
awardCols?: { code: string; name: string }[];
|
||||||
|
// Whole-row colouring by QSL / LoTW status (Settings → Appearance).
|
||||||
|
rowColors?: RowColorSettings | null;
|
||||||
};
|
};
|
||||||
|
|
||||||
const BASE_COLSTATE_KEY = 'hamlog.qsoColState.v2';
|
const BASE_COLSTATE_KEY = 'hamlog.qsoColState.v2';
|
||||||
@@ -132,6 +135,10 @@ function qsoDistanceKm(d: any, myGrid?: string): number | undefined {
|
|||||||
|
|
||||||
export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
||||||
// ── QSO basics ──
|
// ── QSO basics ──
|
||||||
|
// Position in the log, oldest = 1. Filled by the backend over the WHOLE log,
|
||||||
|
// so it does not change when a filter narrows what is shown.
|
||||||
|
{ group: 'QSO', label: t('rqg.c.number'), colId: 'number', headerName: t('rqg.h.number'), field: 'number' as any, width: 80, type: 'rightAligned', cellClass: 'font-mono',
|
||||||
|
comparator: (a, b) => (a ?? 0) - (b ?? 0) },
|
||||||
{ group: 'QSO', label: t('rqg.c.qso_date'), colId: 'qso_date', headerName: t('rqg.c.qso_date'), field: 'qso_date' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value), sort: 'desc', defaultVisible: true },
|
{ group: 'QSO', label: t('rqg.c.qso_date'), colId: 'qso_date', headerName: t('rqg.c.qso_date'), field: 'qso_date' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value), sort: 'desc', defaultVisible: true },
|
||||||
{ group: 'QSO', label: t('rqg.c.qso_date_off'), colId: 'qso_date_off', headerName: t('rqg.c.qso_date_off'), field: 'qso_date_off' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value) },
|
{ group: 'QSO', label: t('rqg.c.qso_date_off'), colId: 'qso_date_off', headerName: t('rqg.c.qso_date_off'), field: 'qso_date_off' as any, width: 150, cellClass: 'font-mono', valueFormatter: (p) => fmtDateUTC(p.value) },
|
||||||
{ group: 'QSO', label: t('rqg.c.callsign'), colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', defaultVisible: true },
|
{ group: 'QSO', label: t('rqg.c.callsign'), colId: 'callsign', headerName: t('rqg.c.callsign'), field: 'callsign' as any, width: 110, cellClass: 'font-mono font-semibold', defaultVisible: true },
|
||||||
@@ -179,6 +186,8 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
|
|||||||
{ group: 'QSL', label: t('rqg.c.qsl_sent_date'),colId: 'qsl_sent_date', headerName: t('rqg.h.qsl_sent_date'), field: 'qsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
{ group: 'QSL', label: t('rqg.c.qsl_sent_date'),colId: 'qsl_sent_date', headerName: t('rqg.h.qsl_sent_date'), field: 'qsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||||
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_date'),colId: 'qsl_rcvd_date', headerName: t('rqg.h.qsl_rcvd_date'), field: 'qsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_date'),colId: 'qsl_rcvd_date', headerName: t('rqg.h.qsl_rcvd_date'), field: 'qsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||||
{ group: 'QSL', label: t('rqg.c.qsl_via'), colId: 'qsl_via', headerName: t('rqg.c.qsl_via'), field: 'qsl_via' as any, width: 130 },
|
{ group: 'QSL', label: t('rqg.c.qsl_via'), colId: 'qsl_via', headerName: t('rqg.c.qsl_via'), field: 'qsl_via' as any, width: 130 },
|
||||||
|
{ group: 'QSL', label: t('rqg.c.qsl_sent_via'), colId: 'qsl_sent_via', headerName: t('rqg.h.qsl_sent_via'), field: 'qsl_sent_via' as any, width: 110 },
|
||||||
|
{ group: 'QSL', label: t('rqg.c.qsl_rcvd_via'), colId: 'qsl_rcvd_via', headerName: t('rqg.h.qsl_rcvd_via'), field: 'qsl_rcvd_via' as any, width: 110 },
|
||||||
{ group: 'QSL', label: t('rqg.c.qsl_msg'), colId: 'qsl_msg', headerName: t('rqg.c.qsl_msg'), field: 'qsl_msg' as any, width: 200 },
|
{ group: 'QSL', label: t('rqg.c.qsl_msg'), colId: 'qsl_msg', headerName: t('rqg.c.qsl_msg'), field: 'qsl_msg' as any, width: 200 },
|
||||||
{ group: 'QSL', label: t('rqg.c.qslmsg_rcvd'), colId: 'qslmsg_rcvd', headerName: t('rqg.c.qslmsg_rcvd'), field: 'qslmsg_rcvd' as any, width: 200 },
|
{ group: 'QSL', label: t('rqg.c.qslmsg_rcvd'), colId: 'qslmsg_rcvd', headerName: t('rqg.c.qslmsg_rcvd'), field: 'qslmsg_rcvd' as any, width: 200 },
|
||||||
|
|
||||||
@@ -299,7 +308,7 @@ const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
|
|||||||
return rest;
|
return rest;
|
||||||
});
|
});
|
||||||
|
|
||||||
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
|
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols, rowColors }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
@@ -696,6 +705,7 @@ 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)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -128,7 +128,9 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="flex items-center justify-center p-2 min-h-0">
|
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
||||||
|
sibling of the <svg> landed beside it. */}
|
||||||
|
<div className="flex flex-col items-center justify-center p-2 min-h-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'}
|
||||||
@@ -188,6 +190,31 @@ 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.
|
||||||
|
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.
|
||||||
|
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. */}
|
||||||
|
<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 ' +
|
||||||
|
(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>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -13,6 +13,32 @@ export interface RecentSpotQSO {
|
|||||||
freqKHz: number;
|
freqKHz: number;
|
||||||
mode: string;
|
mode: string;
|
||||||
band?: string;
|
band?: string;
|
||||||
|
// Award references logged for this QSO, each one complete and ready to read
|
||||||
|
// on a cluster line ("POTA FR-11553"). Empty for an ordinary contact.
|
||||||
|
refs?: string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
// SPOT_COMMENT_MAX is the DX cluster comment field: 30 characters, and nodes
|
||||||
|
// truncate what does not fit without saying so. Only the comment BUILT here is
|
||||||
|
// held to it — whatever the operator types is their own business.
|
||||||
|
const SPOT_COMMENT_MAX = 30;
|
||||||
|
|
||||||
|
// spotComment puts the award references after the mode, the order a cluster
|
||||||
|
// line is read in: "CW POTA FR-11553".
|
||||||
|
//
|
||||||
|
// A reference goes in whole or not at all. Truncation would leave "CW POTA" or
|
||||||
|
// half a park number on the air, which is worse than saying nothing: a spot
|
||||||
|
// nobody can act on still costs everyone who reads it.
|
||||||
|
export function spotComment(mode: string, refs?: string[]): string {
|
||||||
|
let out = (mode || '').trim();
|
||||||
|
for (const ref of refs ?? []) {
|
||||||
|
const one = ref.trim();
|
||||||
|
if (!one) continue;
|
||||||
|
const next = out ? `${out} ${one}` : one;
|
||||||
|
if (next.length > SPOT_COMMENT_MAX) continue; // a shorter one may still fit
|
||||||
|
out = next;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -23,6 +49,9 @@ interface Props {
|
|||||||
defaultCall: string;
|
defaultCall: string;
|
||||||
defaultFreqKHz: number;
|
defaultFreqKHz: number;
|
||||||
defaultMode: string;
|
defaultMode: string;
|
||||||
|
// Award references on the QSO being entered (or on the last logged one),
|
||||||
|
// appended to the comment after the mode.
|
||||||
|
defaultRefs?: string[];
|
||||||
// Master cluster name, shown so the user knows where the spot goes.
|
// Master cluster name, shown so the user knows where the spot goes.
|
||||||
targetName?: string;
|
targetName?: string;
|
||||||
recent: RecentSpotQSO[];
|
recent: RecentSpotQSO[];
|
||||||
@@ -33,7 +62,7 @@ interface Props {
|
|||||||
// the master cluster: callsign + frequency (kHz) + a free message (defaults
|
// the master cluster: callsign + frequency (kHz) + a free message (defaults
|
||||||
// to the mode). A "Latest QSOs" list lets the operator one-click a recent
|
// to the mode). A "Latest QSOs" list lets the operator one-click a recent
|
||||||
// contact into the form.
|
// contact into the form.
|
||||||
export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defaultMode, targetName, recent, onSend }: Props) {
|
export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defaultMode, defaultRefs, targetName, recent, onSend }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [call, setCall] = useState('');
|
const [call, setCall] = useState('');
|
||||||
const [freqKHz, setFreqKHz] = useState('');
|
const [freqKHz, setFreqKHz] = useState('');
|
||||||
@@ -48,12 +77,12 @@ export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defa
|
|||||||
if (!open) return;
|
if (!open) return;
|
||||||
setCall((defaultCall || '').toUpperCase());
|
setCall((defaultCall || '').toUpperCase());
|
||||||
setFreqKHz(defaultFreqKHz > 0 ? trimKHz(defaultFreqKHz) : '');
|
setFreqKHz(defaultFreqKHz > 0 ? trimKHz(defaultFreqKHz) : '');
|
||||||
setMessage(defaultMode || '');
|
setMessage(spotComment(defaultMode, defaultRefs));
|
||||||
setError('');
|
setError('');
|
||||||
setOk(false);
|
setOk(false);
|
||||||
// Focus the freq if the call is already known, else the call.
|
// Focus the freq if the call is already known, else the call.
|
||||||
setTimeout(() => callRef.current?.focus(), 50);
|
setTimeout(() => callRef.current?.focus(), 50);
|
||||||
}, [open, defaultCall, defaultFreqKHz, defaultMode]);
|
}, [open, defaultCall, defaultFreqKHz, defaultMode, defaultRefs]);
|
||||||
|
|
||||||
async function send() {
|
async function send() {
|
||||||
const c = call.trim().toUpperCase();
|
const c = call.trim().toUpperCase();
|
||||||
@@ -77,7 +106,7 @@ export function SendSpotModal({ open, onClose, defaultCall, defaultFreqKHz, defa
|
|||||||
function pick(q: RecentSpotQSO) {
|
function pick(q: RecentSpotQSO) {
|
||||||
setCall(q.callsign.toUpperCase());
|
setCall(q.callsign.toUpperCase());
|
||||||
if (q.freqKHz > 0) setFreqKHz(trimKHz(q.freqKHz));
|
if (q.freqKHz > 0) setFreqKHz(trimKHz(q.freqKHz));
|
||||||
if (q.mode) setMessage(q.mode);
|
setMessage(spotComment(q.mode, q.refs));
|
||||||
setError('');
|
setError('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ import {
|
|||||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||||
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus,
|
GetBandOpenSettings, SaveBandOpenSettings, 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';
|
||||||
@@ -77,6 +77,7 @@ 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 { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
import { UDPIntegrationsPanel } from '@/components/UDPIntegrationsPanel';
|
||||||
|
|
||||||
type LookupSettings = LookupSettingsForm;
|
type LookupSettings = LookupSettingsForm;
|
||||||
@@ -108,6 +109,7 @@ const MODE_CATALOG: Array<{ name: string; sent: string; rcvd: string }> = [
|
|||||||
{ name: 'DIGITALVOICE', sent: '59', rcvd: '59' },
|
{ name: 'DIGITALVOICE', sent: '59', rcvd: '59' },
|
||||||
{ name: 'FT8', sent: '-10', rcvd: '-10' },
|
{ name: 'FT8', sent: '-10', rcvd: '-10' },
|
||||||
{ name: 'FT4', sent: '-10', rcvd: '-10' },
|
{ name: 'FT4', sent: '-10', rcvd: '-10' },
|
||||||
|
{ name: 'FT2', sent: '-10', rcvd: '-10' },
|
||||||
{ name: 'JS8', sent: '-10', rcvd: '-10' },
|
{ name: 'JS8', sent: '-10', rcvd: '-10' },
|
||||||
{ name: 'MSK144', sent: '+00', rcvd: '+00' },
|
{ name: 'MSK144', sent: '+00', rcvd: '+00' },
|
||||||
{ name: 'JT65', sent: '-15', rcvd: '-15' },
|
{ name: 'JT65', sent: '-15', rcvd: '-15' },
|
||||||
@@ -176,6 +178,7 @@ interface Props {
|
|||||||
`disabled: true` greys them out and shows the "coming soon" placeholder. */
|
`disabled: true` greys them out and shows the "coming soon" placeholder. */
|
||||||
type SectionId =
|
type SectionId =
|
||||||
| 'general'
|
| 'general'
|
||||||
|
| 'appearance'
|
||||||
| 'email'
|
| 'email'
|
||||||
| 'station'
|
| 'station'
|
||||||
| 'profiles'
|
| 'profiles'
|
||||||
@@ -266,6 +269,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{
|
{
|
||||||
kind: 'group', label: t('nav.software'), icon: Cog, defaultOpen: true, children: [
|
kind: 'group', label: t('nav.software'), icon: Cog, defaultOpen: true, children: [
|
||||||
{ kind: 'item', label: t('sec.general'), id: 'general' },
|
{ kind: 'item', label: t('sec.general'), id: 'general' },
|
||||||
|
{ kind: 'item', label: t('sec.appearance'), id: 'appearance' },
|
||||||
{ kind: 'item', label: t('sec.email'), id: 'email' },
|
{ kind: 'item', label: t('sec.email'), id: 'email' },
|
||||||
{ kind: 'item', label: t('sec.lookup'), id: 'lookup' },
|
{ kind: 'item', label: t('sec.lookup'), id: 'lookup' },
|
||||||
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
{ kind: 'group', label: t('nav.lists'), icon: Database, defaultOpen: true, children: [
|
||||||
@@ -290,7 +294,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
// Map section id → i18n key (breadcrumb / placeholders).
|
// Map section id → i18n key (breadcrumb / placeholders).
|
||||||
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', 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', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||||
adifmon: 'sec.adifmon',
|
adifmon: 'sec.adifmon',
|
||||||
webpublish: 'sec.webpublish',
|
webpublish: 'sec.webpublish',
|
||||||
@@ -409,6 +413,7 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
|
|||||||
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
||||||
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
||||||
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
||||||
|
'sahara': { bg: '#e6ded0', card: '#f3eee2', accent: '#c4501e' },
|
||||||
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
|
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
|
||||||
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
||||||
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
||||||
@@ -696,7 +701,13 @@ const MOTOR_BAND_DEFAULT_KHZ: Record<string, number> = {
|
|||||||
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
'40m': 7100, '30m': 10125, '20m': 14150, '17m': 18110,
|
||||||
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
'15m': 21150, '12m': 24930, '10m': 28400, '6m': 50150,
|
||||||
};
|
};
|
||||||
const relayCountUI = (type: string) => (type === 'kmtronic' || type === 'denkovi' ? 8 : 5);
|
// Fallback only: the rule editor sizes itself from the device's labels, which
|
||||||
|
// SaveStationDevices already normalises to the real relay count. This is what it
|
||||||
|
// falls back to when a device somehow has none, so it only needs to be in the
|
||||||
|
// right neighbourhood — but it is the third place that counts relays, and the
|
||||||
|
// first two disagreeing is what pinned the HTTP board at four.
|
||||||
|
const relayCountUI = (type: string) =>
|
||||||
|
type === 'kmtronic' || type === 'denkovi' ? 8 : type === 'httpgen' ? 4 : 5;
|
||||||
|
|
||||||
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
// Live status + OPERATE/STANDBY toggle for ONE configured amplifier (by config
|
||||||
// id) — SPE / ACOM / PGXL alike. Module-scoped (not a nested component) so it
|
// id) — SPE / ACOM / PGXL alike. Module-scoped (not a nested component) so it
|
||||||
@@ -1221,6 +1232,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
hamqth_user: '', hamqth_password: '',
|
hamqth_user: '', hamqth_password: '',
|
||||||
primary: '', failsafe: '',
|
primary: '', failsafe: '',
|
||||||
download_images: false,
|
download_images: false,
|
||||||
|
qrz_prefer_nickname: false,
|
||||||
cache_ttl_days: 30,
|
cache_ttl_days: 30,
|
||||||
});
|
});
|
||||||
// Per-provider Test state — keeps the success/error feedback adjacent
|
// Per-provider Test state — keeps the success/error feedback adjacent
|
||||||
@@ -1270,6 +1282,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
|
// Amplifier list — operators can run SEVERAL amps (even two SPEs combined),
|
||||||
// each with its own connection. Saved as a whole via SaveAmplifiers.
|
// each with its own connection. Saved as a whole via SaveAmplifiers.
|
||||||
const [amps, setAmps] = useState<AmpUI[]>([]);
|
const [amps, setAmps] = useState<AmpUI[]>([]);
|
||||||
|
const [linkedAmps, setLinkedAmps] = useState<string[]>([]);
|
||||||
|
|
||||||
// WinKeyer CW keyer settings + macro editor.
|
// WinKeyer CW keyer settings + macro editor.
|
||||||
type WKMac = { label: string; text: string };
|
type WKMac = { label: string; text: string };
|
||||||
@@ -1438,13 +1451,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
tqsl_path: string; station_location: string; key_password: string;
|
tqsl_path: string; station_location: string; key_password: string;
|
||||||
upload_flags: string[]; write_log: boolean;
|
upload_flags: string[]; write_log: boolean;
|
||||||
auto_upload: boolean; upload_mode: string;
|
auto_upload: boolean; upload_mode: string;
|
||||||
|
// HRDLog only: publish the live frequency/mode/rig on hrdlog.net.
|
||||||
|
on_air?: boolean;
|
||||||
};
|
};
|
||||||
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; delete_remote?: boolean };
|
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; delete_remote?: boolean };
|
||||||
const emptyExtCfg = (): ExtServiceCfg => ({
|
const emptyExtCfg = (): ExtServiceCfg => ({
|
||||||
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
|
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
|
||||||
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
|
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
|
||||||
upload_flags: ['N', 'R'], write_log: false,
|
upload_flags: ['N', 'R'], write_log: false,
|
||||||
auto_upload: false, upload_mode: 'immediate',
|
auto_upload: false, upload_mode: 'immediate', on_air: false,
|
||||||
});
|
});
|
||||||
const [extSvc, setExtSvc] = useState<ExternalServices>({
|
const [extSvc, setExtSvc] = useState<ExternalServices>({
|
||||||
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), delete_remote: false,
|
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), delete_remote: false,
|
||||||
@@ -1481,7 +1496,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
finally { setScpBusy(false); }
|
finally { setScpBusy(false); }
|
||||||
};
|
};
|
||||||
// US Counties (offline FCC ULS) — download progress arrives via events.
|
// US Counties (offline FCC ULS) — download progress arrives via events.
|
||||||
const [ulsStatus, setUlsStatus] = useState<{ count: number; updated_at?: string }>({ count: 0 });
|
const [ulsStatus, setUlsStatus] = useState<{ count: number; updated_at?: string; needs_refresh?: boolean }>({ count: 0 });
|
||||||
const [ulsBusy, setUlsBusy] = useState(false);
|
const [ulsBusy, setUlsBusy] = useState(false);
|
||||||
const [ulsProgress, setUlsProgress] = useState<{ stage: string; pct: number } | null>(null);
|
const [ulsProgress, setUlsProgress] = useState<{ stage: string; pct: number } | null>(null);
|
||||||
const [ulsMsg, setUlsMsg] = useState<{ ok: boolean; text: string } | null>(null);
|
const [ulsMsg, setUlsMsg] = useState<{ ok: boolean; text: string } | null>(null);
|
||||||
@@ -1552,6 +1567,11 @@ 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: [] });
|
||||||
|
const [chaseGrids, setChaseGrids] = useState(false);
|
||||||
|
const [chaseNew, setChaseNew] = useState(false);
|
||||||
|
const [spotTTL, setSpotTTL] = useState(0);
|
||||||
|
const [spotTTLText, setSpotTTLText] = useState('0');
|
||||||
|
const [gridStat, setGridStat] = useState<any>(null);
|
||||||
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
||||||
const saveBandOpen = async (next: any) => {
|
const saveBandOpen = async (next: any) => {
|
||||||
setBandOpen(next);
|
setBandOpen(next);
|
||||||
@@ -1560,11 +1580,16 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
|
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
|
||||||
|
try { setChaseGrids(await GetChaseNewGrids()); } catch { /* defaults stand */ }
|
||||||
|
try { setChaseNew(await GetChaseNew()); } catch { /* defaults stand */ }
|
||||||
|
try { setLinkedAmps((await GetLinkedAmps()) ?? []); } catch { /* defaults stand */ }
|
||||||
|
try { const n = await GetSpotTTLMinutes(); setSpotTTL(n); setSpotTTLText(String(n)); } catch { /* defaults stand */ }
|
||||||
})();
|
})();
|
||||||
// Poll the feed while the panel is open: a live count is the only thing that
|
// Poll the feed while the panel is open: a live count is the only thing that
|
||||||
// distinguishes "connected" from "connected and receiving nothing".
|
// distinguishes "connected" from "connected and receiving nothing".
|
||||||
const t = window.setInterval(async () => {
|
const t = window.setInterval(async () => {
|
||||||
try { setPskrStatus(await GetPSKReporterStatus()); } catch { /* ignore */ }
|
try { setPskrStatus(await GetPSKReporterStatus()); } catch { /* ignore */ }
|
||||||
|
try { setGridStat(await GetGridCacheStatus()); } catch { /* ignore */ }
|
||||||
}, 3000);
|
}, 3000);
|
||||||
return () => window.clearInterval(t);
|
return () => window.clearInterval(t);
|
||||||
}, []);
|
}, []);
|
||||||
@@ -2302,6 +2327,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
{/* QRZ only. HamQTH's <nick> already fills the Name field with the
|
||||||
|
on-air name, so the same switch there would toggle a behaviour it
|
||||||
|
has no way to turn off. */}
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer mt-3">
|
||||||
|
<Checkbox
|
||||||
|
checked={!!(lookup as any).qrz_prefer_nickname}
|
||||||
|
onCheckedChange={(c) => setLookup((s) => ({ ...s, qrz_prefer_nickname: !!c } as any))}
|
||||||
|
className="mt-0.5"
|
||||||
|
/>
|
||||||
|
<span>
|
||||||
|
{t('lk.qrzNickname')}
|
||||||
|
<span className="block text-xs text-muted-foreground mt-0.5">
|
||||||
|
{t('lk.qrzNicknameHint')}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mt-6 pt-4 border-t border-border">
|
<div className="mt-6 pt-4 border-t border-border">
|
||||||
@@ -3572,6 +3614,38 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Plus className="size-3.5 mr-1" /> {t('amp.add')}
|
<Plus className="size-3.5 mr-1" /> {t('amp.add')}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
{/* WHICH amplifiers are coupled, not whether coupling is on.
|
||||||
|
A station can run a combiner pair AND a third amplifier that has
|
||||||
|
nothing to do with it — two SPE on the combiner, a PowerGenius on
|
||||||
|
another antenna — so a single switch would send that third one into
|
||||||
|
OPERATE alongside them. Shown from two amplifiers up. */}
|
||||||
|
{amps.length > 1 && (
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<div className="text-sm">{t('amp.linked')}</div>
|
||||||
|
<p className="text-xs text-muted-foreground">{t('amp.linkedHint')}</p>
|
||||||
|
<div className="flex flex-wrap gap-x-4 gap-y-1.5">
|
||||||
|
{amps.filter((x) => (x.id ?? '') !== '').map((x) => {
|
||||||
|
const on = linkedAmps.includes(x.id!);
|
||||||
|
return (
|
||||||
|
<label key={x.id} className="flex items-center gap-1.5 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={on} onCheckedChange={(c) => {
|
||||||
|
const next = c ? [...linkedAmps, x.id!] : linkedAmps.filter((v) => v !== x.id);
|
||||||
|
setLinkedAmps(next);
|
||||||
|
SetLinkedAmps(next).catch(() => {});
|
||||||
|
}} />
|
||||||
|
{x.name?.trim() || x.type}
|
||||||
|
</label>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
{/* An amplifier saved without an id cannot be a member — say so
|
||||||
|
rather than silently leaving it out of the list. */}
|
||||||
|
{amps.some((x) => (x.id ?? '') === '') && (
|
||||||
|
<p className="text-xs text-muted-foreground">{t('amp.linkedSaveFirst')}</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@@ -3600,7 +3674,10 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
const isRG = dev.type === 'rotgenius';
|
const isRG = dev.type === 'rotgenius';
|
||||||
const isARCO = dev.type === 'arco';
|
const isARCO = dev.type === 'arco';
|
||||||
const isDCU1 = dev.type === 'dcu1';
|
const isDCU1 = dev.type === 'dcu1';
|
||||||
const isSerialCap = isARCO || isDCU1; // COM-port or serial-over-IP controllers
|
// A SPID has a COM port and nothing else — no network transport to
|
||||||
|
// offer, which is the whole point of driving it without PstRotator.
|
||||||
|
const isSPID = dev.type === 'spid';
|
||||||
|
const isSerialCap = isARCO || isDCU1 || isSPID; // COM-port or serial-over-IP controllers
|
||||||
const transport = dev.transport ?? 'tcp';
|
const transport = dev.transport ?? 'tcp';
|
||||||
return (
|
return (
|
||||||
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
|
<div key={dev.id || i} className="rounded-xl border border-border bg-card/40 p-3 space-y-3">
|
||||||
@@ -3619,13 +3696,14 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
{/* Each backend gets its default port: Rotator Genius 9006, ARCO 4001
|
||||||
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
(placeholder — must match the ARCO's LAN menu), PstRotator 12000. */}
|
||||||
<Select value={dev.type ?? 'pst'}
|
<Select value={dev.type ?? 'pst'}
|
||||||
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : (v === 'arco' || v === 'dcu1') ? 4001 : 12000, ...(v === 'dcu1' ? { transport: 'serial' } : {}) })}>
|
onValueChange={(v) => patch(i, { type: v as any, port: v === 'rotgenius' ? 9006 : (v === 'arco' || v === 'dcu1') ? 4001 : 12000, ...(v === 'dcu1' || v === 'spid' ? { transport: 'serial' } : {}), ...(v === 'spid' ? { baud: 600, spid_model: 'rot2prog' } : {}) })}>
|
||||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
<SelectItem value="pst">PstRotator (UDP)</SelectItem>
|
||||||
<SelectItem value="rotgenius">Rotator Genius (4O3A, native)</SelectItem>
|
<SelectItem value="rotgenius">Rotator Genius (4O3A, native)</SelectItem>
|
||||||
<SelectItem value="arco">GS-232A controller (microHAM ARCO, ERC…)</SelectItem>
|
<SelectItem value="arco">GS-232A controller (microHAM ARCO, ERC…)</SelectItem>
|
||||||
<SelectItem value="dcu1">Hy-Gain DCU-1 (RotorCard DXA, Rotor-EZ, Green Heron)</SelectItem>
|
<SelectItem value="dcu1">Hy-Gain DCU-1 (RotorCard DXA, Rotor-EZ, Green Heron)</SelectItem>
|
||||||
|
<SelectItem value="spid">SPID / AlfaSpid (RAS, BIG-RAS, MD-01, MD-02)</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
@@ -3642,8 +3720,24 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* SPID: pick the dialect. They differ in reply length AND baud
|
||||||
|
rate, so this cannot be detected — a wrong choice is a
|
||||||
|
controller that never answers. */}
|
||||||
|
{isSPID && (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('rot.spidModel')}</Label>
|
||||||
|
<Select value={dev.spid_model || 'rot2prog'}
|
||||||
|
onValueChange={(v) => patch(i, { spid_model: v as any, baud: v === 'rot1prog' ? 1200 : 600 })}>
|
||||||
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="rot2prog">Rot2Prog (RAS, BIG-RAS/HR, MD-01, MD-02)</SelectItem>
|
||||||
|
<SelectItem value="rot1prog">Rot1Prog (azimuth only)</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{/* ARCO and DCU-1 controllers reach over the LAN (TCP) or a serial COM. */}
|
{/* ARCO and DCU-1 controllers reach over the LAN (TCP) or a serial COM. */}
|
||||||
{isSerialCap && (
|
{isSerialCap && !isSPID && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>Connection</Label>
|
<Label>Connection</Label>
|
||||||
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
|
<Select value={transport} onValueChange={(v) => patch(i, { transport: v as any })}>
|
||||||
@@ -3677,10 +3771,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Button size="sm" variant="outline" className="h-9" onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>
|
<Button size="sm" variant="outline" className="h-9" onClick={() => ListSerialPorts().then((p) => setWkPorts((p ?? []) as string[])).catch(() => {})}>
|
||||||
<ArrowDown className="size-3.5 rotate-90" />
|
<ArrowDown className="size-3.5 rotate-90" />
|
||||||
</Button>
|
</Button>
|
||||||
<Select value={String(dev.baud || 9600)} onValueChange={(v) => patch(i, { baud: Number(v) })}>
|
{/* A SPID runs at 600 or 1200 baud — not a typo, a pulse
|
||||||
|
controller has nothing to say quickly. Offering only the
|
||||||
|
usual rates would have left it permanently mute. */}
|
||||||
|
<Select value={String(dev.baud || (isSPID ? 600 : 9600))} onValueChange={(v) => patch(i, { baud: Number(v) })}>
|
||||||
<SelectTrigger className="h-9 w-28"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9 w-28"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{[4800, 9600, 19200, 38400, 57600].map((b) => (
|
{(isSPID ? [600, 1200, 2400, 4800, 9600] : [4800, 9600, 19200, 38400, 57600]).map((b) => (
|
||||||
<SelectItem key={b} value={String(b)}>{b} baud</SelectItem>
|
<SelectItem key={b} value={String(b)}>{b} baud</SelectItem>
|
||||||
))}
|
))}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
@@ -3710,6 +3807,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
{isRG && <p className="text-xs text-muted-foreground">{t('rot.rgHint')}</p>}
|
||||||
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
{isARCO && <p className="text-xs text-muted-foreground">{t('rot.arcoHint')}</p>}
|
||||||
{isDCU1 && <p className="text-xs text-muted-foreground">{t('rot.dcu1Hint')}</p>}
|
{isDCU1 && <p className="text-xs text-muted-foreground">{t('rot.dcu1Hint')}</p>}
|
||||||
|
{isSPID && <p className="text-xs text-muted-foreground">{t('rot.spidHint')}</p>}
|
||||||
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
|
{/* Which antenna this rotor carries — only relevant with >1 rotor. */}
|
||||||
{multi && (
|
{multi && (
|
||||||
<div className="space-y-1 max-w-xs">
|
<div className="space-y-1 max-w-xs">
|
||||||
@@ -4227,6 +4325,63 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
things set up once. A preferences dialog you reopen every ten minutes
|
things set up once. A preferences dialog you reopen every ten minutes
|
||||||
is a filter in the wrong place. */}
|
is a filter in the wrong place. */}
|
||||||
|
|
||||||
|
{/* Grid chasing. Here rather than in the filter panel because it is set
|
||||||
|
up once: it decides whether locators learnt from decodes are KEPT
|
||||||
|
across restarts, not what the list shows right now. */}
|
||||||
|
{/* Spot lifetime. Applies to the cluster list AND every band map: the
|
||||||
|
spots are removed from the shared list rather than hidden, so the
|
||||||
|
setting cannot mean one thing in one view and another elsewhere. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<div className="flex items-center gap-3 flex-wrap">
|
||||||
|
<span className="text-sm">{t('clu.spotTtl')}</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||||
|
{[0, 5, 10, 15, 30, 60].map((v) => (
|
||||||
|
<button key={v} type="button"
|
||||||
|
onClick={() => { setSpotTTL(v); setSpotTTLText(String(v)); SetSpotTTLMinutes(v).catch(() => {}); }}
|
||||||
|
className={cn('px-2.5 py-1.5 font-medium', spotTTL === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{v === 0 ? t('clu.spotTtlNever') : `${v}′`}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{/* Raw text in local state: binding the input straight to the
|
||||||
|
clamped number makes an empty field impossible to type into. */}
|
||||||
|
<Input className="h-8 w-20" value={spotTTLText}
|
||||||
|
onChange={(e) => {
|
||||||
|
const raw = e.target.value.replace(/[^0-9]/g, '');
|
||||||
|
setSpotTTLText(raw);
|
||||||
|
const n = Math.min(720, parseInt(raw, 10) || 0);
|
||||||
|
setSpotTTL(n);
|
||||||
|
SetSpotTTLMinutes(n).catch(() => {});
|
||||||
|
}} />
|
||||||
|
<span className="text-xs text-muted-foreground">{t('clu.spotTtlHint')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={chaseGrids} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => { setChaseGrids(!!c); SetChaseNewGrids(!!c).catch(() => {}); }} />
|
||||||
|
<span>{t('clu.chaseGrids')} <span className="text-xs text-muted-foreground">{t('clu.chaseGridsHint')}</span></span>
|
||||||
|
</label>
|
||||||
|
{chaseGrids && (
|
||||||
|
<p className="pl-6 text-xs text-muted-foreground">
|
||||||
|
{t('clu.chaseGridsStat', { n: gridStat?.known ?? 0, p: gridStat?.pending ?? 0 })}
|
||||||
|
{pskrStatus?.running ? ` · ${t('bo.feedUp', { n: pskrStatus.received ?? 0 })}` : ''}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Chase new — its own option, NOT nested under grid chasing. Chasing
|
||||||
|
squares and chasing entities are different wants; they only share
|
||||||
|
the PSK Reporter feed, which either one brings up. */}
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={chaseNew} className="mt-0.5"
|
||||||
|
onCheckedChange={(c) => { setChaseNew(!!c); SetChaseNew(!!c).catch(() => {}); }} />
|
||||||
|
<span>{t('chn.option')} <span className="text-xs text-muted-foreground">{t('chn.optionHelp')}</span></span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
|
{/* Band-opening watch. It lives HERE, with the cluster nodes, because
|
||||||
switching it on adds two of them — the operator should see that
|
switching it on adds two of them — the operator should see that
|
||||||
happen where it happens rather than find nodes they did not add. */}
|
happen where it happens rather than find nodes they did not add. */}
|
||||||
@@ -4945,6 +5100,20 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{t('es.autoUpload')}
|
{t('es.autoUpload')}
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
|
{/* ON AIR is a live status, not an upload: it needs the rig
|
||||||
|
readable, not a QSO. Its own switch beside the upload one
|
||||||
|
rather than folded into it. */}
|
||||||
|
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox className="mt-0.5"
|
||||||
|
checked={!!(hrdlog as any).on_air}
|
||||||
|
onCheckedChange={(c) => setHrdlog({ on_air: !!c } as any)}
|
||||||
|
/>
|
||||||
|
<span>
|
||||||
|
{t('es.hrdOnAir')}
|
||||||
|
<span className="block text-xs text-muted-foreground mt-0.5">{t('es.hrdOnAirHint')}</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
|
||||||
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
|
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
|
||||||
<Label className="text-sm">{t('es.uploadTiming')}</Label>
|
<Label className="text-sm">{t('es.uploadTiming')}</Label>
|
||||||
<Select
|
<Select
|
||||||
@@ -6108,6 +6277,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* A database downloaded by an older OpsLog still holds Connecticut's
|
||||||
|
planning regions instead of its counties. The download date cannot
|
||||||
|
show that, so say it outright. */}
|
||||||
|
{loaded && ulsStatus.needs_refresh && !ulsBusy && (
|
||||||
|
<div className="text-[11px] rounded border border-warning-border bg-warning-muted text-warning-muted-foreground px-2 py-1.5 leading-relaxed">
|
||||||
|
{t('uscty.stale')}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{ulsProgress && (
|
{ulsProgress && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<div className="text-[11px] text-muted-foreground flex justify-between">
|
<div className="text-[11px] text-muted-foreground flex justify-between">
|
||||||
@@ -6142,6 +6320,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// Map sections to their content + icon (for placeholder).
|
// Map sections to their content + icon (for placeholder).
|
||||||
const PANELS: Record<SectionId, () => JSX.Element> = {
|
const PANELS: Record<SectionId, () => JSX.Element> = {
|
||||||
general: GeneralPanel,
|
general: GeneralPanel,
|
||||||
|
appearance: () => <AppearancePanel />,
|
||||||
email: EmailPanel,
|
email: EmailPanel,
|
||||||
station: StationPanel,
|
station: StationPanel,
|
||||||
profiles: ProfilesPanel,
|
profiles: ProfilesPanel,
|
||||||
|
|||||||
@@ -23,7 +23,12 @@ import {
|
|||||||
|
|
||||||
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
|
type RotatorProps = { centerLat?: number | null; centerLon?: number | null; bearing?: number | null };
|
||||||
|
|
||||||
type Device = { id: string; type: string; name: string; host: string; user?: string; pass?: string; channels?: number; labels: string[] };
|
type Device = {
|
||||||
|
id: string; type: string; name: string; host: string;
|
||||||
|
user?: string; pass?: string; channels?: number; labels: string[];
|
||||||
|
// Generic HTTP board only. The per-relay URLs win over the patterns.
|
||||||
|
on_urls?: string[]; off_urls?: string[]; on_pattern?: string; off_pattern?: string;
|
||||||
|
};
|
||||||
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[] };
|
||||||
|
|
||||||
@@ -34,14 +39,20 @@ type DevStatus = { id: string; name: string; type: string; connected: boolean; e
|
|||||||
const CARD_MIN = 430; // narrowest a card may get before "Auto" drops a column
|
const CARD_MIN = 430; // narrowest a card may get before "Auto" drops a column
|
||||||
const GRID_GAP = 16; // px between cards, both axes
|
const GRID_GAP = 16; // px between cards, both axes
|
||||||
|
|
||||||
const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2 };
|
const RELAY_COUNT: Record<string, number> = { webswitch: 5, kmtronic: 8, denkovi: 8, usbrelay: 8, dingtian: 2, httpgen: 4 };
|
||||||
const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay' };
|
const TYPE_LABEL: Record<string, string> = { webswitch: 'WebSwitch 1216H', kmtronic: 'KMTronic 8-relay', denkovi: 'Denkovi USB (FT245)', usbrelay: 'Denkovi USB (serial)', dingtian: 'Dingtian IOT relay', httpgen: 'HTTP relay' };
|
||||||
|
|
||||||
// Relay count for a configured device: fixed by type, except Denkovi (4/8) and
|
// Relay count for a configured device: fixed by type, except Denkovi (4/8) and
|
||||||
// the generic USB-serial board, whose channel count the user picks.
|
// the generic USB-serial board, whose channel count the user picks.
|
||||||
|
// chanCount is the relay count for a device. It MUST agree with
|
||||||
|
// deviceRelayCount in app.go: the two decide how many labels and URL rows the
|
||||||
|
// editor shows and how many relays the driver is built for, and a type known to
|
||||||
|
// one and not the other silently pins the count to its fixed default — which is
|
||||||
|
// exactly what happened when the HTTP board was added here and not below.
|
||||||
const chanCount = (d: Device): number =>
|
const chanCount = (d: Device): number =>
|
||||||
(d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8)
|
(d.type === 'denkovi' || d.type === 'usbrelay') ? (d.channels && d.channels >= 1 ? d.channels : 8)
|
||||||
: d.type === 'dingtian' ? (d.channels && d.channels >= 1 ? d.channels : 2)
|
: d.type === 'dingtian' ? (d.channels && d.channels >= 1 ? d.channels : 2)
|
||||||
|
: d.type === 'httpgen' ? (d.channels && d.channels >= 1 ? d.channels : 4)
|
||||||
: (RELAY_COUNT[d.type] ?? 5);
|
: (RELAY_COUNT[d.type] ?? 5);
|
||||||
|
|
||||||
function blankDevice(): Device {
|
function blankDevice(): Device {
|
||||||
@@ -77,6 +88,8 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
|||||||
title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
|
title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
|
||||||
</div>
|
</div>
|
||||||
<div className="p-3 flex gap-4 items-start">
|
<div className="p-3 flex gap-4 items-start">
|
||||||
|
{/* The SP/LP readout lives INSIDE RotorCompass, so every compass in the
|
||||||
|
app carries it rather than each caller drawing its own. */}
|
||||||
<RotorCompass
|
<RotorCompass
|
||||||
bearing={bearing ?? null}
|
bearing={bearing ?? null}
|
||||||
headings={hd.ok ? [hd.azimuth] : []}
|
headings={hd.ok ? [hd.azimuth] : []}
|
||||||
@@ -673,6 +686,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
const isDingtian = device.type === 'dingtian';
|
const isDingtian = device.type === 'dingtian';
|
||||||
const isDenkovi = device.type === 'denkovi';
|
const isDenkovi = device.type === 'denkovi';
|
||||||
const isUsbRelay = device.type === 'usbrelay';
|
const isUsbRelay = device.type === 'usbrelay';
|
||||||
|
const isHTTPGen = device.type === 'httpgen';
|
||||||
// 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(() => {
|
||||||
@@ -724,6 +738,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
<SelectItem value="dingtian">Dingtian IOT relay (LAN / WiFi)</SelectItem>
|
<SelectItem value="dingtian">Dingtian IOT relay (LAN / WiFi)</SelectItem>
|
||||||
<SelectItem value="denkovi">Denkovi USB (FT245 / D2XX)</SelectItem>
|
<SelectItem value="denkovi">Denkovi USB (FT245 / D2XX)</SelectItem>
|
||||||
<SelectItem value="usbrelay">Denkovi USB (serial / COM)</SelectItem>
|
<SelectItem value="usbrelay">Denkovi USB (serial / COM)</SelectItem>
|
||||||
|
<SelectItem value="httpgen">{t('station.typeHttpGen')}</SelectItem>
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
@@ -732,7 +747,7 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
<Input value={device.name} placeholder={TYPE_LABEL[device.type]} onChange={(e) => onChange({ ...device, name: e.target.value })} />
|
<Input value={device.name} placeholder={TYPE_LABEL[device.type]} onChange={(e) => onChange({ ...device, name: e.target.value })} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{(isDenkovi || isUsbRelay || isDingtian) && (
|
{(isDenkovi || isUsbRelay || isDingtian || isHTTPGen) && (
|
||||||
<div className="space-y-1 max-w-[10rem]">
|
<div className="space-y-1 max-w-[10rem]">
|
||||||
<Label>{t('station.channels')}</Label>
|
<Label>{t('station.channels')}</Label>
|
||||||
<Select value={String(chanCount(device))} onValueChange={(v) => setChannels(parseInt(v, 10))}>
|
<Select value={String(chanCount(device))} onValueChange={(v) => setChannels(parseInt(v, 10))}>
|
||||||
@@ -818,6 +833,57 @@ function DeviceEditor({ device, onChange, onSave, onCancel, t }: {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{/* Generic HTTP board: a URL to switch each relay on and one to switch it
|
||||||
|
off. Two ways to fill it, and the per-relay one is why this type
|
||||||
|
exists — a hand-made switch often has URLs with nothing in common
|
||||||
|
between channels, which no pattern can express. */}
|
||||||
|
{isHTTPGen && (
|
||||||
|
<div className="space-y-3 rounded-md border border-border/60 p-3">
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('station.onPattern')}</Label>
|
||||||
|
<Input className="font-mono text-xs" placeholder="http://192.168.1.9/relay?n={relay}&state=on"
|
||||||
|
value={device.on_pattern ?? ''}
|
||||||
|
onChange={(e) => onChange({ ...device, on_pattern: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('station.offPattern')}</Label>
|
||||||
|
<Input className="font-mono text-xs" placeholder="http://192.168.1.9/relay?n={relay}&state=off"
|
||||||
|
value={device.off_pattern ?? ''}
|
||||||
|
onChange={(e) => onChange({ ...device, off_pattern: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="text-[10px] text-muted-foreground">{t('station.patternHint')}</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('station.perRelayUrls')}</Label>
|
||||||
|
<div className="space-y-1">
|
||||||
|
{device.labels.map((_, i) => (
|
||||||
|
<div key={i} className="grid grid-cols-[2.5rem_1fr_1fr] items-center gap-2">
|
||||||
|
<span className="text-[11px] text-muted-foreground">{i + 1}</span>
|
||||||
|
<Input className="h-8 font-mono text-[11px]" placeholder={t('station.onUrlPh')}
|
||||||
|
value={device.on_urls?.[i] ?? ''}
|
||||||
|
onChange={(e) => {
|
||||||
|
const on_urls = [...(device.on_urls ?? [])];
|
||||||
|
while (on_urls.length < device.labels.length) on_urls.push('');
|
||||||
|
on_urls[i] = e.target.value;
|
||||||
|
onChange({ ...device, on_urls });
|
||||||
|
}} />
|
||||||
|
<Input className="h-8 font-mono text-[11px]" placeholder={t('station.offUrlPh')}
|
||||||
|
value={device.off_urls?.[i] ?? ''}
|
||||||
|
onChange={(e) => {
|
||||||
|
const off_urls = [...(device.off_urls ?? [])];
|
||||||
|
while (off_urls.length < device.labels.length) off_urls.push('');
|
||||||
|
off_urls[i] = e.target.value;
|
||||||
|
onChange({ ...device, off_urls });
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="text-[10px] text-muted-foreground">{t('station.perRelayHint')}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('station.labels')}</Label>
|
<Label>{t('station.labels')}</Label>
|
||||||
<div className="grid grid-cols-4 gap-2">
|
<div className="grid grid-cols-4 gap-2">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useEffect, useState } from 'react';
|
import React, { useCallback, useEffect, useState } from 'react';
|
||||||
import { Plus, Trash2, Edit2, RefreshCcw, ArrowDownToLine, ArrowUpFromLine } from 'lucide-react';
|
import { Plus, Trash2, Edit2, RefreshCcw, ArrowDownToLine, ArrowUpFromLine } from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
ListUDPIntegrations, SaveUDPIntegration, DeleteUDPIntegration, ReloadUDPIntegrations,
|
ListUDPIntegrations, SaveUDPIntegration, DeleteUDPIntegration, ReloadUDPIntegrations,
|
||||||
@@ -24,7 +24,13 @@ 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';
|
service_type: 'wsjt' | 'adif' | 'n1mm' | 'remote_call' | 'db_updated' | 'pstrotator_freq' | 'n1mm_radioinfo' | 'wsjt_log' | 'custom';
|
||||||
|
// Custom rows only.
|
||||||
|
trigger?: string;
|
||||||
|
template?: string;
|
||||||
|
transport?: string;
|
||||||
|
url?: string;
|
||||||
|
line_end?: string;
|
||||||
multicast: boolean;
|
multicast: boolean;
|
||||||
multicast_group: string;
|
multicast_group: string;
|
||||||
destination_ip: string;
|
destination_ip: string;
|
||||||
@@ -77,6 +83,28 @@ const SERVICE_TYPES: Array<{
|
|||||||
hint: 'udpp.svcDbHint',
|
hint: 'udpp.svcDbHint',
|
||||||
defaults: { port: 2333, destination_ip: '127.0.0.1' },
|
defaults: { port: 2333, destination_ip: '127.0.0.1' },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
// Announces the QSO on the WSJT-X UDP interface instead of as plain text.
|
||||||
|
// Named for the protocol, not for one program: Logger32 is what it was
|
||||||
|
// built against, but anything listening on that interface takes it, and a
|
||||||
|
// label saying "Logger32" would have every other operator scroll past.
|
||||||
|
// 2250 is Logger32's first additional socket — a starting point, not a rule.
|
||||||
|
id: 'wsjt_log',
|
||||||
|
direction: 'outbound',
|
||||||
|
label: 'udpp.svcWsjtLogLabel',
|
||||||
|
hint: 'udpp.svcWsjtLogHint',
|
||||||
|
defaults: { port: 2250, destination_ip: '127.0.0.1' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// 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
|
||||||
|
// change — but nothing about it is specific to them.
|
||||||
|
id: 'custom',
|
||||||
|
direction: 'outbound',
|
||||||
|
label: 'udpp.svcCustomLabel',
|
||||||
|
hint: 'udpp.svcCustomHint',
|
||||||
|
defaults: { port: 12000, destination_ip: '127.0.0.1' },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: 'pstrotator_freq',
|
id: 'pstrotator_freq',
|
||||||
direction: 'outbound',
|
direction: 'outbound',
|
||||||
@@ -93,6 +121,27 @@ const SERVICE_TYPES: Array<{
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// The fields each trigger carries, and NOTHING else.
|
||||||
|
//
|
||||||
|
// This list is the point of the whole feature. A rotation has no frequency, a
|
||||||
|
// lookup has no report — and a placeholder the trigger cannot fill renders as
|
||||||
|
// nothing at all. Without seeing what is available, an operator writes {freq}
|
||||||
|
// on a band change, gets an empty string, and has no way to learn why. So the
|
||||||
|
// panel prints them under the box, for the trigger actually selected.
|
||||||
|
const TRIGGER_FIELDS: Record<string, string[]> = {
|
||||||
|
qso_logged: ['call', 'band', 'band_m', 'mode', 'freq_hz', 'freq_mhz', 'grid', 'name', 'country', 'dxcc', 'rst_s', 'rst_r', 'comment', 'date', 'time'],
|
||||||
|
rotator_goto: ['az', 'el', 'path'],
|
||||||
|
lookup_done: ['call', 'name', 'grid', 'country', 'qth', 'state', 'dxcc'],
|
||||||
|
band_change: ['band', 'band_m', 'freq_hz', 'freq_mhz', 'mode'],
|
||||||
|
};
|
||||||
|
|
||||||
|
const TRIGGERS = [
|
||||||
|
{ id: 'band_change', label: 'udpp.trgBand' },
|
||||||
|
{ id: 'qso_logged', label: 'udpp.trgQso' },
|
||||||
|
{ id: 'rotator_goto', label: 'udpp.trgRotator' },
|
||||||
|
{ id: 'lookup_done', label: 'udpp.trgLookup' },
|
||||||
|
];
|
||||||
|
|
||||||
type Props = { onError: (msg: string) => void };
|
type Props = { onError: (msg: string) => void };
|
||||||
|
|
||||||
export function UDPIntegrationsPanel({ onError }: Props) {
|
export function UDPIntegrationsPanel({ onError }: Props) {
|
||||||
@@ -124,6 +173,7 @@ export function UDPIntegrationsPanel({ onError }: Props) {
|
|||||||
destination_ip: preset.defaults.destination_ip ?? '',
|
destination_ip: preset.defaults.destination_ip ?? '',
|
||||||
enabled: true,
|
enabled: true,
|
||||||
sort_order: items.filter((i) => i.direction === direction).length,
|
sort_order: items.filter((i) => i.direction === direction).length,
|
||||||
|
trigger: '', template: '', transport: 'udp', url: '', line_end: '',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,7 +426,7 @@ function EditDialog({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{draft.direction === 'outbound' && (
|
{draft.direction === 'outbound' && draft.service_type !== 'custom' && (
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('udpp.destinationIp')}</Label>
|
<Label>{t('udpp.destinationIp')}</Label>
|
||||||
<Input
|
<Input
|
||||||
@@ -388,6 +438,10 @@ function EditDialog({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{draft.service_type === 'custom' && (
|
||||||
|
<CustomFields draft={draft} setDraft={setDraft} />
|
||||||
|
)}
|
||||||
|
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
checked={draft.enabled}
|
checked={draft.enabled}
|
||||||
@@ -413,3 +467,108 @@ function EditDialog({
|
|||||||
|
|
||||||
// silence unused-import for cn — kept for future styling tweaks
|
// silence unused-import for cn — kept for future styling tweaks
|
||||||
void cn;
|
void cn;
|
||||||
|
|
||||||
|
// CustomFields is the editor for a custom outbound row: what fires it, how it
|
||||||
|
// leaves, and what it says.
|
||||||
|
function CustomFields({ draft, setDraft }: {
|
||||||
|
draft: UDPConfig;
|
||||||
|
setDraft: React.Dispatch<React.SetStateAction<UDPConfig>>;
|
||||||
|
}) {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const fields = TRIGGER_FIELDS[draft.trigger ?? ''] ?? [];
|
||||||
|
const isURL = draft.transport === 'url';
|
||||||
|
return (
|
||||||
|
<div className="space-y-4 rounded-md border border-border/60 p-3">
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('udpp.trigger')}</Label>
|
||||||
|
<Select value={draft.trigger || 'band_change'} onValueChange={(v) => setDraft((d) => ({ ...d, trigger: v }))}>
|
||||||
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{TRIGGERS.map((x) => <SelectItem key={x.id} value={x.id}>{t(x.label)}</SelectItem>)}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('udpp.transport')}</Label>
|
||||||
|
<Select value={draft.transport || 'udp'} onValueChange={(v) => setDraft((d) => ({ ...d, transport: v }))}>
|
||||||
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="udp">{t('udpp.transportUdp')}</SelectItem>
|
||||||
|
<SelectItem value="url">{t('udpp.transportUrl')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* The one place these two features overlap. A relay board is a STATE per
|
||||||
|
band, not an event: Station Control tracks it, reads the boards at
|
||||||
|
startup and does not re-switch while the VFO moves inside a band. A
|
||||||
|
URL fired on a band change has none of that, and building the mapping
|
||||||
|
by hand here is work that is already done there. */}
|
||||||
|
{draft.trigger === 'band_change' && isURL && (
|
||||||
|
<div className="rounded border border-warning-border bg-warning-muted px-2 py-1.5 text-[11px] text-warning-muted-foreground leading-relaxed">
|
||||||
|
{t('udpp.relayInstead')}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{isURL ? (
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('udpp.url')}</Label>
|
||||||
|
<Input
|
||||||
|
className="font-mono text-xs"
|
||||||
|
placeholder="http://192.168.1.50/antenna?band={band}"
|
||||||
|
value={draft.url ?? ''}
|
||||||
|
onChange={(e) => setDraft((d) => ({ ...d, url: e.target.value }))}
|
||||||
|
/>
|
||||||
|
<div className="text-[10px] text-muted-foreground">{t('udpp.urlHint')}</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<div className="grid grid-cols-[1fr_auto] gap-2">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('udpp.destinationIp')}</Label>
|
||||||
|
<Input
|
||||||
|
className="font-mono"
|
||||||
|
placeholder="127.0.0.1"
|
||||||
|
value={draft.destination_ip}
|
||||||
|
onChange={(e) => setDraft((d) => ({ ...d, destination_ip: e.target.value }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('udpp.lineEnd')}</Label>
|
||||||
|
<Select value={draft.line_end || 'none'} onValueChange={(v) => setDraft((d) => ({ ...d, line_end: v === 'none' ? '' : v }))}>
|
||||||
|
<SelectTrigger className="w-28"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="none">{t('udpp.lineEndNone')}</SelectItem>
|
||||||
|
<SelectItem value="lf">LF</SelectItem>
|
||||||
|
<SelectItem value="crlf">CRLF</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label>{t('udpp.template')}</Label>
|
||||||
|
<textarea
|
||||||
|
className="w-full min-h-[64px] rounded-md border border-input bg-background px-2 py-1.5 font-mono text-xs"
|
||||||
|
placeholder="<AZIMUT>{az}</AZIMUT>"
|
||||||
|
value={draft.template ?? ''}
|
||||||
|
onChange={(e) => setDraft((d) => ({ ...d, template: e.target.value }))}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* What this trigger can actually fill in. */}
|
||||||
|
<div className="space-y-1">
|
||||||
|
<div className="text-[10px] uppercase tracking-wider text-muted-foreground">{t('udpp.fieldsAvailable')}</div>
|
||||||
|
<div className="flex flex-wrap gap-1">
|
||||||
|
{fields.map((f) => (
|
||||||
|
<code key={f} className="rounded bg-muted px-1 py-px text-[10px] text-muted-foreground">{`{${f}}`}</code>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="text-[10px] text-muted-foreground">{t('udpp.fieldsHint')}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import { Checkbox } from '@/components/ui/checkbox';
|
|||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import {
|
import {
|
||||||
QSLPickPhotos, QSLGenerateProposals, QSLListTemplates, QSLGetTemplate,
|
QSLPickPhotos, QSLGenerateProposals, QSLListTemplates, QSLGetTemplate,
|
||||||
|
QSLListOtherProfileTemplates, QSLCopyTemplateToActiveProfile,
|
||||||
QSLSaveTemplate, QSLSetDefaultTemplate, QSLDeleteTemplate, QSLSavePreview,
|
QSLSaveTemplate, QSLSetDefaultTemplate, QSLDeleteTemplate, QSLSavePreview,
|
||||||
QSLPreviewDataURL, QSLResolvePreview, QSLStylePresets,
|
QSLPreviewDataURL, QSLResolvePreview, QSLStylePresets,
|
||||||
} from '../../../wailsjs/go/main/App';
|
} from '../../../wailsjs/go/main/App';
|
||||||
@@ -59,6 +60,7 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
const [saved, setSaved] = useState<QSLTemplateInfo[]>([]);
|
const [saved, setSaved] = useState<QSLTemplateInfo[]>([]);
|
||||||
|
const [foreign, setForeign] = useState<any[]>([]);
|
||||||
const [previews, setPreviews] = useState<Record<number, string>>({});
|
const [previews, setPreviews] = useState<Record<number, string>>({});
|
||||||
const [presets, setPresets] = useState<QSLPresetInfo[]>([]);
|
const [presets, setPresets] = useState<QSLPresetInfo[]>([]);
|
||||||
const [fontFamilies, setFontFamilies] = useState<string[]>([]);
|
const [fontFamilies, setFontFamilies] = useState<string[]>([]);
|
||||||
@@ -88,6 +90,8 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
if (url) p[t.id] = url;
|
if (url) p[t.id] = url;
|
||||||
}));
|
}));
|
||||||
setPreviews(p);
|
setPreviews(p);
|
||||||
|
// The designs this profile cannot see, offered for copying.
|
||||||
|
try { setForeign(((await QSLListOtherProfileTemplates()) ?? []) as any[]); } catch { /* nothing to offer */ }
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(String(e));
|
setError(String(e));
|
||||||
}
|
}
|
||||||
@@ -274,7 +278,29 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="space-y-2">
|
<section className="space-y-2">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
<h3 className="text-sm font-semibold">Saved templates</h3>
|
<h3 className="text-sm font-semibold">Saved templates</h3>
|
||||||
|
{/* Designs owned by another profile. A second profile is usually
|
||||||
|
the same operator with a different rig or locator — same
|
||||||
|
callsign, same cards — and redrawing one because the antenna
|
||||||
|
changed is work nobody should have to do. */}
|
||||||
|
{!!foreign.length && (
|
||||||
|
<select
|
||||||
|
value=""
|
||||||
|
onChange={async (e) => {
|
||||||
|
const id = parseInt(e.target.value, 10);
|
||||||
|
if (!id) return;
|
||||||
|
try { await QSLCopyTemplateToActiveProfile(id); await refreshSaved(); }
|
||||||
|
catch (err) { setError(String(err)); }
|
||||||
|
}}
|
||||||
|
className="h-7 rounded-md border border-border bg-background px-2 text-xs">
|
||||||
|
<option value="">Copy from another profile…</option>
|
||||||
|
{foreign.map((f) => (
|
||||||
|
<option key={f.id} value={f.id}>{f.profile_name} — {f.name}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
{!saved.length && <p className="text-xs text-muted-foreground">None yet.</p>}
|
{!saved.length && <p className="text-xs text-muted-foreground">None yet.</p>}
|
||||||
<div className="grid grid-cols-3 gap-3">
|
<div className="grid grid-cols-3 gap-3">
|
||||||
{saved.map((t) => (
|
{saved.map((t) => (
|
||||||
|
|||||||
@@ -154,3 +154,41 @@ export function buildAwardRefs(qso: any, pickable: Array<{ code: string; field:
|
|||||||
}
|
}
|
||||||
return out.join(';');
|
return out.join(';');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// COMPUTED_AWARD_FIELDS mirrors isComputedAwardField in app.go: awards whose
|
||||||
|
// reference is derived from the callsign and cty.dat, never assigned by hand.
|
||||||
|
//
|
||||||
|
// State and county are deliberately absent, there as here — an operator sets
|
||||||
|
// those themselves and they drive real predefined-list awards (WAS, WAJA, JCC).
|
||||||
|
const COMPUTED_AWARD_FIELDS = new Set([
|
||||||
|
'dxcc', 'cqz', 'ituz', 'prefix', 'callsign', 'cont', 'country', 'grid', 'grid4',
|
||||||
|
]);
|
||||||
|
|
||||||
|
// spotRefList turns a QSO's code→ref map into the strings a DX-cluster comment
|
||||||
|
// wants: ["SOTA HA/KM-018"].
|
||||||
|
//
|
||||||
|
// COMPUTED awards are dropped. A QSO's materialised references hold both kinds,
|
||||||
|
// and the derived ones — DXCC, WAC, WAZ, WPX — are exactly what every reader of
|
||||||
|
// the spot works out from the callsign anyway. Announcing "WAC EU WAZ 15 WPX HA5"
|
||||||
|
// spends the whole 30-character comment saying nothing, and buries the one
|
||||||
|
// reference worth chasing. Same rule as the QSO editor, which is why these are
|
||||||
|
// the references it lists on the LEFT and not in its read-only panel.
|
||||||
|
//
|
||||||
|
// fieldOf is award code → scanned field (from GetAwardDefs). A code missing from
|
||||||
|
// it is dropped rather than guessed: showing a reference on the air matters more
|
||||||
|
// than showing all of them.
|
||||||
|
//
|
||||||
|
// A code carrying several references (a two-fer park) yields one entry each, so
|
||||||
|
// a spot can take the one that fits instead of emitting a truncated pair.
|
||||||
|
// Shortest first: when they cannot all fit, more references beat fewer.
|
||||||
|
export function spotRefList(byCode: Record<string, string>, fieldOf: Record<string, string>): string[] {
|
||||||
|
const out: string[] = [];
|
||||||
|
for (const [code, refs] of Object.entries(byCode ?? {})) {
|
||||||
|
const field = fieldOf?.[code.toUpperCase()];
|
||||||
|
if (!field || COMPUTED_AWARD_FIELDS.has(field)) continue;
|
||||||
|
for (const ref of String(refs).split(',').map((s) => s.trim()).filter(Boolean)) {
|
||||||
|
out.push(`${code.toUpperCase()} ${ref.toUpperCase()}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out.sort((a, b) => a.length - b.length || a.localeCompare(b));
|
||||||
|
}
|
||||||
|
|||||||
+45
-33
File diff suppressed because one or more lines are too long
@@ -0,0 +1,17 @@
|
|||||||
|
// One answer to "is this QSL received".
|
||||||
|
//
|
||||||
|
// ADIF's QSL_Rcvd enumeration has BOTH Y and V: Y is "received", V is
|
||||||
|
// "verified" — and V is what a LoTW download writes for a confirmation the ARRL
|
||||||
|
// has validated. Testing for 'Y' alone therefore misses exactly the
|
||||||
|
// confirmations an operator cares most about.
|
||||||
|
//
|
||||||
|
// It showed on screen: the Awards panel had Morocco validated on five bands
|
||||||
|
// while the band/mode matrix beside it showed the entity as merely worked. The
|
||||||
|
// award engine accepted Y or V; every other test in the app accepted Y.
|
||||||
|
//
|
||||||
|
// The Go side has the same rule twice over — award.isYes and qso.ConfirmedValues
|
||||||
|
// — and all three have to agree. If you add a value here, add it there.
|
||||||
|
export function isQSLConfirmed(v: unknown): boolean {
|
||||||
|
const s = String(v ?? '').trim().toUpperCase();
|
||||||
|
return s === 'Y' || s === 'V';
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
import { isQSLConfirmed } from '@/lib/qsl';
|
||||||
|
// Row colouring for the log grid, by QSL status.
|
||||||
|
//
|
||||||
|
// Four categories, each scoped to the channels the operator cares about —
|
||||||
|
// paper QSL, LoTW, eQSL, QRZ.com. The rules are ORDERED and the first match
|
||||||
|
// wins, because a contact is usually several of them at once.
|
||||||
|
|
||||||
|
export type RowColorRule = {
|
||||||
|
id: string;
|
||||||
|
color: string;
|
||||||
|
enabled: boolean;
|
||||||
|
channels?: string[]; // empty = every channel
|
||||||
|
};
|
||||||
|
export type RowColorSettings = {
|
||||||
|
enabled: boolean;
|
||||||
|
style?: 'bar' | 'tint' | 'both';
|
||||||
|
intensity?: number;
|
||||||
|
bandmap_lotw?: boolean;
|
||||||
|
rules: RowColorRule[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CHANNELS = ['qsl', 'lotw', 'eqsl', 'qrz'] as const;
|
||||||
|
|
||||||
|
// The two QSO fields behind each channel. QRZ.com and Club Log call theirs an
|
||||||
|
// "upload status" rather than a QSL flag, but they carry the same Y / R letters.
|
||||||
|
const FIELDS: Record<string, { sent: string; rcvd: string }> = {
|
||||||
|
qsl: { sent: 'qsl_sent', rcvd: 'qsl_rcvd' },
|
||||||
|
lotw: { sent: 'lotw_sent', rcvd: 'lotw_rcvd' },
|
||||||
|
eqsl: { sent: 'eqsl_sent', rcvd: 'eqsl_rcvd' },
|
||||||
|
qrz: { sent: 'qrzcom_qso_upload_status', rcvd: 'qrzcom_qso_download_status' },
|
||||||
|
};
|
||||||
|
|
||||||
|
// ADIF QSL fields are single letters. Y is the only one that means "yes";
|
||||||
|
// R (requested) and Q (queued) mean it has not gone out yet — a different state,
|
||||||
|
// and the one an operator looks for when deciding what to send.
|
||||||
|
// Y or V — see lib/qsl. A LoTW-verified contact is confirmed, and colouring it
|
||||||
|
// as unconfirmed is the same bug the band/mode matrix had.
|
||||||
|
const yes = (v: any) => isQSLConfirmed(v);
|
||||||
|
const owed = (v: any) => {
|
||||||
|
const s = String(v ?? '').trim().toUpperCase();
|
||||||
|
return s === 'R' || s === 'Q';
|
||||||
|
};
|
||||||
|
|
||||||
|
const chansOf = (r: RowColorRule): readonly string[] =>
|
||||||
|
r.channels && r.channels.length ? r.channels : CHANNELS;
|
||||||
|
|
||||||
|
function ruleMatches(q: any, r: RowColorRule): boolean {
|
||||||
|
const cs = chansOf(r);
|
||||||
|
switch (r.id) {
|
||||||
|
case 'confirmed':
|
||||||
|
return cs.some((c) => yes(q[FIELDS[c]?.rcvd]));
|
||||||
|
case 'sent':
|
||||||
|
return cs.some((c) => yes(q[FIELDS[c]?.sent]));
|
||||||
|
case 'to_send':
|
||||||
|
return cs.some((c) => owed(q[FIELDS[c]?.sent]));
|
||||||
|
case 'worked':
|
||||||
|
// The catch-all: nothing sent, nothing asked for, nothing back.
|
||||||
|
return !CHANNELS.some((c) => yes(q[FIELDS[c].rcvd]) || yes(q[FIELDS[c].sent]) || owed(q[FIELDS[c].sent]));
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Walks the rules IN ORDER — the order is the priority, and the settings panel
|
||||||
|
// shows it numbered so it can be read rather than guessed.
|
||||||
|
export function matchRowRule(q: any, cfg: RowColorSettings | null): RowColorRule | null {
|
||||||
|
if (!q || !cfg?.rules) return null;
|
||||||
|
for (const r of cfg.rules) {
|
||||||
|
if (r.enabled && ruleMatches(q, r)) return r;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The colour is never a fill by default.
|
||||||
|
//
|
||||||
|
// A log where nearly every contact has SOME QSL state ends up with every row
|
||||||
|
// painted, and colour that is always present stops being information. The
|
||||||
|
// default is a stripe down the left edge; a tint is offered at a chosen strength.
|
||||||
|
export function rowStyleFor(q: any, cfg: RowColorSettings | null): Record<string, string> | undefined {
|
||||||
|
if (!cfg?.enabled) return undefined;
|
||||||
|
const rule = matchRowRule(q, cfg);
|
||||||
|
if (!rule?.color) return undefined;
|
||||||
|
|
||||||
|
const style = cfg.style ?? 'bar';
|
||||||
|
const pct = Math.max(5, Math.min(45, cfg.intensity ?? 12));
|
||||||
|
const out: Record<string, string> = {};
|
||||||
|
if (style === 'tint' || style === 'both') {
|
||||||
|
out.backgroundColor = `color-mix(in srgb, ${rule.color} ${pct}%, transparent)`;
|
||||||
|
}
|
||||||
|
if (style === 'bar' || style === 'both') {
|
||||||
|
// inset shadow rather than a border: a border would shift the cells three
|
||||||
|
// pixels on coloured rows only, and the columns would stop lining up.
|
||||||
|
out.boxShadow = `inset 3px 0 0 ${rule.color}`;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
@@ -74,3 +74,16 @@ export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions):
|
|||||||
}
|
}
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// spotIsWorked answers "does this spot bring me nothing?", which is what the
|
||||||
|
// "hide worked" filter is really asking.
|
||||||
|
//
|
||||||
|
// The extra markers are ORTHOGONAL to the entity status — a spot can be a worked
|
||||||
|
// entity AND a new park, prefix, county or grid — so they win. Without that, a
|
||||||
|
// new prefix in an entity worked years ago vanished the moment the filter went
|
||||||
|
// on, which is the opposite of what an operator hunting prefixes wants.
|
||||||
|
export function spotIsWorked(e: Entry): boolean {
|
||||||
|
if (!e) return false;
|
||||||
|
if (e.new_pota || e.new_county || e.new_pfx || e.new_grid) return false;
|
||||||
|
return !!e.worked_call || e.status === 'worked';
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,14 +6,14 @@ import { GetUIPref } from '../../wailsjs/go/main/App';
|
|||||||
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
||||||
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
||||||
// travels with the data/ folder like the language).
|
// travels with the data/ folder like the language).
|
||||||
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic'
|
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic' | 'sahara'
|
||||||
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
|
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
|
||||||
|
|
||||||
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
|
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
|
||||||
// then darks, with high-contrast last — it is an accessibility choice, not a
|
// then darks, with high-contrast last — it is an accessibility choice, not a
|
||||||
// taste one, and listing it among the moods buries it.
|
// taste one, and listing it among the moods buries it.
|
||||||
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
||||||
'light-warm', 'light-cool', 'light-sage', 'light-nordic',
|
'light-warm', 'light-cool', 'light-sage', 'light-nordic', 'sahara',
|
||||||
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
|
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
|
||||||
'high-contrast',
|
'high-contrast',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ 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.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)
|
||||||
'opslog.showBeamOnMap', // antenna beam lobe drawn on the Main map
|
'opslog.showBeamOnMap', // antenna beam lobe drawn on the Main map
|
||||||
|
|||||||
+78
-1
@@ -775,6 +775,82 @@
|
|||||||
color-scheme: light;
|
color-scheme: light;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ---- Theme 1e: Sahara — Warm light, taken a step deeper --------------------
|
||||||
|
Warm light's cream is kept for panels and the entry strip (#faf6eb, the one
|
||||||
|
surface an operator stares at while typing a call), but the page behind them
|
||||||
|
and every toolbar, tab bar and table header go one shade further into the
|
||||||
|
sand. That was the whole request: same family, just a little darker, so the
|
||||||
|
cream panels lift clearly instead of blending into the page.
|
||||||
|
Ink is a deep warm brown rather than black: pure black on sand glares.
|
||||||
|
The accent moves from Warm light's burnt orange to ochre to keep the two
|
||||||
|
themes apart at a glance in the theme picker. ---------------------------- */
|
||||||
|
[data-theme="sahara"] {
|
||||||
|
--background: #e6ded0; /* parchment — the page */
|
||||||
|
--foreground: #3a3227; /* warm brown-ink */
|
||||||
|
--card: #f3eee2; /* panels, entry strip, log rows */
|
||||||
|
--card-foreground: #3a3227;
|
||||||
|
--popover: #f3eee2;
|
||||||
|
--popover-foreground: #3a3227;
|
||||||
|
--primary: #c4501e; /* terracotta — buttons and the frequency */
|
||||||
|
--primary-foreground: #fdf8f0;
|
||||||
|
--secondary: #ded5c4;
|
||||||
|
--secondary-foreground: #3a3227;
|
||||||
|
--muted: #ded5c4; /* toolbars / tab bar / table headers */
|
||||||
|
--muted-foreground: #6a5f4e; /* readable on both parchments */
|
||||||
|
--accent: #ecd9c0; /* warm highlight */
|
||||||
|
--accent-foreground: #7a3410;
|
||||||
|
--destructive: #b3401b;
|
||||||
|
--destructive-foreground: #ffffff;
|
||||||
|
--destructive-muted: #f7e4da;
|
||||||
|
--destructive-muted-foreground: #8f3315;
|
||||||
|
--border: #cdc2ae; /* one step down, so edges read without lines */
|
||||||
|
--input: #cdc2ae;
|
||||||
|
--ring: #c4501e; /* the accent, so focus matches the buttons */
|
||||||
|
|
||||||
|
--success: #15803d;
|
||||||
|
--success-foreground: #ffffff;
|
||||||
|
--success-muted: #dcf3e1;
|
||||||
|
--success-muted-foreground: #14532d;
|
||||||
|
--success-border: #86d99f;
|
||||||
|
|
||||||
|
--warning: #b45309;
|
||||||
|
--warning-foreground: #ffffff;
|
||||||
|
--warning-muted: #fbeacd;
|
||||||
|
--warning-muted-foreground: #7c3d05;
|
||||||
|
--warning-border: #e8b96a;
|
||||||
|
|
||||||
|
--caution: #a16207;
|
||||||
|
--caution-foreground: #1c1917;
|
||||||
|
--caution-muted: #f7edcb;
|
||||||
|
--caution-muted-foreground: #713f12;
|
||||||
|
--caution-border: #e0c069;
|
||||||
|
|
||||||
|
--danger: #be123c;
|
||||||
|
--danger-foreground: #ffffff;
|
||||||
|
--danger-muted: #fbe3e8;
|
||||||
|
--danger-muted-foreground: #9f1239;
|
||||||
|
--danger-border: #ee9aac;
|
||||||
|
|
||||||
|
--info: #0369a1;
|
||||||
|
--info-foreground: #ffffff;
|
||||||
|
--info-muted: #e0eef6;
|
||||||
|
--info-muted-foreground: #075985;
|
||||||
|
--info-border: #86c5e4;
|
||||||
|
|
||||||
|
/* Band/mode matrix — the app's blues kept, on a sand neutral so an empty slot
|
||||||
|
recedes into the grid instead of punching a hole in it. */
|
||||||
|
--mx-call-conf: #15803d;
|
||||||
|
--mx-call-work: #7fd6a4;
|
||||||
|
--mx-dx-conf: #3730a3;
|
||||||
|
--mx-dx-work: #a5b4fc;
|
||||||
|
--mx-none: #ded5c4;
|
||||||
|
|
||||||
|
--scrollbar-thumb: #c2b6a0;
|
||||||
|
--scrollbar-thumb-hover: #a5977e;
|
||||||
|
--card-shadow: 0 1px 2px rgba(58, 50, 39, 0.06), 0 0 0 1px rgba(58, 50, 39, 0.03);
|
||||||
|
color-scheme: light;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
||||||
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
||||||
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
||||||
@@ -793,7 +869,8 @@
|
|||||||
[data-theme="light-warm"],
|
[data-theme="light-warm"],
|
||||||
[data-theme="light-cool"],
|
[data-theme="light-cool"],
|
||||||
[data-theme="light-sage"],
|
[data-theme="light-sage"],
|
||||||
[data-theme="light-nordic"] {
|
[data-theme="light-nordic"],
|
||||||
|
[data-theme="sahara"] {
|
||||||
--chart-1: #2a78d6; /* blue — default single-series hue */
|
--chart-1: #2a78d6; /* blue — default single-series hue */
|
||||||
--chart-2: #1baf7a; /* aqua */
|
--chart-2: #1baf7a; /* aqua */
|
||||||
--chart-3: #eda100; /* yellow */
|
--chart-3: #eda100; /* yellow */
|
||||||
|
|||||||
@@ -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.24.7';
|
export const APP_VERSION = '0.25.4';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+38
@@ -176,6 +176,8 @@ export function DiscoverFlexRadios():Promise<Array<cat.FlexRadio>>;
|
|||||||
|
|
||||||
export function DismissAwardUpdate(arg1:string):Promise<void>;
|
export function DismissAwardUpdate(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function DismissQSLViaRepair():Promise<void>;
|
||||||
|
|
||||||
export function DownloadAllReferenceLists():Promise<string>;
|
export function DownloadAllReferenceLists():Promise<string>;
|
||||||
|
|
||||||
export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
|
export function DownloadAndApplyUpdate(arg1:string):Promise<void>;
|
||||||
@@ -404,6 +406,12 @@ export function GetCatalogCodes():Promise<Array<string>>;
|
|||||||
|
|
||||||
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
|
export function GetChangelog():Promise<Array<main.ChangelogEntry>>;
|
||||||
|
|
||||||
|
export function GetChaseNew():Promise<boolean>;
|
||||||
|
|
||||||
|
export function GetChaseNewGrids():Promise<boolean>;
|
||||||
|
|
||||||
|
export function GetChaseNewSpots():Promise<Array<main.ChaseNewSpot>>;
|
||||||
|
|
||||||
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
||||||
|
|
||||||
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
||||||
@@ -440,8 +448,12 @@ export function GetFlexBandPower():Promise<Record<string, main.FlexBandPower>>;
|
|||||||
|
|
||||||
export function GetFlexState():Promise<cat.FlexTXState>;
|
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||||
|
|
||||||
|
export function GetGridCacheStatus():Promise<main.GridCacheStatus>;
|
||||||
|
|
||||||
export function GetIcomState():Promise<cat.IcomTXState>;
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
|
export function GetLinkedAmps():Promise<Array<string>>;
|
||||||
|
|
||||||
export function GetListsSettings():Promise<main.ListsSettings>;
|
export function GetListsSettings():Promise<main.ListsSettings>;
|
||||||
|
|
||||||
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
|
export function GetLiveOpenings():Promise<Array<bandopen.Opening>>;
|
||||||
@@ -488,6 +500,8 @@ export function GetRotatorHeading():Promise<main.RotatorHeading>;
|
|||||||
|
|
||||||
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
export function GetRotators():Promise<Array<main.RotatorDevice>>;
|
||||||
|
|
||||||
|
export function GetRowColors():Promise<main.RowColorSettings>;
|
||||||
|
|
||||||
export function GetSPEStatus():Promise<spe.Status>;
|
export function GetSPEStatus():Promise<spe.Status>;
|
||||||
|
|
||||||
export function GetScpStatus():Promise<main.ScpStatus>;
|
export function GetScpStatus():Promise<main.ScpStatus>;
|
||||||
@@ -500,6 +514,8 @@ export function GetSlotStats():Promise<qso.SlotStats>;
|
|||||||
|
|
||||||
export function GetSolarData():Promise<solar.Data>;
|
export function GetSolarData():Promise<solar.Data>;
|
||||||
|
|
||||||
|
export function GetSpotTTLMinutes():Promise<number>;
|
||||||
|
|
||||||
export function GetStartupStatus():Promise<main.StartupStatus>;
|
export function GetStartupStatus():Promise<main.StartupStatus>;
|
||||||
|
|
||||||
export function GetStationDevices():Promise<Array<main.StationDevice>>;
|
export function GetStationDevices():Promise<Array<main.StationDevice>>;
|
||||||
@@ -760,6 +776,8 @@ export function PopulateBuiltinReferences(arg1:string):Promise<number>;
|
|||||||
|
|
||||||
export function PublishLogNow():Promise<string>;
|
export function PublishLogNow():Promise<string>;
|
||||||
|
|
||||||
|
export function QSLCopyTemplateToActiveProfile(arg1:number):Promise<number>;
|
||||||
|
|
||||||
export function QSLDefaultTemplateID():Promise<number>;
|
export function QSLDefaultTemplateID():Promise<number>;
|
||||||
|
|
||||||
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
||||||
@@ -774,6 +792,8 @@ export function QSLGetEmailTemplates():Promise<main.QSLEmailTemplates>;
|
|||||||
|
|
||||||
export function QSLGetTemplate(arg1:number):Promise<string>;
|
export function QSLGetTemplate(arg1:number):Promise<string>;
|
||||||
|
|
||||||
|
export function QSLListOtherProfileTemplates():Promise<Array<main.QSLForeignTemplate>>;
|
||||||
|
|
||||||
export function QSLListTemplates():Promise<Array<main.QSLTemplateInfo>>;
|
export function QSLListTemplates():Promise<Array<main.QSLTemplateInfo>>;
|
||||||
|
|
||||||
export function QSLPhotoDataURL(arg1:number,arg2:string):Promise<string>;
|
export function QSLPhotoDataURL(arg1:number,arg2:string):Promise<string>;
|
||||||
@@ -794,6 +814,8 @@ export function QSLSetDefaultTemplate(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function QSLStylePresets():Promise<Array<main.QSLPresetInfo>>;
|
export function QSLStylePresets():Promise<Array<main.QSLPresetInfo>>;
|
||||||
|
|
||||||
|
export function QSLViaRepairStatus():Promise<main.QSLViaRepairStatus>;
|
||||||
|
|
||||||
export function QSOAudioBegin():Promise<boolean>;
|
export function QSOAudioBegin():Promise<boolean>;
|
||||||
|
|
||||||
export function QSOAudioCancel():Promise<void>;
|
export function QSOAudioCancel():Promise<void>;
|
||||||
@@ -832,6 +854,8 @@ export function RenameLogbook(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
|
export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
|
||||||
|
|
||||||
|
export function RepairQSLVia():Promise<main.QSLViaRepairResult>;
|
||||||
|
|
||||||
export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
|
export function ReplaceAwardReferences(arg1:string,arg2:Array<awardref.Ref>):Promise<number>;
|
||||||
|
|
||||||
export function ReportLiveActivity(arg1:number,arg2:string,arg3:string):Promise<void>;
|
export function ReportLiveActivity(arg1:number,arg2:string,arg3:string):Promise<void>;
|
||||||
@@ -852,6 +876,8 @@ export function RevealDataFolder():Promise<void>;
|
|||||||
|
|
||||||
export function RotatorGoTo(arg1:number,arg2:number):Promise<void>;
|
export function RotatorGoTo(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function RotatorGoToPath(arg1:number,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function RotatorPark():Promise<void>;
|
export function RotatorPark():Promise<void>;
|
||||||
|
|
||||||
export function RotatorStop():Promise<void>;
|
export function RotatorStop():Promise<void>;
|
||||||
@@ -924,6 +950,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 SaveRowColors(arg1:main.RowColorSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
|
||||||
@@ -970,18 +998,26 @@ export function SetCIVTrace(arg1:boolean):Promise<void>;
|
|||||||
|
|
||||||
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetChaseNew(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetChaseNewGrids(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetCompactHeight(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetCompactMode(arg1:boolean):Promise<void>;
|
export function SetCompactMode(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||||
|
|
||||||
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetLinkedAmps(arg1:Array<string>):Promise<void>;
|
||||||
|
|
||||||
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
export function SetMotorFollow(arg1:boolean,arg2:number,arg3:string):Promise<void>;
|
||||||
|
|
||||||
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
|
||||||
@@ -990,6 +1026,8 @@ export function SetPassphrase(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||||
|
|||||||
@@ -294,6 +294,10 @@ export function DismissAwardUpdate(arg1) {
|
|||||||
return window['go']['main']['App']['DismissAwardUpdate'](arg1);
|
return window['go']['main']['App']['DismissAwardUpdate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DismissQSLViaRepair() {
|
||||||
|
return window['go']['main']['App']['DismissQSLViaRepair']();
|
||||||
|
}
|
||||||
|
|
||||||
export function DownloadAllReferenceLists() {
|
export function DownloadAllReferenceLists() {
|
||||||
return window['go']['main']['App']['DownloadAllReferenceLists']();
|
return window['go']['main']['App']['DownloadAllReferenceLists']();
|
||||||
}
|
}
|
||||||
@@ -750,6 +754,18 @@ export function GetChangelog() {
|
|||||||
return window['go']['main']['App']['GetChangelog']();
|
return window['go']['main']['App']['GetChangelog']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetChaseNew() {
|
||||||
|
return window['go']['main']['App']['GetChaseNew']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetChaseNewGrids() {
|
||||||
|
return window['go']['main']['App']['GetChaseNewGrids']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetChaseNewSpots() {
|
||||||
|
return window['go']['main']['App']['GetChaseNewSpots']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetChatHistory(arg1) {
|
export function GetChatHistory(arg1) {
|
||||||
return window['go']['main']['App']['GetChatHistory'](arg1);
|
return window['go']['main']['App']['GetChatHistory'](arg1);
|
||||||
}
|
}
|
||||||
@@ -822,10 +838,18 @@ export function GetFlexState() {
|
|||||||
return window['go']['main']['App']['GetFlexState']();
|
return window['go']['main']['App']['GetFlexState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetGridCacheStatus() {
|
||||||
|
return window['go']['main']['App']['GetGridCacheStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetIcomState() {
|
export function GetIcomState() {
|
||||||
return window['go']['main']['App']['GetIcomState']();
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetLinkedAmps() {
|
||||||
|
return window['go']['main']['App']['GetLinkedAmps']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetListsSettings() {
|
export function GetListsSettings() {
|
||||||
return window['go']['main']['App']['GetListsSettings']();
|
return window['go']['main']['App']['GetListsSettings']();
|
||||||
}
|
}
|
||||||
@@ -918,6 +942,10 @@ export function GetRotators() {
|
|||||||
return window['go']['main']['App']['GetRotators']();
|
return window['go']['main']['App']['GetRotators']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetRowColors() {
|
||||||
|
return window['go']['main']['App']['GetRowColors']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetSPEStatus() {
|
export function GetSPEStatus() {
|
||||||
return window['go']['main']['App']['GetSPEStatus']();
|
return window['go']['main']['App']['GetSPEStatus']();
|
||||||
}
|
}
|
||||||
@@ -942,6 +970,10 @@ export function GetSolarData() {
|
|||||||
return window['go']['main']['App']['GetSolarData']();
|
return window['go']['main']['App']['GetSolarData']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetSpotTTLMinutes() {
|
||||||
|
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetStartupStatus() {
|
export function GetStartupStatus() {
|
||||||
return window['go']['main']['App']['GetStartupStatus']();
|
return window['go']['main']['App']['GetStartupStatus']();
|
||||||
}
|
}
|
||||||
@@ -1462,6 +1494,10 @@ export function PublishLogNow() {
|
|||||||
return window['go']['main']['App']['PublishLogNow']();
|
return window['go']['main']['App']['PublishLogNow']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function QSLCopyTemplateToActiveProfile(arg1) {
|
||||||
|
return window['go']['main']['App']['QSLCopyTemplateToActiveProfile'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function QSLDefaultTemplateID() {
|
export function QSLDefaultTemplateID() {
|
||||||
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
||||||
}
|
}
|
||||||
@@ -1490,6 +1526,10 @@ export function QSLGetTemplate(arg1) {
|
|||||||
return window['go']['main']['App']['QSLGetTemplate'](arg1);
|
return window['go']['main']['App']['QSLGetTemplate'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function QSLListOtherProfileTemplates() {
|
||||||
|
return window['go']['main']['App']['QSLListOtherProfileTemplates']();
|
||||||
|
}
|
||||||
|
|
||||||
export function QSLListTemplates() {
|
export function QSLListTemplates() {
|
||||||
return window['go']['main']['App']['QSLListTemplates']();
|
return window['go']['main']['App']['QSLListTemplates']();
|
||||||
}
|
}
|
||||||
@@ -1530,6 +1570,10 @@ export function QSLStylePresets() {
|
|||||||
return window['go']['main']['App']['QSLStylePresets']();
|
return window['go']['main']['App']['QSLStylePresets']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function QSLViaRepairStatus() {
|
||||||
|
return window['go']['main']['App']['QSLViaRepairStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function QSOAudioBegin() {
|
export function QSOAudioBegin() {
|
||||||
return window['go']['main']['App']['QSOAudioBegin']();
|
return window['go']['main']['App']['QSOAudioBegin']();
|
||||||
}
|
}
|
||||||
@@ -1606,6 +1650,10 @@ export function RenderEQSL(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
|
return window['go']['main']['App']['RenderEQSL'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RepairQSLVia() {
|
||||||
|
return window['go']['main']['App']['RepairQSLVia']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ReplaceAwardReferences(arg1, arg2) {
|
export function ReplaceAwardReferences(arg1, arg2) {
|
||||||
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
|
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -1646,6 +1694,10 @@ export function RotatorGoTo(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['RotatorGoTo'](arg1, arg2);
|
return window['go']['main']['App']['RotatorGoTo'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function RotatorGoToPath(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['RotatorGoToPath'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function RotatorPark() {
|
export function RotatorPark() {
|
||||||
return window['go']['main']['App']['RotatorPark']();
|
return window['go']['main']['App']['RotatorPark']();
|
||||||
}
|
}
|
||||||
@@ -1790,6 +1842,10 @@ export function SaveRotators(arg1) {
|
|||||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveRowColors(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveRowColors'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveSelfSpotSettings(arg1) {
|
export function SaveSelfSpotSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1882,6 +1938,14 @@ export function SetCWDecoderPitch(arg1) {
|
|||||||
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetChaseNew(arg1) {
|
||||||
|
return window['go']['main']['App']['SetChaseNew'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SetChaseNewGrids(arg1) {
|
||||||
|
return window['go']['main']['App']['SetChaseNewGrids'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetClublogCtyEnabled(arg1) {
|
export function SetClublogCtyEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1894,6 +1958,10 @@ export function SetClusterAutoConnect(arg1) {
|
|||||||
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
|
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetCompactHeight(arg1) {
|
||||||
|
return window['go']['main']['App']['SetCompactHeight'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetCompactMode(arg1) {
|
export function SetCompactMode(arg1) {
|
||||||
return window['go']['main']['App']['SetCompactMode'](arg1);
|
return window['go']['main']['App']['SetCompactMode'](arg1);
|
||||||
}
|
}
|
||||||
@@ -1906,6 +1974,10 @@ export function SetKenwoodKeySpeed(arg1) {
|
|||||||
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetLinkedAmps(arg1) {
|
||||||
|
return window['go']['main']['App']['SetLinkedAmps'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetMotorFollow(arg1, arg2, arg3) {
|
export function SetMotorFollow(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2, arg3);
|
return window['go']['main']['App']['SetMotorFollow'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -1922,6 +1994,10 @@ export function SetScpEnabled(arg1) {
|
|||||||
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetSpotTTLMinutes(arg1) {
|
||||||
|
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetTelemetryEnabled(arg1) {
|
export function SetTelemetryEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1331,6 +1331,7 @@ export namespace extsvc {
|
|||||||
upload_flags: string[];
|
upload_flags: string[];
|
||||||
write_log: boolean;
|
write_log: boolean;
|
||||||
auto_upload: boolean;
|
auto_upload: boolean;
|
||||||
|
on_air: boolean;
|
||||||
upload_mode: string;
|
upload_mode: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
@@ -1355,6 +1356,7 @@ export namespace extsvc {
|
|||||||
this.upload_flags = source["upload_flags"];
|
this.upload_flags = source["upload_flags"];
|
||||||
this.write_log = source["write_log"];
|
this.write_log = source["write_log"];
|
||||||
this.auto_upload = source["auto_upload"];
|
this.auto_upload = source["auto_upload"];
|
||||||
|
this.on_air = source["on_air"];
|
||||||
this.upload_mode = source["upload_mode"];
|
this.upload_mode = source["upload_mode"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1441,6 +1443,8 @@ export namespace lookup {
|
|||||||
cont?: string;
|
cont?: string;
|
||||||
email?: string;
|
email?: string;
|
||||||
qsl_via?: string;
|
qsl_via?: string;
|
||||||
|
web?: string;
|
||||||
|
zip?: string;
|
||||||
image_url?: string;
|
image_url?: string;
|
||||||
source: string;
|
source: string;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
@@ -1468,6 +1472,8 @@ export namespace lookup {
|
|||||||
this.cont = source["cont"];
|
this.cont = source["cont"];
|
||||||
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.zip = source["zip"];
|
||||||
this.image_url = source["image_url"];
|
this.image_url = source["image_url"];
|
||||||
this.source = source["source"];
|
this.source = source["source"];
|
||||||
this.fetched_at = this.convertValues(source["fetched_at"], null);
|
this.fetched_at = this.convertValues(source["fetched_at"], null);
|
||||||
@@ -2125,6 +2131,44 @@ export namespace main {
|
|||||||
this.fr = source["fr"];
|
this.fr = source["fr"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class ChaseNewSpot {
|
||||||
|
call: string;
|
||||||
|
band: string;
|
||||||
|
mode: string;
|
||||||
|
freq_hz: number;
|
||||||
|
grid: string;
|
||||||
|
country?: string;
|
||||||
|
cont?: string;
|
||||||
|
dist_km: number;
|
||||||
|
bearing: number;
|
||||||
|
status?: string;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
new_grid?: boolean;
|
||||||
|
lotw?: boolean;
|
||||||
|
at: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new ChaseNewSpot(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.call = source["call"];
|
||||||
|
this.band = source["band"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
this.freq_hz = source["freq_hz"];
|
||||||
|
this.grid = source["grid"];
|
||||||
|
this.country = source["country"];
|
||||||
|
this.cont = source["cont"];
|
||||||
|
this.dist_km = source["dist_km"];
|
||||||
|
this.bearing = source["bearing"];
|
||||||
|
this.status = source["status"];
|
||||||
|
this.new_pfx = source["new_pfx"];
|
||||||
|
this.new_grid = source["new_grid"];
|
||||||
|
this.lotw = source["lotw"];
|
||||||
|
this.at = source["at"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ChatMessage {
|
export class ChatMessage {
|
||||||
id: number;
|
id: number;
|
||||||
operator: string;
|
operator: string;
|
||||||
@@ -2419,6 +2463,22 @@ export namespace main {
|
|||||||
this.body = source["body"];
|
this.body = source["body"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class GridCacheStatus {
|
||||||
|
enabled: boolean;
|
||||||
|
known: number;
|
||||||
|
pending: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new GridCacheStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.known = source["known"];
|
||||||
|
this.pending = source["pending"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ModePreset {
|
export class ModePreset {
|
||||||
name: string;
|
name: string;
|
||||||
default_rst_sent?: string;
|
default_rst_sent?: string;
|
||||||
@@ -2521,6 +2581,7 @@ export namespace main {
|
|||||||
primary: string;
|
primary: string;
|
||||||
failsafe: string;
|
failsafe: string;
|
||||||
download_images: boolean;
|
download_images: boolean;
|
||||||
|
qrz_prefer_nickname: boolean;
|
||||||
cache_ttl_days: number;
|
cache_ttl_days: number;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
@@ -2536,6 +2597,7 @@ export namespace main {
|
|||||||
this.primary = source["primary"];
|
this.primary = source["primary"];
|
||||||
this.failsafe = source["failsafe"];
|
this.failsafe = source["failsafe"];
|
||||||
this.download_images = source["download_images"];
|
this.download_images = source["download_images"];
|
||||||
|
this.qrz_prefer_nickname = source["qrz_prefer_nickname"];
|
||||||
this.cache_ttl_days = source["cache_ttl_days"];
|
this.cache_ttl_days = source["cache_ttl_days"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2677,6 +2739,7 @@ export namespace main {
|
|||||||
sent_date: string;
|
sent_date: string;
|
||||||
rcvd_date: string;
|
rcvd_date: string;
|
||||||
via: string;
|
via: string;
|
||||||
|
rcvd_via: string;
|
||||||
notes: string;
|
notes: string;
|
||||||
comment: string;
|
comment: string;
|
||||||
|
|
||||||
@@ -2691,6 +2754,7 @@ export namespace main {
|
|||||||
this.sent_date = source["sent_date"];
|
this.sent_date = source["sent_date"];
|
||||||
this.rcvd_date = source["rcvd_date"];
|
this.rcvd_date = source["rcvd_date"];
|
||||||
this.via = source["via"];
|
this.via = source["via"];
|
||||||
|
this.rcvd_via = source["rcvd_via"];
|
||||||
this.notes = source["notes"];
|
this.notes = source["notes"];
|
||||||
this.comment = source["comment"];
|
this.comment = source["comment"];
|
||||||
}
|
}
|
||||||
@@ -2761,6 +2825,24 @@ export namespace main {
|
|||||||
this.data_b64 = source["data_b64"];
|
this.data_b64 = source["data_b64"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class QSLForeignTemplate {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
profile_id: number;
|
||||||
|
profile_name: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new QSLForeignTemplate(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.profile_id = source["profile_id"];
|
||||||
|
this.profile_name = source["profile_name"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class QSLPresetInfo {
|
export class QSLPresetInfo {
|
||||||
name: string;
|
name: string;
|
||||||
label: string;
|
label: string;
|
||||||
@@ -2817,6 +2899,32 @@ export namespace main {
|
|||||||
this.updated_at = source["updated_at"];
|
this.updated_at = source["updated_at"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class QSLViaRepairResult {
|
||||||
|
moved: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new QSLViaRepairResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.moved = source["moved"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class QSLViaRepairStatus {
|
||||||
|
affected: number;
|
||||||
|
asked: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new QSLViaRepairStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.affected = source["affected"];
|
||||||
|
this.asked = source["asked"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class QSOAwardRef {
|
export class QSOAwardRef {
|
||||||
code: string;
|
code: string;
|
||||||
ref: string;
|
ref: string;
|
||||||
@@ -2925,6 +3033,7 @@ export namespace main {
|
|||||||
transport: string;
|
transport: string;
|
||||||
com_port: string;
|
com_port: string;
|
||||||
baud: number;
|
baud: number;
|
||||||
|
spid_model?: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new RotatorDevice(source);
|
return new RotatorDevice(source);
|
||||||
@@ -2946,6 +3055,7 @@ export namespace main {
|
|||||||
this.transport = source["transport"];
|
this.transport = source["transport"];
|
||||||
this.com_port = source["com_port"];
|
this.com_port = source["com_port"];
|
||||||
this.baud = source["baud"];
|
this.baud = source["baud"];
|
||||||
|
this.spid_model = source["spid_model"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class RotatorHeading {
|
export class RotatorHeading {
|
||||||
@@ -2972,6 +3082,64 @@ export namespace main {
|
|||||||
this.motorized = source["motorized"];
|
this.motorized = source["motorized"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class RowColorRule {
|
||||||
|
id: string;
|
||||||
|
color: string;
|
||||||
|
enabled: boolean;
|
||||||
|
channels: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RowColorRule(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.color = source["color"];
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.channels = source["channels"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class RowColorSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
style: string;
|
||||||
|
intensity: number;
|
||||||
|
bandmap_lotw: boolean;
|
||||||
|
configured: boolean;
|
||||||
|
rules: RowColorRule[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new RowColorSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.style = source["style"];
|
||||||
|
this.intensity = source["intensity"];
|
||||||
|
this.bandmap_lotw = source["bandmap_lotw"];
|
||||||
|
this.configured = source["configured"];
|
||||||
|
this.rules = this.convertValues(source["rules"], RowColorRule);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ScpStatus {
|
export class ScpStatus {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
count: number;
|
count: number;
|
||||||
@@ -3107,6 +3275,10 @@ export namespace main {
|
|||||||
pass?: string;
|
pass?: string;
|
||||||
channels?: number;
|
channels?: number;
|
||||||
labels: string[];
|
labels: string[];
|
||||||
|
on_urls?: string[];
|
||||||
|
off_urls?: string[];
|
||||||
|
on_pattern?: string;
|
||||||
|
off_pattern?: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new StationDevice(source);
|
return new StationDevice(source);
|
||||||
@@ -3122,6 +3294,10 @@ export namespace main {
|
|||||||
this.pass = source["pass"];
|
this.pass = source["pass"];
|
||||||
this.channels = source["channels"];
|
this.channels = source["channels"];
|
||||||
this.labels = source["labels"];
|
this.labels = source["labels"];
|
||||||
|
this.on_urls = source["on_urls"];
|
||||||
|
this.off_urls = source["off_urls"];
|
||||||
|
this.on_pattern = source["on_pattern"];
|
||||||
|
this.off_pattern = source["off_pattern"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StationRelay {
|
export class StationRelay {
|
||||||
@@ -3262,6 +3438,7 @@ export namespace main {
|
|||||||
export class ULSStatusResult {
|
export class ULSStatusResult {
|
||||||
count: number;
|
count: number;
|
||||||
updated_at: string;
|
updated_at: string;
|
||||||
|
needs_refresh: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new ULSStatusResult(source);
|
return new ULSStatusResult(source);
|
||||||
@@ -3271,6 +3448,7 @@ export namespace main {
|
|||||||
if ('string' === typeof source) source = JSON.parse(source);
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
this.count = source["count"];
|
this.count = source["count"];
|
||||||
this.updated_at = source["updated_at"];
|
this.updated_at = source["updated_at"];
|
||||||
|
this.needs_refresh = source["needs_refresh"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class UltrabeamSettings {
|
export class UltrabeamSettings {
|
||||||
@@ -4186,6 +4364,7 @@ export namespace qso {
|
|||||||
}
|
}
|
||||||
export class QSO {
|
export class QSO {
|
||||||
id: number;
|
id: number;
|
||||||
|
number?: number;
|
||||||
callsign: string;
|
callsign: string;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
qso_date: any;
|
qso_date: any;
|
||||||
@@ -4227,6 +4406,8 @@ export namespace qso {
|
|||||||
qsl_sent_date?: string;
|
qsl_sent_date?: string;
|
||||||
qsl_rcvd_date?: string;
|
qsl_rcvd_date?: string;
|
||||||
qsl_via?: string;
|
qsl_via?: string;
|
||||||
|
qsl_sent_via?: string;
|
||||||
|
qsl_rcvd_via?: string;
|
||||||
qsl_msg?: string;
|
qsl_msg?: string;
|
||||||
qslmsg_rcvd?: string;
|
qslmsg_rcvd?: string;
|
||||||
lotw_sent?: string;
|
lotw_sent?: string;
|
||||||
@@ -4326,6 +4507,7 @@ export namespace qso {
|
|||||||
constructor(source: any = {}) {
|
constructor(source: any = {}) {
|
||||||
if ('string' === typeof source) source = JSON.parse(source);
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
this.id = source["id"];
|
this.id = source["id"];
|
||||||
|
this.number = source["number"];
|
||||||
this.callsign = source["callsign"];
|
this.callsign = source["callsign"];
|
||||||
this.qso_date = this.convertValues(source["qso_date"], null);
|
this.qso_date = this.convertValues(source["qso_date"], null);
|
||||||
this.qso_date_off = this.convertValues(source["qso_date_off"], null);
|
this.qso_date_off = this.convertValues(source["qso_date_off"], null);
|
||||||
@@ -4365,6 +4547,8 @@ export namespace qso {
|
|||||||
this.qsl_sent_date = source["qsl_sent_date"];
|
this.qsl_sent_date = source["qsl_sent_date"];
|
||||||
this.qsl_rcvd_date = source["qsl_rcvd_date"];
|
this.qsl_rcvd_date = source["qsl_rcvd_date"];
|
||||||
this.qsl_via = source["qsl_via"];
|
this.qsl_via = source["qsl_via"];
|
||||||
|
this.qsl_sent_via = source["qsl_sent_via"];
|
||||||
|
this.qsl_rcvd_via = source["qsl_rcvd_via"];
|
||||||
this.qsl_msg = source["qsl_msg"];
|
this.qsl_msg = source["qsl_msg"];
|
||||||
this.qslmsg_rcvd = source["qslmsg_rcvd"];
|
this.qslmsg_rcvd = source["qslmsg_rcvd"];
|
||||||
this.lotw_sent = source["lotw_sent"];
|
this.lotw_sent = source["lotw_sent"];
|
||||||
@@ -4969,6 +5153,11 @@ export namespace udp {
|
|||||||
destination_ip: string;
|
destination_ip: string;
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
sort_order: number;
|
sort_order: number;
|
||||||
|
trigger: string;
|
||||||
|
template: string;
|
||||||
|
transport: string;
|
||||||
|
url: string;
|
||||||
|
line_end: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new Config(source);
|
return new Config(source);
|
||||||
@@ -4986,6 +5175,11 @@ export namespace udp {
|
|||||||
this.destination_ip = source["destination_ip"];
|
this.destination_ip = source["destination_ip"];
|
||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
this.sort_order = source["sort_order"];
|
this.sort_order = source["sort_order"];
|
||||||
|
this.trigger = source["trigger"];
|
||||||
|
this.template = source["template"];
|
||||||
|
this.transport = source["transport"];
|
||||||
|
this.url = source["url"];
|
||||||
|
this.line_end = source["line_end"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// HRDLog "ON AIR" — publishing the live frequency, mode and rig on hrdlog.net,
|
||||||
|
// so the site shows "F4BPO is on air 14,074,000 FT8 IC-7300" while the station
|
||||||
|
// is operating.
|
||||||
|
//
|
||||||
|
// The endpoint and its field names come from HRDLog's own library
|
||||||
|
// (github.com/iw1qlh/HRDLOG-net-library), not from reading someone's traffic.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/extsvc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// onAirEvery is how often the status is refreshed. HRDLog drops a station from
|
||||||
|
// the on-air list when it stops hearing from it, so this is a heartbeat, not a
|
||||||
|
// change notification.
|
||||||
|
const onAirEvery = 2 * time.Minute
|
||||||
|
|
||||||
|
// hrdlogOnAirLoop publishes while the option is on and the rig is readable.
|
||||||
|
func (a *App) hrdlogOnAirLoop() {
|
||||||
|
defer func() { _ = recover() }() // never crash the app from a status broadcast
|
||||||
|
t := time.NewTicker(onAirEvery)
|
||||||
|
defer t.Stop()
|
||||||
|
for range t.C {
|
||||||
|
a.publishHRDLogOnAir()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// publishHRDLogOnAir sends one update. Silent when switched off, unconfigured,
|
||||||
|
// or when the rig has nothing to report — an announcement with no frequency
|
||||||
|
// would say the operator is on air on 0 Hz.
|
||||||
|
func (a *App) publishHRDLogOnAir() {
|
||||||
|
cfg := a.loadExternalServices().HRDLog
|
||||||
|
if !cfg.OnAir || strings.TrimSpace(cfg.Callsign) == "" || strings.TrimSpace(cfg.Code) == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if a.cat == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
st := a.cat.State()
|
||||||
|
if !st.Connected || st.FreqHz <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// The rig NAME as the operator knows it — that string is what the site
|
||||||
|
// displays. The active profile's MyRig first, since it is what every QSO is
|
||||||
|
// stamped with; the CAT backend's own model only when the profile has none.
|
||||||
|
radio := ""
|
||||||
|
if a.profiles != nil {
|
||||||
|
if pr, err := a.profiles.Active(a.ctx); err == nil {
|
||||||
|
radio = strings.TrimSpace(pr.MyRig)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if radio == "" {
|
||||||
|
radio = strings.TrimSpace(st.Rig)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
msg, err := extsvc.SendHRDLogOnAir(ctx, nil, cfg.Callsign, cfg.Code, st.FreqHz, st.Mode, radio)
|
||||||
|
if err != nil {
|
||||||
|
// Logged, never surfaced: this is a broadcast the operator did not ask
|
||||||
|
// for at this instant, and a toast every two minutes on a flaky link
|
||||||
|
// would be worse than the missing status.
|
||||||
|
applog.Printf("hrdlog on-air: %v (%s)", err, msg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("hrdlog on-air: %s %.3f MHz %s (%s) — %s",
|
||||||
|
cfg.Callsign, float64(st.FreqHz)/1e6, st.Mode, radio, msg)
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// ADIF defines CNTY as "STATE,COUNTY" — "GA,BARROW". OpsLog exported the bare
|
||||||
|
// county, which a receiving logger cannot resolve: county names repeat across
|
||||||
|
// states, and there is a Washington County in thirty of them.
|
||||||
|
func TestADIFCountyFormat(t *testing.T) {
|
||||||
|
for _, tc := range []struct{ state, county, want string }{
|
||||||
|
{"GA", "BARROW", "GA,BARROW"},
|
||||||
|
{"ga", "Barrow", "GA,Barrow"}, // the state is a code, upper-cased; the name is not touched
|
||||||
|
{"", "BARROW", "BARROW"}, // no state known: a bare name beats nothing
|
||||||
|
{"GA", "", ""}, // no county: nothing to write
|
||||||
|
{"GA", "GA,BARROW", "GA,BARROW"}, // already formatted — never double the prefix
|
||||||
|
{" GA ", " BARROW ", "GA,BARROW"},
|
||||||
|
} {
|
||||||
|
if got := adifCounty(tc.state, tc.county); got != tc.want {
|
||||||
|
t.Errorf("adifCounty(%q, %q) = %q, want %q", tc.state, tc.county, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And the mirror: a file from a logger that follows the standard must fill both
|
||||||
|
// columns, while a file carrying the bare county still imports unchanged.
|
||||||
|
func TestSplitADIFCounty(t *testing.T) {
|
||||||
|
for _, tc := range []struct{ in, county, state string }{
|
||||||
|
{"GA,BARROW", "BARROW", "GA"},
|
||||||
|
{"ga, Barrow", "Barrow", "GA"},
|
||||||
|
{"BARROW", "BARROW", ""}, // the old OpsLog form, and many other loggers
|
||||||
|
{"", "", ""},
|
||||||
|
{" ", "", ""},
|
||||||
|
} {
|
||||||
|
c, s := splitADIFCounty(tc.in)
|
||||||
|
if c != tc.county || s != tc.state {
|
||||||
|
t.Errorf("splitADIFCounty(%q) = (%q, %q), want (%q, %q)", tc.in, c, s, tc.county, tc.state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Round trip: what OpsLog writes, OpsLog reads back to the same two values.
|
||||||
|
func TestCountyRoundTrip(t *testing.T) {
|
||||||
|
c, s := splitADIFCounty(adifCounty("GA", "BARROW"))
|
||||||
|
if c != "BARROW" || s != "GA" {
|
||||||
|
t.Errorf("round trip gave (%q, %q), want (BARROW, GA)", c, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
+32
-2
@@ -221,7 +221,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
|||||||
w("VUCC_GRIDS", q.VUCCGrids)
|
w("VUCC_GRIDS", q.VUCCGrids)
|
||||||
w("COUNTRY", q.Country)
|
w("COUNTRY", q.Country)
|
||||||
w("STATE", q.State)
|
w("STATE", q.State)
|
||||||
w("CNTY", q.County)
|
w("CNTY", adifCounty(q.State, q.County))
|
||||||
wi("DXCC", q.DXCC)
|
wi("DXCC", q.DXCC)
|
||||||
w("CONT", q.Continent)
|
w("CONT", q.Continent)
|
||||||
wi("CQZ", q.CQZ)
|
wi("CQZ", q.CQZ)
|
||||||
@@ -241,6 +241,14 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
|||||||
w("QSLSDATE", q.QSLSentDate)
|
w("QSLSDATE", q.QSLSentDate)
|
||||||
w("QSLRDATE", q.QSLRcvdDate)
|
w("QSLRDATE", q.QSLRcvdDate)
|
||||||
w("QSL_VIA", q.QSLVia)
|
w("QSL_VIA", q.QSLVia)
|
||||||
|
// M (manager) is import-only in the QSL Via enumeration: we keep it when a
|
||||||
|
// file gives it to us, but a file we write must not carry it.
|
||||||
|
if q.QSLSentVia != QSLViaManager {
|
||||||
|
w("QSL_SENT_VIA", q.QSLSentVia)
|
||||||
|
}
|
||||||
|
if q.QSLRcvdVia != QSLViaManager {
|
||||||
|
w("QSL_RCVD_VIA", q.QSLRcvdVia)
|
||||||
|
}
|
||||||
w("QSLMSG", q.QSLMsg)
|
w("QSLMSG", q.QSLMsg)
|
||||||
w("QSLMSG_RCVD", q.QSLMsgRcvd)
|
w("QSLMSG_RCVD", q.QSLMsgRcvd)
|
||||||
w("LOTW_QSL_SENT", q.LOTWSent)
|
w("LOTW_QSL_SENT", q.LOTWSent)
|
||||||
@@ -285,7 +293,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
|||||||
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
|
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
|
||||||
w("MY_COUNTRY", q.MyCountry)
|
w("MY_COUNTRY", q.MyCountry)
|
||||||
w("MY_STATE", q.MyState)
|
w("MY_STATE", q.MyState)
|
||||||
w("MY_CNTY", q.MyCounty)
|
w("MY_CNTY", adifCounty(q.MyState, q.MyCounty))
|
||||||
w("MY_IOTA", q.MyIOTA)
|
w("MY_IOTA", q.MyIOTA)
|
||||||
w("MY_SOTA_REF", q.MySOTARef)
|
w("MY_SOTA_REF", q.MySOTARef)
|
||||||
w("MY_POTA_REF", q.MyPOTARef)
|
w("MY_POTA_REF", q.MyPOTARef)
|
||||||
@@ -413,3 +421,25 @@ func modeForExport(mode, submode string) (string, string) {
|
|||||||
}
|
}
|
||||||
return mode, ""
|
return mode, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// adifCounty renders CNTY the way ADIF specifies: "STATE,COUNTY", e.g.
|
||||||
|
// "GA,BARROW".
|
||||||
|
//
|
||||||
|
// OpsLog stores the two apart, and exported only the county — which a receiving
|
||||||
|
// logger cannot resolve, since county names repeat across states (there is a
|
||||||
|
// Washington County in thirty of them). The award engine here was never
|
||||||
|
// affected because it reads the columns, not the ADIF; the damage was to
|
||||||
|
// everyone we send a file to.
|
||||||
|
//
|
||||||
|
// The county alone is still written when no state is known: a bare name is
|
||||||
|
// worth more than nothing, and inventing a prefix would be worse than either.
|
||||||
|
// A county that ALREADY carries a comma is passed through — it has been
|
||||||
|
// formatted once, and doubling the prefix would corrupt it.
|
||||||
|
func adifCounty(state, county string) string {
|
||||||
|
c := strings.TrimSpace(county)
|
||||||
|
s := strings.TrimSpace(state)
|
||||||
|
if c == "" || s == "" || strings.Contains(c, ",") {
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
return strings.ToUpper(s) + "," + c
|
||||||
|
}
|
||||||
|
|||||||
@@ -135,8 +135,8 @@ var Fields = []FieldDef{
|
|||||||
{Name: "QSLSDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
{Name: "QSLSDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSLRDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
{Name: "QSLRDATE", Kind: KindDate, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSL_VIA", Kind: KindText, Category: "QSL", Promoted: true},
|
{Name: "QSL_VIA", Kind: KindText, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSL_SENT_VIA", Kind: KindEnum, Category: "QSL"},
|
{Name: "QSL_SENT_VIA", Kind: KindEnum, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSL_RCVD_VIA", Kind: KindEnum, Category: "QSL"},
|
{Name: "QSL_RCVD_VIA", Kind: KindEnum, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSLMSG", Kind: KindText, Category: "QSL", Promoted: true},
|
{Name: "QSLMSG", Kind: KindText, Category: "QSL", Promoted: true},
|
||||||
{Name: "QSLMSG_INTL", Kind: KindText, Category: "QSL", Intl: true},
|
{Name: "QSLMSG_INTL", Kind: KindText, Category: "QSL", Intl: true},
|
||||||
{Name: "QSLMSG_RCVD", Kind: KindText, Category: "QSL", Promoted: true},
|
{Name: "QSLMSG_RCVD", Kind: KindText, Category: "QSL", Promoted: true},
|
||||||
|
|||||||
+39
-5
@@ -428,7 +428,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
|||||||
q.VUCCGrids = strings.ToUpper(rec["vucc_grids"])
|
q.VUCCGrids = strings.ToUpper(rec["vucc_grids"])
|
||||||
q.Country = rec["country"]
|
q.Country = rec["country"]
|
||||||
q.State = strings.ToUpper(rec["state"])
|
q.State = strings.ToUpper(rec["state"])
|
||||||
q.County = rec["cnty"]
|
q.County, _ = splitADIFCounty(rec["cnty"])
|
||||||
|
if st := rec["state"]; strings.TrimSpace(st) == "" {
|
||||||
|
if _, fromCnty := splitADIFCounty(rec["cnty"]); fromCnty != "" {
|
||||||
|
q.State = fromCnty
|
||||||
|
}
|
||||||
|
}
|
||||||
if v, ok := parseInt(rec["dxcc"]); ok {
|
if v, ok := parseInt(rec["dxcc"]); ok {
|
||||||
q.DXCC = &v
|
q.DXCC = &v
|
||||||
}
|
}
|
||||||
@@ -459,10 +464,17 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
|||||||
q.QSLRcvd = rec["qsl_rcvd"]
|
q.QSLRcvd = rec["qsl_rcvd"]
|
||||||
q.QSLSentDate = rec["qslsdate"]
|
q.QSLSentDate = rec["qslsdate"]
|
||||||
q.QSLRcvdDate = rec["qslrdate"]
|
q.QSLRcvdDate = rec["qslrdate"]
|
||||||
|
// QSL_VIA is the manager. QSL_SENT_VIA / QSL_RCVD_VIA are the routing
|
||||||
|
// method, an enumeration of their own.
|
||||||
|
//
|
||||||
|
// These used to be one field here: an empty QSL_VIA was filled from
|
||||||
|
// QSL_SENT_VIA, on the theory that loggers writing one meant the other.
|
||||||
|
// They do not — Log4OM defaults QSL_SENT_VIA to E, and the import put "E"
|
||||||
|
// where every panel in OpsLog shows the manager's callsign. Keeping them
|
||||||
|
// apart is also what lets an export give them back.
|
||||||
q.QSLVia = rec["qsl_via"]
|
q.QSLVia = rec["qsl_via"]
|
||||||
if q.QSLVia == "" { // many loggers (Log4OM) write QSL_SENT_VIA instead
|
q.QSLSentVia = NormaliseQSLVia(rec["qsl_sent_via"])
|
||||||
q.QSLVia = rec["qsl_sent_via"]
|
q.QSLRcvdVia = NormaliseQSLVia(rec["qsl_rcvd_via"])
|
||||||
}
|
|
||||||
q.QSLMsg = rec["qslmsg"]
|
q.QSLMsg = rec["qslmsg"]
|
||||||
q.QSLMsgRcvd = rec["qslmsg_rcvd"]
|
q.QSLMsgRcvd = rec["qslmsg_rcvd"]
|
||||||
q.LOTWSent = rec["lotw_qsl_sent"]
|
q.LOTWSent = rec["lotw_qsl_sent"]
|
||||||
@@ -515,7 +527,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
|||||||
q.MyGridExt = strings.ToUpper(rec["my_gridsquare_ext"])
|
q.MyGridExt = strings.ToUpper(rec["my_gridsquare_ext"])
|
||||||
q.MyCountry = rec["my_country"]
|
q.MyCountry = rec["my_country"]
|
||||||
q.MyState = strings.ToUpper(rec["my_state"])
|
q.MyState = strings.ToUpper(rec["my_state"])
|
||||||
q.MyCounty = rec["my_cnty"]
|
q.MyCounty, _ = splitADIFCounty(rec["my_cnty"])
|
||||||
|
if st := rec["my_state"]; strings.TrimSpace(st) == "" {
|
||||||
|
if _, fromCnty := splitADIFCounty(rec["my_cnty"]); fromCnty != "" {
|
||||||
|
q.MyState = fromCnty
|
||||||
|
}
|
||||||
|
}
|
||||||
q.MyIOTA = strings.ToUpper(rec["my_iota"])
|
q.MyIOTA = strings.ToUpper(rec["my_iota"])
|
||||||
q.MySOTARef = strings.ToUpper(rec["my_sota_ref"])
|
q.MySOTARef = strings.ToUpper(rec["my_sota_ref"])
|
||||||
q.MyPOTARef = strings.ToUpper(rec["my_pota_ref"])
|
q.MyPOTARef = strings.ToUpper(rec["my_pota_ref"])
|
||||||
@@ -698,3 +715,20 @@ var promotableSubmodes = map[string]bool{
|
|||||||
func submodeSubsumesParent(submode string) bool {
|
func submodeSubsumesParent(submode string) bool {
|
||||||
return promotableSubmodes[submode]
|
return promotableSubmodes[submode]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// splitADIFCounty reads CNTY, which ADIF defines as "STATE,COUNTY".
|
||||||
|
//
|
||||||
|
// Returns the county on its own plus the state the field carried, so an import
|
||||||
|
// from a logger that follows the standard fills BOTH columns here. Files that
|
||||||
|
// write the bare county — as OpsLog itself used to — still import unchanged.
|
||||||
|
//
|
||||||
|
// The state from the field never overrides an explicit STATE tag: STATE is the
|
||||||
|
// dedicated field and the more specific statement. It only fills a blank.
|
||||||
|
func splitADIFCounty(cnty string) (county, state string) {
|
||||||
|
cnty = strings.TrimSpace(cnty)
|
||||||
|
i := strings.Index(cnty, ",")
|
||||||
|
if i < 0 {
|
||||||
|
return cnty, ""
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(cnty[i+1:]), strings.ToUpper(strings.TrimSpace(cnty[:i]))
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// The ADIF "QSL Via" enumeration, used by QSL_SENT_VIA and QSL_RCVD_VIA. It
|
||||||
|
// says how a card travelled, and is a different thing entirely from QSL_VIA,
|
||||||
|
// which is the manager's callsign.
|
||||||
|
const (
|
||||||
|
QSLViaBureau = "B"
|
||||||
|
QSLViaDirect = "D"
|
||||||
|
QSLViaElectronic = "E"
|
||||||
|
// QSLViaManager is import-only in the standard: it may be read from another
|
||||||
|
// logger's file, never written to one. OpsLog keeps it when it arrives so
|
||||||
|
// the operator's own data is not silently altered, and NormaliseQSLVia is
|
||||||
|
// the only place that decides so.
|
||||||
|
QSLViaManager = "M"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NormaliseQSLVia folds what other loggers and OpsLog's own older versions put
|
||||||
|
// in a routing field down to the ADIF enumeration.
|
||||||
|
//
|
||||||
|
// It accepts the letter, the English word, and the French one — OpsLog wrote
|
||||||
|
// "Bureau", "Direct" and "Electronic" in full for a long time, and the QSL
|
||||||
|
// Manager panel still shows those words to a French operator. Anything it does
|
||||||
|
// not recognise comes back empty rather than being passed through: this feeds
|
||||||
|
// an enumerated ADIF field, and inventing a value there breaks the file for
|
||||||
|
// every other logger that reads it.
|
||||||
|
func NormaliseQSLVia(s string) string {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(s)) {
|
||||||
|
case "B", "BUREAU", "BURO", "VIA BUREAU":
|
||||||
|
return QSLViaBureau
|
||||||
|
case "D", "DIRECT":
|
||||||
|
return QSLViaDirect
|
||||||
|
case "E", "ELECTRONIC", "ELECTRONIQUE", "ÉLECTRONIQUE", "OQRS":
|
||||||
|
return QSLViaElectronic
|
||||||
|
case "M", "MANAGER":
|
||||||
|
return QSLViaManager
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsQSLViaRouting reports whether a QSL_VIA value is in fact a routing method
|
||||||
|
// that ended up in the manager field.
|
||||||
|
//
|
||||||
|
// It exists for one repair: OpsLog's QSL Manager panel wrote "Bureau",
|
||||||
|
// "Direct" and "Electronic" into QSL_VIA, and imports folded QSL_SENT_VIA
|
||||||
|
// there too, so logs hold a mixture of managers and routing words in one
|
||||||
|
// column. A manager is a callsign, never one of these six words, so the test
|
||||||
|
// is exact — but it is deliberately narrow: anything else, including a manager
|
||||||
|
// whose callsign happens to be unusual, is left alone.
|
||||||
|
func IsQSLViaRouting(s string) bool {
|
||||||
|
return NormaliseQSLVia(s) != ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package adif
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestNormaliseQSLVia(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"B": "B", "b": "B", "Bureau": "B", "BUREAU": "B", " buro ": "B",
|
||||||
|
"D": "D", "Direct": "D", "direct": "D",
|
||||||
|
"E": "E", "Electronic": "E", "électronique": "E", "OQRS": "E",
|
||||||
|
"M": "M", "Manager": "M",
|
||||||
|
// A manager's callsign is not a routing method, and neither is noise.
|
||||||
|
"M0OXO": "", "EA5GL": "", "": "", "Bureau via M0OXO": "", "X": "",
|
||||||
|
} {
|
||||||
|
if got := NormaliseQSLVia(in); got != want {
|
||||||
|
t.Errorf("NormaliseQSLVia(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The repair moves values out of the manager column. A false positive would
|
||||||
|
// erase a real manager, so the guard is worth its own test: every callsign-like
|
||||||
|
// value must be refused.
|
||||||
|
func TestIsQSLViaRoutingRefusesManagers(t *testing.T) {
|
||||||
|
for _, call := range []string{
|
||||||
|
"M0OXO", "EA5GL", "F5CWU", "DJ9ZB", "W3HNK", "IK2DUW", "N7RO",
|
||||||
|
"BUREAU M0OXO", "via bureau DL1XYZ", "QSL DIRECT ONLY",
|
||||||
|
} {
|
||||||
|
if IsQSLViaRouting(call) {
|
||||||
|
t.Errorf("%q was taken for a routing method — the repair would erase it", call)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, v := range []string{"B", "D", "E", "M", "Bureau", "Direct", "Electronic"} {
|
||||||
|
if !IsQSLViaRouting(v) {
|
||||||
|
t.Errorf("%q should be recognised as a routing method", v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -119,3 +119,85 @@ func renderRecord(q qso.QSO, includeApp bool) string {
|
|||||||
bw.Flush()
|
bw.Flush()
|
||||||
return buf.String()
|
return buf.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestQSLViaFieldsRoundTrip covers the case reported as issue #16: a log
|
||||||
|
// exported by another logger carries a manager in QSL_VIA and a routing method
|
||||||
|
// in QSL_SENT_VIA, and the two must stay apart.
|
||||||
|
//
|
||||||
|
// Before this, QSL_SENT_VIA was folded into QSL_VIA whenever QSL_VIA was empty
|
||||||
|
// — so a Log4OM log, which defaults QSL_SENT_VIA to E, showed "E" wherever
|
||||||
|
// OpsLog displays the manager — and QSL_RCVD_VIA was thrown away outright: it
|
||||||
|
// was listed as a promoted field with no column behind it, so it was not even
|
||||||
|
// kept among the extras. Neither was ever exported, which made an import
|
||||||
|
// followed by an export destroy both.
|
||||||
|
func TestQSLViaFieldsRoundTrip(t *testing.T) {
|
||||||
|
in := qso.QSO{
|
||||||
|
Callsign: "3B9FR", Band: "20m", Mode: "CW",
|
||||||
|
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
|
||||||
|
QSLVia: "M0OXO", // the manager
|
||||||
|
QSLSentVia: "D", // sent direct
|
||||||
|
QSLRcvdVia: "B", // came back via the bureau
|
||||||
|
}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
bw := bufio.NewWriter(&buf)
|
||||||
|
bw.WriteString("<EOH>\n")
|
||||||
|
writeRecord(bw, in, true, nil)
|
||||||
|
bw.Flush()
|
||||||
|
|
||||||
|
var rec Record
|
||||||
|
if err := Parse(strings.NewReader(buf.String()), func(r Record) error { rec = r; return nil }); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
out, ok := recordToQSO(rec)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("recordToQSO returned !ok")
|
||||||
|
}
|
||||||
|
for name, c := range map[string]struct{ got, want string }{
|
||||||
|
"QSL_VIA": {out.QSLVia, in.QSLVia},
|
||||||
|
"QSL_SENT_VIA": {out.QSLSentVia, in.QSLSentVia},
|
||||||
|
"QSL_RCVD_VIA": {out.QSLRcvdVia, in.QSLRcvdVia},
|
||||||
|
} {
|
||||||
|
if c.got != c.want {
|
||||||
|
t.Errorf("%s: got %q, want %q", name, c.got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestQSLSentViaDoesNotBecomeManager pins the exact shape a Log4OM export has:
|
||||||
|
// no QSL_VIA at all, QSL_SENT_VIA defaulted to E. The manager field must come
|
||||||
|
// back empty rather than holding "E".
|
||||||
|
func TestQSLSentViaDoesNotBecomeManager(t *testing.T) {
|
||||||
|
const rec = "<CALL:5>OE6CLD<QSO_DATE:8>20260606<TIME_ON:4>1200<BAND:3>20m<MODE:2>CW" +
|
||||||
|
"<QSL_SENT_VIA:1>E<EOR>\n"
|
||||||
|
var got Record
|
||||||
|
if err := Parse(strings.NewReader("<EOH>\n"+rec), func(r Record) error { got = r; return nil }); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
q, ok := recordToQSO(got)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("recordToQSO returned !ok")
|
||||||
|
}
|
||||||
|
if q.QSLVia != "" {
|
||||||
|
t.Errorf("QSL_VIA = %q — the routing method leaked into the manager field again", q.QSLVia)
|
||||||
|
}
|
||||||
|
if q.QSLSentVia != "E" {
|
||||||
|
t.Errorf("QSL_SENT_VIA = %q, want %q", q.QSLSentVia, "E")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// M is import-only in the ADIF QSL Via enumeration: keep it when given, never
|
||||||
|
// write it back out.
|
||||||
|
func TestQSLViaManagerIsImportOnly(t *testing.T) {
|
||||||
|
in := qso.QSO{
|
||||||
|
Callsign: "3B9FR", Band: "20m", Mode: "CW",
|
||||||
|
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
|
||||||
|
QSLSentVia: "M", QSLRcvdVia: "M",
|
||||||
|
}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
bw := bufio.NewWriter(&buf)
|
||||||
|
writeRecord(bw, in, true, nil)
|
||||||
|
bw.Flush()
|
||||||
|
if s := buf.String(); strings.Contains(s, "QSL_SENT_VIA") || strings.Contains(s, "QSL_RCVD_VIA") {
|
||||||
|
t.Errorf("exported an import-only value:\n%s", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+13
-4
@@ -749,9 +749,14 @@ func EmissionOf(mode string) string { return emissionOf(mode) }
|
|||||||
// abbreviating "Saint"→"St." and hyphenating "Matanuska-Susitna". The rules:
|
// abbreviating "Saint"→"St." and hyphenating "Matanuska-Susitna". The rules:
|
||||||
// - if cnty already carries "ST,County", split on the first comma; else take
|
// - if cnty already carries "ST,County", split on the first comma; else take
|
||||||
// the state from the STATE column;
|
// the state from the STATE column;
|
||||||
// - upper-case; drop periods and apostrophes; hyphens→space; strip a trailing
|
// - upper-case; fold accents (the FIPS list writes "Doña Ana", callbooks and
|
||||||
// County/Parish/Borough/Census Area/Municipality; fold Saint(e)→St(e);
|
// logs write "Dona Ana"); drop periods and apostrophes; hyphens→space;
|
||||||
// collapse whitespace;
|
// expand the parenthetical shapes GeoNames uses for county-equivalents
|
||||||
|
// ("Baltimore (city)", "Nome (CA)") and drop its "City and County of"
|
||||||
|
// style prefixes; strip a trailing County/Parish/Borough/Census Area/
|
||||||
|
// Municipality; fold Saint(e)→St(e); collapse whitespace;
|
||||||
|
// - fold the counties renamed since the USA-CA list was drawn onto the name
|
||||||
|
// the award still uses, so a QSO there counts for something (see renamed);
|
||||||
// - require a 2-letter state and a non-empty county, else no match ("").
|
// - require a 2-letter state and a non-empty county, else no match ("").
|
||||||
func USCountyKey(state, cnty string) string {
|
func USCountyKey(state, cnty string) string {
|
||||||
s := strings.TrimSpace(cnty)
|
s := strings.TrimSpace(cnty)
|
||||||
@@ -764,10 +769,11 @@ func USCountyKey(state, cnty string) string {
|
|||||||
} else {
|
} else {
|
||||||
st, co = strings.TrimSpace(state), s
|
st, co = strings.TrimSpace(state), s
|
||||||
}
|
}
|
||||||
co = strings.ToUpper(co)
|
co = strings.ToUpper(foldAccents(co))
|
||||||
co = strings.ReplaceAll(co, ".", "")
|
co = strings.ReplaceAll(co, ".", "")
|
||||||
co = strings.ReplaceAll(co, "'", "")
|
co = strings.ReplaceAll(co, "'", "")
|
||||||
co = strings.ReplaceAll(co, "-", " ")
|
co = strings.ReplaceAll(co, "-", " ")
|
||||||
|
co = expandCountyEquivalent(co)
|
||||||
for _, suf := range []string{" COUNTY", " PARISH", " BOROUGH", " CENSUS AREA", " MUNICIPALITY"} {
|
for _, suf := range []string{" COUNTY", " PARISH", " BOROUGH", " CENSUS AREA", " MUNICIPALITY"} {
|
||||||
if strings.HasSuffix(co, suf) {
|
if strings.HasSuffix(co, suf) {
|
||||||
co = strings.TrimSuffix(co, suf)
|
co = strings.TrimSuffix(co, suf)
|
||||||
@@ -788,6 +794,9 @@ func USCountyKey(state, cnty string) string {
|
|||||||
if len(st) != 2 || co == "" {
|
if len(st) != 2 || co == "" {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
if alias, ok := renamed[st+"/"+co]; ok {
|
||||||
|
co = alias
|
||||||
|
}
|
||||||
// Separator is "/", NOT ",": the QSOFIELDS matcher splits a field value on
|
// Separator is "/", NOT ",": the QSOFIELDS matcher splits a field value on
|
||||||
// commas/semicolons (n-fer POTA "US-1,US-2"), which would shatter "AL,AUTAUGA"
|
// commas/semicolons (n-fer POTA "US-1,US-2"), which would shatter "AL,AUTAUGA"
|
||||||
// into two non-matching tokens. The stored ADIF cnty keeps its comma; only
|
// into two non-matching tokens. The stored ADIF cnty keeps its comma; only
|
||||||
|
|||||||
@@ -0,0 +1,120 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// Name normalisation for USCountyKey. It exists because the county a QSO
|
||||||
|
// carries and the county the USA-CA reference list carries come from different
|
||||||
|
// hands and rarely agree letter for letter:
|
||||||
|
//
|
||||||
|
// - the reference is the FIPS list ("Doña Ana County", "Baltimore city");
|
||||||
|
// - a callbook writes what the licensee typed;
|
||||||
|
// - and OpsLog's own offline resolver reads GeoNames, which spells the
|
||||||
|
// county-equivalents its own way ("Baltimore (city)", "Nome (CA)",
|
||||||
|
// "City and County of San Francisco").
|
||||||
|
//
|
||||||
|
// Measured against a full FCC ULS import (1.56 M US callsigns), the shapes
|
||||||
|
// handled here account for ~7 300 stations whose county matched nothing at all
|
||||||
|
// — they showed as a new county for ever and counted for no award.
|
||||||
|
//
|
||||||
|
// Everything here is SPELLING. A county that genuinely no longer exists under
|
||||||
|
// that name is a different problem, handled by renamed below.
|
||||||
|
|
||||||
|
// foldAccents strips the diacritics that separate a FIPS name from the ASCII
|
||||||
|
// every log and callbook actually holds. Only the letters that occur in US
|
||||||
|
// place names are listed — this is not a general Unicode folder, and it must
|
||||||
|
// not become one: silently folding arbitrary marks would let two distinct
|
||||||
|
// references collapse onto one key.
|
||||||
|
var accents = strings.NewReplacer(
|
||||||
|
"ñ", "n", "Ñ", "N",
|
||||||
|
"á", "a", "Á", "A",
|
||||||
|
"é", "e", "É", "E",
|
||||||
|
"í", "i", "Í", "I",
|
||||||
|
"ó", "o", "Ó", "O",
|
||||||
|
"ú", "u", "Ú", "U",
|
||||||
|
"ü", "u", "Ü", "U",
|
||||||
|
"ç", "c", "Ç", "C",
|
||||||
|
)
|
||||||
|
|
||||||
|
func foldAccents(s string) string {
|
||||||
|
// Fast path: US county names are ASCII with a single exception (Doña Ana),
|
||||||
|
// so the common case must not pay for the replacer.
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
if s[i] >= 0x80 {
|
||||||
|
return accents.Replace(s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// expandCountyEquivalent rewrites GeoNames' parenthetical and prefixed spellings
|
||||||
|
// of county-equivalents into the plain FIPS form, which the rest of USCountyKey
|
||||||
|
// then normalises as usual.
|
||||||
|
//
|
||||||
|
// Input is already upper-cased with periods and hyphens removed.
|
||||||
|
//
|
||||||
|
// BALTIMORE (CITY) → BALTIMORE CITY (FIPS "Baltimore city")
|
||||||
|
// NOME (CA) → NOME CENSUS AREA (suffix stripped after)
|
||||||
|
// CITY AND COUNTY OF SAN FRANCISCO → SAN FRANCISCO
|
||||||
|
//
|
||||||
|
// The truncated "(CITY" is not a typo here: GeoNames really does ship
|
||||||
|
// "Colonial Heights (city" with the closing parenthesis missing.
|
||||||
|
func expandCountyEquivalent(co string) string {
|
||||||
|
switch {
|
||||||
|
case strings.HasSuffix(co, " (CITY)"):
|
||||||
|
co = strings.TrimSuffix(co, " (CITY)") + " CITY"
|
||||||
|
case strings.HasSuffix(co, " (CITY"):
|
||||||
|
co = strings.TrimSuffix(co, " (CITY") + " CITY"
|
||||||
|
case strings.HasSuffix(co, " (CA)"):
|
||||||
|
co = strings.TrimSuffix(co, " (CA)") + " CENSUS AREA"
|
||||||
|
}
|
||||||
|
// "City and County of X" and "City and Borough of X" are the same place as
|
||||||
|
// FIPS's bare "X" (San Francisco, Denver, Honolulu, Juneau, Sitka). Note the
|
||||||
|
// order: the longer prefixes must be tried before "CITY OF ".
|
||||||
|
for _, p := range []string{
|
||||||
|
"CITY AND COUNTY OF ",
|
||||||
|
"CITY AND BOROUGH OF ",
|
||||||
|
"MUNICIPALITY OF ",
|
||||||
|
"BOROUGH OF ",
|
||||||
|
"CITY OF ",
|
||||||
|
} {
|
||||||
|
if strings.HasPrefix(co, p) {
|
||||||
|
return strings.TrimPrefix(co, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return co
|
||||||
|
}
|
||||||
|
|
||||||
|
// renamed folds a county renamed or re-drawn since the CQ USA-CA list was
|
||||||
|
// published onto the name the award still counts. Keys and values are finished
|
||||||
|
// USCountyKey county parts (upper-case, no spaces), looked up as "ST/COUNTY".
|
||||||
|
//
|
||||||
|
// This deliberately does NOT track the FIPS list. USA-CA is a fixed target of
|
||||||
|
// ~3 100 counties; when a state renames one, the award does not reissue its
|
||||||
|
// list, so a QSO with the new name would otherwise match nothing and count for
|
||||||
|
// nothing. Folding it onto the old name is the only outcome that scores.
|
||||||
|
//
|
||||||
|
// Connecticut is absent on purpose. Its 2022 planning regions are not renamed
|
||||||
|
// counties: a region is drawn from towns belonging to several different
|
||||||
|
// counties, so there is no name that maps to another name. That one is resolved
|
||||||
|
// from the station's ZIP, in internal/uls.
|
||||||
|
var renamed = map[string]string{
|
||||||
|
// Wade Hampton Census Area, AK → Kusilvak Census Area (2015).
|
||||||
|
"AK/KUSILVAK": "WADEHAMPTON",
|
||||||
|
// Shannon County, SD → Oglala Lakota County (2015).
|
||||||
|
"SD/OGLALALAKOTA": "SHANNON",
|
||||||
|
// Valdez-Cordova Census Area, AK was split in two (2019). Both halves fold
|
||||||
|
// back to the parent the award still lists.
|
||||||
|
"AK/CHUGACH": "VALDEZCORDOVA",
|
||||||
|
"AK/COPPERRIVER": "VALDEZCORDOVA",
|
||||||
|
|
||||||
|
// Alaska's four "X City and Borough". The reference codes for these look
|
||||||
|
// wrong and are not: the trailing " BOROUGH" is stripped as a county type,
|
||||||
|
// leaving "JUNEAU CITY AND". Nothing else in the chain produces that shape
|
||||||
|
// — a log that simply says "Juneau", and GeoNames' "City and Borough of
|
||||||
|
// Juneau", both arrive here as "JUNEAU" and would match nothing. Rather
|
||||||
|
// than re-key four published references, bend the bare name onto them.
|
||||||
|
"AK/JUNEAU": "JUNEAUCITYAND",
|
||||||
|
"AK/SITKA": "SITKACITYAND",
|
||||||
|
"AK/WRANGELL": "WRANGELLCITYAND",
|
||||||
|
"AK/YAKUTAT": "YAKUTATCITYAND",
|
||||||
|
}
|
||||||
@@ -1943,7 +1943,7 @@ func usCounties() []Ref {
|
|||||||
ref("NM/COLFAX", "Colfax County, NM", 291),
|
ref("NM/COLFAX", "Colfax County, NM", 291),
|
||||||
ref("NM/CURRY", "Curry County, NM", 291),
|
ref("NM/CURRY", "Curry County, NM", 291),
|
||||||
ref("NM/DEBACA", "De Baca County, NM", 291),
|
ref("NM/DEBACA", "De Baca County, NM", 291),
|
||||||
ref("NM/DO̱AANA", "Do̱a Ana County, NM", 291),
|
ref("NM/DONAANA", "Doña Ana County, NM", 291),
|
||||||
ref("NM/EDDY", "Eddy County, NM", 291),
|
ref("NM/EDDY", "Eddy County, NM", 291),
|
||||||
ref("NM/GRANT", "Grant County, NM", 291),
|
ref("NM/GRANT", "Grant County, NM", 291),
|
||||||
ref("NM/GUADALUPE", "Guadalupe County, NM", 291),
|
ref("NM/GUADALUPE", "Guadalupe County, NM", 291),
|
||||||
|
|||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package awardref
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"unicode/utf8"
|
||||||
|
|
||||||
|
"hamlog/internal/award"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestUSCountyRefsSelfConsistent is the guard that was missing when the Doña Ana
|
||||||
|
// row shipped mangled: its code was "NM/DO̱AANA", which no log, no callbook and
|
||||||
|
// no county database could ever produce, so that county was unwinnable and
|
||||||
|
// nothing said so.
|
||||||
|
//
|
||||||
|
// Every reference must reproduce its own code from its own display name through
|
||||||
|
// award.USCountyKey — the same function cmd/cntygen used to build it. That ties
|
||||||
|
// the generated file to the matcher: change the normalisation rules and this
|
||||||
|
// fails the moment one of the 3 102 references stops matching itself.
|
||||||
|
func TestUSCountyRefsSelfConsistent(t *testing.T) {
|
||||||
|
refs := usCounties()
|
||||||
|
if len(refs) < 3000 {
|
||||||
|
t.Fatalf("only %d counties — the generated list looks truncated", len(refs))
|
||||||
|
}
|
||||||
|
for _, r := range refs {
|
||||||
|
if !utf8.ValidString(r.Name) || !utf8.ValidString(r.Code) {
|
||||||
|
t.Errorf("%s (%q): not valid UTF-8", r.Code, r.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Name is "County Name, ST".
|
||||||
|
i := strings.LastIndex(r.Name, ", ")
|
||||||
|
if i < 0 {
|
||||||
|
t.Errorf("%s: name %q is not \"County, ST\"", r.Code, r.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
name, st := r.Name[:i], r.Name[i+2:]
|
||||||
|
if got := award.USCountyKey(st, name); got != r.Code {
|
||||||
|
t.Errorf("USCountyKey(%q, %q) = %q, want %q", st, name, got, r.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUSCountyRefsUnique catches a normalisation rule loose enough to collapse
|
||||||
|
// two real counties onto one key — the failure mode that would silently merge
|
||||||
|
// them in every award total.
|
||||||
|
func TestUSCountyRefsUnique(t *testing.T) {
|
||||||
|
seen := map[string]string{}
|
||||||
|
for _, r := range usCounties() {
|
||||||
|
if prev, dup := seen[r.Code]; dup {
|
||||||
|
t.Errorf("code %s is shared by %q and %q", r.Code, prev, r.Name)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[r.Code] = r.Name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUSCountyResolverShapes pins the spellings OpsLog's own offline resolver
|
||||||
|
// produces (GeoNames, via internal/uls) against the reference. These are the
|
||||||
|
// real strings that were failing to match, with the number of US callsigns each
|
||||||
|
// covers in a full FCC ULS import.
|
||||||
|
func TestUSCountyResolverShapes(t *testing.T) {
|
||||||
|
valid := map[string]bool{}
|
||||||
|
for _, r := range usCounties() {
|
||||||
|
valid[r.Code] = true
|
||||||
|
}
|
||||||
|
cases := []struct {
|
||||||
|
st, county, want string
|
||||||
|
}{
|
||||||
|
{"CA", "City and County of San Francisco", "CA/SANFRANCISCO"}, // 4 217 calls
|
||||||
|
{"NM", "Doña Ana", "NM/DONAANA"}, // 1 214
|
||||||
|
{"NM", "Dona Ana", "NM/DONAANA"}, // what logs hold
|
||||||
|
{"MD", "Baltimore (city)", "MD/BALTIMORECITY"}, // 885
|
||||||
|
{"MO", "St. Louis (city)", "MO/STLOUISCITY"}, // 574
|
||||||
|
{"MO", "St. Louis", "MO/STLOUIS"}, // the county, distinct
|
||||||
|
{"AK", "Nome (CA)", "AK/NOME"}, // 252
|
||||||
|
{"AK", "Yukon-Koyukuk (CA)", "AK/YUKONKOYUKUK"}, // 84
|
||||||
|
{"AK", "City and Borough of Wrangell", "AK/WRANGELLCITYAND"}, // 27
|
||||||
|
{"AK", "Juneau", "AK/JUNEAUCITYAND"}, // a log that just says Juneau
|
||||||
|
{"AK", "Kusilvak", "AK/WADEHAMPTON"}, // renamed 2015
|
||||||
|
{"SD", "Oglala Lakota County", "SD/SHANNON"}, // renamed 2015
|
||||||
|
{"AK", "Chugach Census Area", "AK/VALDEZCORDOVA"}, // split 2019
|
||||||
|
{"AK", "Copper River Census Area", "AK/VALDEZCORDOVA"},
|
||||||
|
{"CO", "City and County of Denver", "CO/DENVER"},
|
||||||
|
{"HI", "City and County of Honolulu", "HI/HONOLULU"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
got := award.USCountyKey(c.st, c.county)
|
||||||
|
if got != c.want {
|
||||||
|
t.Errorf("USCountyKey(%q, %q) = %q, want %q", c.st, c.county, got, c.want)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !valid[got] {
|
||||||
|
t.Errorf("USCountyKey(%q, %q) = %q, which is not in the reference list", c.st, c.county, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestUSCountyKeepsVirginiaCitiesOut guards the other direction: cmd/cntygen
|
||||||
|
// drops Virginia's independent cities and Carson City on purpose, because CQ's
|
||||||
|
// USA-CA does not count them. Normalising their names must not smuggle them
|
||||||
|
// back in as some neighbouring county.
|
||||||
|
func TestUSCountyKeepsVirginiaCitiesOut(t *testing.T) {
|
||||||
|
valid := map[string]bool{}
|
||||||
|
for _, r := range usCounties() {
|
||||||
|
valid[r.Code] = true
|
||||||
|
}
|
||||||
|
for _, c := range []string{"Virginia Beach (city)", "City of Alexandria", "Lynchburg (city)"} {
|
||||||
|
if k := award.USCountyKey("VA", c); valid[k] {
|
||||||
|
t.Errorf("%q resolved to %s, which USA-CA does not count", c, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Charles City and James City ARE counties, despite the name.
|
||||||
|
for _, c := range []string{"Charles City", "James City"} {
|
||||||
|
if k := award.USCountyKey("VA", c); !valid[k] {
|
||||||
|
t.Errorf("%q resolved to %s, which is missing from the reference", c, k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
-- The lookup cache gains the two fields the providers were already sending and
|
||||||
|
-- nothing was reading: the operator's own site, and the postal code.
|
||||||
|
--
|
||||||
|
-- `web` matters beyond the cache: the qso table has had a `web` column since
|
||||||
|
-- 0003 and no lookup ever filled it.
|
||||||
|
ALTER TABLE callsign_cache ADD COLUMN web TEXT;
|
||||||
|
ALTER TABLE callsign_cache ADD COLUMN zip TEXT;
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
-- QSL_SENT_VIA / QSL_RCVD_VIA — the ADIF fields that say HOW a card travelled.
|
||||||
|
--
|
||||||
|
-- Until now OpsLog had one column, qsl_via, and used it for two unrelated
|
||||||
|
-- things: the QSL manager (what ADIF's QSL_VIA holds) and the routing method.
|
||||||
|
-- Imports made it worse — QSL_SENT_VIA was folded into qsl_via when qsl_via was
|
||||||
|
-- empty, so a Log4OM log arrived with "E" sitting where the manager belongs —
|
||||||
|
-- and QSL_RCVD_VIA was dropped outright, listed as a promoted field with no
|
||||||
|
-- column behind it, so it was not even kept among the extras.
|
||||||
|
--
|
||||||
|
-- These two columns hold the ADIF enumeration: B (bureau), D (direct),
|
||||||
|
-- E (electronic). M (manager) is accepted on import only, per the standard.
|
||||||
|
--
|
||||||
|
-- Adding the columns is all that happens here. Existing qsl_via values are NOT
|
||||||
|
-- touched: separating a manager from a routing word rewrites what an operator
|
||||||
|
-- can see in their own log, so it is offered once, with a count, and only runs
|
||||||
|
-- when they say yes.
|
||||||
|
ALTER TABLE qso ADD COLUMN qsl_sent_via TEXT;
|
||||||
|
ALTER TABLE qso ADD COLUMN qsl_rcvd_via TEXT;
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-- Custom outbound messages: a trigger, a template, and a transport.
|
||||||
|
--
|
||||||
|
-- Until now an outbound row was one of a handful of hard-coded emitters, each
|
||||||
|
-- with its own format and its own moment. This adds the general case: pick what
|
||||||
|
-- fires it, write what it says, and choose whether it leaves as a UDP datagram
|
||||||
|
-- or an HTTP request.
|
||||||
|
--
|
||||||
|
-- The HTTP half is what makes it useful for antenna switches — most of them are
|
||||||
|
-- driven by a URL like http://192.168.1.50/antenna?band=20m — and the band
|
||||||
|
-- change is the trigger they want, being rare by nature.
|
||||||
|
--
|
||||||
|
-- Empty on every existing row, which is what the hard-coded services expect.
|
||||||
|
ALTER TABLE integrations_udp ADD COLUMN trig TEXT NOT NULL DEFAULT '';
|
||||||
|
ALTER TABLE integrations_udp ADD COLUMN template TEXT NOT NULL DEFAULT '';
|
||||||
|
ALTER TABLE integrations_udp ADD COLUMN transport TEXT NOT NULL DEFAULT '';
|
||||||
|
ALTER TABLE integrations_udp ADD COLUMN url TEXT NOT NULL DEFAULT '';
|
||||||
|
ALTER TABLE integrations_udp ADD COLUMN line_end TEXT NOT NULL DEFAULT '';
|
||||||
@@ -132,6 +132,18 @@ func (db *DB) Entities() []*Entity {
|
|||||||
func (db *DB) Lookup(callsign string) (Match, bool) {
|
func (db *DB) Lookup(callsign string) (Match, bool) {
|
||||||
db.mu.RLock()
|
db.mu.RLock()
|
||||||
defer db.mu.RUnlock()
|
defer db.mu.RUnlock()
|
||||||
|
// Maritime and aeronautical mobile belong to NO entity, and that is not a
|
||||||
|
// technicality — the station is at sea or in the air. RI1FJL/MM resolved to
|
||||||
|
// Franz Josef Land while the expedition was still on its way there, telling
|
||||||
|
// the operator they had worked an entity they had not.
|
||||||
|
//
|
||||||
|
// The previous choice was deliberate ("the log should still show the
|
||||||
|
// operator's country") and it is wrong for exactly that reason: a home
|
||||||
|
// country here is not extra information, it is a false claim about where the
|
||||||
|
// contact happened.
|
||||||
|
if IsMobileNoEntity(callsign) {
|
||||||
|
return Match{}, false
|
||||||
|
}
|
||||||
call := normalizeCallsign(callsign)
|
call := normalizeCallsign(callsign)
|
||||||
if call == "" {
|
if call == "" {
|
||||||
return Match{}, false
|
return Match{}, false
|
||||||
@@ -364,3 +376,22 @@ func replaceAreaDigit(call string, d byte) string {
|
|||||||
}
|
}
|
||||||
return call
|
return call
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsMobileNoEntity reports a callsign DXCC assigns to no entity: a TRAILING
|
||||||
|
// /MM (maritime mobile) or /AM (aeronautical mobile).
|
||||||
|
//
|
||||||
|
// Trailing only. A LEADING "MM" is the Scotland prefix and "AM" is Spain, so
|
||||||
|
// MM0ABC and AM5X are ordinary calls — treating those as entity-less would be a
|
||||||
|
// far larger error than the one this fixes.
|
||||||
|
func IsMobileNoEntity(callsign string) bool {
|
||||||
|
s := strings.ToUpper(strings.TrimSpace(callsign))
|
||||||
|
i := strings.LastIndex(s, "/")
|
||||||
|
if i < 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
switch s[i+1:] {
|
||||||
|
case "MM", "AM":
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package dxcc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// /MM and /AM belong to NO DXCC entity: the station is at sea or in the air.
|
||||||
|
//
|
||||||
|
// This is not a technicality. RI1FJL/MM resolved to Franz Josef Land while the
|
||||||
|
// expedition was still sailing there, which told the operator they had worked
|
||||||
|
// an entity they had not.
|
||||||
|
func TestMobileNoEntity(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
call string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"RI1FJL/MM", true},
|
||||||
|
{"YB1SCY/AM", true},
|
||||||
|
{"ri1fjl/mm", true},
|
||||||
|
{" RI1FJL/MM ", true},
|
||||||
|
// A LEADING MM is Scotland and AM is Spain. Treating those as
|
||||||
|
// entity-less would be a far larger error than the one this fixes.
|
||||||
|
{"MM0ABC", false},
|
||||||
|
{"AM5X", false},
|
||||||
|
{"MM/F4BPO", false},
|
||||||
|
{"AM/DL1ABC", false},
|
||||||
|
// Other suffixes keep their entity — a portable station is still ashore.
|
||||||
|
{"F4BPO/P", false},
|
||||||
|
{"F4BPO/M", false},
|
||||||
|
{"4U1UN/B", false},
|
||||||
|
{"F4BPO", false},
|
||||||
|
// Only the LAST element counts: RI1FJL/MM/P is still maritime, and a
|
||||||
|
// call whose /MM is not final is not.
|
||||||
|
{"RI1FJL/MM/P", false},
|
||||||
|
{"", false},
|
||||||
|
} {
|
||||||
|
if got := IsMobileNoEntity(tc.call); got != tc.want {
|
||||||
|
t.Errorf("IsMobileNoEntity(%q) = %v, want %v", tc.call, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+27
-1
@@ -4,6 +4,7 @@ package email
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/wneessen/go-mail"
|
"github.com/wneessen/go-mail"
|
||||||
@@ -85,7 +86,32 @@ func SendFiles(cfg Config, to, subject, body string, attachPaths []string) error
|
|||||||
return fmt.Errorf("smtp client: %w", err)
|
return fmt.Errorf("smtp client: %w", err)
|
||||||
}
|
}
|
||||||
if err := client.DialAndSend(m); err != nil {
|
if err := client.DialAndSend(m); err != nil {
|
||||||
return fmt.Errorf("send: %w", err)
|
return fmt.Errorf("send via %s:%d (%s, %s): %w",
|
||||||
|
cfg.Host, cfg.Port, cfg.Encryption, describeSize(attachPaths), err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// describeSize reports what was attached, in bytes.
|
||||||
|
//
|
||||||
|
// "An existing connection was forcibly closed" during DATA is the same message
|
||||||
|
// whether the server refused the size, hit a quota, or simply dropped the
|
||||||
|
// socket — and the first of those is the only one the operator can act on
|
||||||
|
// directly. Naming the size rules it in or out without a second attempt.
|
||||||
|
func describeSize(paths []string) string {
|
||||||
|
var total int64
|
||||||
|
n := 0
|
||||||
|
for _, p := range paths {
|
||||||
|
if p == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if fi, err := os.Stat(p); err == nil {
|
||||||
|
total += fi.Size()
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
return "no attachment"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%d attachment(s), %d KB", n, (total+1023)/1024)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// "An existing connection was forcibly closed" during DATA reads the same
|
||||||
|
// whether the server refused the SIZE, hit a quota, or just dropped the socket
|
||||||
|
// — and only the first is something the operator can act on. Naming the size in
|
||||||
|
// the error rules it in or out without a second attempt.
|
||||||
|
func TestDescribeSize(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
a := filepath.Join(dir, "card.jpg")
|
||||||
|
if err := os.WriteFile(a, make([]byte, 2048), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if got := describeSize(nil); got != "no attachment" {
|
||||||
|
t.Errorf("no attachment = %q", got)
|
||||||
|
}
|
||||||
|
if got := describeSize([]string{""}); got != "no attachment" {
|
||||||
|
t.Errorf("blank path = %q, want it ignored", got)
|
||||||
|
}
|
||||||
|
if got := describeSize([]string{a}); got != "1 attachment(s), 2 KB" {
|
||||||
|
t.Errorf("one file = %q", got)
|
||||||
|
}
|
||||||
|
// A path that does not exist must not be counted — the mail library skips it,
|
||||||
|
// so reporting it would describe a message that was never sent.
|
||||||
|
if got := describeSize([]string{a, filepath.Join(dir, "gone.jpg")}); got != "1 attachment(s), 2 KB" {
|
||||||
|
t.Errorf("missing file counted: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -81,6 +81,8 @@ type ServiceConfig struct {
|
|||||||
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
|
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
|
||||||
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
|
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
|
||||||
AutoUpload bool `json:"auto_upload"`
|
AutoUpload bool `json:"auto_upload"`
|
||||||
|
// OnAir: HRDLog only — publish the live frequency, mode and rig on the site.
|
||||||
|
OnAir bool `json:"on_air"`
|
||||||
UploadMode UploadMode `json:"upload_mode"`
|
UploadMode UploadMode `json:"upload_mode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,4 +144,10 @@ type UploadResult struct {
|
|||||||
OK bool // the service accepted (or already had) the QSO
|
OK bool // the service accepted (or already had) the QSO
|
||||||
LogID string // service-assigned record id, when provided
|
LogID string // service-assigned record id, when provided
|
||||||
Message string // human-readable detail (reason on failure)
|
Message string // human-readable detail (reason on failure)
|
||||||
|
// Ignored is set when the service accepted the submission but left some or
|
||||||
|
// all of the QSOs out of it. TQSL does this for contacts already uploaded
|
||||||
|
// AND for contacts outside the certificate's date range, and reports both
|
||||||
|
// with the same exit code — so the caller must show the message rather than
|
||||||
|
// decide on its own that everything went through.
|
||||||
|
Ignored bool
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -143,3 +144,59 @@ func TestHRDLog(ctx context.Context, client *http.Client, cfg ServiceConfig) (st
|
|||||||
}
|
}
|
||||||
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
|
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hrdlogOnAirURL is HRDLog's live-status endpoint — what puts "F4BPO is on air
|
||||||
|
// 14,074,000 FM IC-7300" on the site's front page.
|
||||||
|
//
|
||||||
|
// Endpoint and field names taken from HRDLog's own library (github.com/iw1qlh/
|
||||||
|
// HRDLOG-net-library, HrdProtocol.SendOnAirAsync), not from guesswork: it posts
|
||||||
|
// Frequency in Hz, Mode, Radio, Callsign, Code and App.
|
||||||
|
//
|
||||||
|
// HTTPS where that library uses plain HTTP. The upload code is a credential and
|
||||||
|
// has no business crossing the network in clear; the sibling NewEntry endpoint
|
||||||
|
// on the same host already serves TLS.
|
||||||
|
const hrdlogOnAirURL = "https://robot.hrdlog.net/OnAir.aspx"
|
||||||
|
|
||||||
|
// SendHRDLogOnAir publishes the current frequency, mode and rig.
|
||||||
|
//
|
||||||
|
// Deliberately fire-and-forget in spirit: it is a status broadcast, so a
|
||||||
|
// failure is logged and never surfaced as an error the operator must clear —
|
||||||
|
// but the message is returned so the caller can log WHAT the site said rather
|
||||||
|
// than only that something went wrong.
|
||||||
|
func SendHRDLogOnAir(ctx context.Context, client *http.Client, callsign, code string, freqHz int64, mode, radio string) (string, error) {
|
||||||
|
callsign = strings.ToUpper(strings.TrimSpace(callsign))
|
||||||
|
code = strings.TrimSpace(code)
|
||||||
|
if callsign == "" || code == "" {
|
||||||
|
return "", fmt.Errorf("hrdlog: callsign and upload code required")
|
||||||
|
}
|
||||||
|
if freqHz <= 0 {
|
||||||
|
return "", fmt.Errorf("hrdlog: no frequency to announce")
|
||||||
|
}
|
||||||
|
form := url.Values{}
|
||||||
|
form.Set("Callsign", callsign)
|
||||||
|
form.Set("Code", code)
|
||||||
|
form.Set("App", hrdlogApp)
|
||||||
|
form.Set("Frequency", strconv.FormatInt(freqHz, 10))
|
||||||
|
form.Set("Mode", strings.TrimSpace(mode))
|
||||||
|
form.Set("Radio", strings.TrimSpace(radio))
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, hrdlogOnAirURL, strings.NewReader(form.Encode()))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("hrdlog on-air: build request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
if client == nil {
|
||||||
|
client = &http.Client{Timeout: 15 * time.Second}
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("hrdlog on-air: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 32*1024))
|
||||||
|
msg := strings.TrimSpace(string(body))
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return msg, fmt.Errorf("hrdlog on-air: http %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|||||||
+51
-4
@@ -178,8 +178,12 @@ func fileExists(p string) bool {
|
|||||||
//
|
//
|
||||||
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
|
// tqsl -d -x -a all -l "<location>" -u [-p <keypass>] <file.adi>
|
||||||
//
|
//
|
||||||
// Exit codes (TQSL): 0 = uploaded; 8 = nothing new (all duplicates/out of
|
// Exit codes are TQSL's own (see the table in its cmdline help). 8 and 9 are
|
||||||
// range); 9 = some uploaded, some skipped; anything else = failure.
|
// the ones that matter and both used to be read as plain success: 8 means NO
|
||||||
|
// QSOs were processed and 9 means some were left out — in each case because
|
||||||
|
// they were already uploaded OR outside the callsign certificate's date range.
|
||||||
|
// Reporting either as success is how a contact came to be stamped "uploaded"
|
||||||
|
// while LoTW had never seen it.
|
||||||
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
|
func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord string) (UploadResult, error) {
|
||||||
tqsl := strings.TrimSpace(cfg.TQSLPath)
|
tqsl := strings.TrimSpace(cfg.TQSLPath)
|
||||||
loc := strings.TrimSpace(cfg.StationLocation)
|
loc := strings.TrimSpace(cfg.StationLocation)
|
||||||
@@ -249,11 +253,31 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TQSL's exit codes, from its own cmdline documentation. Two of them used to
|
||||||
|
// be read as plain success, and that is how contacts came to be stamped
|
||||||
|
// "uploaded" while LoTW had never seen them:
|
||||||
|
//
|
||||||
|
// 8 NO QSOs were processed — already uploaded OR OUT OF DATE RANGE
|
||||||
|
// 9 some processed, some ignored — same two reasons
|
||||||
|
// 14 some already uploaded, the rest signed
|
||||||
|
//
|
||||||
|
// "Out of date range" is the one that bites: a contact older than the
|
||||||
|
// callsign certificate's validity is silently left out, and reporting that as
|
||||||
|
// success stamped it sent for ever. TQSL says which case it is in its output,
|
||||||
|
// so the message is carried up rather than replaced with a guess.
|
||||||
switch code {
|
switch code {
|
||||||
case 0, 9:
|
case 0:
|
||||||
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
|
return UploadResult{OK: true, Message: "uploaded to LoTW"}, nil
|
||||||
|
case 9, 14:
|
||||||
|
return UploadResult{OK: true, Ignored: true, Message: tqslDetail(msg,
|
||||||
|
"uploaded — but TQSL left some contacts out (already uploaded, or outside the certificate's date range)")}, nil
|
||||||
case 8:
|
case 8:
|
||||||
return UploadResult{OK: true, Message: "already uploaded (duplicate)"}, nil
|
// Nothing reached LoTW. NOT stamped as sent: a duplicate left at "R" is
|
||||||
|
// harmless and will be refused again, while a contact wrongly marked sent
|
||||||
|
// is one the operator will never think to look at again.
|
||||||
|
return UploadResult{OK: false, Ignored: true, Message: tqslDetail(msg,
|
||||||
|
"TQSL uploaded nothing — every contact was already uploaded, or outside the certificate's date range")},
|
||||||
|
fmt.Errorf("lotw: no QSOs processed")
|
||||||
default:
|
default:
|
||||||
if msg == "" {
|
if msg == "" {
|
||||||
msg = fmt.Sprintf("tqsl exit code %d", code)
|
msg = fmt.Sprintf("tqsl exit code %d", code)
|
||||||
@@ -262,6 +286,29 @@ func UploadLoTW(ctx context.Context, cfg ServiceConfig, tempDir, adifRecord stri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// tqslDetail keeps the lines of TQSL's own output that say what happened to the
|
||||||
|
// contacts, and appends the summary.
|
||||||
|
//
|
||||||
|
// TQSL is explicit — "414 QSO records were already uploaded", "N QSO records
|
||||||
|
// are out of date range" — and that sentence is the whole answer to "why is my
|
||||||
|
// contact not on LoTW". It used to be captured and thrown away.
|
||||||
|
func tqslDetail(out, summary string) string {
|
||||||
|
var keep []string
|
||||||
|
for _, ln := range strings.Split(out, "\n") {
|
||||||
|
ln = strings.TrimSpace(ln)
|
||||||
|
l := strings.ToLower(ln)
|
||||||
|
if strings.Contains(l, "qso") && (strings.Contains(l, "already uploaded") ||
|
||||||
|
strings.Contains(l, "date range") || strings.Contains(l, "ignored") ||
|
||||||
|
strings.Contains(l, "duplicate")) {
|
||||||
|
keep = append(keep, ln)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(keep) == 0 {
|
||||||
|
return summary
|
||||||
|
}
|
||||||
|
return summary + " — " + strings.Join(keep, "; ")
|
||||||
|
}
|
||||||
|
|
||||||
// TestLoTW validates the LoTW config: tqsl present and the chosen station
|
// TestLoTW validates the LoTW config: tqsl present and the chosen station
|
||||||
// location exists in station_data.
|
// location exists in station_data.
|
||||||
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
func TestLoTW(cfg ServiceConfig, stationDataPath string) (string, error) {
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package extsvc
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// TQSL's own exit codes, from its cmdline documentation:
|
||||||
|
//
|
||||||
|
// 0 success
|
||||||
|
// 8 NO QSOs were processed — already uploaded OR out of date range
|
||||||
|
// 9 some processed, some ignored — same two reasons
|
||||||
|
// 14 some already uploaded, the rest signed
|
||||||
|
//
|
||||||
|
// 8 and 9 both used to be read as plain success, and that is how a contact came
|
||||||
|
// to be stamped "uploaded to LoTW" while LoTW had never seen it. The one that
|
||||||
|
// bites is "out of date range": a contact older than the callsign certificate's
|
||||||
|
// validity is silently left out of the submission.
|
||||||
|
func TestTQSLDetailKeepsTheReason(t *testing.T) {
|
||||||
|
out := `13:22:01: Signing using Callsign G0ABC, DXCC Entity ENGLAND
|
||||||
|
13:22:02: /tmp/x.adi: 20 QSO records are out of date range
|
||||||
|
13:22:02: Final Status: No QSOs were processed (8)`
|
||||||
|
got := tqslDetail(out, "summary")
|
||||||
|
if got == "summary" {
|
||||||
|
t.Fatal("threw away TQSL's explanation — that sentence is the whole answer to \"why is my contact not on LoTW\"")
|
||||||
|
}
|
||||||
|
if !contains(got, "out of date range") {
|
||||||
|
t.Errorf("the reason was lost: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestTQSLDetailFallsBackToTheSummary(t *testing.T) {
|
||||||
|
if got := tqslDetail("nothing useful here", "summary"); got != "summary" {
|
||||||
|
t.Errorf("got %q, want the plain summary when TQSL said nothing specific", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func contains(h, n string) bool {
|
||||||
|
return len(h) >= len(n) && (func() bool {
|
||||||
|
for i := 0; i+len(n) <= len(h); i++ {
|
||||||
|
if h[i:i+len(n)] == n {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})()
|
||||||
|
}
|
||||||
@@ -67,3 +67,54 @@ func DistanceBetweenGrids(a, b string) (km float64, ok bool) {
|
|||||||
}
|
}
|
||||||
return HaversineKm(lat1, lon1, lat2, lon2), true
|
return HaversineKm(lat1, lon1, lat2, lon2), true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// LatLonToGrid returns the 4-character Maidenhead square for a position.
|
||||||
|
func LatLonToGrid(lat, lon float64) string {
|
||||||
|
lon = math.Mod(lon+180, 360)
|
||||||
|
if lon < 0 {
|
||||||
|
lon += 360
|
||||||
|
}
|
||||||
|
lat = lat + 90
|
||||||
|
if lat < 0 {
|
||||||
|
lat = 0
|
||||||
|
} else if lat > 180 {
|
||||||
|
lat = 180
|
||||||
|
}
|
||||||
|
return string([]byte{
|
||||||
|
byte('A' + int(lon/20)),
|
||||||
|
byte('A' + int(lat/10)),
|
||||||
|
byte('0' + int(math.Mod(lon, 20)/2)),
|
||||||
|
byte('0' + int(math.Mod(lat, 10)/1)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// NeighbourGrids returns the square holding (lat, lon) and the ring of squares
|
||||||
|
// around it — 9 squares for ring 1, 25 for ring 2.
|
||||||
|
//
|
||||||
|
// Used to filter the PSK Reporter feed at the BROKER rather than in OpsLog. A
|
||||||
|
// square is about 111 km tall and 150 km wide at mid latitudes, so one ring is
|
||||||
|
// roughly the 300 km "around here" the feed already meant, and the traffic that
|
||||||
|
// used to be received and discarded is never sent.
|
||||||
|
func NeighbourGrids(lat, lon float64, ring int) []string {
|
||||||
|
if ring < 0 {
|
||||||
|
ring = 0
|
||||||
|
}
|
||||||
|
seen := map[string]bool{}
|
||||||
|
out := []string{}
|
||||||
|
for dLat := -ring; dLat <= ring; dLat++ {
|
||||||
|
for dLon := -ring; dLon <= ring; dLon++ {
|
||||||
|
// One square step: 1° of latitude, 2° of longitude.
|
||||||
|
la := lat + float64(dLat)
|
||||||
|
lo := lon + float64(dLon)*2
|
||||||
|
if la > 90 || la < -90 {
|
||||||
|
continue // past a pole there is no square, not a wrapped one
|
||||||
|
}
|
||||||
|
g := LatLonToGrid(la, lo)
|
||||||
|
if !seen[g] {
|
||||||
|
seen[g] = true
|
||||||
|
out = append(out, g)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package geo
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The squares the PSK Reporter feed is filtered on. A wrong ring means either
|
||||||
|
// receiving the world again or hearing nothing.
|
||||||
|
func TestNeighbourGrids(t *testing.T) {
|
||||||
|
// JN36 is around 46.5N 5.5E.
|
||||||
|
lat, lon, ok := GridToLatLon("JN36")
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("JN36 did not resolve")
|
||||||
|
}
|
||||||
|
if got := LatLonToGrid(lat, lon); got != "JN36" {
|
||||||
|
t.Fatalf("round trip gave %q, want JN36", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
ring := NeighbourGrids(lat, lon, 1)
|
||||||
|
if len(ring) != 9 {
|
||||||
|
t.Errorf("ring 1 has %d squares, want 9: %v", len(ring), ring)
|
||||||
|
}
|
||||||
|
found := false
|
||||||
|
for _, g := range ring {
|
||||||
|
if g == "JN36" {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
if len(g) != 4 {
|
||||||
|
t.Errorf("not a 4-character square: %q", g)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
t.Errorf("the operator's own square is missing from %v", ring)
|
||||||
|
}
|
||||||
|
if n := len(NeighbourGrids(lat, lon, 0)); n != 1 {
|
||||||
|
t.Errorf("ring 0 has %d squares, want just the operator's", n)
|
||||||
|
}
|
||||||
|
if n := len(NeighbourGrids(lat, lon, 2)); n != 25 {
|
||||||
|
t.Errorf("ring 2 has %d squares, want 25", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Near a pole a step north has nowhere to go; it must be dropped, not wrapped
|
||||||
|
// onto a square on the far side of the world.
|
||||||
|
func TestNeighbourGridsNearThePole(t *testing.T) {
|
||||||
|
for _, g := range NeighbourGrids(89.5, 25, 1) {
|
||||||
|
if len(g) != 4 {
|
||||||
|
t.Errorf("bad square near the pole: %q", g)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,226 @@
|
|||||||
|
// Package gridcache is the long-term callsign→grid store behind grid chasing.
|
||||||
|
//
|
||||||
|
// Its own SQLite file, not a table in the settings database: that one sits
|
||||||
|
// wherever the operator put it, often a synchronised folder, and this rewrites
|
||||||
|
// itself every minute. Deleting the file costs a few days of listening.
|
||||||
|
//
|
||||||
|
// A callsign has one grid and the newest report wins — a stale locator reads as
|
||||||
|
// a square already worked, which is worse than none.
|
||||||
|
package gridcache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
_ "modernc.org/sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Retention bounds a store that would otherwise only ever grow. Two years is
|
||||||
|
// chosen to be far longer than any propagation interest and short enough that a
|
||||||
|
// reassigned callsign eventually stops carrying its previous holder's square —
|
||||||
|
// the one way this cache can be actively wrong rather than merely empty.
|
||||||
|
const Retention = 2 * 365 * 24 * time.Hour
|
||||||
|
|
||||||
|
// FlushEvery is the batch interval. Long enough that a burst of reports costs
|
||||||
|
// one transaction, short enough that a crash loses a minute of learning.
|
||||||
|
const FlushEvery = 60 * time.Second
|
||||||
|
|
||||||
|
// Sources a locator can come from.
|
||||||
|
const (
|
||||||
|
SourceDecode = "decode" // a CQ this station's own receiver decoded
|
||||||
|
SourceMQTT = "mqtt" // a PSK Reporter report
|
||||||
|
)
|
||||||
|
|
||||||
|
// Entry is one locator and where it came from.
|
||||||
|
type Entry struct {
|
||||||
|
Grid string
|
||||||
|
Source string
|
||||||
|
}
|
||||||
|
|
||||||
|
type Store struct {
|
||||||
|
db *sql.DB
|
||||||
|
|
||||||
|
mu sync.Mutex
|
||||||
|
dirty map[string]Entry // call → what to write
|
||||||
|
|
||||||
|
stop chan struct{}
|
||||||
|
stopOnce sync.Once
|
||||||
|
wg sync.WaitGroup
|
||||||
|
|
||||||
|
logf func(string, ...any)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open creates or opens the store at path and prunes what has aged out.
|
||||||
|
func Open(path string, logf func(string, ...any)) (*Store, error) {
|
||||||
|
if logf == nil {
|
||||||
|
logf = func(string, ...any) {}
|
||||||
|
}
|
||||||
|
// WAL so a flush never blocks a read, and a busy timeout because the flush
|
||||||
|
// goroutine and the startup load can overlap on a slow disk.
|
||||||
|
db, err := sql.Open("sqlite", path+"?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("gridcache: open %s: %w", path, err)
|
||||||
|
}
|
||||||
|
if _, err := db.Exec("CREATE TABLE IF NOT EXISTS grids (" +
|
||||||
|
"call TEXT PRIMARY KEY, grid TEXT NOT NULL, updated_at INTEGER NOT NULL, " +
|
||||||
|
"source TEXT NOT NULL DEFAULT '')"); err != nil {
|
||||||
|
db.Close()
|
||||||
|
return nil, fmt.Errorf("gridcache: schema: %w", err)
|
||||||
|
}
|
||||||
|
// A file written before the column existed keeps its rows; this fails
|
||||||
|
// harmlessly when the column is already there.
|
||||||
|
db.Exec("ALTER TABLE grids ADD COLUMN source TEXT NOT NULL DEFAULT ''")
|
||||||
|
s := &Store{db: db, dirty: map[string]Entry{}, stop: make(chan struct{}), logf: logf}
|
||||||
|
if n, err := s.prune(); err != nil {
|
||||||
|
s.logf("gridcache: prune failed: %v", err)
|
||||||
|
} else if n > 0 {
|
||||||
|
s.logf("gridcache: pruned %d locators not heard in %d days", n, int(Retention.Hours()/24))
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) prune() (int64, error) {
|
||||||
|
cut := time.Now().Add(-Retention).Unix()
|
||||||
|
res, err := s.db.Exec(`DELETE FROM grids WHERE updated_at < ?`, cut)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return res.RowsAffected()
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadAll returns every stored locator, for seeding the in-memory map at
|
||||||
|
// startup. One query and one map build — the point of the whole package is that
|
||||||
|
// nothing afterwards has to ask the database anything.
|
||||||
|
func (s *Store) LoadAll() (map[string]string, error) {
|
||||||
|
rows, err := s.db.Query(`SELECT call, grid FROM grids`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("gridcache: load: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]string, 4096)
|
||||||
|
for rows.Next() {
|
||||||
|
var call, grid string
|
||||||
|
if err := rows.Scan(&call, &grid); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out[call] = grid
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Put queues a locator for writing. Callers pass only what CHANGED — an
|
||||||
|
// unchanged report is the common case by a wide margin and must not reach here,
|
||||||
|
// or the batch would carry the whole feed instead of the news in it.
|
||||||
|
func (s *Store) Put(call, grid, source string) {
|
||||||
|
call = strings.ToUpper(strings.TrimSpace(call))
|
||||||
|
grid = strings.TrimSpace(grid)
|
||||||
|
if call == "" || grid == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
s.dirty[call] = Entry{Grid: grid, Source: source}
|
||||||
|
s.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start runs the flush loop until Close.
|
||||||
|
func (s *Store) Start(ctx context.Context) {
|
||||||
|
s.wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer s.wg.Done()
|
||||||
|
t := time.NewTicker(FlushEvery)
|
||||||
|
defer t.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-s.stop:
|
||||||
|
return
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
s.logf("gridcache: flush failed: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Flush writes the pending batch in one transaction. Safe to call with nothing
|
||||||
|
// pending, which is most of the time on a quiet band.
|
||||||
|
func (s *Store) Flush() error {
|
||||||
|
s.mu.Lock()
|
||||||
|
if len(s.dirty) == 0 {
|
||||||
|
s.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
batch := s.dirty
|
||||||
|
s.dirty = map[string]Entry{}
|
||||||
|
s.mu.Unlock()
|
||||||
|
|
||||||
|
tx, err := s.db.Begin()
|
||||||
|
if err != nil {
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
st, err := tx.Prepare(`INSERT INTO grids (call, grid, updated_at, source) VALUES (?, ?, ?, ?)
|
||||||
|
ON CONFLICT(call) DO UPDATE SET grid = excluded.grid, updated_at = excluded.updated_at,
|
||||||
|
source = excluded.source`)
|
||||||
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
now := time.Now().Unix()
|
||||||
|
for call, e := range batch {
|
||||||
|
if _, err := st.Exec(call, e.Grid, now, e.Source); err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := tx.Commit(); err != nil {
|
||||||
|
s.requeue(batch)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Logged because a batch that never reaches the disk looks exactly like one
|
||||||
|
// that does: the locators are in memory either way until the next restart,
|
||||||
|
// which is the one moment the difference shows.
|
||||||
|
s.logf("gridcache: wrote %d locators", len(batch))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// requeue puts a failed batch back, without overwriting anything learnt while it
|
||||||
|
// was in flight — the newer value is the right one.
|
||||||
|
func (s *Store) requeue(batch map[string]Entry) {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
for call, e := range batch {
|
||||||
|
if _, newer := s.dirty[call]; !newer {
|
||||||
|
s.dirty[call] = e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pending reports how many locators are waiting to be written.
|
||||||
|
func (s *Store) Pending() int {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
return len(s.dirty)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close stops the loop and writes whatever is pending. A restart is the moment
|
||||||
|
// the cache is most valuable, so losing the last minute of learning to a clean
|
||||||
|
// shutdown would be a poor trade.
|
||||||
|
func (s *Store) Close() error {
|
||||||
|
s.stopOnce.Do(func() { close(s.stop) })
|
||||||
|
s.wg.Wait()
|
||||||
|
err := s.Flush()
|
||||||
|
if cerr := s.db.Close(); err == nil {
|
||||||
|
err = cerr
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
package gridcache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func open(t *testing.T) (*Store, string) {
|
||||||
|
t.Helper()
|
||||||
|
path := filepath.Join(t.TempDir(), "grids.db")
|
||||||
|
s, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open: %v", err)
|
||||||
|
}
|
||||||
|
return s, path
|
||||||
|
}
|
||||||
|
|
||||||
|
// The whole reason the store exists: what was learnt is still there after a
|
||||||
|
// restart, so the cluster's locator column is full in the first second instead
|
||||||
|
// of after an hour of listening.
|
||||||
|
func TestSurvivesRestart(t *testing.T) {
|
||||||
|
s, path := open(t)
|
||||||
|
s.Put("F4BPO", "JN36", SourceDecode)
|
||||||
|
s.Put("OH5CX", "KP30", SourceDecode)
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatalf("flush: %v", err)
|
||||||
|
}
|
||||||
|
if err := s.Close(); err != nil {
|
||||||
|
t.Fatalf("close: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
again, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("reopen: %v", err)
|
||||||
|
}
|
||||||
|
defer again.Close()
|
||||||
|
got, err := again.LoadAll()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("load: %v", err)
|
||||||
|
}
|
||||||
|
if got["F4BPO"] != "JN36" || got["OH5CX"] != "KP30" {
|
||||||
|
t.Errorf("locators lost across a restart: %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A callsign has ONE grid and the newest report wins. Operators move, go
|
||||||
|
// portable, go on expedition — and a stale locator is worse than none for grid
|
||||||
|
// chasing, because it reads as a square already worked.
|
||||||
|
func TestNewestReportWins(t *testing.T) {
|
||||||
|
s, _ := open(t)
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
|
s.Put("F4BPO", "JN36", SourceDecode)
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
s.Put("F4BPO", "KP30", SourceDecode) // moved
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := s.LoadAll()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if got["F4BPO"] != "KP30" {
|
||||||
|
t.Errorf("grid = %q, want the newer KP30", got["F4BPO"])
|
||||||
|
}
|
||||||
|
if len(got) != 1 {
|
||||||
|
t.Errorf("a callsign must hold one row, got %d: %v", len(got), got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing reaches the disk until a flush, and a flush with nothing pending is
|
||||||
|
// not an error — that is most minutes on a quiet band.
|
||||||
|
func TestBatching(t *testing.T) {
|
||||||
|
s, _ := open(t)
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
|
for _, c := range []string{"A1AA", "B2BB", "C3CC"} {
|
||||||
|
s.Put(c, "JN36", SourceDecode)
|
||||||
|
}
|
||||||
|
if n := s.Pending(); n != 3 {
|
||||||
|
t.Errorf("pending = %d, want 3 queued and unwritten", n)
|
||||||
|
}
|
||||||
|
if got, _ := s.LoadAll(); len(got) != 0 {
|
||||||
|
t.Errorf("wrote before the flush: %v", got)
|
||||||
|
}
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if n := s.Pending(); n != 0 {
|
||||||
|
t.Errorf("pending = %d after a flush, want 0", n)
|
||||||
|
}
|
||||||
|
if got, _ := s.LoadAll(); len(got) != 3 {
|
||||||
|
t.Errorf("flush wrote %d rows, want 3", len(got))
|
||||||
|
}
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Errorf("empty flush must be a no-op, got %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Age is what bounds a store that would otherwise only grow. A callsign not
|
||||||
|
// heard in two years is likely reassigned, and carrying its previous holder's
|
||||||
|
// square is the one way this cache can be actively wrong rather than empty.
|
||||||
|
func TestPruneOnOpen(t *testing.T) {
|
||||||
|
s, path := open(t)
|
||||||
|
s.Put("FRESH", "JN36", SourceDecode)
|
||||||
|
s.Put("STALE", "IO91", SourceDecode)
|
||||||
|
if err := s.Flush(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// Backdate one row past the retention window.
|
||||||
|
old := time.Now().Add(-Retention - 24*time.Hour).Unix()
|
||||||
|
if _, err := s.db.Exec(`UPDATE grids SET updated_at = ? WHERE call = 'STALE'`, old); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
s.Close()
|
||||||
|
|
||||||
|
again, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer again.Close()
|
||||||
|
got, _ := again.LoadAll()
|
||||||
|
if _, ok := got["STALE"]; ok {
|
||||||
|
t.Error("an entry past the retention window survived — the store is unbounded")
|
||||||
|
}
|
||||||
|
if got["FRESH"] != "JN36" {
|
||||||
|
t.Error("pruning took a live entry with it")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close has to write what the last minute learnt: a restart is exactly when the
|
||||||
|
// cache is worth the most, so losing it to a clean shutdown would be a poor
|
||||||
|
// trade.
|
||||||
|
func TestCloseFlushes(t *testing.T) {
|
||||||
|
s, path := open(t)
|
||||||
|
s.Put("LATE", "JN36", SourceDecode)
|
||||||
|
if err := s.Close(); err != nil {
|
||||||
|
t.Fatalf("close: %v", err)
|
||||||
|
}
|
||||||
|
again, err := Open(path, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer again.Close()
|
||||||
|
got, _ := again.LoadAll()
|
||||||
|
if got["LATE"] != "JN36" {
|
||||||
|
t.Error("what was pending at shutdown was dropped")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/binary"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// An operator's log arrived with four hundred identical "ADIF payload ignored"
|
||||||
|
// lines and nothing else legible: two inbound listeners were configured on the
|
||||||
|
// SAME multicast group and port, one WSJT and one ADIF, so every WSJT-X decode
|
||||||
|
// was delivered to both and the ADIF one rejected each in writing. An FT8 cycle
|
||||||
|
// is dozens of decodes every fifteen seconds.
|
||||||
|
//
|
||||||
|
// The listener has to recognise that traffic and say what it is — once.
|
||||||
|
func TestIgnoredADIFStaysBounded(t *testing.T) {
|
||||||
|
s := &Server{cfg: Config{Name: "FLDIGI", Port: 2237}}
|
||||||
|
|
||||||
|
// A WSJT-X packet: magic first. One line is the whole diagnosis, so the
|
||||||
|
// counter is pushed past the cap immediately.
|
||||||
|
pkt := make([]byte, 16)
|
||||||
|
binary.BigEndian.PutUint32(pkt[:4], wsjtMagic)
|
||||||
|
s.noteIgnoredADIF(pkt)
|
||||||
|
if s.badPkts <= maxBadPktDumps {
|
||||||
|
t.Errorf("badPkts = %d — WSJT traffic should silence the listener at once", s.badPkts)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Anything else is described a few times before going quiet, so an ordinary
|
||||||
|
// keep-alive does not get the same one-line treatment as a real diagnosis.
|
||||||
|
s2 := &Server{cfg: Config{Name: "FLDIGI", Port: 2237}}
|
||||||
|
s2.noteIgnoredADIF([]byte("keep-alive"))
|
||||||
|
if s2.badPkts > maxBadPktDumps {
|
||||||
|
t.Errorf("one unusable payload silenced the listener (badPkts = %d)", s2.badPkts)
|
||||||
|
}
|
||||||
|
for i := 0; i < 50; i++ {
|
||||||
|
s2.noteIgnoredADIF([]byte("keep-alive"))
|
||||||
|
}
|
||||||
|
if s2.badPkts <= maxBadPktDumps {
|
||||||
|
t.Errorf("badPkts = %d — the throttle never engaged", s2.badPkts)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,6 +37,34 @@ 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)
|
||||||
|
// 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
|
||||||
|
// discard a bare ADIF record without a word — so the two cannot be one row.
|
||||||
|
ServiceWSJTLog ServiceType = "wsjt_log"
|
||||||
|
// ServiceCustom is the general case: the operator picks the trigger, writes
|
||||||
|
// the message, and chooses UDP or HTTP. See Trigger and Config.Template.
|
||||||
|
ServiceCustom ServiceType = "custom"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Trigger names the moment a custom outbound row fires.
|
||||||
|
type Trigger string
|
||||||
|
|
||||||
|
const (
|
||||||
|
TriggerQSOLogged Trigger = "qso_logged"
|
||||||
|
TriggerRotatorGo Trigger = "rotator_goto"
|
||||||
|
TriggerLookupDone Trigger = "lookup_done"
|
||||||
|
// TriggerBandChange is the RIG changing band, not the entry form: a switch
|
||||||
|
// follows the radio, not what is being typed. Rare by nature, so unlike a
|
||||||
|
// frequency trigger it needs no damping.
|
||||||
|
TriggerBandChange Trigger = "band_change"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Transport is how a custom row leaves: a UDP datagram or an HTTP GET.
|
||||||
|
type Transport string
|
||||||
|
|
||||||
|
const (
|
||||||
|
TransportUDP Transport = "udp"
|
||||||
|
TransportURL Transport = "url"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Config is one user-defined UDP connection.
|
// Config is one user-defined UDP connection.
|
||||||
@@ -51,6 +79,13 @@ type Config struct {
|
|||||||
DestinationIP string `json:"destination_ip"` // outbound only
|
DestinationIP string `json:"destination_ip"` // outbound only
|
||||||
Enabled bool `json:"enabled"`
|
Enabled bool `json:"enabled"`
|
||||||
SortOrder int `json:"sort_order"`
|
SortOrder int `json:"sort_order"`
|
||||||
|
|
||||||
|
// Custom rows only (ServiceCustom).
|
||||||
|
Trigger Trigger `json:"trigger"`
|
||||||
|
Template string `json:"template"` // message text with {fields}
|
||||||
|
Transport Transport `json:"transport"` // udp | url
|
||||||
|
URL string `json:"url"` // URL template, when transport is url
|
||||||
|
LineEnd string `json:"line_end"` // "" | lf | crlf — UDP only
|
||||||
}
|
}
|
||||||
|
|
||||||
// Repo is the persistence layer for UDP integration rows.
|
// Repo is the persistence layer for UDP integration rows.
|
||||||
@@ -62,7 +97,8 @@ func (r *Repo) List(ctx context.Context) ([]Config, error) {
|
|||||||
rows, err := r.db.QueryContext(ctx, `
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
SELECT id, direction, name, port, service_type,
|
SELECT id, direction, name, port, service_type,
|
||||||
multicast, multicast_group, destination_ip,
|
multicast, multicast_group, destination_ip,
|
||||||
enabled, sort_order
|
enabled, sort_order,
|
||||||
|
trig, template, transport, url, line_end
|
||||||
FROM integrations_udp
|
FROM integrations_udp
|
||||||
ORDER BY direction, sort_order, id`)
|
ORDER BY direction, sort_order, id`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -74,7 +110,8 @@ func (r *Repo) List(ctx context.Context) ([]Config, error) {
|
|||||||
var c Config
|
var c Config
|
||||||
var mc, en int
|
var mc, en int
|
||||||
if err := rows.Scan(&c.ID, &c.Direction, &c.Name, &c.Port, &c.ServiceType,
|
if err := rows.Scan(&c.ID, &c.Direction, &c.Name, &c.Port, &c.ServiceType,
|
||||||
&mc, &c.MulticastGroup, &c.DestinationIP, &en, &c.SortOrder); err != nil {
|
&mc, &c.MulticastGroup, &c.DestinationIP, &en, &c.SortOrder,
|
||||||
|
&c.Trigger, &c.Template, &c.Transport, &c.URL, &c.LineEnd); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
c.Multicast = mc != 0
|
c.Multicast = mc != 0
|
||||||
@@ -101,10 +138,12 @@ func (r *Repo) Save(ctx context.Context, c *Config) error {
|
|||||||
if c.ID == 0 {
|
if c.ID == 0 {
|
||||||
res, err := r.db.ExecContext(ctx, `
|
res, err := r.db.ExecContext(ctx, `
|
||||||
INSERT INTO integrations_udp(direction, name, port, service_type,
|
INSERT INTO integrations_udp(direction, name, port, service_type,
|
||||||
multicast, multicast_group, destination_ip, enabled, sort_order)
|
multicast, multicast_group, destination_ip, enabled, sort_order,
|
||||||
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
trig, template, transport, url, line_end)
|
||||||
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||||
c.Direction, c.Name, c.Port, c.ServiceType,
|
c.Direction, c.Name, c.Port, c.ServiceType,
|
||||||
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder)
|
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder,
|
||||||
|
c.Trigger, c.Template, c.Transport, c.URL, c.LineEnd)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("insert udp: %w", err)
|
return fmt.Errorf("insert udp: %w", err)
|
||||||
}
|
}
|
||||||
@@ -117,10 +156,12 @@ func (r *Repo) Save(ctx context.Context, c *Config) error {
|
|||||||
direction = ?, name = ?, port = ?, service_type = ?,
|
direction = ?, name = ?, port = ?, service_type = ?,
|
||||||
multicast = ?, multicast_group = ?, destination_ip = ?,
|
multicast = ?, multicast_group = ?, destination_ip = ?,
|
||||||
enabled = ?, sort_order = ?,
|
enabled = ?, sort_order = ?,
|
||||||
|
trig = ?, template = ?, transport = ?, url = ?, line_end = ?,
|
||||||
updated_at = ?
|
updated_at = ?
|
||||||
WHERE id = ?`,
|
WHERE id = ?`,
|
||||||
c.Direction, c.Name, c.Port, c.ServiceType,
|
c.Direction, c.Name, c.Port, c.ServiceType,
|
||||||
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder, db.NowISO(), c.ID)
|
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder,
|
||||||
|
c.Trigger, c.Template, c.Transport, c.URL, c.LineEnd, db.NowISO(), c.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("update udp: %w", err)
|
return fmt.Errorf("update udp: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,205 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Custom outbound messages: a trigger, a template, a transport.
|
||||||
|
//
|
||||||
|
// The hard-coded emitters beside this one each speak a published format at a
|
||||||
|
// fixed moment. This is the escape hatch: the operator chooses when it fires and
|
||||||
|
// writes what it says. It exists mainly for antenna switches, which are driven
|
||||||
|
// by a URL — http://192.168.1.50/antenna?band=20m — and want the band change,
|
||||||
|
// but nothing here is specific to them.
|
||||||
|
//
|
||||||
|
// The presets are NOT reimplemented on top of this. PstRotator and N1MM
|
||||||
|
// RadioInfo are documented formats that work; a typo in a template would break
|
||||||
|
// them silently, and "it worked before I touched anything" is not a trade worth
|
||||||
|
// making for one less code path.
|
||||||
|
|
||||||
|
// httpTimeout bounds a request. A UDP datagram leaves and is forgotten; an HTTP
|
||||||
|
// call to a switch that has been unplugged will otherwise sit there for the
|
||||||
|
// operating system's own timeout — and this fires on a band change, which is
|
||||||
|
// exactly when nobody wants to wait.
|
||||||
|
const httpTimeout = 3 * time.Second
|
||||||
|
|
||||||
|
// customHTTP is the client for URL rows. One client, reused: a new one per
|
||||||
|
// request leaks connections on a switch that keeps them alive.
|
||||||
|
var customHTTP = &http.Client{Timeout: httpTimeout}
|
||||||
|
|
||||||
|
// Render substitutes {field} placeholders in tmpl.
|
||||||
|
//
|
||||||
|
// escape decides how a value is written, and it is not cosmetic: in a URL every
|
||||||
|
// value has to be percent-encoded, or the first portable callsign — F4BPO/P —
|
||||||
|
// puts a path separator in the middle of a query string, and a name with a
|
||||||
|
// space breaks the request outright. In a UDP payload the opposite holds: the
|
||||||
|
// receiver wants the text as typed.
|
||||||
|
//
|
||||||
|
// A placeholder with no value becomes empty rather than staying as "{freq}".
|
||||||
|
// Leaving the braces would send them down the wire, and a receiver would store
|
||||||
|
// the literal text as if it meant something.
|
||||||
|
func Render(tmpl string, fields map[string]string, escape bool) string {
|
||||||
|
var b strings.Builder
|
||||||
|
for {
|
||||||
|
i := strings.IndexByte(tmpl, '{')
|
||||||
|
if i < 0 {
|
||||||
|
b.WriteString(tmpl)
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
j := strings.IndexByte(tmpl[i:], '}')
|
||||||
|
if j < 0 {
|
||||||
|
b.WriteString(tmpl) // an unclosed brace is literal text
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
b.WriteString(tmpl[:i])
|
||||||
|
key := strings.ToLower(strings.TrimSpace(tmpl[i+1 : i+j]))
|
||||||
|
v := fields[key]
|
||||||
|
if escape {
|
||||||
|
v = url.QueryEscape(v)
|
||||||
|
}
|
||||||
|
b.WriteString(v)
|
||||||
|
tmpl = tmpl[i+j+1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// lineEnding turns the stored choice into the bytes appended to a UDP payload.
|
||||||
|
// Many receivers read a line at a time and wait for a terminator; a trailing
|
||||||
|
// space in a text box is invisible and lost on the first copy-paste, so this is
|
||||||
|
// a choice rather than something to type.
|
||||||
|
func lineEnding(s string) string {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(s)) {
|
||||||
|
case "lf":
|
||||||
|
return "\n"
|
||||||
|
case "crlf":
|
||||||
|
return "\r\n"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// EmitTrigger fires every enabled custom row bound to this trigger.
|
||||||
|
//
|
||||||
|
// Runs the sends in the background: an HTTP request must never sit on the path
|
||||||
|
// of the thing that caused it — a band change waiting on an antenna switch is a
|
||||||
|
// band change the operator watches not happen.
|
||||||
|
func (m *Manager) EmitTrigger(t Trigger, fields map[string]string) {
|
||||||
|
var rows []Config
|
||||||
|
for _, c := range m.Outbound(ServiceCustom) {
|
||||||
|
if c.Trigger == t {
|
||||||
|
rows = append(rows, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(rows) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, c := range rows {
|
||||||
|
go m.fireCustom(c, fields)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Manager) fireCustom(c Config, fields map[string]string) {
|
||||||
|
if c.Transport == TransportURL {
|
||||||
|
target := Render(c.URL, fields, true)
|
||||||
|
if strings.TrimSpace(target) == "" {
|
||||||
|
m.noteEmptyRender(c, c.URL)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.getURL(c, target)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
payload := Render(c.Template, fields, false) + lineEnding(c.LineEnd)
|
||||||
|
if strings.TrimSpace(payload) == "" {
|
||||||
|
m.noteEmptyRender(c, c.Template)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
m.sendTo(c, []byte(payload))
|
||||||
|
}
|
||||||
|
|
||||||
|
// noteEmptyRender reports a template that produced nothing.
|
||||||
|
//
|
||||||
|
// Silence here was the worst of the lot: a row whose template is a single
|
||||||
|
// placeholder the trigger does not carry — {freq} on a band change — renders
|
||||||
|
// empty, sends nothing, and looked exactly like a row that had never fired. The
|
||||||
|
// operator has no way to tell a typo from a trigger that is not reaching them.
|
||||||
|
//
|
||||||
|
// Throttled with the same per-row timer as a failing URL: a template that is
|
||||||
|
// wrong stays wrong on every band change.
|
||||||
|
func (m *Manager) noteEmptyRender(c Config, tmpl string) {
|
||||||
|
m.noteCustomProblem(c, fmt.Sprintf(
|
||||||
|
"on %s the message came out empty — %q filled in nothing. Check the field names against the list under the box.",
|
||||||
|
c.Trigger, tmpl))
|
||||||
|
}
|
||||||
|
|
||||||
|
// getURL performs the request and reports what came back.
|
||||||
|
//
|
||||||
|
// The status code is logged, not just transport errors. A switch answering 404
|
||||||
|
// because a firmware update moved its endpoint is a total failure that looks
|
||||||
|
// exactly like success from here — the datagram equivalent does not exist, and
|
||||||
|
// an operator would have no way to tell.
|
||||||
|
func (m *Manager) getURL(c Config, target string) {
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), httpTimeout)
|
||||||
|
defer cancel()
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, target, nil)
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("udp: [%s] bad URL %q: %v", c.Name, redactURL(target), err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resp, err := customHTTP.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
m.noteCustomProblem(c, fmt.Sprintf("%s failed: %v", redactURL(target), err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode >= 400 {
|
||||||
|
m.noteCustomProblem(c, fmt.Sprintf("%s answered %s", redactURL(target), resp.Status))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("udp: [%s] on %s GET %s → %s", c.Name, c.Trigger, redactURL(target), resp.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// redactURL hides the password in a URL before it reaches the log.
|
||||||
|
//
|
||||||
|
// The URL is what makes this feature debuggable, so it is logged in full — but
|
||||||
|
// an operator who put http://admin:secret@switch/ in the box is going to send
|
||||||
|
// that log to somebody when something goes wrong. Storing the password as typed
|
||||||
|
// was a deliberate choice for LAN gear; writing it into a file that travels is
|
||||||
|
// not the same choice, and was never made.
|
||||||
|
func redactURL(raw string) string {
|
||||||
|
u, err := url.Parse(raw)
|
||||||
|
if err != nil || u.User == nil {
|
||||||
|
return raw
|
||||||
|
}
|
||||||
|
if _, hasPass := u.User.Password(); !hasPass {
|
||||||
|
return raw
|
||||||
|
}
|
||||||
|
u.User = url.UserPassword(u.User.Username(), "***")
|
||||||
|
// Qt-style escaping of the placeholder would give %2A%2A%2A; put it back so
|
||||||
|
// the line stays readable.
|
||||||
|
return strings.ReplaceAll(u.String(), "%2A%2A%2A", "***")
|
||||||
|
}
|
||||||
|
|
||||||
|
// noteCustomProblem logs a failing URL row, throttled per row: a switch that is
|
||||||
|
// off answers the same way on every band change, and this fires on every one.
|
||||||
|
func (m *Manager) noteCustomProblem(c Config, msg string) {
|
||||||
|
m.httpFailMu.Lock()
|
||||||
|
if m.httpFailAt == nil {
|
||||||
|
m.httpFailAt = map[int64]time.Time{}
|
||||||
|
}
|
||||||
|
last := m.httpFailAt[c.ID]
|
||||||
|
now := time.Now()
|
||||||
|
quiet := now.Sub(last) < 5*time.Minute
|
||||||
|
if !quiet {
|
||||||
|
m.httpFailAt[c.ID] = now
|
||||||
|
}
|
||||||
|
m.httpFailMu.Unlock()
|
||||||
|
if quiet {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("udp: [%s] %s", c.Name, msg)
|
||||||
|
}
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The escaping rule is the whole difference between a template that works on
|
||||||
|
// the bench and one that fails on the first portable callsign.
|
||||||
|
func TestRenderEscapesForURLsOnly(t *testing.T) {
|
||||||
|
fields := map[string]string{
|
||||||
|
"call": "F4BPO/P", "name": "Jean Pierre", "band": "20m", "az": "137",
|
||||||
|
}
|
||||||
|
// UDP: the receiver wants the text as typed.
|
||||||
|
if got := Render("<CALL>{call}</CALL>", fields, false); got != "<CALL>F4BPO/P</CALL>" {
|
||||||
|
t.Errorf("UDP render = %q", got)
|
||||||
|
}
|
||||||
|
// URL: a slash in a callsign is a path separator, a space breaks the request.
|
||||||
|
if got := Render("http://sw/a?c={call}&n={name}", fields, true); got != "http://sw/a?c=F4BPO%2FP&n=Jean+Pierre" {
|
||||||
|
t.Errorf("URL render = %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A placeholder the trigger does not carry becomes empty, not the literal
|
||||||
|
// "{freq}" — otherwise the braces go down the wire and a receiver files them.
|
||||||
|
func TestRenderDropsUnknownFields(t *testing.T) {
|
||||||
|
if got := Render("<AZIMUT>{az}</AZIMUT>{freq}", map[string]string{"az": "137"}, false); got != "<AZIMUT>137</AZIMUT>" {
|
||||||
|
t.Errorf("got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Text that merely looks like a placeholder must survive: an unclosed brace is
|
||||||
|
// content, not a broken field.
|
||||||
|
func TestRenderLeavesLiteralBraces(t *testing.T) {
|
||||||
|
for _, c := range []struct{ in, want string }{
|
||||||
|
{"no fields here", "no fields here"},
|
||||||
|
{"{unclosed", "{unclosed"},
|
||||||
|
{"a } b", "a } b"},
|
||||||
|
} {
|
||||||
|
if got := Render(c.in, map[string]string{}, false); got != c.want {
|
||||||
|
t.Errorf("Render(%q) = %q, want %q", c.in, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Field names are matched case- and space-insensitively: an operator typing
|
||||||
|
// {Band} or { band } means the band.
|
||||||
|
func TestRenderFieldNamesAreForgiving(t *testing.T) {
|
||||||
|
f := map[string]string{"band": "20m"}
|
||||||
|
for _, tmpl := range []string{"{band}", "{Band}", "{ BAND }"} {
|
||||||
|
if got := Render(tmpl, f, false); got != "20m" {
|
||||||
|
t.Errorf("Render(%q) = %q, want 20m", tmpl, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Receivers that read a line at a time need a terminator, and a trailing space
|
||||||
|
// in a text box is invisible — hence a choice rather than something to type.
|
||||||
|
func TestLineEnding(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"": "", "lf": "\n", "LF": "\n", "crlf": "\r\n", " CRLF ": "\r\n", "nonsense": "",
|
||||||
|
} {
|
||||||
|
if got := lineEnding(in); got != want {
|
||||||
|
t.Errorf("lineEnding(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// These logs get sent to whoever is helping when something breaks. Storing a
|
||||||
|
// switch password as typed was a deliberate choice for LAN gear; putting it in
|
||||||
|
// a file that travels is a different one, and was never made.
|
||||||
|
func TestRedactURLHidesThePassword(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"http://admin:[email protected]/ant?b=20m": "http://admin:***@192.168.1.50/ant?b=20m",
|
||||||
|
// No credentials, nothing to hide — and the URL must come back untouched,
|
||||||
|
// because it is the thing being debugged.
|
||||||
|
"http://192.168.1.50/ant?b=20m": "http://192.168.1.50/ant?b=20m",
|
||||||
|
// A username with no password is not a secret.
|
||||||
|
"http://[email protected]/ant": "http://[email protected]/ant",
|
||||||
|
// Not a URL at all: leave it, the operator needs to see what they typed.
|
||||||
|
"not a url {band}": "not a url {band}",
|
||||||
|
} {
|
||||||
|
if got := redactURL(in); got != want {
|
||||||
|
t.Errorf("redactURL(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "sent 18 bytes" says nothing about whether the substitution came out right.
|
||||||
|
// The payload is shown for custom rows and only those: an ADIF record or a
|
||||||
|
// binary WSJT frame on every QSO would bury the log.
|
||||||
|
func TestSentPreviewIsForCustomRowsOnly(t *testing.T) {
|
||||||
|
custom := Config{ServiceType: ServiceCustom, Trigger: TriggerBandChange}
|
||||||
|
got := sentPreview(custom, []byte("<BAND>20</BAND>\r\n"))
|
||||||
|
if got != ` on band_change: "<BAND>20</BAND>\r\n"` {
|
||||||
|
t.Errorf("custom preview = %q", got)
|
||||||
|
}
|
||||||
|
// A line ending is a choice the operator made — it has to be visible, and it
|
||||||
|
// must not break the log line in two.
|
||||||
|
if strings.ContainsAny(got, "\r\n") {
|
||||||
|
t.Error("the preview put a real newline in the log line")
|
||||||
|
}
|
||||||
|
for _, s := range []ServiceType{ServiceDBUpdated, ServiceWSJTLog, ServiceN1MMRadio} {
|
||||||
|
if p := sentPreview(Config{ServiceType: s}, []byte("<CALL:5>VK9XX<EOR>")); p != "" {
|
||||||
|
t.Errorf("%s should not dump its payload, got %q", s, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -86,12 +86,92 @@ func (m *Manager) EmitLoggedADIF(adif string) {
|
|||||||
if strings.TrimSpace(adif) == "" {
|
if strings.TrimSpace(adif) == "" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
for _, c := range m.Outbound(ServiceDBUpdated) {
|
rows := m.Outbound(ServiceDBUpdated)
|
||||||
|
if len(rows) == 0 {
|
||||||
|
// Said once per session, not per QSO. An operator who configured a second
|
||||||
|
// logger and sees nothing arrive needs to know the difference between "we
|
||||||
|
// sent it" and "there was nothing to send to" — and the usual cause is a
|
||||||
|
// row created as an inbound ADIF listener instead of an outbound message.
|
||||||
|
m.noADIFOnce.Do(func() {
|
||||||
|
applog.Printf("udp: a QSO was logged but no outbound \"ADIF message\" row is enabled — " +
|
||||||
|
"nothing is forwarded to another logger")
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, c := range rows {
|
||||||
m.sendTo(c, []byte(adif))
|
m.sendTo(c, []byte(adif))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EmitLoggedQSOWSJT announces a logged contact on the WSJT-X interface, for
|
||||||
|
// receivers that speak it rather than plain text — Logger32's additional UDP
|
||||||
|
// sockets among them.
|
||||||
|
//
|
||||||
|
// BOTH messages go out, "QSO Logged" (5) then "Logged ADIF" (12), because that
|
||||||
|
// is exactly what WSJT-X does for every contact. Which one a receiver takes is
|
||||||
|
// its own business: MacLoggerDX reads the structured one by default and offers
|
||||||
|
// the ADIF as an option, and sending only the ADIF is why a QSO reached
|
||||||
|
// Logger32's socket and never reached its log. Anything built for WSJT-X
|
||||||
|
// already sees both from the real thing, so neither is a surprise and nothing
|
||||||
|
// logs the contact twice.
|
||||||
|
func (m *Manager) EmitLoggedQSOWSJT(q LoggedQSO, adifRec string) {
|
||||||
|
rows := m.Outbound(ServiceWSJTLog)
|
||||||
|
if len(rows) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
qsoPkt := BuildWSJTQSOLogged("OpsLog", q)
|
||||||
|
var adifPkt []byte
|
||||||
|
if strings.TrimSpace(adifRec) != "" {
|
||||||
|
adifPkt = BuildWSJTLoggedADIF("OpsLog", adifRec)
|
||||||
|
}
|
||||||
|
for _, c := range rows {
|
||||||
|
m.sendTo(c, qsoPkt)
|
||||||
|
if adifPkt != nil {
|
||||||
|
m.sendTo(c, adifPkt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// sentPreview appends what was actually sent, for the rows where that is worth
|
||||||
|
// reading.
|
||||||
|
//
|
||||||
|
// Custom rows only, and deliberately: their payload is a template the operator
|
||||||
|
// wrote, and "sent 18 bytes" tells them nothing about whether the substitution
|
||||||
|
// came out as they meant. The ADIF and WSJT-X rows carry a whole record or a
|
||||||
|
// binary frame, and dumping either into the log on every QSO would bury it.
|
||||||
|
//
|
||||||
|
// The trigger is named too — a row that fires on the wrong moment looks exactly
|
||||||
|
// like a row that does not fire.
|
||||||
|
func sentPreview(c Config, payload []byte) string {
|
||||||
|
if c.ServiceType != ServiceCustom {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
const maxShown = 200
|
||||||
|
s := string(payload)
|
||||||
|
if len(s) > maxShown {
|
||||||
|
s = s[:maxShown] + "…"
|
||||||
|
}
|
||||||
|
// %q below already renders a carriage return as \r rather than breaking the
|
||||||
|
// log line in two — and it is the line ending the operator chose, so it has
|
||||||
|
// to be visible. Escaping it by hand first would double every backslash.
|
||||||
|
if c.Trigger != "" {
|
||||||
|
return fmt.Sprintf(" on %s: %q", c.Trigger, s)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf(": %q", s)
|
||||||
|
}
|
||||||
|
|
||||||
// sendTo resolves the row's destination (host:port) and fires one datagram.
|
// sendTo resolves the row's destination (host:port) and fires one datagram.
|
||||||
|
//
|
||||||
|
// A successful send is logged, not just a failure. UDP has no delivery report:
|
||||||
|
// when an operator says "I set up an ADIF message to Logger32 on port 2250 and
|
||||||
|
// nothing arrives", the only thing that separates "OpsLog never sent it" from
|
||||||
|
// "the other program did not take it" is a line saying we sent. Without one,
|
||||||
|
// both look identical from here — and the first is far more common, because a
|
||||||
|
// row created as an INBOUND ADIF listener rather than an OUTBOUND ADIF message
|
||||||
|
// matches nothing and emits nothing, in silence.
|
||||||
|
//
|
||||||
|
// Rate is not a concern: these fire on a QSO being logged or a frequency
|
||||||
|
// change, not per packet on a socket.
|
||||||
func (m *Manager) sendTo(c Config, payload []byte) {
|
func (m *Manager) sendTo(c Config, payload []byte) {
|
||||||
host := strings.TrimSpace(c.DestinationIP)
|
host := strings.TrimSpace(c.DestinationIP)
|
||||||
if host == "" {
|
if host == "" {
|
||||||
@@ -100,5 +180,8 @@ func (m *Manager) sendTo(c Config, payload []byte) {
|
|||||||
dst := fmt.Sprintf("%s:%d", host, c.Port)
|
dst := fmt.Sprintf("%s:%d", host, c.Port)
|
||||||
if err := SendUDP(dst, payload); err != nil {
|
if err := SendUDP(dst, payload); err != nil {
|
||||||
applog.Printf("udp: [%s] outbound send to %s failed: %v", c.Name, dst, err)
|
applog.Printf("udp: [%s] outbound send to %s failed: %v", c.Name, dst, err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
applog.Printf("udp: [%s] sent %d bytes to %s (%s)%s",
|
||||||
|
c.Name, len(payload), dst, c.ServiceType, sentPreview(c, payload))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package udp
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"regexp"
|
"regexp"
|
||||||
@@ -268,6 +269,44 @@ func (s *Server) logBadPacket(kind string, remote *net.UDPAddr, pkt []byte, err
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// noteIgnoredADIF reports a payload the ADIF listener could not use, ONCE per
|
||||||
|
// cause and then quietly.
|
||||||
|
//
|
||||||
|
// This used to log a line per datagram. An operator's log arrived with four
|
||||||
|
// hundred identical "ADIF payload ignored" lines and nothing else legible: two
|
||||||
|
// inbound listeners were configured on the SAME multicast group and port
|
||||||
|
// (239.255.0.1:2237, one WSJT and one ADIF), so every WSJT-X decode packet was
|
||||||
|
// delivered to both, and the ADIF one rejected each of them in writing. An FT8
|
||||||
|
// cycle is dozens of decodes every fifteen seconds.
|
||||||
|
//
|
||||||
|
// So the WSJT-X magic number is checked here. When it matches, the payload is
|
||||||
|
// not "chatter" — it is a specific, fixable misconfiguration, and saying which
|
||||||
|
// is the difference between a log the operator can act on and one they cannot.
|
||||||
|
func (s *Server) noteIgnoredADIF(pkt []byte) {
|
||||||
|
s.mu.Lock()
|
||||||
|
s.badPkts++
|
||||||
|
n := s.badPkts
|
||||||
|
s.mu.Unlock()
|
||||||
|
if n > maxBadPktDumps {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(pkt) >= 4 && binary.BigEndian.Uint32(pkt[:4]) == wsjtMagic {
|
||||||
|
applog.Printf("udp: [%s] this is WSJT-X traffic, not ADIF — port %d is shared with a WSJT source; "+
|
||||||
|
"give the ADIF forwarder (JTAlert / GridTracker) its own port, or set this listener's service to WSJT\n",
|
||||||
|
s.cfg.Name, s.cfg.Port)
|
||||||
|
// One line is the whole diagnosis: nothing is gained by counting to five.
|
||||||
|
s.mu.Lock()
|
||||||
|
s.badPkts = maxBadPktDumps + 1
|
||||||
|
s.mu.Unlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("udp: [%s] ADIF payload ignored (no <call:>/<eor>) — %s\n", s.cfg.Name, describePacket(pkt))
|
||||||
|
if n == maxBadPktDumps {
|
||||||
|
applog.Printf("udp: [%s] further unusable payloads on port %d will not be logged\n",
|
||||||
|
s.cfg.Name, s.cfg.Port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||||
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 {
|
||||||
@@ -338,7 +377,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
text := string(pkt)
|
text := string(pkt)
|
||||||
low := strings.ToLower(text)
|
low := strings.ToLower(text)
|
||||||
if !strings.Contains(low, "<call:") || !strings.Contains(low, "<eor") {
|
if !strings.Contains(low, "<call:") || !strings.Contains(low, "<eor") {
|
||||||
applog.Printf("udp: [%s] ADIF payload ignored (no <call:>/<eor>)\n", s.cfg.Name)
|
s.noteIgnoredADIF(pkt)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
ev.LoggedADIF = text
|
ev.LoggedADIF = text
|
||||||
@@ -458,6 +497,15 @@ type Manager struct {
|
|||||||
repo *Repo
|
repo *Repo
|
||||||
out chan Event
|
out chan Event
|
||||||
|
|
||||||
|
// noADIFOnce keeps the "nothing to forward to" note to one line a session
|
||||||
|
// rather than one per QSO logged.
|
||||||
|
noADIFOnce sync.Once
|
||||||
|
|
||||||
|
// httpFailAt throttles the complaint from a custom URL row, per row: a
|
||||||
|
// switch that is off answers the same way on every band change.
|
||||||
|
httpFailMu sync.Mutex
|
||||||
|
httpFailAt map[int64]time.Time
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
inbound map[int64]*Server
|
inbound map[int64]*Server
|
||||||
outbound []Config
|
outbound []Config
|
||||||
|
|||||||
@@ -0,0 +1,148 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Sending WSJT-X UDP messages, as opposed to parsing them (wsjt.go).
|
||||||
|
//
|
||||||
|
// This exists for Logger32, and for anything else that listens on the WSJT-X
|
||||||
|
// interface rather than for plain text. Logger32's "additional WSJT/JTDX UDP
|
||||||
|
// sockets" receivers — ports 2250, 2251, 2252 — are documented as receiving
|
||||||
|
// "UDP logging packets": they speak the WSJT-X v2 protocol, and a raw ADIF
|
||||||
|
// record posted to them is discarded without a word.
|
||||||
|
//
|
||||||
|
// That is a real distinction and not a detail: an operator can watch OpsLog
|
||||||
|
// report "sent 1153 bytes to 127.0.0.1:2250" and see nothing whatsoever appear
|
||||||
|
// in Logger32, because both statements are true.
|
||||||
|
|
||||||
|
// buildQString encodes a Qt QString/QByteArray as QDataStream writes it: a
|
||||||
|
// big-endian int32 length followed by the UTF-8 bytes. A negative length means
|
||||||
|
// null, which is not what we ever want here — an empty string is length 0.
|
||||||
|
func buildQString(s string) []byte {
|
||||||
|
out := make([]byte, 4, 4+len(s))
|
||||||
|
binary.BigEndian.PutUint32(out, uint32(len(s)))
|
||||||
|
return append(out, s...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildWSJTLoggedADIF frames a WSJT-X "Logged ADIF" datagram (message type 12).
|
||||||
|
//
|
||||||
|
// uint32 magic 0xadbccbda
|
||||||
|
// uint32 schema 2
|
||||||
|
// uint32 type 12
|
||||||
|
// QString id the sending program's name
|
||||||
|
// QString adif the ADIF record
|
||||||
|
//
|
||||||
|
// id matters more than it looks: a receiver uses it to tell instances apart, and
|
||||||
|
// some show it in their log. "OpsLog" is honest — pretending to be WSJT-X would
|
||||||
|
// make a second instance of the real thing indistinguishable from us.
|
||||||
|
func BuildWSJTLoggedADIF(id, adif string) []byte {
|
||||||
|
var b bytes.Buffer
|
||||||
|
var hdr [12]byte
|
||||||
|
binary.BigEndian.PutUint32(hdr[0:4], wsjtMagic)
|
||||||
|
binary.BigEndian.PutUint32(hdr[4:8], 2) // schema 2 — what WSJT-X 2.x speaks
|
||||||
|
binary.BigEndian.PutUint32(hdr[8:12], wsjtMsgLoggedADIF)
|
||||||
|
b.Write(hdr[:])
|
||||||
|
b.Write(buildQString(id))
|
||||||
|
b.Write(buildQString(adif))
|
||||||
|
return b.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoggedQSO is what a WSJT-X "QSO Logged" message carries. Declared here rather
|
||||||
|
// than taking a qso.QSO so this package stays free of the logbook — it speaks a
|
||||||
|
// wire protocol and nothing else.
|
||||||
|
type LoggedQSO struct {
|
||||||
|
DXCall string
|
||||||
|
DXGrid string
|
||||||
|
TxFreqHz uint64
|
||||||
|
Mode string
|
||||||
|
ReportSent string
|
||||||
|
ReportRcvd string
|
||||||
|
TxPower string
|
||||||
|
Comments string
|
||||||
|
Name string
|
||||||
|
TimeOn time.Time // UTC
|
||||||
|
TimeOff time.Time // UTC
|
||||||
|
OperatorCall string
|
||||||
|
MyCall string
|
||||||
|
MyGrid string
|
||||||
|
ExchangeSent string
|
||||||
|
ExchangeRcvd string
|
||||||
|
PropMode string
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildWSJTQSOLogged frames a WSJT-X "QSO Logged" datagram (message type 5).
|
||||||
|
//
|
||||||
|
// This is the message most loggers listen for — MacLoggerDX takes it by default
|
||||||
|
// and offers the ADIF one as an alternative, and WSJT-X itself sends BOTH for
|
||||||
|
// every contact. Sending only the ADIF form was the reason a QSO reached
|
||||||
|
// Logger32's socket and never reached its log.
|
||||||
|
//
|
||||||
|
// Field order is fixed by WSJT-X's NetworkMessage.hpp and cannot be rearranged:
|
||||||
|
// a receiver reads them positionally, so one field out of place shifts every
|
||||||
|
// one after it.
|
||||||
|
func BuildWSJTQSOLogged(id string, q LoggedQSO) []byte {
|
||||||
|
var b bytes.Buffer
|
||||||
|
var hdr [12]byte
|
||||||
|
binary.BigEndian.PutUint32(hdr[0:4], wsjtMagic)
|
||||||
|
binary.BigEndian.PutUint32(hdr[4:8], 2)
|
||||||
|
binary.BigEndian.PutUint32(hdr[8:12], wsjtMsgQSOLogged)
|
||||||
|
b.Write(hdr[:])
|
||||||
|
b.Write(buildQString(id))
|
||||||
|
b.Write(buildQDateTimeUTC(q.TimeOff))
|
||||||
|
b.Write(buildQString(q.DXCall))
|
||||||
|
b.Write(buildQString(q.DXGrid))
|
||||||
|
var f [8]byte
|
||||||
|
binary.BigEndian.PutUint64(f[:], q.TxFreqHz)
|
||||||
|
b.Write(f[:])
|
||||||
|
b.Write(buildQString(q.Mode))
|
||||||
|
b.Write(buildQString(q.ReportSent))
|
||||||
|
b.Write(buildQString(q.ReportRcvd))
|
||||||
|
b.Write(buildQString(q.TxPower))
|
||||||
|
b.Write(buildQString(q.Comments))
|
||||||
|
b.Write(buildQString(q.Name))
|
||||||
|
b.Write(buildQDateTimeUTC(q.TimeOn))
|
||||||
|
b.Write(buildQString(q.OperatorCall))
|
||||||
|
b.Write(buildQString(q.MyCall))
|
||||||
|
b.Write(buildQString(q.MyGrid))
|
||||||
|
b.Write(buildQString(q.ExchangeSent))
|
||||||
|
b.Write(buildQString(q.ExchangeRcvd))
|
||||||
|
b.Write(buildQString(q.PropMode))
|
||||||
|
return b.Bytes()
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildQDateTimeUTC encodes a QDateTime the way QDataStream has since Qt 5:
|
||||||
|
//
|
||||||
|
// qint64 Julian day number
|
||||||
|
// quint32 milliseconds since midnight
|
||||||
|
// quint8 time spec — 1 is UTC, which is the only one we ever send
|
||||||
|
//
|
||||||
|
// Everything in the logbook is already UTC, and a receiver that guessed local
|
||||||
|
// time from a spec of 0 would file the contact in the wrong hour.
|
||||||
|
func buildQDateTimeUTC(t time.Time) []byte {
|
||||||
|
t = t.UTC()
|
||||||
|
out := make([]byte, 0, 13)
|
||||||
|
var jd [8]byte
|
||||||
|
binary.BigEndian.PutUint64(jd[:], uint64(julianDay(t)))
|
||||||
|
out = append(out, jd[:]...)
|
||||||
|
ms := uint32(t.Hour()*3600000 + t.Minute()*60000 + t.Second()*1000 + t.Nanosecond()/1e6)
|
||||||
|
var m [4]byte
|
||||||
|
binary.BigEndian.PutUint32(m[:], ms)
|
||||||
|
out = append(out, m[:]...)
|
||||||
|
return append(out, 1) // Qt::UTC
|
||||||
|
}
|
||||||
|
|
||||||
|
// julianDay is the standard Gregorian-to-JDN conversion. Integer division
|
||||||
|
// throughout — this is the arithmetic Qt uses, and a floating-point version
|
||||||
|
// lands a day out at the edges.
|
||||||
|
func julianDay(t time.Time) int64 {
|
||||||
|
y := int64(t.Year())
|
||||||
|
m := int64(t.Month())
|
||||||
|
d := int64(t.Day())
|
||||||
|
a := (14 - m) / 12
|
||||||
|
y2 := y + 4800 - a
|
||||||
|
m2 := m + 12*a - 3
|
||||||
|
return d + (153*m2+2)/5 + 365*y2 + y2/4 - y2/100 + y2/400 - 32045
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// What we send has to be what we can read back: Logger32 and the rest decode
|
||||||
|
// this with the same rules our own parser uses, so a round trip through
|
||||||
|
// ParseWSJT is the honest check.
|
||||||
|
//
|
||||||
|
// The case behind it: OpsLog reported "sent 1153 bytes to 127.0.0.1:2250" and
|
||||||
|
// Logger32 showed nothing. Both were true — its UDP sockets speak the WSJT-X
|
||||||
|
// protocol and discard a bare ADIF record without a word.
|
||||||
|
func TestWSJTLoggedADIFRoundTrips(t *testing.T) {
|
||||||
|
const rec = "<CALL:5>VK9XX<BAND:3>20m<MODE:3>FT8<QSO_DATE:8>20260814<TIME_ON:6>174433<EOR>"
|
||||||
|
pkt := BuildWSJTLoggedADIF("OpsLog", rec)
|
||||||
|
|
||||||
|
ev, ok, err := ParseWSJT(pkt)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ParseWSJT: %v", err)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("our own parser did not recognise the datagram we build")
|
||||||
|
}
|
||||||
|
if ev.LoggedADIF != rec {
|
||||||
|
t.Errorf("ADIF = %q, want %q", ev.LoggedADIF, rec)
|
||||||
|
}
|
||||||
|
if ev.ProgramID != "OpsLog" {
|
||||||
|
t.Errorf("id = %q, want OpsLog — a receiver uses it to tell instances apart", ev.ProgramID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The header is fixed and other programs match on it byte for byte.
|
||||||
|
func TestWSJTLoggedADIFHeader(t *testing.T) {
|
||||||
|
pkt := BuildWSJTLoggedADIF("OpsLog", "<EOR>")
|
||||||
|
want := []byte{
|
||||||
|
0xad, 0xbc, 0xcb, 0xda, // magic
|
||||||
|
0x00, 0x00, 0x00, 0x02, // schema 2
|
||||||
|
0x00, 0x00, 0x00, 0x0c, // type 12 — Logged ADIF
|
||||||
|
0x00, 0x00, 0x00, 0x06, // len("OpsLog")
|
||||||
|
'O', 'p', 's', 'L', 'o', 'g',
|
||||||
|
0x00, 0x00, 0x00, 0x05, // len("<EOR>")
|
||||||
|
'<', 'E', 'O', 'R', '>',
|
||||||
|
}
|
||||||
|
if !bytes.Equal(pkt, want) {
|
||||||
|
t.Errorf("packet = % X\nwant % X", pkt, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The julian day has to match Qt's, because the receiver turns it back into a
|
||||||
|
// date. A day out here files every contact on the wrong day.
|
||||||
|
func TestJulianDayMatchesKnownValues(t *testing.T) {
|
||||||
|
for _, c := range []struct {
|
||||||
|
date time.Time
|
||||||
|
want int64
|
||||||
|
}{
|
||||||
|
// Checked against the standard tables: JDN is the count at noon UTC.
|
||||||
|
{time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC), 2451545},
|
||||||
|
{time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC), 2440588},
|
||||||
|
{time.Date(2026, 8, 15, 0, 0, 0, 0, time.UTC), 2461268},
|
||||||
|
} {
|
||||||
|
if got := julianDay(c.date); got != c.want {
|
||||||
|
t.Errorf("julianDay(%s) = %d, want %d", c.date.Format("2006-01-02"), got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// QDateTime is julian day, then milliseconds since midnight, then the time
|
||||||
|
// spec. A receiver reads them positionally, and a spec of 0 (local time) would
|
||||||
|
// have it re-interpret a UTC contact in its own zone.
|
||||||
|
func TestQDateTimeIsUTCAndPositional(t *testing.T) {
|
||||||
|
got := buildQDateTimeUTC(time.Date(2026, 8, 15, 17, 44, 33, 0, time.UTC))
|
||||||
|
if len(got) != 13 {
|
||||||
|
t.Fatalf("%d bytes, want 13", len(got))
|
||||||
|
}
|
||||||
|
if jd := int64(binary.BigEndian.Uint64(got[0:8])); jd != 2461268 {
|
||||||
|
t.Errorf("julian day = %d, want 2461268", jd)
|
||||||
|
}
|
||||||
|
wantMs := uint32((17*3600 + 44*60 + 33) * 1000)
|
||||||
|
if ms := binary.BigEndian.Uint32(got[8:12]); ms != wantMs {
|
||||||
|
t.Errorf("ms since midnight = %d, want %d", ms, wantMs)
|
||||||
|
}
|
||||||
|
if got[12] != 1 {
|
||||||
|
t.Errorf("time spec = %d, want 1 (UTC)", got[12])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The QSO Logged message is read positionally: one field out of place shifts
|
||||||
|
// every one after it, and the receiver silently files nonsense. This pins the
|
||||||
|
// order against WSJT-X's NetworkMessage.hpp.
|
||||||
|
func TestWSJTQSOLoggedFieldOrder(t *testing.T) {
|
||||||
|
pkt := BuildWSJTQSOLogged("OpsLog", LoggedQSO{
|
||||||
|
DXCall: "VK9XX", DXGrid: "QH30", TxFreqHz: 14074000, Mode: "FT8",
|
||||||
|
ReportSent: "-12", ReportRcvd: "-08", TxPower: "50", Comments: "tnx",
|
||||||
|
Name: "Ken", TimeOn: time.Date(2026, 8, 15, 17, 44, 0, 0, time.UTC),
|
||||||
|
TimeOff: time.Date(2026, 8, 15, 17, 45, 0, 0, time.UTC),
|
||||||
|
MyCall: "F4BPO", MyGrid: "IN95", OperatorCall: "F4BPO",
|
||||||
|
PropMode: "",
|
||||||
|
})
|
||||||
|
r := bytes.NewReader(pkt)
|
||||||
|
var magic, schema, mtype uint32
|
||||||
|
binary.Read(r, binary.BigEndian, &magic)
|
||||||
|
binary.Read(r, binary.BigEndian, &schema)
|
||||||
|
binary.Read(r, binary.BigEndian, &mtype)
|
||||||
|
if magic != wsjtMagic || schema != 2 || mtype != wsjtMsgQSOLogged {
|
||||||
|
t.Fatalf("header magic=%08x schema=%d type=%d", magic, schema, mtype)
|
||||||
|
}
|
||||||
|
id, _ := readQString(r)
|
||||||
|
if id != "OpsLog" {
|
||||||
|
t.Errorf("id = %q", id)
|
||||||
|
}
|
||||||
|
r.Seek(13, 1) // QSO off
|
||||||
|
call, _ := readQString(r)
|
||||||
|
grid, _ := readQString(r)
|
||||||
|
var freq uint64
|
||||||
|
binary.Read(r, binary.BigEndian, &freq)
|
||||||
|
mode, _ := readQString(r)
|
||||||
|
sent, _ := readQString(r)
|
||||||
|
rcvd, _ := readQString(r)
|
||||||
|
if call != "VK9XX" || grid != "QH30" || freq != 14074000 || mode != "FT8" || sent != "-12" || rcvd != "-08" {
|
||||||
|
t.Errorf("got call=%q grid=%q freq=%d mode=%q sent=%q rcvd=%q", call, grid, freq, mode, sent, rcvd)
|
||||||
|
}
|
||||||
|
pwr, _ := readQString(r)
|
||||||
|
comments, _ := readQString(r)
|
||||||
|
name, _ := readQString(r)
|
||||||
|
if pwr != "50" || comments != "tnx" || name != "Ken" {
|
||||||
|
t.Errorf("got pwr=%q comments=%q name=%q", pwr, comments, name)
|
||||||
|
}
|
||||||
|
r.Seek(13, 1) // QSO on
|
||||||
|
op, _ := readQString(r)
|
||||||
|
myCall, _ := readQString(r)
|
||||||
|
myGrid, _ := readQString(r)
|
||||||
|
if op != "F4BPO" || myCall != "F4BPO" || myGrid != "IN95" {
|
||||||
|
t.Errorf("got op=%q myCall=%q myGrid=%q", op, myCall, myGrid)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -94,6 +94,13 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return Result{}, err
|
return Result{}, err
|
||||||
}
|
}
|
||||||
|
return parseHamQTHSearch(body)
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseHamQTHSearch turns one answer into a Result. Split out from the request
|
||||||
|
// so the field mapping can be checked against a captured payload — which is how
|
||||||
|
// the missing full name and picture were found.
|
||||||
|
func parseHamQTHSearch(body []byte) (Result, error) {
|
||||||
var resp hamqthRoot
|
var resp hamqthRoot
|
||||||
if err := xml.Unmarshal(body, &resp); err != nil {
|
if err := xml.Unmarshal(body, &resp); err != nil {
|
||||||
return Result{}, fmt.Errorf("hamqth: parse callsign: %w", err)
|
return Result{}, fmt.Errorf("hamqth: parse callsign: %w", err)
|
||||||
@@ -112,11 +119,20 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
|||||||
if s.Callsign == "" {
|
if s.Callsign == "" {
|
||||||
return Result{}, ErrNotFound
|
return Result{}, ErrNotFound
|
||||||
}
|
}
|
||||||
|
// <nick> is the name the operator goes BY on the air, which is what belongs
|
||||||
|
// in a log — "Igor", not "Igor Vladimirovich Getman". adr_name is the postal
|
||||||
|
// name and is used only when there is nothing else, so a record carrying
|
||||||
|
// neither nick nor name no longer resolves to blank.
|
||||||
|
name := strings.TrimSpace(s.Nick + " " + s.LastName)
|
||||||
|
if name == "" {
|
||||||
|
name = strings.TrimSpace(s.AdrName)
|
||||||
|
}
|
||||||
r := Result{
|
r := Result{
|
||||||
Callsign: strings.ToUpper(s.Callsign),
|
Callsign: strings.ToUpper(s.Callsign),
|
||||||
Name: strings.TrimSpace(s.Nick + " " + s.LastName),
|
Name: name,
|
||||||
QTH: firstNonEmpty(s.QTH, s.AdrCity),
|
QTH: firstNonEmpty(s.QTH, s.AdrCity),
|
||||||
Address: s.AdrStreet1,
|
Address: s.AdrStreet1,
|
||||||
|
Zip: s.AdrZip,
|
||||||
State: strings.ToUpper(s.USState),
|
State: strings.ToUpper(s.USState),
|
||||||
County: s.USCounty,
|
County: s.USCounty,
|
||||||
Country: firstNonEmpty(s.AdrCountry, s.Country),
|
Country: firstNonEmpty(s.AdrCountry, s.Country),
|
||||||
@@ -124,6 +140,8 @@ func (h *HamQTH) fetch(ctx context.Context, sessionID, callsign string) (Result,
|
|||||||
Continent: strings.ToUpper(s.Continent),
|
Continent: strings.ToUpper(s.Continent),
|
||||||
Email: s.Email,
|
Email: s.Email,
|
||||||
QSLVia: s.QSLVia,
|
QSLVia: s.QSLVia,
|
||||||
|
Web: s.Web,
|
||||||
|
ImageURL: s.Picture,
|
||||||
}
|
}
|
||||||
r.Lat, _ = strconv.ParseFloat(s.Latitude, 64)
|
r.Lat, _ = strconv.ParseFloat(s.Latitude, 64)
|
||||||
r.Lon, _ = strconv.ParseFloat(s.Longitude, 64)
|
r.Lon, _ = strconv.ParseFloat(s.Longitude, 64)
|
||||||
@@ -182,4 +200,14 @@ type hamqthSearch struct {
|
|||||||
Continent string `xml:"continent"`
|
Continent string `xml:"continent"`
|
||||||
Email string `xml:"email"`
|
Email string `xml:"email"`
|
||||||
QSLVia string `xml:"qsl_via"`
|
QSLVia string `xml:"qsl_via"`
|
||||||
|
// AdrName is the full postal name. Many records carry it and no <name> at
|
||||||
|
// all, so building the name from <nick> + <name> silently kept the first
|
||||||
|
// name and dropped the rest.
|
||||||
|
AdrName string `xml:"adr_name"`
|
||||||
|
AdrZip string `xml:"adr_zip"`
|
||||||
|
// Picture is HamQTH's profile photo. Result.ImageURL was documented as "QRZ
|
||||||
|
// only" because this element was never read — QRZ calls the same thing
|
||||||
|
// <image>.
|
||||||
|
Picture string `xml:"picture"`
|
||||||
|
Web string `xml:"web"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,128 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/xml"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A real HamQTH answer, captured from the live API.
|
||||||
|
//
|
||||||
|
// Two things it settles. The email IS returned and must reach the QSO. And the
|
||||||
|
// element names are not the ones a reading of the documentation suggests:
|
||||||
|
// there is no <name> here at all, the full name is <adr_name>, and the picture
|
||||||
|
// is <picture> where QRZ calls it <image>. The stray <div> is an advert the
|
||||||
|
// server injects into its own XML; the parser has to shrug it off.
|
||||||
|
const hamqthEU1EU = `<?xml version="1.0"?>
|
||||||
|
<HamQTH xmlns="https://www.hamqth.com" version="2.8">
|
||||||
|
<div id="in-page-channel-node-id" data-channel-name="in_page_channel_Sux7_K"/>
|
||||||
|
<search>
|
||||||
|
<callsign>eu1eu</callsign>
|
||||||
|
<nick>Igor</nick>
|
||||||
|
<qth>Minsk-5</qth>
|
||||||
|
<country>Belarus</country>
|
||||||
|
<adif>27</adif>
|
||||||
|
<itu>29</itu>
|
||||||
|
<cq>16</cq>
|
||||||
|
<grid>KO33SV</grid>
|
||||||
|
<adr_name>Igor Vladimirovich Getman</adr_name>
|
||||||
|
<adr_street1>A/ya 143</adr_street1>
|
||||||
|
<adr_city>Minsk-5</adr_city>
|
||||||
|
<adr_zip>220005</adr_zip>
|
||||||
|
<adr_country>Belarus</adr_country>
|
||||||
|
<adr_adif>27</adr_adif>
|
||||||
|
<district>WAARB-LE</district>
|
||||||
|
<lotw>?</lotw>
|
||||||
|
<qsldirect>?</qsldirect>
|
||||||
|
<qsl>?</qsl>
|
||||||
|
<eqsl>Y</eqsl>
|
||||||
|
<email>eu1eu@mail.ru</email>
|
||||||
|
<latitude>53.88999938964844</latitude>
|
||||||
|
<longitude>27.59000015258789</longitude>
|
||||||
|
<continent>EU</continent>
|
||||||
|
<utc_offset>-2</utc_offset>
|
||||||
|
<picture>https://www.hamqth.com/images/default/ts-930_qith_old_radios.jpg</picture>
|
||||||
|
</search>
|
||||||
|
</HamQTH>`
|
||||||
|
|
||||||
|
func TestHamQTHParsesEveryUsefulField(t *testing.T) {
|
||||||
|
var root hamqthRoot
|
||||||
|
if err := xml.Unmarshal([]byte(hamqthEU1EU), &root); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
s := root.Search
|
||||||
|
|
||||||
|
for _, c := range []struct{ name, got, want string }{
|
||||||
|
{"callsign", s.Callsign, "eu1eu"},
|
||||||
|
{"email", s.Email, "[email protected]"},
|
||||||
|
{"grid", s.Grid, "KO33SV"},
|
||||||
|
{"qth", s.QTH, "Minsk-5"},
|
||||||
|
{"street", s.AdrStreet1, "A/ya 143"},
|
||||||
|
{"city", s.AdrCity, "Minsk-5"},
|
||||||
|
{"country", s.AdrCountry, "Belarus"},
|
||||||
|
{"continent", s.Continent, "EU"},
|
||||||
|
{"dxcc", s.DXCC, "27"},
|
||||||
|
{"cq", s.CQ, "16"},
|
||||||
|
{"itu", s.ITU, "29"},
|
||||||
|
} {
|
||||||
|
if c.got != c.want {
|
||||||
|
t.Errorf("%s = %q, want %q", c.name, c.got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The fields the parser was blind to. Each is data OpsLog has somewhere to put.
|
||||||
|
func TestHamQTHParsesTheFieldsThatWereMissing(t *testing.T) {
|
||||||
|
var root hamqthRoot
|
||||||
|
if err := xml.Unmarshal([]byte(hamqthEU1EU), &root); err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
s := root.Search
|
||||||
|
|
||||||
|
// The postal name, the fallback when a record carries no nick and no name.
|
||||||
|
if s.AdrName != "Igor Vladimirovich Getman" {
|
||||||
|
t.Errorf("adr_name = %q", s.AdrName)
|
||||||
|
}
|
||||||
|
if s.LastName != "" {
|
||||||
|
t.Errorf("this record has no <name>; got %q", s.LastName)
|
||||||
|
}
|
||||||
|
// The profile picture. Result.ImageURL existed and said "QRZ only" — HamQTH
|
||||||
|
// sends one too, under a different element name.
|
||||||
|
if s.Picture == "" {
|
||||||
|
t.Error("picture not parsed")
|
||||||
|
}
|
||||||
|
if s.AdrZip != "220005" {
|
||||||
|
t.Errorf("adr_zip = %q", s.AdrZip)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// End to end: what the provider hands back must carry the email, the full name
|
||||||
|
// and the picture.
|
||||||
|
func TestHamQTHResultCarriesTheLot(t *testing.T) {
|
||||||
|
r, err := parseHamQTHSearch([]byte(hamqthEU1EU))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if r.Email != "[email protected]" {
|
||||||
|
t.Errorf("Email = %q — this is what was reported missing", r.Email)
|
||||||
|
}
|
||||||
|
// The nick, not the postal name: a log wants the name the operator goes by
|
||||||
|
// on the air. adr_name is only the fallback when there is nothing else.
|
||||||
|
if r.Name != "Igor" {
|
||||||
|
t.Errorf("Name = %q, want the on-air nick", r.Name)
|
||||||
|
}
|
||||||
|
if r.ImageURL == "" {
|
||||||
|
t.Error("ImageURL empty — HamQTH sent a picture")
|
||||||
|
}
|
||||||
|
if r.Grid != "KO33SV" {
|
||||||
|
t.Errorf("Grid = %q", r.Grid)
|
||||||
|
}
|
||||||
|
if r.Lat < 53.8 || r.Lat > 53.9 {
|
||||||
|
t.Errorf("Lat = %v", r.Lat)
|
||||||
|
}
|
||||||
|
if r.DXCC != 27 || r.CQZ != 16 || r.ITUZ != 29 {
|
||||||
|
t.Errorf("dxcc/cq/itu = %d/%d/%d", r.DXCC, r.CQZ, r.ITUZ)
|
||||||
|
}
|
||||||
|
if r.Address != "A/ya 143" {
|
||||||
|
t.Errorf("Address = %q", r.Address)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,7 +37,13 @@ type Result struct {
|
|||||||
Continent string `json:"cont,omitempty"`
|
Continent string `json:"cont,omitempty"`
|
||||||
Email string `json:"email,omitempty"`
|
Email string `json:"email,omitempty"`
|
||||||
QSLVia string `json:"qsl_via,omitempty"`
|
QSLVia string `json:"qsl_via,omitempty"`
|
||||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL (QRZ only for now)
|
// Web is the operator's own site. The QSO table has had a `web` column all
|
||||||
|
// along and nothing ever filled it, because no provider mapping read the
|
||||||
|
// field.
|
||||||
|
Web string `json:"web,omitempty"`
|
||||||
|
// Zip is the postal code. HamQTH and QRZ both send one.
|
||||||
|
Zip string `json:"zip,omitempty"`
|
||||||
|
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
||||||
Source string `json:"source"` // "qrz", "hamqth", or "cache"
|
Source string `json:"source"` // "qrz", "hamqth", or "cache"
|
||||||
FetchedAt time.Time `json:"fetched_at"`
|
FetchedAt time.Time `json:"fetched_at"`
|
||||||
}
|
}
|
||||||
@@ -446,12 +452,13 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
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,
|
||||||
source, fetched_at
|
web, zip, 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
|
||||||
src string
|
src string
|
||||||
dxcc, cqz, ituz sql.NullInt64
|
dxcc, cqz, ituz sql.NullInt64
|
||||||
lat, lon sql.NullFloat64
|
lat, lon sql.NullFloat64
|
||||||
@@ -459,7 +466,7 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
)
|
)
|
||||||
if err := row.Scan(&r.Callsign, &name, &qth, &addr, &state, &cnty,
|
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,
|
&dxcc, &cqz, &ituz, &cont, &email, &qslVia, &image, &web, &zip,
|
||||||
&src, &fetched); err != nil {
|
&src, &fetched); err != nil {
|
||||||
return Result{}, false
|
return Result{}, false
|
||||||
}
|
}
|
||||||
@@ -481,6 +488,8 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
r.Lon = lon.Float64
|
r.Lon = lon.Float64
|
||||||
r.Continent = cont.String
|
r.Continent = cont.String
|
||||||
r.Email = email.String
|
r.Email = email.String
|
||||||
|
r.Web = web.String
|
||||||
|
r.Zip = zip.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)
|
||||||
@@ -497,7 +506,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
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",
|
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url", "web", "zip",
|
||||||
"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
|
||||||
@@ -510,8 +519,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,
|
||||||
source, fetched_at)
|
web, zip, 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),
|
||||||
@@ -520,7 +529,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
nullableFloat(r.Lat), nullableFloat(r.Lon),
|
nullableFloat(r.Lat), nullableFloat(r.Lon),
|
||||||
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.ImageURL), nullable(r.Web), nullable(r.Zip),
|
||||||
r.Source, db.NowISO(),
|
r.Source, db.NowISO(),
|
||||||
)
|
)
|
||||||
return err
|
return err
|
||||||
|
|||||||
+33
-14
@@ -21,6 +21,12 @@ type QRZ struct {
|
|||||||
|
|
||||||
HTTP *http.Client
|
HTTP *http.Client
|
||||||
|
|
||||||
|
// PreferNickname takes QRZ's <nickname> over the composed first+last name
|
||||||
|
// when the operator has published one. It is the name they go BY on the air,
|
||||||
|
// which is what belongs in a log — HamQTH's <nick> is already used that way,
|
||||||
|
// and this brings QRZ into line for operators who want it.
|
||||||
|
PreferNickname bool
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
session string
|
session string
|
||||||
loggedAt time.Time
|
loggedAt time.Time
|
||||||
@@ -117,7 +123,7 @@ func (q *QRZ) fetch(ctx context.Context, sessionKey, callsign string) (Result, e
|
|||||||
}
|
}
|
||||||
r := Result{
|
r := Result{
|
||||||
Callsign: strings.ToUpper(c.Call),
|
Callsign: strings.ToUpper(c.Call),
|
||||||
Name: joinName(c.FName, c.Name),
|
Name: qrzName(q.PreferNickname, c.Nickname, c.FName, c.Name),
|
||||||
QTH: c.Addr2,
|
QTH: c.Addr2,
|
||||||
Address: composeQRZAddress(c.Addr1, c.Addr2, c.Zip, c.Country),
|
Address: composeQRZAddress(c.Addr1, c.Addr2, c.Zip, c.Country),
|
||||||
State: strings.ToUpper(c.State),
|
State: strings.ToUpper(c.State),
|
||||||
@@ -169,6 +175,7 @@ type qrzSession struct {
|
|||||||
type qrzCallsign struct {
|
type qrzCallsign struct {
|
||||||
Call string `xml:"call"`
|
Call string `xml:"call"`
|
||||||
FName string `xml:"fname"`
|
FName string `xml:"fname"`
|
||||||
|
Nickname string `xml:"nickname"` // the name the operator goes by on the air
|
||||||
Name string `xml:"name"`
|
Name string `xml:"name"`
|
||||||
Addr1 string `xml:"addr1"`
|
Addr1 string `xml:"addr1"`
|
||||||
Addr2 string `xml:"addr2"`
|
Addr2 string `xml:"addr2"`
|
||||||
@@ -213,19 +220,6 @@ func composeQRZAddress(addr1, addr2, zip, country string) string {
|
|||||||
return strings.Join(parts, ", ")
|
return strings.Join(parts, ", ")
|
||||||
}
|
}
|
||||||
|
|
||||||
func joinName(first, last string) string {
|
|
||||||
first = strings.TrimSpace(first)
|
|
||||||
last = strings.TrimSpace(last)
|
|
||||||
switch {
|
|
||||||
case first != "" && last != "":
|
|
||||||
return first + " " + last
|
|
||||||
case first != "":
|
|
||||||
return first
|
|
||||||
default:
|
|
||||||
return last
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func firstNonEmpty(s ...string) string {
|
func firstNonEmpty(s ...string) string {
|
||||||
for _, v := range s {
|
for _, v := range s {
|
||||||
v = strings.TrimSpace(v)
|
v = strings.TrimSpace(v)
|
||||||
@@ -235,3 +229,28 @@ func firstNonEmpty(s ...string) string {
|
|||||||
}
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// qrzName picks what goes in the log's Name field.
|
||||||
|
//
|
||||||
|
// The FIRST name only. A log greets an operator, it does not address an
|
||||||
|
// envelope: "Robert" is what goes out on the air, and "Robert Smith" filled the
|
||||||
|
// field with something no one would ever send. The surname stays available in
|
||||||
|
// the record; it simply is not the name of the contact.
|
||||||
|
//
|
||||||
|
// The nickname is taken ahead of it when the operator asked for that AND QRZ
|
||||||
|
// has one — a blank nickname must never blank the name, which is the whole
|
||||||
|
// reason this is a fallback rather than a swap.
|
||||||
|
//
|
||||||
|
// The surname is the last resort: a record with no first name at all is better
|
||||||
|
// answered with a surname than with nothing.
|
||||||
|
func qrzName(preferNickname bool, nickname, fname, name string) string {
|
||||||
|
if preferNickname {
|
||||||
|
if n := strings.TrimSpace(nickname); n != "" {
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if f := strings.TrimSpace(fname); f != "" {
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(name)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package lookup
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// What goes in a log's Name field is the FIRST name. A log greets an operator;
|
||||||
|
// it does not address an envelope. "Robert Smith" filled the field with
|
||||||
|
// something no one would ever send on the air.
|
||||||
|
//
|
||||||
|
// The nickname wins ahead of it when asked for — but a published nickname is
|
||||||
|
// optional, so an empty one must fall through rather than blank the name. That
|
||||||
|
// is the whole difference between a fallback and a swap.
|
||||||
|
func TestQRZName(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
prefer bool
|
||||||
|
nickname, fname, last string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"first name only, never the surname", false, "Bob", "Robert", "Smith", "Robert"},
|
||||||
|
{"nickname when asked for", true, "Bob", "Robert", "Smith", "Bob"},
|
||||||
|
{"no nickname published falls back to the FIRST name", true, "", "Robert", "Smith", "Robert"},
|
||||||
|
{"a blank nickname is not a nickname", true, " ", "Robert", "Smith", "Robert"},
|
||||||
|
{"option off ignores the nickname", false, "Bob", "Robert", "Smith", "Robert"},
|
||||||
|
{"surname is the last resort, not the default", true, "", "", "Smith", "Smith"},
|
||||||
|
{"nothing published at all", false, "", "", "", ""},
|
||||||
|
{"nickname alone", true, "Bob", "", "", "Bob"},
|
||||||
|
} {
|
||||||
|
if got := qrzName(tc.prefer, tc.nickname, tc.fname, tc.last); got != tc.want {
|
||||||
|
t.Errorf("%s: qrzName(%v, %q, %q, %q) = %q, want %q",
|
||||||
|
tc.name, tc.prefer, tc.nickname, tc.fname, tc.last, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+47
-4
@@ -54,6 +54,9 @@ type Spot struct {
|
|||||||
Band string
|
Band string
|
||||||
Mode string
|
Mode string
|
||||||
Grid string // transmitter's grid, 4 characters
|
Grid string // transmitter's grid, 4 characters
|
||||||
|
// FreqHz is where the decode happened. The band alone is enough for an
|
||||||
|
// opening, but a station worth chasing has to be tuned to.
|
||||||
|
FreqHz int64
|
||||||
DistKm int // from the operator
|
DistKm int // from the operator
|
||||||
Bearing int // degrees from the operator, short path
|
Bearing int // degrees from the operator, short path
|
||||||
At time.Time
|
At time.Time
|
||||||
@@ -81,6 +84,15 @@ type Config struct {
|
|||||||
// OnSpot receives every accepted decode. Called from the MQTT goroutine, so
|
// OnSpot receives every accepted decode. Called from the MQTT goroutine, so
|
||||||
// it must not block: the broker's buffer is what pays for it if it does.
|
// it must not block: the broker's buffer is what pays for it if it does.
|
||||||
OnSpot func(Spot)
|
OnSpot func(Spot)
|
||||||
|
// OnGrid receives the transmitter of EVERY message, before any geographic
|
||||||
|
// filtering, for the callsign-to-locator store. Same goroutine as OnSpot and
|
||||||
|
// the same rule: do not block.
|
||||||
|
OnGrid func(call, grid string)
|
||||||
|
// RxGrids filters at the BROKER: only reports collected by a receiver in one
|
||||||
|
// of these squares are sent at all. Empty keeps the old behaviour, which was
|
||||||
|
// to receive the world and discard it here — measured at 83 messages a second
|
||||||
|
// for the four opening bands, of which about one in a hundred survived.
|
||||||
|
RxGrids []string
|
||||||
Logf func(string, ...any)
|
Logf func(string, ...any)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -115,6 +127,32 @@ func New(cfg Config) *Watcher {
|
|||||||
return &Watcher{cfg: cfg}
|
return &Watcher{cfg: cfg}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// topics builds the subscription list.
|
||||||
|
//
|
||||||
|
// The v2 topic is
|
||||||
|
//
|
||||||
|
// pskr/filter/v2/<band>/<mode>/<tx call>/<rx call>/<tx grid>/<rx grid>/<tx dxcc>/<rx dxcc>
|
||||||
|
//
|
||||||
|
// so the receiver's square is a level the broker can filter on, and a band of
|
||||||
|
// "+" means every band. Filtering by RECEIVER square rather than by receiver
|
||||||
|
// DXCC is deliberate: measured on 20 m, one country ranged from 1.2 messages a
|
||||||
|
// second (OH) to 72.5 (K), because a DXCC can be a continent. By square the
|
||||||
|
// same measurement is 0.2 to 1.2 — the load follows distance, which is what the
|
||||||
|
// feed is actually about, and it is the same for every operator.
|
||||||
|
func (w *Watcher) topics() []string {
|
||||||
|
out := []string{}
|
||||||
|
for _, b := range w.cfg.Bands {
|
||||||
|
if len(w.cfg.RxGrids) == 0 {
|
||||||
|
out = append(out, "pskr/filter/v2/"+b+"/#")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, g := range w.cfg.RxGrids {
|
||||||
|
out = append(out, "pskr/filter/v2/"+b+"/+/+/+/+/"+strings.ToUpper(g)+"/+/+")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
// Start connects and subscribes. Safe to call when already running.
|
// Start connects and subscribes. Safe to call when already running.
|
||||||
func (w *Watcher) Start() error {
|
func (w *Watcher) Start() error {
|
||||||
w.mu.Lock()
|
w.mu.Lock()
|
||||||
@@ -143,10 +181,7 @@ func (w *Watcher) Start() error {
|
|||||||
|
|
||||||
opts.OnConnect = func(c mqtt.Client) {
|
opts.OnConnect = func(c mqtt.Client) {
|
||||||
w.cfg.Logf("pskr: connected to %s", w.cfg.Broker)
|
w.cfg.Logf("pskr: connected to %s", w.cfg.Broker)
|
||||||
for _, b := range w.cfg.Bands {
|
for _, topic := range w.topics() {
|
||||||
// Every mode, every pair of stations, on this band. That firehose IS
|
|
||||||
// the point: the detector's job is to find the shape in it.
|
|
||||||
topic := "pskr/filter/v2/" + b + "/#"
|
|
||||||
if tok := c.Subscribe(topic, 0, w.handle); tok.Wait() && tok.Error() != nil {
|
if tok := c.Subscribe(topic, 0, w.handle); tok.Wait() && tok.Error() != nil {
|
||||||
w.cfg.Logf("pskr: subscribe %s failed: %v", topic, tok.Error())
|
w.cfg.Logf("pskr: subscribe %s failed: %v", topic, tok.Error())
|
||||||
continue
|
continue
|
||||||
@@ -206,6 +241,13 @@ func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The locator store takes every transmitter, before any of the geography
|
||||||
|
// below. What it wants is "which square is this callsign in", and that is
|
||||||
|
// true whoever happened to hear the report.
|
||||||
|
if w.cfg.OnGrid != nil {
|
||||||
|
w.cfg.OnGrid(call, grid[:4])
|
||||||
|
}
|
||||||
|
|
||||||
// THE RECEIVER HAS TO BE NEAR THE OPERATOR. This is the whole difference
|
// THE RECEIVER HAS TO BE NEAR THE OPERATOR. This is the whole difference
|
||||||
// between a useful feed and a world map.
|
// between a useful feed and a world map.
|
||||||
//
|
//
|
||||||
@@ -230,6 +272,7 @@ func (w *Watcher) handle(_ mqtt.Client, m mqtt.Message) {
|
|||||||
s := Spot{
|
s := Spot{
|
||||||
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
|
Call: call, Band: strings.ToLower(strings.TrimSpace(p.Band)),
|
||||||
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
|
Mode: strings.ToUpper(strings.TrimSpace(p.Mode)), Grid: grid[:4],
|
||||||
|
FreqHz: p.Freq,
|
||||||
DistKm: dist, Bearing: brg,
|
DistKm: dist, Bearing: brg,
|
||||||
// Stamped on receipt: the broker's own timestamps vary between payload
|
// Stamped on receipt: the broker's own timestamps vary between payload
|
||||||
// versions, and the window this feeds is measured in minutes.
|
// versions, and the window this feeds is measured in minutes.
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package pskr
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The frequency has to survive from the payload to the Spot: the Chase New
|
||||||
|
// panel is only useful if a click can put the rig on the station, and a row
|
||||||
|
// showing "—" instead of 14074.0 is a row nobody can act on.
|
||||||
|
func TestWirePayloadCarriesFrequency(t *testing.T) {
|
||||||
|
const payload = `{"sq":1,"f":14074123,"md":"FT8","rp":-12,"sc":"VK9XX","sl":"QH30","rc":"F4BPO","rl":"IN95","b":"20m"}`
|
||||||
|
var p wire
|
||||||
|
if err := json.Unmarshal([]byte(payload), &p); err != nil {
|
||||||
|
t.Fatalf("unmarshal: %v", err)
|
||||||
|
}
|
||||||
|
if p.Freq != 14074123 {
|
||||||
|
t.Errorf("Freq = %d, want 14074123", p.Freq)
|
||||||
|
}
|
||||||
|
if p.TxCall != "VK9XX" || p.Band != "20m" || p.Mode != "FT8" {
|
||||||
|
t.Errorf("unexpected decode: %+v", p)
|
||||||
|
}
|
||||||
|
// And the Spot the watcher builds must carry it — this is the field that was
|
||||||
|
// declared, documented, and then never assigned.
|
||||||
|
s := Spot{Call: p.TxCall, Band: p.Band, Mode: p.Mode, FreqHz: p.Freq}
|
||||||
|
if s.FreqHz != p.Freq {
|
||||||
|
t.Errorf("Spot.FreqHz = %d, want %d", s.FreqHz, p.Freq)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package pskr
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The receiver square is a level the BROKER can filter on, which is the whole
|
||||||
|
// point: measured on the live feed, the four opening bands unfiltered are 83
|
||||||
|
// messages a second of which about one in a hundred survives the NearKm test.
|
||||||
|
// One ring of squares is under two a second, and the same for every operator —
|
||||||
|
// where filtering by DXCC ranged from 1.2 (OH) to 72.5 (K) on one band.
|
||||||
|
func TestTopicsFilterOnTheReceiverSquare(t *testing.T) {
|
||||||
|
w := New(Config{Bands: []string{"6m"}, RxGrids: []string{"jn36", "JN37"}})
|
||||||
|
got := w.topics()
|
||||||
|
if len(got) != 2 {
|
||||||
|
t.Fatalf("want one subscription per band × square, got %v", got)
|
||||||
|
}
|
||||||
|
// Level order: band/mode/txcall/rxcall/txgrid/RXGRID/txdxcc/rxdxcc
|
||||||
|
want := "pskr/filter/v2/6m/+/+/+/+/JN36/+/+"
|
||||||
|
if got[0] != want {
|
||||||
|
t.Errorf("topic = %q, want %q", got[0], want)
|
||||||
|
}
|
||||||
|
if !strings.Contains(got[1], "/JN37/") {
|
||||||
|
t.Errorf("square not upper-cased into the topic: %q", got[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// With no squares the old behaviour stands: receive the band and decide here.
|
||||||
|
func TestTopicsWithoutSquares(t *testing.T) {
|
||||||
|
w := New(Config{Bands: []string{"10m", "2m"}})
|
||||||
|
got := w.topics()
|
||||||
|
if len(got) != 2 || got[0] != "pskr/filter/v2/10m/#" {
|
||||||
|
t.Errorf("unfiltered topics = %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Grid chasing wants every band. "+" is the MQTT single-level wildcard, so one
|
||||||
|
// subscription per square covers the lot instead of one per band per square.
|
||||||
|
func TestTopicsAllBands(t *testing.T) {
|
||||||
|
w := New(Config{Bands: []string{"+"}, RxGrids: []string{"JN36"}})
|
||||||
|
got := w.topics()
|
||||||
|
if len(got) != 1 || got[0] != "pskr/filter/v2/+/+/+/+/+/JN36/+/+" {
|
||||||
|
t.Errorf("all-band topic = %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
_ "modernc.org/sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A LoTW confirmation the ARRL has validated arrives as V, not Y — ADIF's
|
||||||
|
// QSL_Rcvd enumeration has both. Every SQL query here compared against 'Y'
|
||||||
|
// alone, so the band/mode matrix showed an entity as merely worked while the
|
||||||
|
// Awards panel beside it showed the same entity validated on five bands.
|
||||||
|
//
|
||||||
|
// This drives the real queries against a real database rather than asserting on
|
||||||
|
// the constant: the constant being right is not the point, the queries using it
|
||||||
|
// is.
|
||||||
|
func TestConfirmedCountsVerifiedNotJustYes(t *testing.T) {
|
||||||
|
db, err := sql.Open("sqlite", "file:confirmedvalues?mode=memory&cache=shared")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer db.Close()
|
||||||
|
if _, err := db.Exec(`CREATE TABLE qso (
|
||||||
|
id INTEGER PRIMARY KEY, callsign TEXT, dxcc INTEGER, band TEXT, mode TEXT,
|
||||||
|
lotw_rcvd TEXT, qsl_rcvd TEXT, eqsl_rcvd TEXT)`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// Two Morocco contacts: one verified through LoTW, one not confirmed at all.
|
||||||
|
if _, err := db.Exec(`INSERT INTO qso (callsign, dxcc, band, mode, lotw_rcvd, qsl_rcvd, eqsl_rcvd)
|
||||||
|
VALUES ('CN8ABC', 446, '30m', 'FT8', 'V', '', ''),
|
||||||
|
('CN8XYZ', 446, '20m', 'FT8', 'N', '', '')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var confirmed30, confirmed20 int
|
||||||
|
q := `SELECT band, MAX(CASE WHEN lotw_rcvd IN ` + ConfirmedValues +
|
||||||
|
` OR qsl_rcvd IN ` + ConfirmedValues + ` OR eqsl_rcvd IN ` + ConfirmedValues +
|
||||||
|
` THEN 1 ELSE 0 END) FROM qso WHERE dxcc = 446 GROUP BY band`
|
||||||
|
rows, err := db.QueryContext(context.Background(), q)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
for rows.Next() {
|
||||||
|
var band string
|
||||||
|
var c int
|
||||||
|
if err := rows.Scan(&band, &c); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
switch band {
|
||||||
|
case "30m":
|
||||||
|
confirmed30 = c
|
||||||
|
case "20m":
|
||||||
|
confirmed20 = c
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if confirmed30 != 1 {
|
||||||
|
t.Error("a LoTW 'V' (verified) was not counted as confirmed — the matrix would show the entity as merely worked")
|
||||||
|
}
|
||||||
|
if confirmed20 != 0 {
|
||||||
|
t.Error("an 'N' was counted as confirmed")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
_ "modernc.org/sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
// OrderedIDs against a real SQLite file, with qso_date stored the way the repo
|
||||||
|
// actually writes it.
|
||||||
|
//
|
||||||
|
// The first version scanned that column straight into a time.Time. It compiles,
|
||||||
|
// it reads correctly, and it fails at run time — the column holds a formatted
|
||||||
|
// STRING. The error was swallowed into "the column will be empty", which is
|
||||||
|
// exactly what shipped: a column that was always blank.
|
||||||
|
func TestOrderedIDsAgainstRealSQLite(t *testing.T) {
|
||||||
|
conn, err := sql.Open("sqlite", "file:"+filepath.Join(t.TempDir(), "t.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { conn.Close() })
|
||||||
|
if _, err := conn.Exec(`CREATE TABLE qso (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
callsign TEXT NOT NULL,
|
||||||
|
qso_date TEXT NOT NULL
|
||||||
|
)`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Inserted NEWEST first, so the ids run opposite to the dates — what an
|
||||||
|
// imported ADIF produces, and the whole reason the id is not the number.
|
||||||
|
for _, row := range []struct {
|
||||||
|
call string
|
||||||
|
at time.Time
|
||||||
|
}{
|
||||||
|
{"NEWEST", time.Date(2026, 8, 13, 10, 0, 0, 0, time.UTC)},
|
||||||
|
{"MIDDLE", time.Date(2020, 1, 1, 10, 0, 0, 0, time.UTC)},
|
||||||
|
{"OLDEST", time.Date(1999, 5, 5, 10, 0, 0, 0, time.UTC)},
|
||||||
|
} {
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso (callsign, qso_date) VALUES (?, ?)`,
|
||||||
|
row.call, row.at.UTC().Format(isoMillis)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ids, newest, err := NewRepo(conn).OrderedIDs(context.Background())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("OrderedIDs: %v — this is the failure that emptied the column", err)
|
||||||
|
}
|
||||||
|
if len(ids) != 3 {
|
||||||
|
t.Fatalf("got %d ids, want 3", len(ids))
|
||||||
|
}
|
||||||
|
// Rows 1,2,3 were inserted newest→oldest, so chronological order is 3,2,1.
|
||||||
|
if ids[0] != 3 || ids[1] != 2 || ids[2] != 1 {
|
||||||
|
t.Errorf("order = %v, want the oldest contact first (3,2,1)", ids)
|
||||||
|
}
|
||||||
|
if newest.Year() != 2026 {
|
||||||
|
t.Errorf("newest = %v, want the 2026 contact", newest)
|
||||||
|
}
|
||||||
|
}
|
||||||
+201
-9
@@ -48,6 +48,14 @@ func MergeNonZero(dst *QSO, src QSO) {
|
|||||||
// Anything in ADIF that is not a promoted column lands in Extras.
|
// Anything in ADIF that is not a promoted column lands in Extras.
|
||||||
type QSO struct {
|
type QSO struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
|
// Number is the contact's position in the log, oldest = 1.
|
||||||
|
//
|
||||||
|
// NOT a column and NOT the ID: the primary key follows insertion order, so
|
||||||
|
// importing an old ADIF gives the oldest contacts the highest ids. This is a
|
||||||
|
// rank over qso_date, computed by the App layer and stamped on the way out —
|
||||||
|
// which is why it is `json:"-"`-adjacent in spirit: nothing reads or writes
|
||||||
|
// it in SQL.
|
||||||
|
Number int `json:"number,omitempty"`
|
||||||
Callsign string `json:"callsign"`
|
Callsign string `json:"callsign"`
|
||||||
QSODate time.Time `json:"qso_date"` // start, UTC
|
QSODate time.Time `json:"qso_date"` // start, UTC
|
||||||
QSODateOff time.Time `json:"qso_date_off,omitempty"` // end, UTC
|
QSODateOff time.Time `json:"qso_date_off,omitempty"` // end, UTC
|
||||||
@@ -91,7 +99,9 @@ type QSO struct {
|
|||||||
QSLRcvd string `json:"qsl_rcvd,omitempty"`
|
QSLRcvd string `json:"qsl_rcvd,omitempty"`
|
||||||
QSLSentDate string `json:"qsl_sent_date,omitempty"`
|
QSLSentDate string `json:"qsl_sent_date,omitempty"`
|
||||||
QSLRcvdDate string `json:"qsl_rcvd_date,omitempty"`
|
QSLRcvdDate string `json:"qsl_rcvd_date,omitempty"`
|
||||||
QSLVia string `json:"qsl_via,omitempty"`
|
QSLVia string `json:"qsl_via,omitempty"` // ADIF QSL_VIA — the QSL manager
|
||||||
|
QSLSentVia string `json:"qsl_sent_via,omitempty"` // ADIF enumeration B/D/E — how the card was sent
|
||||||
|
QSLRcvdVia string `json:"qsl_rcvd_via,omitempty"` // same enumeration, for the card received
|
||||||
QSLMsg string `json:"qsl_msg,omitempty"`
|
QSLMsg string `json:"qsl_msg,omitempty"`
|
||||||
QSLMsgRcvd string `json:"qslmsg_rcvd,omitempty"`
|
QSLMsgRcvd string `json:"qslmsg_rcvd,omitempty"`
|
||||||
|
|
||||||
@@ -238,7 +248,7 @@ const columnList = `callsign, qso_date, qso_date_off, band, band_rx, mode, submo
|
|||||||
grid, gridsquare_ext, vucc_grids,
|
grid, gridsquare_ext, vucc_grids,
|
||||||
country, state, cnty, dxcc, cont, cqz, ituz, iota, sota_ref, pota_ref,
|
country, state, cnty, dxcc, cont, cqz, ituz, iota, sota_ref, pota_ref,
|
||||||
age, lat, lon, rig, ant,
|
age, lat, lon, rig, ant,
|
||||||
qsl_sent, qsl_rcvd, qsl_sent_date, qsl_rcvd_date, qsl_via, qsl_msg, qslmsg_rcvd,
|
qsl_sent, qsl_rcvd, qsl_sent_date, qsl_rcvd_date, qsl_via, qsl_sent_via, qsl_rcvd_via, qsl_msg, qslmsg_rcvd,
|
||||||
lotw_sent, lotw_rcvd, lotw_sent_date, lotw_rcvd_date,
|
lotw_sent, lotw_rcvd, lotw_sent_date, lotw_rcvd_date,
|
||||||
eqsl_sent, eqsl_rcvd, eqsl_sent_date, eqsl_rcvd_date,
|
eqsl_sent, eqsl_rcvd, eqsl_sent_date, eqsl_rcvd_date,
|
||||||
clublog_qso_upload_date, clublog_qso_upload_status,
|
clublog_qso_upload_date, clublog_qso_upload_status,
|
||||||
@@ -313,7 +323,7 @@ func (q *QSO) args() []any {
|
|||||||
q.Grid, q.GridExt, q.VUCCGrids,
|
q.Grid, q.GridExt, q.VUCCGrids,
|
||||||
q.Country, q.State, q.County, q.DXCC, q.Continent, q.CQZ, q.ITUZ, q.IOTA, q.SOTARef, q.POTARef,
|
q.Country, q.State, q.County, q.DXCC, q.Continent, q.CQZ, q.ITUZ, q.IOTA, q.SOTARef, q.POTARef,
|
||||||
q.Age, q.Lat, q.Lon, q.Rig, q.Ant,
|
q.Age, q.Lat, q.Lon, q.Rig, q.Ant,
|
||||||
q.QSLSent, q.QSLRcvd, q.QSLSentDate, q.QSLRcvdDate, q.QSLVia, q.QSLMsg, q.QSLMsgRcvd,
|
q.QSLSent, q.QSLRcvd, q.QSLSentDate, q.QSLRcvdDate, q.QSLVia, q.QSLSentVia, q.QSLRcvdVia, q.QSLMsg, q.QSLMsgRcvd,
|
||||||
q.LOTWSent, q.LOTWRcvd, q.LOTWSentDate, q.LOTWRcvdDate,
|
q.LOTWSent, q.LOTWRcvd, q.LOTWSentDate, q.LOTWRcvdDate,
|
||||||
q.EQSLSent, q.EQSLRcvd, q.EQSLSentDate, q.EQSLRcvdDate,
|
q.EQSLSent, q.EQSLRcvd, q.EQSLSentDate, q.EQSLRcvdDate,
|
||||||
q.ClublogUploadDate, q.ClublogUploadStatus,
|
q.ClublogUploadDate, q.ClublogUploadStatus,
|
||||||
@@ -763,6 +773,8 @@ var bulkEditableCols = map[string]bool{
|
|||||||
"qsl_sent": true,
|
"qsl_sent": true,
|
||||||
"qsl_rcvd": true,
|
"qsl_rcvd": true,
|
||||||
"qsl_via": true,
|
"qsl_via": true,
|
||||||
|
"qsl_sent_via": true,
|
||||||
|
"qsl_rcvd_via": true,
|
||||||
"qrzcom_qso_upload_status": true,
|
"qrzcom_qso_upload_status": true,
|
||||||
"qrzcom_qso_download_status": true,
|
"qrzcom_qso_download_status": true,
|
||||||
"clublog_qso_upload_status": true,
|
"clublog_qso_upload_status": true,
|
||||||
@@ -1242,7 +1254,7 @@ var filterableColumns = map[string]bool{
|
|||||||
"grid": true, "country": true, "state": true, "cnty": true,
|
"grid": true, "country": true, "state": true, "cnty": true,
|
||||||
"dxcc": true, "cont": true, "cqz": true, "ituz": true,
|
"dxcc": true, "cont": true, "cqz": true, "ituz": true,
|
||||||
"iota": true, "sota_ref": true, "pota_ref": true, "wwff_ref": true, "rig": true, "ant": true,
|
"iota": true, "sota_ref": true, "pota_ref": true, "wwff_ref": true, "rig": true, "ant": true,
|
||||||
"qsl_sent": true, "qsl_rcvd": true, "qsl_via": true,
|
"qsl_sent": true, "qsl_rcvd": true, "qsl_via": true, "qsl_sent_via": true, "qsl_rcvd_via": true,
|
||||||
"lotw_sent": true, "lotw_rcvd": true, "eqsl_sent": true, "eqsl_rcvd": true,
|
"lotw_sent": true, "lotw_rcvd": true, "eqsl_sent": true, "eqsl_rcvd": true,
|
||||||
"qrzcom_qso_upload_status": true, "qrzcom_qso_download_status": true,
|
"qrzcom_qso_upload_status": true, "qrzcom_qso_download_status": true,
|
||||||
"clublog_qso_upload_status": true, "hrdlog_qso_upload_status": true,
|
"clublog_qso_upload_status": true, "hrdlog_qso_upload_status": true,
|
||||||
@@ -1895,9 +1907,9 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int,
|
|||||||
SELECT band, mode,
|
SELECT band, mode,
|
||||||
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
|
MAX(CASE WHEN callsign = ? THEN 1 ELSE 0 END),
|
||||||
MAX(CASE WHEN callsign = ?
|
MAX(CASE WHEN callsign = ?
|
||||||
AND (lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y')
|
AND (lotw_rcvd IN `+ConfirmedValues+` OR qsl_rcvd IN `+ConfirmedValues+` OR eqsl_rcvd IN `+ConfirmedValues+`)
|
||||||
THEN 1 ELSE 0 END),
|
THEN 1 ELSE 0 END),
|
||||||
MAX(CASE WHEN lotw_rcvd = 'Y' OR qsl_rcvd = 'Y' OR eqsl_rcvd = 'Y'
|
MAX(CASE WHEN lotw_rcvd IN `+ConfirmedValues+` OR qsl_rcvd IN `+ConfirmedValues+` OR eqsl_rcvd IN `+ConfirmedValues+`
|
||||||
THEN 1 ELSE 0 END)
|
THEN 1 ELSE 0 END)
|
||||||
FROM qso
|
FROM qso
|
||||||
WHERE dxcc = ?
|
WHERE dxcc = ?
|
||||||
@@ -2257,6 +2269,132 @@ func (r *Repo) WorkedCountyKeys(ctx context.Context, keyFn func(state, cnty stri
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CountQSLViaRouting counts the QSOs whose qsl_via holds a routing method
|
||||||
|
// instead of a manager, per isRouting.
|
||||||
|
//
|
||||||
|
// The test is applied in Go rather than in SQL because it has to hold the same
|
||||||
|
// vocabulary as the import and the QSL panel — one list of accepted spellings,
|
||||||
|
// in internal/adif, not a LIKE pattern drifting apart from it here. Only the
|
||||||
|
// distinct values are examined, so the log is scanned once whatever its size.
|
||||||
|
func (r *Repo) CountQSLViaRouting(ctx context.Context, isRouting func(string) bool) (int, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT qsl_via, COUNT(*) FROM qso
|
||||||
|
WHERE qsl_via IS NOT NULL AND qsl_via != ''
|
||||||
|
AND (qsl_sent_via IS NULL OR qsl_sent_via = '')
|
||||||
|
GROUP BY qsl_via`)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
n := 0
|
||||||
|
for rows.Next() {
|
||||||
|
var via string
|
||||||
|
var c int
|
||||||
|
if err := rows.Scan(&via, &c); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
if isRouting(via) {
|
||||||
|
n += c
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return n, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// RepairQSLViaRouting moves routing words out of qsl_via into qsl_sent_via,
|
||||||
|
// returning how many QSOs were changed.
|
||||||
|
//
|
||||||
|
// One UPDATE per distinct spelling, not per QSO: a log holds a handful of them
|
||||||
|
// ("Bureau", "E", "Direct"…), and a remote MySQL logbook must not be made to
|
||||||
|
// carry one round trip per contact for a tidy-up. Rows that already have a
|
||||||
|
// sent-via are left alone by the same condition the count uses, so running this
|
||||||
|
// twice cannot undo a later import.
|
||||||
|
func (r *Repo) RepairQSLViaRouting(ctx context.Context, normalise func(string) string) (int, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT DISTINCT qsl_via FROM qso
|
||||||
|
WHERE qsl_via IS NOT NULL AND qsl_via != ''
|
||||||
|
AND (qsl_sent_via IS NULL OR qsl_sent_via = '')`)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
type move struct{ from, to string }
|
||||||
|
var moves []move
|
||||||
|
for rows.Next() {
|
||||||
|
var via string
|
||||||
|
if err := rows.Scan(&via); err != nil {
|
||||||
|
rows.Close()
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
if to := normalise(via); to != "" {
|
||||||
|
moves = append(moves, move{from: via, to: to})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rows.Close()
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
total := 0
|
||||||
|
for _, m := range moves {
|
||||||
|
res, err := r.db.ExecContext(ctx,
|
||||||
|
`UPDATE qso SET qsl_sent_via = ?, qsl_via = ''
|
||||||
|
WHERE qsl_via = ? AND (qsl_sent_via IS NULL OR qsl_sent_via = '')`,
|
||||||
|
m.to, m.from)
|
||||||
|
if err != nil {
|
||||||
|
return total, err
|
||||||
|
}
|
||||||
|
if n, err := res.RowsAffected(); err == nil {
|
||||||
|
total += int(n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return total, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// CallCounties returns callsign → "STATE,County" for every US station already
|
||||||
|
// logged with a county, newest QSO winning.
|
||||||
|
//
|
||||||
|
// It exists so the cluster shows the SAME county the entry panel does. The
|
||||||
|
// entry panel gets its county from a callbook, which knows where the licensee
|
||||||
|
// actually lives; a spot carries only a callsign, so the cluster falls back to
|
||||||
|
// deriving one from the FCC licence address, which is right about 98% of the
|
||||||
|
// time. Where the log already holds a callbook's answer for that station, the
|
||||||
|
// two panels disagreeing is pure noise — this is what lets the better answer
|
||||||
|
// win in both.
|
||||||
|
//
|
||||||
|
// One DISTINCT scan when the cluster snapshot is rebuilt, then map lookups per
|
||||||
|
// spot, like the worked-county and worked-grid sets beside it.
|
||||||
|
func (r *Repo) CallCounties(ctx context.Context) (map[string]string, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT callsign, COALESCE(state,''), COALESCE(cnty,'') FROM qso
|
||||||
|
WHERE dxcc IN (291,110,6) AND cnty IS NOT NULL AND cnty != ''
|
||||||
|
ORDER BY qso_date, time_on`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make(map[string]string, 1024)
|
||||||
|
for rows.Next() {
|
||||||
|
var call, state, cnty string
|
||||||
|
if err := rows.Scan(&call, &state, &cnty); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
call = strings.ToUpper(strings.TrimSpace(call))
|
||||||
|
cnty = strings.TrimSpace(cnty)
|
||||||
|
if call == "" || cnty == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Store the ADIF "STATE,County" shape whatever the log holds, so the
|
||||||
|
// caller has both halves without a second column.
|
||||||
|
if !strings.Contains(cnty, ",") {
|
||||||
|
if state = strings.TrimSpace(state); state == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cnty = state + "," + cnty
|
||||||
|
}
|
||||||
|
out[call] = cnty
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// CountyWorked reports whether one US county has already been worked.
|
// CountyWorked reports whether one US county has already been worked.
|
||||||
//
|
//
|
||||||
// It exists so the entry panel can flag a new county without loading the whole
|
// It exists so the entry panel can flag a new county without loading the whole
|
||||||
@@ -2654,12 +2792,27 @@ type SlotStats struct {
|
|||||||
DIGConfirmed int `json:"dig_confirmed"`
|
DIGConfirmed int `json:"dig_confirmed"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ConfirmedValues is what a QSL-received field holds when the contact IS
|
||||||
|
// confirmed, as an SQL list.
|
||||||
|
//
|
||||||
|
// Y AND V. ADIF's QSL_Rcvd enumeration has both: Y is "received", V is
|
||||||
|
// "verified" — and that is what a LoTW download writes for a confirmation the
|
||||||
|
// ARRL has validated. Testing only = 'Y' therefore misses exactly the
|
||||||
|
// confirmations an operator cares most about.
|
||||||
|
//
|
||||||
|
// This was visible on screen: the Awards panel showed Morocco validated on five
|
||||||
|
// bands while the band/mode matrix beside it showed the entity as merely worked,
|
||||||
|
// because the award engine's isYes accepts "Y" or "V" and every SQL query here
|
||||||
|
// compared against 'Y' alone. One definition of confirmed, in one place, is the
|
||||||
|
// only way those two agree.
|
||||||
|
const ConfirmedValues = "('Y','V')"
|
||||||
|
|
||||||
// GetSlotStats computes the worked/confirmed slot and DXCC tallies in one pass.
|
// GetSlotStats computes the worked/confirmed slot and DXCC tallies in one pass.
|
||||||
// "Confirmed" = LoTW or paper QSL received (the award-valid sources).
|
// "Confirmed" = LoTW or paper QSL received (the award-valid sources).
|
||||||
func (r *Repo) GetSlotStats(ctx context.Context) (SlotStats, error) {
|
func (r *Repo) GetSlotStats(ctx context.Context) (SlotStats, error) {
|
||||||
rows, err := r.db.QueryContext(ctx, `
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
SELECT COALESCE(dxcc,0), LOWER(COALESCE(band,'')), UPPER(COALESCE(mode,'')),
|
SELECT COALESCE(dxcc,0), LOWER(COALESCE(band,'')), UPPER(COALESCE(mode,'')),
|
||||||
CASE WHEN lotw_rcvd='Y' OR qsl_rcvd='Y' THEN 1 ELSE 0 END
|
CASE WHEN lotw_rcvd IN `+ConfirmedValues+` OR qsl_rcvd IN `+ConfirmedValues+` THEN 1 ELSE 0 END
|
||||||
FROM qso`)
|
FROM qso`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return SlotStats{}, err
|
return SlotStats{}, err
|
||||||
@@ -2835,7 +2988,8 @@ func scanQSO(s scanner) (QSO, error) {
|
|||||||
rig, ant sql.NullString
|
rig, ant sql.NullString
|
||||||
qslSent, qslRcvd sql.NullString
|
qslSent, qslRcvd sql.NullString
|
||||||
qslSentDate, qslRcvdDate sql.NullString
|
qslSentDate, qslRcvdDate sql.NullString
|
||||||
qslVia, qslMsg, qslMsgRcvd sql.NullString
|
qslVia, qslSentVia, qslRcvdVia sql.NullString
|
||||||
|
qslMsg, qslMsgRcvd sql.NullString
|
||||||
lotwSent, lotwRcvd sql.NullString
|
lotwSent, lotwRcvd sql.NullString
|
||||||
lotwSentDate, lotwRcvdDate sql.NullString
|
lotwSentDate, lotwRcvdDate sql.NullString
|
||||||
eqslSent, eqslRcvd sql.NullString
|
eqslSent, eqslRcvd sql.NullString
|
||||||
@@ -2880,7 +3034,7 @@ func scanQSO(s scanner) (QSO, error) {
|
|||||||
&grid, &gridExt, &vucc,
|
&grid, &gridExt, &vucc,
|
||||||
&country, &state, &cnty, &dxcc, &cont, &cqz, &ituz, &iota, &sota, &pota,
|
&country, &state, &cnty, &dxcc, &cont, &cqz, &ituz, &iota, &sota, &pota,
|
||||||
&age, &lat, &lon, &rig, &ant,
|
&age, &lat, &lon, &rig, &ant,
|
||||||
&qslSent, &qslRcvd, &qslSentDate, &qslRcvdDate, &qslVia, &qslMsg, &qslMsgRcvd,
|
&qslSent, &qslRcvd, &qslSentDate, &qslRcvdDate, &qslVia, &qslSentVia, &qslRcvdVia, &qslMsg, &qslMsgRcvd,
|
||||||
&lotwSent, &lotwRcvd, &lotwSentDate, &lotwRcvdDate,
|
&lotwSent, &lotwRcvd, &lotwSentDate, &lotwRcvdDate,
|
||||||
&eqslSent, &eqslRcvd, &eqslSentDate, &eqslRcvdDate,
|
&eqslSent, &eqslRcvd, &eqslSentDate, &eqslRcvdDate,
|
||||||
&clublogDate, &clublogStatus,
|
&clublogDate, &clublogStatus,
|
||||||
@@ -2964,6 +3118,8 @@ func scanQSO(s scanner) (QSO, error) {
|
|||||||
q.QSLSentDate = qslSentDate.String
|
q.QSLSentDate = qslSentDate.String
|
||||||
q.QSLRcvdDate = qslRcvdDate.String
|
q.QSLRcvdDate = qslRcvdDate.String
|
||||||
q.QSLVia = qslVia.String
|
q.QSLVia = qslVia.String
|
||||||
|
q.QSLSentVia = qslSentVia.String
|
||||||
|
q.QSLRcvdVia = qslRcvdVia.String
|
||||||
q.QSLMsg = qslMsg.String
|
q.QSLMsg = qslMsg.String
|
||||||
q.QSLMsgRcvd = qslMsgRcvd.String
|
q.QSLMsgRcvd = qslMsgRcvd.String
|
||||||
q.LOTWSent = lotwSent.String
|
q.LOTWSent = lotwSent.String
|
||||||
@@ -3170,3 +3326,39 @@ func (r *Repo) WorkedGridKeys(ctx context.Context, normMode func(string) string)
|
|||||||
}
|
}
|
||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OrderedIDs returns every QSO id in chronological order, oldest first.
|
||||||
|
//
|
||||||
|
// The mirror of ListFiltered's "qso_date DESC, id DESC", so the tie-break is the
|
||||||
|
// same one the grid displays and a contact cannot change number depending on
|
||||||
|
// which way it is read.
|
||||||
|
//
|
||||||
|
// One query, ids only: the caller turns it into a rank once and keeps it in
|
||||||
|
// memory. Asking the database for a row's rank per row would be a correlated
|
||||||
|
// count over the whole log for each of thirty thousand rows.
|
||||||
|
func (r *Repo) OrderedIDs(ctx context.Context) ([]int64, time.Time, error) {
|
||||||
|
rows, err := r.db.QueryContext(ctx, `SELECT id, qso_date FROM qso ORDER BY qso_date ASC, id ASC`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, time.Time{}, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make([]int64, 0, 4096)
|
||||||
|
// qso_date is stored as a formatted STRING, not a driver date. Scanning it
|
||||||
|
// into a time.Time silently fails on SQLite, which is how this returned an
|
||||||
|
// error and left the whole column empty.
|
||||||
|
var lastDate string
|
||||||
|
for rows.Next() {
|
||||||
|
var id int64
|
||||||
|
var at string
|
||||||
|
if err := rows.Scan(&id, &at); err != nil {
|
||||||
|
return nil, time.Time{}, err
|
||||||
|
}
|
||||||
|
out = append(out, id)
|
||||||
|
lastDate = at // ascending, so the last row read is the newest
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, time.Time{}, err
|
||||||
|
}
|
||||||
|
// Parsed once, for the newest row only — the ordering came from SQL.
|
||||||
|
return out, parseTimeLoose(lastDate), nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,124 @@
|
|||||||
|
package relaydev
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A generic HTTP relay board: one URL to switch a relay on, one to switch it off.
|
||||||
|
//
|
||||||
|
// This is for the home-made switch — an ESP8266 with a web page, a Shelly, a
|
||||||
|
// Sonoff running third-party firmware, any of the boxes that answer a GET and
|
||||||
|
// have no protocol worth naming. The named drivers beside it exist because
|
||||||
|
// their boards need something specific; this one exists because most of them
|
||||||
|
// need nothing at all.
|
||||||
|
//
|
||||||
|
// TWO WAYS TO CONFIGURE IT, and the difference matters:
|
||||||
|
//
|
||||||
|
// - one URL pair with {relay} in it, used for every relay:
|
||||||
|
// http://192.168.1.9/relay?n={relay}&state=on
|
||||||
|
// - or one pair per relay, when the box has no pattern to speak of:
|
||||||
|
// relay 1 → http://192.168.1.9/FF0101 , relay 2 → .../FF0201
|
||||||
|
//
|
||||||
|
// The second is the reason this driver exists. A hand-made switch often has
|
||||||
|
// URLs with nothing in common between channels, and a template with {relay}
|
||||||
|
// cannot express that.
|
||||||
|
//
|
||||||
|
// STATE IS REMEMBERED, NOT READ. Most of these boxes have no status endpoint,
|
||||||
|
// or answer with a web page nobody can parse reliably. Status therefore returns
|
||||||
|
// what we last commanded — see the method for what that costs.
|
||||||
|
type httpGen struct {
|
||||||
|
onURLs []string // index 0 = relay 1; "" falls back to the pattern
|
||||||
|
offURLs []string
|
||||||
|
onPat string // pattern with {relay}, used when the per-relay URL is empty
|
||||||
|
offPat string
|
||||||
|
user string
|
||||||
|
pass string
|
||||||
|
count int
|
||||||
|
|
||||||
|
mu sync.Mutex
|
||||||
|
state []bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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
|
||||||
|
// fallback patterns.
|
||||||
|
func NewHTTPGeneric(onURLs, offURLs []string, onPat, offPat, user, pass string, count int) Device {
|
||||||
|
if count <= 0 {
|
||||||
|
count = len(onURLs)
|
||||||
|
}
|
||||||
|
if count <= 0 {
|
||||||
|
count = 1
|
||||||
|
}
|
||||||
|
return &httpGen{
|
||||||
|
onURLs: onURLs, offURLs: offURLs,
|
||||||
|
onPat: onPat, offPat: offPat,
|
||||||
|
user: user, pass: pass, count: count,
|
||||||
|
state: make([]bool, count),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *httpGen) Count() int { return h.count }
|
||||||
|
func (h *httpGen) Close() error { return nil } // stateless HTTP, nothing to release
|
||||||
|
|
||||||
|
// urlFor picks the per-relay URL, falling back to the pattern.
|
||||||
|
func (h *httpGen) urlFor(relay int, on bool) string {
|
||||||
|
list, pat := h.offURLs, h.offPat
|
||||||
|
if on {
|
||||||
|
list, pat = h.onURLs, h.onPat
|
||||||
|
}
|
||||||
|
if i := relay - 1; i >= 0 && i < len(list) {
|
||||||
|
if u := strings.TrimSpace(list[i]); u != "" {
|
||||||
|
return u
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if pat = strings.TrimSpace(pat); pat == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.ReplaceAll(pat, "{relay}", strconv.Itoa(relay))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *httpGen) Set(ctx context.Context, relay int, on bool) error {
|
||||||
|
if relay < 1 || relay > h.count {
|
||||||
|
return fmt.Errorf("relay %d out of range 1..%d", relay, h.count)
|
||||||
|
}
|
||||||
|
u := h.urlFor(relay, on)
|
||||||
|
if u == "" {
|
||||||
|
// Naming the direction matters: an operator who filled the ON URLs and
|
||||||
|
// left OFF empty gets a switch that latches, and "no URL configured"
|
||||||
|
// alone would not say which half is missing.
|
||||||
|
dir := "OFF"
|
||||||
|
if on {
|
||||||
|
dir = "ON"
|
||||||
|
}
|
||||||
|
return fmt.Errorf("no %s URL configured for relay %d", dir, relay)
|
||||||
|
}
|
||||||
|
if _, err := get(ctx, u, h.user, h.pass); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
h.mu.Lock()
|
||||||
|
if i := relay - 1; i < len(h.state) {
|
||||||
|
h.state[i] = on
|
||||||
|
}
|
||||||
|
h.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status returns what was last commanded, not what the board is doing.
|
||||||
|
//
|
||||||
|
// These boxes rarely have a status endpoint worth trusting, so there is nothing
|
||||||
|
// to read. The cost is real and worth stating: after OpsLog restarts, every
|
||||||
|
// relay reads as off until something switches it, so the automatic control
|
||||||
|
// re-commands each one once. That is a harmless extra command on a board with
|
||||||
|
// no memory of its own — and far better than guessing a state and leaving an
|
||||||
|
// antenna disconnected because we assumed it was already selected.
|
||||||
|
func (h *httpGen) Status(ctx context.Context) ([]bool, error) {
|
||||||
|
h.mu.Lock()
|
||||||
|
defer h.mu.Unlock()
|
||||||
|
out := make([]bool, h.count)
|
||||||
|
copy(out, h.state)
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
package relaydev
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The pattern form: one URL pair for the whole board, {relay} substituted.
|
||||||
|
func TestHTTPGenericPattern(t *testing.T) {
|
||||||
|
var mu sync.Mutex
|
||||||
|
var got []string
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
mu.Lock()
|
||||||
|
got = append(got, r.URL.String())
|
||||||
|
mu.Unlock()
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
d := NewHTTPGeneric(nil, nil,
|
||||||
|
srv.URL+"/relay?n={relay}&state=on",
|
||||||
|
srv.URL+"/relay?n={relay}&state=off", "", "", 4)
|
||||||
|
if err := d.Set(context.Background(), 2, true); err != nil {
|
||||||
|
t.Fatalf("Set on: %v", err)
|
||||||
|
}
|
||||||
|
if err := d.Set(context.Background(), 3, false); err != nil {
|
||||||
|
t.Fatalf("Set off: %v", err)
|
||||||
|
}
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
want := []string{"/relay?n=2&state=on", "/relay?n=3&state=off"}
|
||||||
|
if strings.Join(got, " ") != strings.Join(want, " ") {
|
||||||
|
t.Errorf("requested %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The per-relay form, which is the reason this driver exists: a hand-made
|
||||||
|
// switch often has URLs with nothing in common between channels, and no
|
||||||
|
// pattern can express that.
|
||||||
|
func TestHTTPGenericPerRelayURLsWinOverThePattern(t *testing.T) {
|
||||||
|
var mu sync.Mutex
|
||||||
|
var got []string
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
mu.Lock()
|
||||||
|
got = append(got, r.URL.Path)
|
||||||
|
mu.Unlock()
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
d := NewHTTPGeneric(
|
||||||
|
[]string{srv.URL + "/FF0101", "", srv.URL + "/weird/on"},
|
||||||
|
[]string{srv.URL + "/FF0100", "", ""},
|
||||||
|
srv.URL+"/pattern/on/{relay}", srv.URL+"/pattern/off/{relay}", "", "", 3)
|
||||||
|
|
||||||
|
_ = 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(), 3, false) // no OFF of its own → pattern
|
||||||
|
mu.Lock()
|
||||||
|
defer mu.Unlock()
|
||||||
|
want := []string{"/FF0101", "/pattern/on/2", "/pattern/off/3"}
|
||||||
|
if strings.Join(got, " ") != strings.Join(want, " ") {
|
||||||
|
t.Errorf("requested %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
func TestHTTPGenericNamesTheMissingDirection(t *testing.T) {
|
||||||
|
d := NewHTTPGeneric([]string{"http://x/on"}, nil, "", "", "", "", 1)
|
||||||
|
err := d.Set(context.Background(), 1, false)
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "OFF") {
|
||||||
|
t.Errorf("err = %v, want it to name the OFF direction", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status reports what was commanded: these boxes have nothing to read.
|
||||||
|
func TestHTTPGenericRemembersWhatItCommanded(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
|
||||||
|
defer srv.Close()
|
||||||
|
d := NewHTTPGeneric(nil, nil, srv.URL+"/on/{relay}", srv.URL+"/off/{relay}", "", "", 3)
|
||||||
|
_ = d.Set(context.Background(), 2, true)
|
||||||
|
st, err := d.Status(context.Background())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Status: %v", err)
|
||||||
|
}
|
||||||
|
if len(st) != 3 || st[0] || !st[1] || st[2] {
|
||||||
|
t.Errorf("state = %v, want only relay 2 on", st)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,6 +32,7 @@ package rigctld
|
|||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"hamlog/internal/cat"
|
||||||
"net"
|
"net"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -244,7 +245,18 @@ func (s *Server) serve(c net.Conn) {
|
|||||||
s.log("rigctld: client %s disconnected", c.RemoteAddr())
|
s.log("rigctld: client %s disconnected", c.RemoteAddr())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp, quit := s.handle(strings.TrimSpace(line))
|
req := strings.TrimSpace(line)
|
||||||
|
resp, quit := s.handle(req)
|
||||||
|
// The whole exchange, when tracing is on.
|
||||||
|
//
|
||||||
|
// Only PTT transitions were ever recorded, so when JTDX aborted a
|
||||||
|
// transmission mid-frame the log showed the abort and not the command
|
||||||
|
// that preceded it — the one thing needed to tell whether OpsLog answered
|
||||||
|
// something the client could not accept. Behind the same switch as the CAT
|
||||||
|
// wire trace: this is one line per poll and would drown an ordinary log.
|
||||||
|
if req != "" && cat.CIVTraceEnabled() {
|
||||||
|
s.log("rigctld: %s → %q ⇒ %q", c.RemoteAddr(), req, strings.TrimRight(resp, "\r\n"))
|
||||||
|
}
|
||||||
if resp != "" {
|
if resp != "" {
|
||||||
if _, err := w.WriteString(resp); err != nil {
|
if _, err := w.WriteString(resp); err != nil {
|
||||||
return
|
return
|
||||||
@@ -409,6 +421,17 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
|||||||
return rprt(0), false
|
return rprt(0), false
|
||||||
}
|
}
|
||||||
s.splitWanted.Store(false)
|
s.splitWanted.Store(false)
|
||||||
|
// Already simplex? Then there is nothing to do and the request is
|
||||||
|
// satisfied. Reporting a failure here is what broke JTDX in "Fake It":
|
||||||
|
// Fake It uses no split, JTDX still sends "S 0" to be sure, and a backend
|
||||||
|
// that cannot SET split answered an error to a request that was already
|
||||||
|
// true. JTDX read that as rig control failing and abandoned the
|
||||||
|
// transmission a second into the frame.
|
||||||
|
//
|
||||||
|
// A refusal is only honest when something actually needed doing.
|
||||||
|
if on, _ := s.rig.Split(); !on {
|
||||||
|
return rprt(0), false
|
||||||
|
}
|
||||||
if err := s.rig.SetSplit(false, 0); err != nil {
|
if err := s.rig.SetSplit(false, 0); err != nil {
|
||||||
s.log("rigctld: split off failed: %v", err)
|
s.log("rigctld: split off failed: %v", err)
|
||||||
return rprt(-9), false
|
return rprt(-9), false
|
||||||
@@ -438,6 +461,34 @@ func (s *Server) handle(line string) (resp string, quit bool) {
|
|||||||
s.log("rigctld: split ON, TX %.0f Hz", hz)
|
s.log("rigctld: split ON, TX %.0f Hz", hz)
|
||||||
return rprt(0), false
|
return rprt(0), false
|
||||||
|
|
||||||
|
case "X", "\\set_split_mode":
|
||||||
|
// "X <mode> <passband>" — the mode of the TRANSMIT VFO.
|
||||||
|
//
|
||||||
|
// Accepted rather than refused. WSJT-X and JTDX send it as part of their
|
||||||
|
// normal setup even in "Fake It", where there is no split and therefore no
|
||||||
|
// second VFO to give a mode to; answering "not implemented" made JTDX give
|
||||||
|
// up on rig control mid-transmission.
|
||||||
|
//
|
||||||
|
// The mode is applied when there IS a split — the transmit VFO is a real
|
||||||
|
// one then. Without split the request has no target and succeeding is the
|
||||||
|
// honest answer: the transmit VFO already has that mode, because it is the
|
||||||
|
// same VFO.
|
||||||
|
if len(args) < 1 {
|
||||||
|
return rprt(-1), false
|
||||||
|
}
|
||||||
|
if on, _ := s.rig.Split(); !on {
|
||||||
|
return rprt(0), false
|
||||||
|
}
|
||||||
|
if err := s.rig.SetMode(args[0]); err != nil {
|
||||||
|
s.log("rigctld: split mode %q failed: %v", args[0], err)
|
||||||
|
return rprt(-9), false
|
||||||
|
}
|
||||||
|
return rprt(0), false
|
||||||
|
case "x", "\\get_split_mode":
|
||||||
|
// Mirrors X: the transmit VFO's mode and passband. Without split that is
|
||||||
|
// simply the current mode.
|
||||||
|
return s.rig.Mode() + "\n2400\n", false
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// A frame ending in ';' is not a rigctl command at all — it is raw rig
|
// A frame ending in ';' is not a rigctl command at all — it is raw rig
|
||||||
// dialect (Kenwood/Elecraft/Yaesu), which means the client is configured
|
// dialect (Kenwood/Elecraft/Yaesu), which means the client is configured
|
||||||
|
|||||||
@@ -50,3 +50,55 @@ func TestSetSplitRefusalIsReported(t *testing.T) {
|
|||||||
t.Errorf("a rig that cannot split answered %q — the client will transmit on the wrong frequency", got)
|
t.Errorf("a rig that cannot split answered %q — the client will transmit on the wrong frequency", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// "Fake It" uses NO split, and JTDX still sends "S 0" to make sure. A backend
|
||||||
|
// that cannot SET split used to answer an error to that — a refusal of a
|
||||||
|
// request that was already satisfied — and JTDX read it as rig control failing
|
||||||
|
// and abandoned the transmission a second into a 13.8-second frame.
|
||||||
|
//
|
||||||
|
// Reported against a Yaesu whose backend cannot arm split from software.
|
||||||
|
func TestSplitOffOnASimplexRigSucceeds(t *testing.T) {
|
||||||
|
rig := &fakeRig{freq: 14074000, mode: "FT8", noSplit: true}
|
||||||
|
s := New(0, rig, func(string, ...any) {})
|
||||||
|
|
||||||
|
if got, _ := s.handle("S 0 VFOA"); !strings.HasPrefix(got, "RPRT 0") {
|
||||||
|
t.Errorf("split off on a simplex rig answered %q — nothing needed doing", got)
|
||||||
|
}
|
||||||
|
// And it must not have bothered the rig at all.
|
||||||
|
if len(rig.splitCalls) != 0 {
|
||||||
|
t.Errorf("rig was asked to clear a split it did not have: %v", rig.splitCalls)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Arming, however, must still fail loudly: there the request is real and
|
||||||
|
// unmet, and a client that believes it is transmitting up the band while the
|
||||||
|
// radio sits on the DX's frequency is the bug this refusal exists to prevent.
|
||||||
|
if got, _ := s.handle("S 1 VFOB"); !strings.HasPrefix(got, "RPRT 0") {
|
||||||
|
t.Fatalf("arming is deferred to set_split_freq: %q", got)
|
||||||
|
}
|
||||||
|
if got, _ := s.handle("I 14075300.000000"); strings.HasPrefix(got, "RPRT 0") {
|
||||||
|
t.Error("arming split on a backend that cannot must report a failure")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// X (set_split_mode) is sent by WSJT-X and JTDX during ordinary setup, Fake It
|
||||||
|
// included — where there is no second VFO to give a mode to. Answering "not
|
||||||
|
// implemented" made JTDX give up on rig control mid-transmission.
|
||||||
|
func TestSplitModeIsAccepted(t *testing.T) {
|
||||||
|
rig := &fakeRig{freq: 14074000, mode: "FT8"}
|
||||||
|
s := New(0, rig, func(string, ...any) {})
|
||||||
|
|
||||||
|
// No split: nothing to target, and succeeding is honest — the transmit VFO
|
||||||
|
// already has that mode because it is the same VFO.
|
||||||
|
if got, _ := s.handle("X PKTUSB -1"); !strings.HasPrefix(got, "RPRT 0") {
|
||||||
|
t.Errorf("set_split_mode answered %q", got)
|
||||||
|
}
|
||||||
|
if rig.mode != "FT8" {
|
||||||
|
t.Errorf("the mode was changed with no split in force: %q", rig.mode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reading it back must answer a mode and a passband, never an error.
|
||||||
|
got, _ := s.handle("x")
|
||||||
|
if !strings.Contains(got, "FT8") {
|
||||||
|
t.Errorf("get_split_mode = %q, want the current mode", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,257 @@
|
|||||||
|
// Package spid drives a SPID (AlfaSpid) rotator over its own serial protocol,
|
||||||
|
// Rot1Prog or Rot2Prog — the controllers sold as RAS, RAK, BIG-RAS/HR, MD-01
|
||||||
|
// and MD-02.
|
||||||
|
//
|
||||||
|
// It exists so an operator with SPID rotators does not need PstRotator running
|
||||||
|
// just to turn an antenna. Two towers with a controller each is the ordinary
|
||||||
|
// case; each one is a separate serial port and a separate rotor in OpsLog.
|
||||||
|
//
|
||||||
|
// WIRE FORMAT
|
||||||
|
//
|
||||||
|
// Every command is 13 bytes:
|
||||||
|
//
|
||||||
|
// 0 1 2 3 4 5 6 7 8 9 10 11 12
|
||||||
|
// 0x57 H1 H2 H3 H4 PH V1 V2 V3 V4 PV K 0x20
|
||||||
|
//
|
||||||
|
// K is the command: 0x0F stop, 0x1F status, 0x2F set.
|
||||||
|
//
|
||||||
|
// The DIGITS ARE ASCII in a command ('0'+d) and RAW BYTES in a reply (0..9).
|
||||||
|
// That asymmetry is the whole trap in this protocol: send raw digits and the
|
||||||
|
// controller ignores you, read them as ASCII and every heading is 48 degrees
|
||||||
|
// times a hundred out. It is pinned by the tests beside this file.
|
||||||
|
//
|
||||||
|
// PH and PV are the resolution in pulses per degree — 1, 2 or 4 — and are raw
|
||||||
|
// in both directions. The target is scaled by it:
|
||||||
|
//
|
||||||
|
// u_az = PH × (360 + az) and the four decimal digits of u_az are sent
|
||||||
|
//
|
||||||
|
// A reply is 12 bytes for Rot2Prog (azimuth and elevation) or 5 for Rot1Prog
|
||||||
|
// (azimuth only, three digits):
|
||||||
|
//
|
||||||
|
// az = H1×100 + H2×10 + H3 + H4/10 − 360
|
||||||
|
//
|
||||||
|
// The 360 offset is what lets the controller report a rotator that has turned
|
||||||
|
// past north in either direction, which is the point of a pulse-counting
|
||||||
|
// rotator: −180…540 rather than 0…359.
|
||||||
|
//
|
||||||
|
// Serial is 8N1 at 600 baud for Rot2Prog and 1200 for Rot1Prog. Those are not
|
||||||
|
// typos — a pulse controller has nothing to say quickly.
|
||||||
|
//
|
||||||
|
// Verified against Hamlib's spid.c (rotators/spid/spid.c), which is the
|
||||||
|
// reference implementation, and SPID's published protocol note. NOT yet run
|
||||||
|
// against real hardware here; the tests pin the frames, the controller is the
|
||||||
|
// only thing that can confirm the rest.
|
||||||
|
package spid
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"go.bug.st/serial"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Model selects the dialect.
|
||||||
|
type Model string
|
||||||
|
|
||||||
|
const (
|
||||||
|
Rot1Prog Model = "rot1prog" // azimuth only, 5-byte reply, 1200 baud
|
||||||
|
Rot2Prog Model = "rot2prog" // azimuth + elevation, 12-byte reply, 600 baud
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
cmdStop = 0x0F
|
||||||
|
cmdStatus = 0x1F
|
||||||
|
cmdSet = 0x2F
|
||||||
|
|
||||||
|
frameStart = 0x57
|
||||||
|
frameEnd = 0x20
|
||||||
|
)
|
||||||
|
|
||||||
|
// Client is one controller on one serial port.
|
||||||
|
//
|
||||||
|
// The port is opened per exchange rather than held: a rotator is polled every
|
||||||
|
// few seconds at most, and holding a COM port open for the life of the program
|
||||||
|
// is what stops an operator from using their controller's own software
|
||||||
|
// alongside — which they will want while they are still trusting this.
|
||||||
|
type Client struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
port string
|
||||||
|
baud int
|
||||||
|
model Model
|
||||||
|
// resolution is pulses per degree: 1, 2 or 4. The controller is configured
|
||||||
|
// for one of them and answers with it, so a wrong value here corrects itself
|
||||||
|
// on the first status read.
|
||||||
|
resolution byte
|
||||||
|
}
|
||||||
|
|
||||||
|
// New builds a client. baud 0 takes the model's documented default.
|
||||||
|
func New(comPort string, baud int, model Model) *Client {
|
||||||
|
if model != Rot1Prog {
|
||||||
|
model = Rot2Prog
|
||||||
|
}
|
||||||
|
if baud <= 0 {
|
||||||
|
baud = 600
|
||||||
|
if model == Rot1Prog {
|
||||||
|
baud = 1200
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &Client{port: strings.TrimSpace(comPort), baud: baud, model: model, resolution: 1}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildStatus frames the "where are you" command.
|
||||||
|
func BuildStatus() []byte { return buildCmd(0, 0, 0, 0, cmdStatus) }
|
||||||
|
|
||||||
|
// BuildStop frames the "stop now" command.
|
||||||
|
func BuildStop() []byte { return buildCmd(0, 0, 0, 0, cmdStop) }
|
||||||
|
|
||||||
|
// BuildSet frames a target. resolution is the controller's pulses per degree.
|
||||||
|
//
|
||||||
|
// Azimuth is offset by 360 before scaling, so a target of −10° and one of 350°
|
||||||
|
// are different instructions: the first turns anticlockwise past north, the
|
||||||
|
// second does not. Feeding a 0…359 heading in is therefore always safe.
|
||||||
|
func BuildSet(az, el float64, resolution byte) []byte {
|
||||||
|
if resolution == 0 {
|
||||||
|
resolution = 1
|
||||||
|
}
|
||||||
|
uaz := int(float64(resolution)*(360+az) + 0.5)
|
||||||
|
uel := int(float64(resolution)*(360+el) + 0.5)
|
||||||
|
return buildCmd(uaz, uel, resolution, resolution, cmdSet)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildCmd(uaz, uel int, ph, pv byte, k byte) []byte {
|
||||||
|
c := make([]byte, 13)
|
||||||
|
c[0] = frameStart
|
||||||
|
if k == cmdSet {
|
||||||
|
c[1] = '0' + byte(uaz/1000%10)
|
||||||
|
c[2] = '0' + byte(uaz/100%10)
|
||||||
|
c[3] = '0' + byte(uaz/10%10)
|
||||||
|
c[4] = '0' + byte(uaz%10)
|
||||||
|
c[5] = ph
|
||||||
|
c[6] = '0' + byte(uel/1000%10)
|
||||||
|
c[7] = '0' + byte(uel/100%10)
|
||||||
|
c[8] = '0' + byte(uel/10%10)
|
||||||
|
c[9] = '0' + byte(uel%10)
|
||||||
|
c[10] = pv
|
||||||
|
}
|
||||||
|
c[11] = k
|
||||||
|
c[12] = frameEnd
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseStatus decodes a reply. Returns the azimuth, the elevation (0 for
|
||||||
|
// Rot1Prog) and the resolution the controller reported.
|
||||||
|
func ParseStatus(buf []byte, model Model) (az, el float64, resolution byte, err error) {
|
||||||
|
want := 12
|
||||||
|
if model == Rot1Prog {
|
||||||
|
want = 5
|
||||||
|
}
|
||||||
|
if len(buf) < want {
|
||||||
|
return 0, 0, 0, fmt.Errorf("spid: short reply (%d bytes, want %d)", len(buf), want)
|
||||||
|
}
|
||||||
|
if buf[0] != frameStart || buf[want-1] != frameEnd {
|
||||||
|
return 0, 0, 0, fmt.Errorf("spid: not a reply frame: % X", buf[:want])
|
||||||
|
}
|
||||||
|
az = float64(buf[1])*100 + float64(buf[2])*10 + float64(buf[3])
|
||||||
|
if model == Rot1Prog {
|
||||||
|
return az - 360, 0, 1, nil
|
||||||
|
}
|
||||||
|
az += float64(buf[4]) / 10
|
||||||
|
el = float64(buf[6])*100 + float64(buf[7])*10 + float64(buf[8]) + float64(buf[9])/10
|
||||||
|
resolution = buf[5]
|
||||||
|
if resolution == 0 {
|
||||||
|
resolution = 1
|
||||||
|
}
|
||||||
|
return az - 360, el - 360, resolution, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GoTo points the rotator at az (and el, on a Rot2Prog with elevation).
|
||||||
|
func (c *Client) GoTo(az int, el int) error {
|
||||||
|
c.mu.Lock()
|
||||||
|
res := c.resolution
|
||||||
|
c.mu.Unlock()
|
||||||
|
e := 0.0
|
||||||
|
if el >= 0 && c.model == Rot2Prog {
|
||||||
|
e = float64(el)
|
||||||
|
}
|
||||||
|
_, err := c.exchange(BuildSet(float64(az), e, res), 0)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop interrupts a rotation in progress.
|
||||||
|
func (c *Client) Stop() error {
|
||||||
|
// The controller answers a stop with its position, like a status — read it
|
||||||
|
// so the reply does not sit in the buffer and get taken for the ANSWER to
|
||||||
|
// the next poll, which would report a heading one command stale for ever.
|
||||||
|
_, err := c.exchange(BuildStop(), c.replyLen())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Heading reads the current position.
|
||||||
|
func (c *Client) Heading() (az int, el int, err error) {
|
||||||
|
buf, err := c.exchange(BuildStatus(), c.replyLen())
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
a, e, res, err := ParseStatus(buf, c.model)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
// Believe the controller about its own resolution: it is configured on the
|
||||||
|
// front panel, and a wrong guess here would scale every target we send.
|
||||||
|
c.mu.Lock()
|
||||||
|
c.resolution = res
|
||||||
|
c.mu.Unlock()
|
||||||
|
return int(a + 0.5), int(e + 0.5), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) replyLen() int {
|
||||||
|
if c.model == Rot1Prog {
|
||||||
|
return 5
|
||||||
|
}
|
||||||
|
return 12
|
||||||
|
}
|
||||||
|
|
||||||
|
// exchange opens the port, writes one frame and reads the expected reply.
|
||||||
|
func (c *Client) exchange(cmd []byte, wantBytes int) ([]byte, error) {
|
||||||
|
if c.port == "" {
|
||||||
|
return nil, fmt.Errorf("spid: no serial port configured")
|
||||||
|
}
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
p, err := serial.Open(c.port, &serial.Mode{
|
||||||
|
BaudRate: c.baud, DataBits: 8, Parity: serial.NoParity, StopBits: serial.OneStopBit,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("spid: open %s: %w", c.port, err)
|
||||||
|
}
|
||||||
|
defer p.Close()
|
||||||
|
// 600 baud is 60 bytes a second: a 12-byte reply takes a fifth of a second
|
||||||
|
// to arrive on the wire alone, before the controller has thought about it.
|
||||||
|
_ = p.SetReadTimeout(2 * time.Second)
|
||||||
|
if _, err := p.Write(cmd); err != nil {
|
||||||
|
return nil, fmt.Errorf("spid: write: %w", err)
|
||||||
|
}
|
||||||
|
if wantBytes == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
buf := make([]byte, 0, wantBytes)
|
||||||
|
tmp := make([]byte, wantBytes)
|
||||||
|
deadline := time.Now().Add(3 * time.Second)
|
||||||
|
for len(buf) < wantBytes && time.Now().Before(deadline) {
|
||||||
|
n, err := p.Read(tmp)
|
||||||
|
if n > 0 {
|
||||||
|
buf = append(buf, tmp[:n]...)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(buf) < wantBytes {
|
||||||
|
return nil, fmt.Errorf("spid: no reply from %s (%d of %d bytes) — check the port, the baud rate (%d) and that nothing else holds the controller",
|
||||||
|
c.port, len(buf), wantBytes, c.baud)
|
||||||
|
}
|
||||||
|
return buf, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
package spid
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The frames are pinned against Hamlib's spid.c, the reference implementation.
|
||||||
|
// This protocol has one trap and it is here: digits go out as ASCII and come
|
||||||
|
// back RAW. Getting that backwards points an antenna at a heading nobody asked
|
||||||
|
// for, and nothing in the app would notice.
|
||||||
|
func TestSetFrameMatchesTheReference(t *testing.T) {
|
||||||
|
// Hamlib: u_az = PH × (360 + az), then the four decimal digits as ASCII;
|
||||||
|
// PH and PV raw; K = 0x2F.
|
||||||
|
got := BuildSet(0, 0, 1) // 360 → "0360"
|
||||||
|
want := []byte{0x57, '0', '3', '6', '0', 0x01, '0', '3', '6', '0', 0x01, 0x2F, 0x20}
|
||||||
|
assertBytes(t, "az 0 res 1", got, want)
|
||||||
|
|
||||||
|
// 90° at half-degree resolution: 2 × 450 = 900 → "0900".
|
||||||
|
got = BuildSet(90, 0, 2)
|
||||||
|
want = []byte{0x57, '0', '9', '0', '0', 0x02, '0', '7', '2', '0', 0x02, 0x2F, 0x20}
|
||||||
|
assertBytes(t, "az 90 res 2", got, want)
|
||||||
|
|
||||||
|
// A quarter-degree controller, 359°: 4 × 719 = 2876.
|
||||||
|
got = BuildSet(359, 0, 4)
|
||||||
|
want = []byte{0x57, '2', '8', '7', '6', 0x04, '1', '4', '4', '0', 0x04, 0x2F, 0x20}
|
||||||
|
assertBytes(t, "az 359 res 4", got, want)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status and stop carry no position: every data byte is zero, only K differs.
|
||||||
|
func TestStatusAndStopFrames(t *testing.T) {
|
||||||
|
assertBytes(t, "status", BuildStatus(),
|
||||||
|
[]byte{0x57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x1F, 0x20})
|
||||||
|
assertBytes(t, "stop", BuildStop(),
|
||||||
|
[]byte{0x57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0F, 0x20})
|
||||||
|
}
|
||||||
|
|
||||||
|
// A reply's digits are RAW, and the 360 offset is what lets a pulse-counting
|
||||||
|
// controller report a rotator that has turned past north — the whole reason
|
||||||
|
// these rotators exist.
|
||||||
|
func TestParseStatusRot2Prog(t *testing.T) {
|
||||||
|
// 0x57 H1 H2 H3 H4 PH V1 V2 V3 V4 PV 0x20
|
||||||
|
// az digits 4,5,1,5 → 451.5 − 360 = 91.5
|
||||||
|
frame := []byte{0x57, 4, 5, 1, 5, 0x02, 3, 6, 0, 0, 0x02, 0x20}
|
||||||
|
az, el, res, err := ParseStatus(frame, Rot2Prog)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ParseStatus: %v", err)
|
||||||
|
}
|
||||||
|
if math.Abs(az-91.5) > 0.001 {
|
||||||
|
t.Errorf("az = %v, want 91.5", az)
|
||||||
|
}
|
||||||
|
if math.Abs(el-0) > 0.001 {
|
||||||
|
t.Errorf("el = %v, want 0", el)
|
||||||
|
}
|
||||||
|
if res != 2 {
|
||||||
|
t.Errorf("resolution = %d, want 2 — the controller's own value must win", res)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rot1Prog: five bytes, three digits, no elevation.
|
||||||
|
func TestParseStatusRot1Prog(t *testing.T) {
|
||||||
|
az, el, res, err := ParseStatus([]byte{0x57, 4, 5, 1, 0x20}, Rot1Prog)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ParseStatus: %v", err)
|
||||||
|
}
|
||||||
|
if math.Abs(az-91) > 0.001 {
|
||||||
|
t.Errorf("az = %v, want 91", az)
|
||||||
|
}
|
||||||
|
if el != 0 || res != 1 {
|
||||||
|
t.Errorf("el = %v, res = %d — Rot1Prog has neither", el, res)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A truncated or foreign frame must be refused rather than decoded into a
|
||||||
|
// heading: half a reply read as a position turns an antenna somewhere real.
|
||||||
|
func TestParseStatusRefusesRubbish(t *testing.T) {
|
||||||
|
for name, frame := range map[string][]byte{
|
||||||
|
"short": {0x57, 4, 5, 1},
|
||||||
|
"no start": {0x00, 4, 5, 1, 5, 1, 3, 6, 0, 0, 1, 0x20},
|
||||||
|
"no end": {0x57, 4, 5, 1, 5, 1, 3, 6, 0, 0, 1, 0x00},
|
||||||
|
"empty": {},
|
||||||
|
} {
|
||||||
|
if _, _, _, err := ParseStatus(frame, Rot2Prog); err == nil {
|
||||||
|
t.Errorf("%s: decoded without complaint", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertBytes(t *testing.T, what string, got, want []byte) {
|
||||||
|
t.Helper()
|
||||||
|
if len(got) != len(want) {
|
||||||
|
t.Fatalf("%s: % X\nwant % X", what, got, want)
|
||||||
|
}
|
||||||
|
for i := range want {
|
||||||
|
if got[i] != want[i] {
|
||||||
|
t.Fatalf("%s: % X\nwant % X", what, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package spe
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// decodeCSV marks the client connected on EVERY frame it parses, and the poll
|
||||||
|
// goroutine can be mid-read while PowerOff runs. So the frame from a second ago
|
||||||
|
// landed after PowerOff had marked the amp offline and put it straight back —
|
||||||
|
// the console kept showing the amplifier on until the operator pressed OFF a
|
||||||
|
// second time.
|
||||||
|
func TestFrameInFlightDoesNotResurrectASwitchedOffAmp(t *testing.T) {
|
||||||
|
c := &Client{}
|
||||||
|
const frame = ",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,"
|
||||||
|
|
||||||
|
// Normal running: a frame marks it connected and reads OPERATE.
|
||||||
|
c.decodeCSV(frame)
|
||||||
|
if !c.GetStatus().Connected || !c.GetStatus().Operate {
|
||||||
|
t.Fatal("a status frame should mark the amp connected")
|
||||||
|
}
|
||||||
|
|
||||||
|
// The operator presses OFF. This is what PowerOff does, in order.
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.offUntil = time.Now().Add(3 * time.Second)
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
c.setErr(errSwitchedOff{})
|
||||||
|
|
||||||
|
// A frame that was already on the wire arrives now.
|
||||||
|
c.decodeCSV(frame)
|
||||||
|
|
||||||
|
if c.GetStatus().Connected {
|
||||||
|
t.Error("a frame from before the switch-off put the amp back on — this is the double-click on OFF")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An amp switched back on at its own front panel must reappear without OpsLog
|
||||||
|
// being told, so the suppression has to expire rather than latch.
|
||||||
|
func TestSuppressionExpires(t *testing.T) {
|
||||||
|
c := &Client{}
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.offUntil = time.Now().Add(-time.Second) // window already past
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
c.setErr(errSwitchedOff{})
|
||||||
|
|
||||||
|
c.decodeCSV(",13K,O,R,A,1,05,1b,0r,M,0000, 0.00, 0.00, 1.3, 0.0, 26,000,000,N,N,")
|
||||||
|
if !c.GetStatus().Connected {
|
||||||
|
t.Error("an amp answering after the window must come back on its own")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type errSwitchedOff struct{}
|
||||||
|
|
||||||
|
func (errSwitchedOff) Error() string { return "switched off" }
|
||||||
+56
-2
@@ -91,6 +91,15 @@ type Client struct {
|
|||||||
statusMu sync.RWMutex
|
statusMu sync.RWMutex
|
||||||
status Status
|
status Status
|
||||||
lastRaw string // last raw status payload logged (log only on change)
|
lastRaw string // last raw status payload logged (log only on change)
|
||||||
|
// offUntil suppresses status frames that were already in flight when the amp
|
||||||
|
// was switched off. decodeCSV marks the client connected on every frame it
|
||||||
|
// parses, and the poll goroutine can be mid-read while PowerOff runs — so the
|
||||||
|
// frame from a second ago resurrected an amplifier the operator had just
|
||||||
|
// switched off, and the console only caught up when they pressed OFF twice.
|
||||||
|
//
|
||||||
|
// Time-bounded rather than a latch: an amp switched back on at its own front
|
||||||
|
// panel must reappear on its own.
|
||||||
|
offUntil time.Time
|
||||||
|
|
||||||
stop chan struct{}
|
stop chan struct{}
|
||||||
running bool
|
running bool
|
||||||
@@ -177,6 +186,12 @@ func (c *Client) PowerOn() error {
|
|||||||
if c.GetStatus().Connected {
|
if c.GetStatus().Connected {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
// Switching on cancels the suppression window: the operator wants frames
|
||||||
|
// believed again, and waiting out a timer they cannot see would read as the
|
||||||
|
// power-on having failed.
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.offUntil = time.Time{}
|
||||||
|
c.statusMu.Unlock()
|
||||||
// The poll goroutine may still be inside a blocking read on the old handle;
|
// The poll goroutine may still be inside a blocking read on the old handle;
|
||||||
// Windows keeps the port "busy" until that read times out (ioTimeout). Retry
|
// Windows keeps the port "busy" until that read times out (ioTimeout). Retry
|
||||||
// the open for a little longer than that.
|
// the open for a little longer than that.
|
||||||
@@ -205,9 +220,17 @@ func (c *Client) PowerOn() error {
|
|||||||
time.Sleep(wakePulse)
|
time.Sleep(wakePulse)
|
||||||
return set(true)
|
return set(true)
|
||||||
}
|
}
|
||||||
if err = pulse(sp.SetRTS); err == nil {
|
// Each line reported separately. Not every USB-serial chip honours the modem
|
||||||
err = pulse(sp.SetDTR)
|
// lines, and some refuse them without saying so — on an amplifier that never
|
||||||
|
// wakes, "which of the two failed, or neither" is the whole diagnosis, and a
|
||||||
|
// single combined error cannot give it.
|
||||||
|
rtsErr := pulse(sp.SetRTS)
|
||||||
|
dtrErr := pulse(sp.SetDTR)
|
||||||
|
if err = rtsErr; err == nil {
|
||||||
|
err = dtrErr
|
||||||
}
|
}
|
||||||
|
applog.Printf("spe: power ON pulse on %s (model=%q transport=%s) — RTS err=%v, DTR err=%v",
|
||||||
|
c.cfg.ComPort, c.GetStatus().Model, c.cfg.Transport, rtsErr, dtrErr)
|
||||||
// Booting, the amp re-enumerates its USB interface, which leaves this handle
|
// Booting, the amp re-enumerates its USB interface, which leaves this handle
|
||||||
// pointing at a device that no longer exists — the amp came up and OpsLog
|
// pointing at a device that no longer exists — the amp came up and OpsLog
|
||||||
// still read "offline". Drop it; the poll loop reopens a fresh one as soon as
|
// still read "offline". Drop it; the poll loop reopens a fresh one as soon as
|
||||||
@@ -216,6 +239,26 @@ func (c *Client) PowerOn() error {
|
|||||||
c.dropLocked()
|
c.dropLocked()
|
||||||
c.mu.Unlock()
|
c.mu.Unlock()
|
||||||
applog.Printf("spe: power ON — RTS then DTR pulsed on %s (err=%v)", c.cfg.ComPort, err)
|
applog.Printf("spe: power ON — RTS then DTR pulsed on %s (err=%v)", c.cfg.ComPort, err)
|
||||||
|
|
||||||
|
// Say whether it actually woke. "The ON button does nothing" is a report with
|
||||||
|
// three different causes — the pulse was refused, the pulse went out and the
|
||||||
|
// amp ignored it, or the amp came up and the UI missed it — and only the log
|
||||||
|
// can separate them. Watched off the caller's goroutine so the click returns
|
||||||
|
// at once.
|
||||||
|
go func() {
|
||||||
|
deadline := time.Now().Add(15 * time.Second)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
if c.GetStatus().Connected {
|
||||||
|
applog.Printf("spe: power ON — amp answered after %.0fs",
|
||||||
|
15-time.Until(deadline).Seconds())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
applog.Printf("spe: power ON — no answer within 15s on %s. The pulse was sent; "+
|
||||||
|
"either this amplifier does not wake on RTS/DTR, or the adapter does not drive those lines",
|
||||||
|
c.cfg.ComPort)
|
||||||
|
}()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -226,6 +269,14 @@ func (c *Client) PowerOn() error {
|
|||||||
// the poll loop keeps reopening the port with both lines high and that has
|
// the poll loop keeps reopening the port with both lines high and that has
|
||||||
// never woken it — only the deliberate low→high sequence in PowerOn does.
|
// never woken it — only the deliberate low→high sequence in PowerOn does.
|
||||||
func (c *Client) PowerOff() error {
|
func (c *Client) PowerOff() error {
|
||||||
|
// Close the window BEFORE the key goes out, so a frame already travelling up
|
||||||
|
// the wire cannot land after setErr and undo it. Three seconds covers a poll
|
||||||
|
// interval with room to spare; after that a real answer means the amp is
|
||||||
|
// genuinely alive again, which is what happens if it is switched back on at
|
||||||
|
// its own front panel.
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.offUntil = time.Now().Add(3 * time.Second)
|
||||||
|
c.statusMu.Unlock()
|
||||||
err := c.sendCmd(cmdOff)
|
err := c.sendCmd(cmdOff)
|
||||||
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
applog.Printf("spe: power OFF — SWITCH OFF key sent (err=%v)", err)
|
||||||
// Drop the link and mark the amp offline at once, exactly as a fresh start
|
// Drop the link and mark the amp offline at once, exactly as a fresh start
|
||||||
@@ -482,6 +533,9 @@ func (c *Client) decodeCSV(payload string) {
|
|||||||
c.lastRaw = payload
|
c.lastRaw = payload
|
||||||
applog.Printf("spe: status raw=%q fields=%d", payload, len(f))
|
applog.Printf("spe: status raw=%q fields=%d", payload, len(f))
|
||||||
}
|
}
|
||||||
|
if time.Now().Before(c.offUntil) {
|
||||||
|
return // a frame from before the switch-off — the amp is on its way down
|
||||||
|
}
|
||||||
c.status.Connected = true
|
c.status.Connected = true
|
||||||
c.status.LastError = ""
|
c.status.LastError = ""
|
||||||
// The real frame carries a leading empty field (it starts with a comma), so the
|
// The real frame carries a leading empty field (it starts with a comma), so the
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user