Compare commits
83
Commits
00cab6b204
...
v0.16.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
18438d7737 | ||
|
|
97e24ea24f | ||
|
|
3e199f9ab6 | ||
|
|
8740a4ba66 | ||
|
|
8ccad7ca65 | ||
|
|
fa7df57435 | ||
|
|
812e4f05e5 | ||
|
|
6ec31b61ce | ||
|
|
93c8f6b9d3 | ||
|
|
65c22232dd | ||
|
|
edede0bc1e | ||
|
|
2712902057 | ||
|
|
9281645359 | ||
|
|
a05dd6b3a9 | ||
|
|
a2401d7fd3 | ||
|
|
053b351dab | ||
|
|
64f2d38d87 | ||
|
|
299184712a | ||
|
|
76c1e2df60 | ||
|
|
165f33caa5 | ||
|
|
464a1c702c | ||
|
|
19c5045dc6 | ||
|
|
fa09251039 | ||
|
|
d6626d96d0 | ||
|
|
8b831145ad | ||
|
|
81c60628c6 | ||
|
|
678787ec62 | ||
|
|
79dc20a859 | ||
|
|
824971d0a1 | ||
|
|
60bcd2422d | ||
|
|
9b0d7ce1dc | ||
|
|
572e8ca538 | ||
|
|
6ac9783f7c | ||
|
|
725600c341 | ||
|
|
5d9765be09 | ||
|
|
b302d4d87b | ||
|
|
8b7c42ec9b | ||
|
|
cde0add5e0 | ||
|
|
0e2ef317c3 | ||
|
|
a9f2e515e1 | ||
|
|
260172cd6d | ||
|
|
4b5e2e0b72 | ||
|
|
4a6ea45665 | ||
|
|
95d37da3bb | ||
|
|
e1b3f0faf3 | ||
|
|
6379e2cd1f | ||
|
|
2228816057 | ||
|
|
32878c17be | ||
|
|
079d0c32df | ||
|
|
45d081ac0c | ||
|
|
183db7ac2b | ||
|
|
4d074de27e | ||
|
|
679e8f8d39 | ||
|
|
dd2deee939 | ||
|
|
cdd71b17c8 | ||
|
|
e8eedcc1dc | ||
|
|
3c47366f56 | ||
|
|
bd11bb4763 | ||
|
|
40e95e6a16 | ||
|
|
cc0f9ffc64 | ||
|
|
e1f1ab4922 | ||
|
|
b6d991b799 | ||
|
|
59f1775fcd | ||
|
|
b2a8b1946f | ||
|
|
8b1609f5ce | ||
|
|
bde1195b34 | ||
|
|
abdab22010 | ||
|
|
16dc864dbd | ||
|
|
01235624ee | ||
|
|
a7bbc53c35 | ||
|
|
3d15f20c7f | ||
|
|
e5c6bddb29 | ||
|
|
75ee5344a4 | ||
|
|
957182611d | ||
|
|
69d0780bac | ||
|
|
33af122964 | ||
|
|
22e3bb4a18 | ||
|
|
29fd832bcd | ||
|
|
67203cd4a8 | ||
|
|
08162fa126 | ||
|
|
81e505e040 | ||
|
|
0b3e22c97e | ||
|
|
d3ba7c71f4 |
+10
-1
@@ -13,7 +13,16 @@
|
|||||||
"Bash(git config *)",
|
"Bash(git config *)",
|
||||||
"Bash(ls \"/c/Program Files/Git/mingw64/bin/git-credential-manager\"*.exe)",
|
"Bash(ls \"/c/Program Files/Git/mingw64/bin/git-credential-manager\"*.exe)",
|
||||||
"Bash(ls \"/c/Program Files/Git/mingw64/libexec/git-core/git-credential-manager\"*.exe)",
|
"Bash(ls \"/c/Program Files/Git/mingw64/libexec/git-core/git-credential-manager\"*.exe)",
|
||||||
"Bash(which git-credential-manager *)"
|
"Bash(which git-credential-manager *)",
|
||||||
|
"Bash(gofmt -w internal/ultrabeam/ultrabeam.go)",
|
||||||
|
"Bash(cd \"c:/Perso/Seafile/Programmation/Golang/OpsLog/frontend\" && npx tsc --noEmit 2>&1 | grep -v \"npm notice\" | head && cd .. && /c/Users/legre/go/bin/wails build 2>&1 | tail -2 && ls -la --time-style=+%H:%M build/bin/OpsLog.exe)",
|
||||||
|
"Read(//c/Perso/Seafile/Programmation/Golang/**)",
|
||||||
|
"Bash(gofmt -w internal/qslcard/*.go)",
|
||||||
|
"Bash(awk '{print $3}')",
|
||||||
|
"Bash(xargs grep -n \"CREATE TABLE\\\\|key\\\\|value\")",
|
||||||
|
"Bash(ls -la .claude/)",
|
||||||
|
"Bash(cat .claude/settings.local.json)",
|
||||||
|
"Bash(cat .claude/settings.json)"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
{
|
||||||
|
"permissions": {
|
||||||
|
"allow": [
|
||||||
|
"Bash(go:*)",
|
||||||
|
"Bash(gofmt:*)",
|
||||||
|
"Bash(/c/Users/legre/go/bin/wails:*)",
|
||||||
|
"Bash(wails:*)",
|
||||||
|
"Bash(npm:*)",
|
||||||
|
"Bash(npx:*)",
|
||||||
|
"Bash(grep:*)",
|
||||||
|
"Bash(rg:*)",
|
||||||
|
"Bash(cat:*)",
|
||||||
|
"Bash(ls:*)",
|
||||||
|
"Bash(find:*)",
|
||||||
|
"Bash(echo:*)",
|
||||||
|
"Bash(head:*)",
|
||||||
|
"Bash(tail:*)",
|
||||||
|
"Bash(awk:*)",
|
||||||
|
"Bash(sed:*)",
|
||||||
|
"Bash(sort:*)",
|
||||||
|
"Bash(uniq:*)",
|
||||||
|
"Bash(wc:*)",
|
||||||
|
"Bash(xargs:*)",
|
||||||
|
"Bash(for f in *)",
|
||||||
|
"Bash(git status:*)",
|
||||||
|
"Bash(git diff:*)",
|
||||||
|
"Bash(git log:*)",
|
||||||
|
"Bash(git show:*)",
|
||||||
|
"Bash(curl -sI --max-time 10 https://raw.githubusercontent.com/google/fonts/main/ofl/archivoblack/ArchivoBlack-Regular.ttf)"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -39,6 +39,7 @@ desktop.ini
|
|||||||
hamlog.db*
|
hamlog.db*
|
||||||
cty.dat
|
cty.dat
|
||||||
cat.log
|
cat.log
|
||||||
|
*.adi
|
||||||
|
|
||||||
# --- Secrets ---
|
# --- Secrets ---
|
||||||
.env
|
.env
|
||||||
|
|||||||
@@ -1,19 +1,125 @@
|
|||||||
# README
|
# OpsLog
|
||||||
|
|
||||||
## About
|
A modern, fast ham-radio logger for Windows — Log4OM-style entry, real-time CAT
|
||||||
|
(OmniRig **and** native FlexRadio/SmartSDR), DX cluster, awards tracking, maps,
|
||||||
|
QSL management and a QSL-card designer. Built with **Wails v2** (Go backend +
|
||||||
|
React/TypeScript frontend), **pure Go** (no CGO): SQLite for configuration,
|
||||||
|
optional **shared MySQL** for the logbook so several operators can run one log.
|
||||||
|
|
||||||
This is the official Wails Svelte-TS template.
|
Developed by **F4BPO**.
|
||||||
|
|
||||||
## Live Development
|
---
|
||||||
|
|
||||||
To run in live development mode, run `wails dev` in the project directory. This will run a Vite development
|
## Building / developing
|
||||||
server that will provide very fast hot reload of your frontend changes. If you want to develop in a browser
|
|
||||||
and have access to your Go methods, there is also a dev server that runs on http://localhost:34115. Connect
|
|
||||||
to this in your browser, and you can call your Go code from devtools.
|
|
||||||
|
|
||||||
## Building
|
- **Dev:** `wails dev` (Vite hot-reload; Go methods reachable at http://localhost:34115).
|
||||||
|
- **Build:** `wails build` (use the project's wails v2.11 — `~/go/bin/wails.exe`).
|
||||||
|
- **Regenerate Go↔TS bindings** after changing exported `App` methods:
|
||||||
|
`wails generate module`.
|
||||||
|
- **Release:** `.vscode/release.ps1` (Ctrl+Shift+P → *Tasks: Run Task* →
|
||||||
|
*Release OpsLog*) — bumps the version, pushes source to Gitea, builds the exe
|
||||||
|
and publishes it to Gitea + GitHub releases.
|
||||||
|
|
||||||
To build a redistributable, production mode package, use `wails build`.
|
---
|
||||||
|
|
||||||
|
## Logging
|
||||||
|
|
||||||
|
- **Log4OM-style entry strip:** callsign, RST tx/rx, name/QTH/grid, band/mode,
|
||||||
|
TX/RX frequency (split), start/end time, comment/note. The contacted entity's
|
||||||
|
**flag** is shown large next to the RST fields.
|
||||||
|
- **Callsign lookup** (QRZ.com / HamQTH) with photo, auto-fill of name/QTH/grid
|
||||||
|
and the QRZ.com tab.
|
||||||
|
- **Offline DXCC** resolution from `cty.dat` (country, CQ/ITU zones, continent),
|
||||||
|
with `/MM` `/AM` and call-area (`/8`, `/W6`) handling, plus ClubLog DXpedition
|
||||||
|
date overrides.
|
||||||
|
- **Recent QSOs**, **Worked-before** matrix (per band/mode slot), bulk re-resolve
|
||||||
|
from cty/QRZ/ClubLog, bulk send to QSL services.
|
||||||
|
- **Profiles:** every setting is per-profile; each profile can point its logbook
|
||||||
|
at the local SQLite file or a **shared MySQL** database (multi-operator).
|
||||||
|
|
||||||
|
## Maps & antenna
|
||||||
|
|
||||||
|
- **Main view = two configurable panes** (per profile, Settings → General →
|
||||||
|
*Main view*): great-circle map, locator (street) map, the cluster grid, the
|
||||||
|
worked-before grid, or the **FlexRadio controls**.
|
||||||
|
- **Great-circle map** with short/long-path distance & azimuth, selectable
|
||||||
|
basemaps (Light / Voyager / Street / Satellite, all key-free and labelled) and
|
||||||
|
the **antenna beam lobe(s)** drawn from the rotor azimuth.
|
||||||
|
- **Rotor compass** (azimuthal-equidistant, click-to-turn) driven by PstRotator.
|
||||||
|
- **Ultrabeam** support (Normal / 180° reverse / Bidirectional): the radiating
|
||||||
|
direction is shown in green and the **mechanical boom** in grey, on both the
|
||||||
|
compass and the map, so you never lose track of where the antenna points.
|
||||||
|
|
||||||
|
## DX Cluster
|
||||||
|
|
||||||
|
- Multiple cluster servers with auto-reconnect, a master for commands.
|
||||||
|
- **Filter sidebar** (callsign search, hide-worked, group duplicates, band /
|
||||||
|
mode / status / source) shared by the Cluster tab and the Main-view cluster
|
||||||
|
pane, with a show/hide toggle.
|
||||||
|
- Per-spot **status** (new / new-band / new-slot / worked), click-to-tune the
|
||||||
|
rig, and a multi-band **Band Map** (panadapter-style strips).
|
||||||
|
|
||||||
|
## CAT control
|
||||||
|
|
||||||
|
- **OmniRig** backend (Rig 1/2, hot-swap), and a native **FlexRadio (SmartSDR)**
|
||||||
|
backend over the radio's TCP API — real-time slice freq/mode/split, auto
|
||||||
|
reconnect, UDP discovery, and **panadapter spots** (cluster spots pushed to the
|
||||||
|
Flex display, click → fill the call).
|
||||||
|
- Mode is taken from the radio; the digital sub-mode (FT4 vs FT8) is inferred
|
||||||
|
from the frequency.
|
||||||
|
|
||||||
|
### FlexRadio control tab (SmartSDR-style)
|
||||||
|
|
||||||
|
Shown only when the CAT backend is a FlexRadio:
|
||||||
|
|
||||||
|
- **Transmit:** RF power, tune power, TUNE, MOX, speech processor (NOR/DX/DX+),
|
||||||
|
VOX (+ level + delay), monitor (+ level), mic gain.
|
||||||
|
- **Receive (active slice):** AGC mode/threshold, audio level, NB / NR / ANF.
|
||||||
|
- **Antenna tuner (ATU):** tune / bypass / memories.
|
||||||
|
- **Amplifier:** PowerGenius XL operate/standby + fault.
|
||||||
|
- **Live meters** over the UDP VITA-49 stream: S-meter (S-units), forward power
|
||||||
|
(W), SWR, ALC, PA temperature, voltage, plus the amplifier's meters.
|
||||||
|
|
||||||
|
## Keyers & audio
|
||||||
|
|
||||||
|
- **WinKeyer** CW keyer (macros, F-key macros, auto-call repeat).
|
||||||
|
- **Digital Voice Keyer** (DVK) message playback.
|
||||||
|
- **QSO audio recording** (SSB/DAX) archived per QSO; disabled for CW (no DAX
|
||||||
|
audio in CW).
|
||||||
|
|
||||||
|
## QSL & awards
|
||||||
|
|
||||||
|
- **Awards engine:** built-in + custom award definitions (shared **globally**
|
||||||
|
across profiles), worked/confirmed/validated by band & mode, OR rules and
|
||||||
|
manual reference assignment, live reference detection on call entry, and a
|
||||||
|
**Rescan** that re-pulls the logbook (picks up fresh LoTW/QRZ confirmations).
|
||||||
|
- **QSL services:** ClubLog (batched ADIF upload), LoTW, QRZ.com, eQSL — upload
|
||||||
|
and **confirmation download** (which auto-refreshes the award stats).
|
||||||
|
- **QSL Card Designer** (see below).
|
||||||
|
- **E-mail eQSL:** right-click a QSO → *Send eQSL by e-mail* via the configured
|
||||||
|
SMTP account. (Outlook/Hotmail disable basic-auth SMTP — use Gmail with an app
|
||||||
|
password, or a Microsoft app password.)
|
||||||
|
|
||||||
|
## Multi-operator live status (special events)
|
||||||
|
|
||||||
|
For a multi-op special-event call on a shared MySQL logbook (e.g. **TM74TFR**):
|
||||||
|
Settings → General → *Publish live operator status*. Each OpsLog instance
|
||||||
|
heartbeats its current activity (operator call, band, frequency, mode) into a
|
||||||
|
`live_status` table every ~15 s. A small PHP renderer
|
||||||
|
([`docs/livestatus/tm74-status.php`](docs/livestatus/tm74-status.php)) on your
|
||||||
|
own web server reads that table and produces a live page/image you can embed on
|
||||||
|
the station's **QRZ.com** bio (`<img src="…/tm74-status.php?img=1">`). OpsLog
|
||||||
|
only writes to the DB — it is not a web server.
|
||||||
|
|
||||||
|
## Other
|
||||||
|
|
||||||
|
- **Autostart:** launch external programs (WSJT-X, JTAlert, rotator control…) at
|
||||||
|
OpsLog startup, skipping any already running.
|
||||||
|
- **Update check** at startup with a toast (toggleable).
|
||||||
|
- **Anonymous usage telemetry** (a once-a-day heartbeat: random install ID +
|
||||||
|
version + OS — no callsign or QSO data; opt-out in Preferences).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## QSL Card Designer
|
## QSL Card Designer
|
||||||
|
|
||||||
@@ -40,3 +146,13 @@ Fonts: Archivo Black, Lilita One, Baloo 2, Oswald, Great Vibes, Allura (all
|
|||||||
OFL, embedded — licenses in `internal/qslcard/assets/fonts/`); Cooper Black is
|
OFL, embedded — licenses in `internal/qslcard/assets/fonts/`); Cooper Black is
|
||||||
offered when MS Office installed it. Flags: flag-icons (MIT), embedded for the
|
offered when MS Office installed it. Flags: flag-icons (MIT), embedded for the
|
||||||
commonly-worked DXCC entities.
|
commonly-worked DXCC entities.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Data & storage
|
||||||
|
|
||||||
|
- **Config** (settings, profiles, rigs/antennas, cluster nodes, lookup cache,
|
||||||
|
award lists, QSL templates) always lives in the local SQLite file under
|
||||||
|
`data/` — instant even when the logbook is on a far-away MySQL.
|
||||||
|
- **Logbook** (QSOs) lives where the active profile points it: the local SQLite
|
||||||
|
file or a per-profile shared **MySQL** database.
|
||||||
|
|||||||
@@ -0,0 +1,149 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/audio"
|
||||||
|
"hamlog/internal/cwdecode"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CW decoder: taps the RX audio device (the same "From radio" capture the DVK
|
||||||
|
// and QSO recorder use) and streams decoded Morse text to the UI. It is started
|
||||||
|
// only by the frontend, and only while the entry mode is CW.
|
||||||
|
//
|
||||||
|
// Pitch targeting: the single-channel decoder is far more reliable when it locks
|
||||||
|
// to a KNOWN pitch (a narrow filter at the signal frequency, like a skimmer)
|
||||||
|
// instead of auto-searching for the loudest tone. So we follow the radio's CW
|
||||||
|
// pitch (FlexRadio cw_pitch) when available — or a manual override — and fall
|
||||||
|
// back to auto-search otherwise.
|
||||||
|
|
||||||
|
// cwTargetPitch returns the pitch (Hz) the decoder should lock to: the manual
|
||||||
|
// override if set, else the FlexRadio's CW pitch when it's in CW, else 0 (auto).
|
||||||
|
func (a *App) cwTargetPitch() int {
|
||||||
|
if a.cwPitchHz > 0 {
|
||||||
|
return a.cwPitchHz
|
||||||
|
}
|
||||||
|
if a.cat != nil {
|
||||||
|
if st, ok := a.cat.FlexState(); ok && st.Available {
|
||||||
|
// Only trust the radio's pitch when it's actually in CW.
|
||||||
|
if st.Mode == "CW" || st.Mode == "CWL" || st.Mode == "CWU" {
|
||||||
|
if st.CWPitch > 0 {
|
||||||
|
return st.CWPitch
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartCWDecoder begins decoding CW from the configured RX audio device. The
|
||||||
|
// frontend calls this when the decoder toggle is on AND the mode is CW. Safe to
|
||||||
|
// call repeatedly; a second call is a no-op while already running.
|
||||||
|
func (a *App) StartCWDecoder() error {
|
||||||
|
a.cwMu.Lock()
|
||||||
|
defer a.cwMu.Unlock()
|
||||||
|
if a.cwStop != nil {
|
||||||
|
return nil // already running
|
||||||
|
}
|
||||||
|
dev := ""
|
||||||
|
if a.settings != nil {
|
||||||
|
dev, _ = a.settings.Get(a.ctx, keyAudioFromRadio)
|
||||||
|
}
|
||||||
|
if dev == "" {
|
||||||
|
return fmt.Errorf("no RX audio device configured (set \"From radio\" in Audio settings)")
|
||||||
|
}
|
||||||
|
|
||||||
|
dec := cwdecode.New(audio.SampleRate,
|
||||||
|
func(text string) {
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "cw:text", text)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
func(st cwdecode.Status) {
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "cw:status", st)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
dec.SetTarget(a.cwTargetPitch())
|
||||||
|
a.cwDecoder = dec
|
||||||
|
|
||||||
|
stop := make(chan struct{})
|
||||||
|
a.cwStop = stop
|
||||||
|
go func() {
|
||||||
|
if err := audio.StreamCapture(dev, stop, dec.Process); err != nil {
|
||||||
|
applog.Printf("cw: capture failed: %v", err)
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "cw:error", err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.cwMu.Lock()
|
||||||
|
if a.cwStop == stop {
|
||||||
|
a.cwStop = nil
|
||||||
|
a.cwDecoder = nil
|
||||||
|
}
|
||||||
|
a.cwMu.Unlock()
|
||||||
|
}()
|
||||||
|
// Follow the radio's CW pitch live (every second) while this run is active.
|
||||||
|
go a.cwFollowPitch(stop, dec)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// cwFollowPitch keeps the decoder locked to the current target pitch until stop.
|
||||||
|
func (a *App) cwFollowPitch(stop <-chan struct{}, dec *cwdecode.Decoder) {
|
||||||
|
t := time.NewTicker(time.Second)
|
||||||
|
defer t.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-stop:
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
dec.SetTarget(a.cwTargetPitch())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// StopCWDecoder halts the CW decoder if running.
|
||||||
|
func (a *App) StopCWDecoder() {
|
||||||
|
a.cwMu.Lock()
|
||||||
|
stop := a.cwStop
|
||||||
|
a.cwStop = nil
|
||||||
|
a.cwDecoder = nil
|
||||||
|
a.cwMu.Unlock()
|
||||||
|
if stop != nil {
|
||||||
|
close(stop)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CWDecoderRunning reports whether the decoder is currently capturing.
|
||||||
|
func (a *App) CWDecoderRunning() bool {
|
||||||
|
a.cwMu.Lock()
|
||||||
|
defer a.cwMu.Unlock()
|
||||||
|
return a.cwStop != nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetCWDecoderPitch sets a manual decode pitch (Hz); 0 returns to auto (follow
|
||||||
|
// the Flex CW pitch, or search). Applies live to a running decoder.
|
||||||
|
func (a *App) SetCWDecoderPitch(hz int) {
|
||||||
|
if hz < 0 {
|
||||||
|
hz = 0
|
||||||
|
}
|
||||||
|
a.cwMu.Lock()
|
||||||
|
a.cwPitchHz = hz
|
||||||
|
dec := a.cwDecoder
|
||||||
|
a.cwMu.Unlock()
|
||||||
|
if dec != nil {
|
||||||
|
dec.SetTarget(a.cwTargetPitch())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCWDecoderPitch returns the manual override (0 = auto / follow Flex).
|
||||||
|
func (a *App) GetCWDecoderPitch() int {
|
||||||
|
a.cwMu.Lock()
|
||||||
|
defer a.cwMu.Unlock()
|
||||||
|
return a.cwPitchHz
|
||||||
|
}
|
||||||
+13
-12
@@ -34,6 +34,10 @@ const (
|
|||||||
keyQSLAutoSend = "qsl.auto_send" // "1" → render+send an eQSL on log when an e-mail and default template exist
|
keyQSLAutoSend = "qsl.auto_send" // "1" → render+send an eQSL on log when an e-mail and default template exist
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// appQSLCardSentField is the ADIF APP_ field stamping when OpsLog e-mailed its
|
||||||
|
// own QSL card. Deliberately NOT eqsl_sent (that's eQSL.cc's, kept independent).
|
||||||
|
const appQSLCardSentField = "APP_OPSLOG_QSL_SENT"
|
||||||
|
|
||||||
const (
|
const (
|
||||||
defaultQSLEmailSubject = "eQSL — {CALL} de {MYCALL}"
|
defaultQSLEmailSubject = "eQSL — {CALL} de {MYCALL}"
|
||||||
defaultQSLEmailBody = "Hi,\n\nThank you for our QSO! Please find attached your eQSL card.\n\n{DATE} · {BAND} · {MODE}\n\n73,\n{MYCALL}"
|
defaultQSLEmailBody = "Hi,\n\nThank you for our QSO! Please find attached your eQSL card.\n\n{DATE} · {BAND} · {MODE}\n\n73,\n{MYCALL}"
|
||||||
@@ -74,7 +78,7 @@ type QSLPresetInfo struct {
|
|||||||
// so picking through the native dialog is the reliable route to real paths).
|
// so picking through the native dialog is the reliable route to real paths).
|
||||||
func (a *App) QSLPickPhotos() ([]string, error) {
|
func (a *App) QSLPickPhotos() ([]string, error) {
|
||||||
return wruntime.OpenMultipleFilesDialog(a.ctx, wruntime.OpenDialogOptions{
|
return wruntime.OpenMultipleFilesDialog(a.ctx, wruntime.OpenDialogOptions{
|
||||||
Title: "Choose card photos (1–3)",
|
Title: "Choose card photos (1–5)",
|
||||||
Filters: []wruntime.FileFilter{
|
Filters: []wruntime.FileFilter{
|
||||||
{DisplayName: "Photos (*.jpg;*.jpeg;*.png)", Pattern: "*.jpg;*.jpeg;*.png"},
|
{DisplayName: "Photos (*.jpg;*.jpeg;*.png)", Pattern: "*.jpg;*.jpeg;*.png"},
|
||||||
},
|
},
|
||||||
@@ -87,8 +91,8 @@ func (a *App) QSLGenerateProposals(photoPaths []string) ([]string, error) {
|
|||||||
if len(photoPaths) == 0 {
|
if len(photoPaths) == 0 {
|
||||||
return nil, fmt.Errorf("no photos selected")
|
return nil, fmt.Errorf("no photos selected")
|
||||||
}
|
}
|
||||||
if len(photoPaths) > 3 {
|
if len(photoPaths) > 5 {
|
||||||
return nil, fmt.Errorf("at most 3 photos (got %d)", len(photoPaths))
|
return nil, fmt.Errorf("at most 5 photos (got %d)", len(photoPaths))
|
||||||
}
|
}
|
||||||
photos := make([]qslcard.PhotoAnalysis, 0, len(photoPaths))
|
photos := make([]qslcard.PhotoAnalysis, 0, len(photoPaths))
|
||||||
for _, p := range photoPaths {
|
for _, p := range photoPaths {
|
||||||
@@ -425,17 +429,14 @@ func (a *App) SendEQSL(qsoID int64, templateID int64, jpegB64 string) error {
|
|||||||
applog.Printf("qsl: send eQSL to %s (%s) failed: %v", to, q.Callsign, err)
|
applog.Printf("qsl: send eQSL to %s (%s) failed: %v", to, q.Callsign, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// Stamp the standard ADIF eqsl_sent flag plus an app-specific timestamp of
|
// Record WHEN OpsLog e-mailed its own QSL card, in a dedicated app field —
|
||||||
// the eQSL-card e-mail (APP_OPSLOG_QSL_SENT) — distinct from eqsl_sent, which
|
// NOT the ADIF eqsl_sent flag, which belongs to eQSL.cc and must stay
|
||||||
// an eQSL.cc upload may also set. q came straight from GetByID, so a full
|
// independent. q came straight from GetByID, so a full Update rewrites the
|
||||||
// Update rewrites the row unchanged apart from these fields.
|
// row unchanged apart from this field.
|
||||||
now := time.Now().UTC()
|
|
||||||
q.EQSLSent = "Y"
|
|
||||||
q.EQSLSentDate = now.Format("20060102")
|
|
||||||
if q.Extras == nil {
|
if q.Extras == nil {
|
||||||
q.Extras = map[string]string{}
|
q.Extras = map[string]string{}
|
||||||
}
|
}
|
||||||
q.Extras["APP_OPSLOG_QSL_SENT"] = now.Format(time.RFC3339)
|
q.Extras[appQSLCardSentField] = time.Now().UTC().Format(time.RFC3339)
|
||||||
if err := a.qso.Update(a.ctx, q); err != nil {
|
if err := a.qso.Update(a.ctx, q); err != nil {
|
||||||
applog.Printf("qsl: eQSL sent to %s but marking failed: %v", q.Callsign, err)
|
applog.Printf("qsl: eQSL sent to %s but marking failed: %v", q.Callsign, err)
|
||||||
return fmt.Errorf("eQSL sent but status not saved: %w", err)
|
return fmt.Errorf("eQSL sent but status not saved: %w", err)
|
||||||
@@ -502,7 +503,7 @@ func (a *App) maybeAutoSendEQSL(q qso.QSO) {
|
|||||||
if v, _ := a.settings.Get(a.ctx, keyQSLAutoSend); v != "1" {
|
if v, _ := a.settings.Get(a.ctx, keyQSLAutoSend); v != "1" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(q.Email) == "" || strings.EqualFold(q.EQSLSent, "Y") {
|
if strings.TrimSpace(q.Email) == "" || q.Extras[appQSLCardSentField] != "" {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
p, err := a.profiles.Active(a.ctx)
|
p, err := a.profiles.Active(a.ctx)
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ var sensitiveSettingKeys = map[string]bool{
|
|||||||
keyExtClublogPassword: true,
|
keyExtClublogPassword: true,
|
||||||
keyExtLoTWKeyPassword: true,
|
keyExtLoTWKeyPassword: true,
|
||||||
keyExtLoTWWebPassword: true,
|
keyExtLoTWWebPassword: true,
|
||||||
|
keyExtHRDLogCode: true,
|
||||||
|
keyExtEQSLPassword: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
||||||
|
|||||||
+198
@@ -0,0 +1,198 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
// keyAutostartPrograms holds the per-profile list of external programs OpsLog
|
||||||
|
// launches on startup (JSON array of AutostartProgram).
|
||||||
|
const keyAutostartPrograms = "autostart.programs"
|
||||||
|
|
||||||
|
// AutostartProgram is one external application OpsLog can launch when it starts
|
||||||
|
// — e.g. WSJT-X, JTAlert, a rotator controller. Stored per profile.
|
||||||
|
type AutostartProgram struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Path string `json:"path"`
|
||||||
|
Args string `json:"args"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AutostartLaunchResult reports what happened for one program when launching.
|
||||||
|
type AutostartLaunchResult struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Status string `json:"status"` // launched | already_running | missing | disabled | error
|
||||||
|
Message string `json:"message"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAutostartPrograms returns the active profile's autostart list.
|
||||||
|
func (a *App) GetAutostartPrograms() ([]AutostartProgram, error) {
|
||||||
|
out := []AutostartProgram{}
|
||||||
|
if a.settings == nil {
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
s, _ := a.settings.Get(a.ctx, keyAutostartPrograms)
|
||||||
|
if strings.TrimSpace(s) == "" {
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal([]byte(s), &out); err != nil {
|
||||||
|
return []AutostartProgram{}, nil
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveAutostartPrograms persists the autostart list for the active profile.
|
||||||
|
func (a *App) SaveAutostartPrograms(progs []AutostartProgram) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
b, err := json.Marshal(progs)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return a.settings.Set(a.ctx, keyAutostartPrograms, string(b))
|
||||||
|
}
|
||||||
|
|
||||||
|
// BrowseExecutable opens a native file picker for choosing a program to launch.
|
||||||
|
func (a *App) BrowseExecutable() (string, error) {
|
||||||
|
return wruntime.OpenFileDialog(a.ctx, wruntime.OpenDialogOptions{
|
||||||
|
Title: "Choose a program to launch on startup",
|
||||||
|
Filters: []wruntime.FileFilter{
|
||||||
|
{DisplayName: "Programs (*.exe;*.bat;*.cmd)", Pattern: "*.exe;*.bat;*.cmd"},
|
||||||
|
{DisplayName: "All files (*.*)", Pattern: "*.*"},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// LaunchAutostartPrograms starts every enabled program that isn't already
|
||||||
|
// running, returning a per-program result. Used at startup (best effort) and by
|
||||||
|
// the "Launch now" button in settings.
|
||||||
|
func (a *App) LaunchAutostartPrograms() []AutostartLaunchResult {
|
||||||
|
progs, _ := a.GetAutostartPrograms()
|
||||||
|
running := runningProcessNames()
|
||||||
|
out := make([]AutostartLaunchResult, 0, len(progs))
|
||||||
|
for _, p := range progs {
|
||||||
|
if !p.Enabled {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, launchProgram(p, running))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// LaunchAutostartProgram launches a single program by id on demand (the per-row
|
||||||
|
// "launch now" action), regardless of its enabled flag.
|
||||||
|
func (a *App) LaunchAutostartProgram(id string) (AutostartLaunchResult, error) {
|
||||||
|
progs, err := a.GetAutostartPrograms()
|
||||||
|
if err != nil {
|
||||||
|
return AutostartLaunchResult{}, err
|
||||||
|
}
|
||||||
|
for _, p := range progs {
|
||||||
|
if p.ID == id {
|
||||||
|
return launchProgram(p, runningProcessNames()), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return AutostartLaunchResult{}, fmt.Errorf("program %q not found", id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// launchProgram starts one program unless its executable is already running.
|
||||||
|
func launchProgram(p AutostartProgram, running map[string]bool) AutostartLaunchResult {
|
||||||
|
res := AutostartLaunchResult{ID: p.ID, Name: p.Name}
|
||||||
|
path := strings.TrimSpace(p.Path)
|
||||||
|
if path == "" {
|
||||||
|
res.Status, res.Message = "error", "no path configured"
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
if _, err := os.Stat(path); err != nil {
|
||||||
|
res.Status, res.Message = "missing", "executable not found: "+path
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
// Skip if a process with the same executable name is already running, so we
|
||||||
|
// never spawn a second copy of WSJT-X / JTAlert / etc.
|
||||||
|
base := strings.ToLower(filepath.Base(path))
|
||||||
|
if running[base] {
|
||||||
|
res.Status, res.Message = "already_running", base+" already running"
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
cmd := exec.Command(path, splitArgs(p.Args)...)
|
||||||
|
cmd.Dir = filepath.Dir(path) // many ham apps expect their own folder as CWD
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
res.Status, res.Message = "error", err.Error()
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
// Don't wait on the child — it runs independently of OpsLog. Release the
|
||||||
|
// handle so we don't accumulate zombies.
|
||||||
|
go func() { _ = cmd.Wait() }()
|
||||||
|
res.Status, res.Message = "launched", "started "+base
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitArgs does a minimal shell-like split of an argument string, honouring
|
||||||
|
// double quotes so a path with spaces stays one argument.
|
||||||
|
func splitArgs(s string) []string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if s == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var args []string
|
||||||
|
var cur strings.Builder
|
||||||
|
inQuote := false
|
||||||
|
for _, r := range s {
|
||||||
|
switch {
|
||||||
|
case r == '"':
|
||||||
|
inQuote = !inQuote
|
||||||
|
case r == ' ' && !inQuote:
|
||||||
|
if cur.Len() > 0 {
|
||||||
|
args = append(args, cur.String())
|
||||||
|
cur.Reset()
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
cur.WriteRune(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if cur.Len() > 0 {
|
||||||
|
args = append(args, cur.String())
|
||||||
|
}
|
||||||
|
return args
|
||||||
|
}
|
||||||
|
|
||||||
|
// runningProcessNames returns the set of lowercase executable names currently
|
||||||
|
// running, via the Windows `tasklist`. Best effort — on failure the set is
|
||||||
|
// empty (we then just attempt to launch, which is acceptable).
|
||||||
|
func runningProcessNames() map[string]bool {
|
||||||
|
out := map[string]bool{}
|
||||||
|
cmd := exec.Command("tasklist", "/FO", "CSV", "/NH")
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true, CreationFlags: 0x08000000} // CREATE_NO_WINDOW
|
||||||
|
data, err := cmd.Output()
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("autostart: tasklist failed: %v", err)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
for _, line := range strings.Split(string(data), "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if line == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// CSV row: "image.exe","PID",... — take the first quoted field.
|
||||||
|
field := line
|
||||||
|
if i := strings.Index(line[1:], "\""); i >= 0 && strings.HasPrefix(line, "\"") {
|
||||||
|
field = line[1 : i+1]
|
||||||
|
}
|
||||||
|
field = strings.Trim(field, "\"")
|
||||||
|
if field != "" {
|
||||||
|
out[strings.ToLower(field)] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,228 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Multi-operator chat over the SHARED MySQL logbook. The database is the message
|
||||||
|
// bus: each OpsLog INSERTs into chat_messages and polls for new rows (~3 s), so
|
||||||
|
// operators on the same shared log (e.g. a special-event call) can talk. No
|
||||||
|
// extra server. Presence is a lightweight heartbeat into chat_presence. Chat is
|
||||||
|
// only available on a MySQL logbook (SQLite/solo has no one else to talk to).
|
||||||
|
|
||||||
|
const (
|
||||||
|
chatPollInterval = 3 * time.Second
|
||||||
|
chatPresenceEvery = 20 * time.Second
|
||||||
|
chatRetentionDays = 7
|
||||||
|
chatHistoryDefault = 80
|
||||||
|
chatPresenceStaleSecs = 120 // a presence row older than this = offline
|
||||||
|
)
|
||||||
|
|
||||||
|
// ChatMessage is one chat line.
|
||||||
|
type ChatMessage struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Operator string `json:"operator"`
|
||||||
|
Station string `json:"station"`
|
||||||
|
Message string `json:"message"`
|
||||||
|
CreatedAt string `json:"created_at"` // ISO UTC
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChatPresence is one operator currently online (recent heartbeat).
|
||||||
|
type ChatPresence struct {
|
||||||
|
Operator string `json:"operator"`
|
||||||
|
Station string `json:"station"`
|
||||||
|
AgoSecs int `json:"ago_secs"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// chatActive reports whether chat can run (shared MySQL logbook).
|
||||||
|
func (a *App) chatActive() bool {
|
||||||
|
return a.logDb != nil && a.dbBackend == "mysql"
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChatAvailable lets the UI show/hide the chat icon (only on a shared log).
|
||||||
|
func (a *App) ChatAvailable() bool { return a.chatActive() }
|
||||||
|
|
||||||
|
func (a *App) ensureChatTables() error {
|
||||||
|
if _, err := a.logDb.ExecContext(a.ctx,
|
||||||
|
"CREATE TABLE IF NOT EXISTS chat_messages ("+
|
||||||
|
"id BIGINT AUTO_INCREMENT PRIMARY KEY, "+
|
||||||
|
"operator VARCHAR(32), station VARCHAR(32), "+
|
||||||
|
"message TEXT, created_at DATETIME)"); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err := a.logDb.ExecContext(a.ctx,
|
||||||
|
"CREATE TABLE IF NOT EXISTS chat_presence ("+
|
||||||
|
"operator VARCHAR(32) PRIMARY KEY, station VARCHAR(32), updated_at DATETIME)")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendChatMessage posts a message to the shared chat and returns the stored row
|
||||||
|
// (with its id) so the UI can show it immediately; the poll loop dedupes by id.
|
||||||
|
func (a *App) SendChatMessage(text string) (ChatMessage, error) {
|
||||||
|
text = strings.TrimSpace(text)
|
||||||
|
if text == "" {
|
||||||
|
return ChatMessage{}, nil
|
||||||
|
}
|
||||||
|
if len(text) > 1000 {
|
||||||
|
text = text[:1000]
|
||||||
|
}
|
||||||
|
if !a.chatActive() {
|
||||||
|
return ChatMessage{}, fmt.Errorf("chat is only available on a shared MySQL logbook")
|
||||||
|
}
|
||||||
|
op, station := a.liveStatusOperator()
|
||||||
|
if op == "" {
|
||||||
|
return ChatMessage{}, fmt.Errorf("set your callsign/operator in Settings → Station first")
|
||||||
|
}
|
||||||
|
if err := a.ensureChatTables(); err != nil {
|
||||||
|
return ChatMessage{}, err
|
||||||
|
}
|
||||||
|
res, err := a.logDb.ExecContext(a.ctx,
|
||||||
|
"INSERT INTO chat_messages (operator, station, message, created_at) VALUES (?, ?, ?, UTC_TIMESTAMP())",
|
||||||
|
op, station, text)
|
||||||
|
if err != nil {
|
||||||
|
return ChatMessage{}, err
|
||||||
|
}
|
||||||
|
id, _ := res.LastInsertId()
|
||||||
|
return ChatMessage{ID: id, Operator: op, Station: station, Message: text,
|
||||||
|
CreatedAt: time.Now().UTC().Format(time.RFC3339)}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetChatHistory returns the most recent messages (oldest first) for the panel.
|
||||||
|
func (a *App) GetChatHistory(limit int) ([]ChatMessage, error) {
|
||||||
|
if !a.chatActive() {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if limit <= 0 || limit > 500 {
|
||||||
|
limit = chatHistoryDefault
|
||||||
|
}
|
||||||
|
if err := a.ensureChatTables(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
rows, err := a.logDb.QueryContext(a.ctx,
|
||||||
|
"SELECT id, operator, station, message, created_at FROM chat_messages ORDER BY id DESC LIMIT ?", limit)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []ChatMessage
|
||||||
|
for rows.Next() {
|
||||||
|
var m ChatMessage
|
||||||
|
if err := rows.Scan(&m.ID, &m.Operator, &m.Station, &m.Message, &m.CreatedAt); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, m)
|
||||||
|
}
|
||||||
|
// Reverse to chronological order (we queried newest-first to honour LIMIT).
|
||||||
|
for i, j := 0, len(out)-1; i < j; i, j = i+1, j-1 {
|
||||||
|
out[i], out[j] = out[j], out[i]
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetOnlineOperators lists operators with a recent presence heartbeat.
|
||||||
|
func (a *App) GetOnlineOperators() ([]ChatPresence, error) {
|
||||||
|
if !a.chatActive() {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if err := a.ensureChatTables(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
rows, err := a.logDb.QueryContext(a.ctx,
|
||||||
|
"SELECT operator, station, TIMESTAMPDIFF(SECOND, updated_at, UTC_TIMESTAMP()) AS ago "+
|
||||||
|
"FROM chat_presence WHERE updated_at > UTC_TIMESTAMP() - INTERVAL ? SECOND ORDER BY operator",
|
||||||
|
chatPresenceStaleSecs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []ChatPresence
|
||||||
|
for rows.Next() {
|
||||||
|
var p ChatPresence
|
||||||
|
if err := rows.Scan(&p.Operator, &p.Station, &p.AgoSecs); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, p)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// chatLoop polls for new messages and heartbeats presence while on a shared
|
||||||
|
// MySQL logbook. Started once at startup; a cheap no-op otherwise.
|
||||||
|
func (a *App) chatLoop() {
|
||||||
|
defer func() { _ = recover() }()
|
||||||
|
var lastID int64 = -1 // -1 = not yet baselined
|
||||||
|
var lastDB *sql.DB // logbook the baseline belongs to
|
||||||
|
lastPresence := time.Time{}
|
||||||
|
lastPurge := time.Time{}
|
||||||
|
t := time.NewTicker(chatPollInterval)
|
||||||
|
defer t.Stop()
|
||||||
|
for range t.C {
|
||||||
|
if !a.chatActive() {
|
||||||
|
lastID = -1 // re-baseline if the backend changes
|
||||||
|
lastDB = nil
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Profile switch swaps the logbook under us: re-baseline against the new
|
||||||
|
// DB so we don't query it with the previous log's id cursor.
|
||||||
|
if a.logDb != lastDB {
|
||||||
|
lastID = -1
|
||||||
|
lastDB = a.logDb
|
||||||
|
}
|
||||||
|
if err := a.ensureChatTables(); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
// Presence heartbeat.
|
||||||
|
if now.Sub(lastPresence) >= chatPresenceEvery {
|
||||||
|
if op, station := a.liveStatusOperator(); op != "" {
|
||||||
|
_, _ = a.logDb.ExecContext(a.ctx,
|
||||||
|
"INSERT INTO chat_presence (operator, station, updated_at) VALUES (?, ?, UTC_TIMESTAMP()) "+
|
||||||
|
"ON DUPLICATE KEY UPDATE station=VALUES(station), updated_at=UTC_TIMESTAMP()",
|
||||||
|
op, station)
|
||||||
|
}
|
||||||
|
lastPresence = now
|
||||||
|
}
|
||||||
|
// Baseline on first run so existing history isn't replayed as "new"
|
||||||
|
// (the panel loads it via GetChatHistory).
|
||||||
|
if lastID < 0 {
|
||||||
|
row := a.logDb.QueryRowContext(a.ctx, "SELECT COALESCE(MAX(id),0) FROM chat_messages")
|
||||||
|
_ = row.Scan(&lastID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Emit new messages.
|
||||||
|
rows, err := a.logDb.QueryContext(a.ctx,
|
||||||
|
"SELECT id, operator, station, message, created_at FROM chat_messages WHERE id > ? ORDER BY id", lastID)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for rows.Next() {
|
||||||
|
var m ChatMessage
|
||||||
|
if err := rows.Scan(&m.ID, &m.Operator, &m.Station, &m.Message, &m.CreatedAt); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if m.ID > lastID {
|
||||||
|
lastID = m.ID
|
||||||
|
}
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "chat:message", m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rows.Close()
|
||||||
|
// Purge old messages occasionally (hourly).
|
||||||
|
if now.Sub(lastPurge) >= time.Hour {
|
||||||
|
_, err := a.logDb.ExecContext(a.ctx,
|
||||||
|
"DELETE FROM chat_messages WHERE created_at < UTC_TIMESTAMP() - INTERVAL ? DAY", chatRetentionDays)
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("chat: purge failed: %v", err)
|
||||||
|
}
|
||||||
|
lastPurge = now
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* OpsLog multi-operator LIVE STATUS renderer.
|
||||||
|
*
|
||||||
|
* Reads the shared `live_status` table that every OpsLog instance heartbeats
|
||||||
|
* (operator call + station call + freq/band/mode, refreshed every ~15s) and
|
||||||
|
* shows the operators active in the last 2 minutes.
|
||||||
|
*
|
||||||
|
* Put this file on YOUR web server (the one reachable from the internet), point
|
||||||
|
* it at the SAME MySQL database OpsLog uses for the shared logbook, and embed it
|
||||||
|
* on the QRZ.com bio of the station call:
|
||||||
|
*
|
||||||
|
* <img src="https://your-server/tm74-status.php?img=1"> (image, cached ~min by QRZ)
|
||||||
|
* or <a href="https://your-server/tm74-status.php">Live operators</a> (real-time page)
|
||||||
|
*
|
||||||
|
* QRZ strips <script>/<iframe>, so only an <img> auto-updates the page.
|
||||||
|
*/
|
||||||
|
|
||||||
|
$DB_HOST = '10.10.10.15'; // your MySQL host (same as OpsLog's logbook)
|
||||||
|
$DB_NAME = 'opslog'; // database name
|
||||||
|
$DB_USER = 'opslog';
|
||||||
|
$DB_PASS = 'CHANGE_ME';
|
||||||
|
$STALE_SECONDS = 120; // an operator is "active" if seen within this window
|
||||||
|
|
||||||
|
// PHP 8.1+ makes mysqli THROW on errors by default; turn that off so a missing
|
||||||
|
// `live_status` table (not yet created by OpsLog) just yields an empty list
|
||||||
|
// instead of a fatal "table doesn't exist".
|
||||||
|
mysqli_report(MYSQLI_REPORT_OFF);
|
||||||
|
|
||||||
|
$mysqli = @new mysqli($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME);
|
||||||
|
if ($mysqli->connect_errno) {
|
||||||
|
http_response_code(500);
|
||||||
|
exit('DB error');
|
||||||
|
}
|
||||||
|
|
||||||
|
// The table is created by OpsLog on first publish; tolerate it not existing yet.
|
||||||
|
$rows = [];
|
||||||
|
$sql = "SELECT operator, station, freq_hz, band, mode, updated_at
|
||||||
|
FROM live_status
|
||||||
|
WHERE updated_at >= UTC_TIMESTAMP() - INTERVAL ? SECOND
|
||||||
|
ORDER BY band, freq_hz";
|
||||||
|
if ($stmt = @$mysqli->prepare($sql)) {
|
||||||
|
$stmt->bind_param('i', $STALE_SECONDS);
|
||||||
|
@$stmt->execute();
|
||||||
|
if ($res = $stmt->get_result()) {
|
||||||
|
while ($r = $res->fetch_assoc()) $rows[] = $r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$station = $rows ? $rows[0]['station'] : 'OpsLog';
|
||||||
|
$fmtFreq = function ($hz) { return $hz > 0 ? number_format($hz / 1e6, 3) . ' MHz' : '—'; };
|
||||||
|
|
||||||
|
// ── Image output (SVG) for the QRZ <img> embed: ?img=1 ──────────────────────
|
||||||
|
if (isset($_GET['img'])) {
|
||||||
|
header('Content-Type: image/svg+xml');
|
||||||
|
header('Cache-Control: no-cache, max-age=30');
|
||||||
|
$rowH = 26; $h = 44 + max(1, count($rows)) * $rowH; $w = 440;
|
||||||
|
echo "<svg xmlns='http://www.w3.org/2000/svg' width='$w' height='$h' font-family='Segoe UI,Arial'>";
|
||||||
|
echo "<rect width='$w' height='$h' rx='8' fill='#0f172a'/>";
|
||||||
|
echo "<text x='14' y='26' fill='#38bdf8' font-size='15' font-weight='bold'>" . htmlspecialchars($station) . " — live operators</text>";
|
||||||
|
$y = 44 + 18;
|
||||||
|
if (!$rows) {
|
||||||
|
echo "<text x='14' y='$y' fill='#94a3b8' font-size='13'>No operator active right now.</text>";
|
||||||
|
}
|
||||||
|
foreach ($rows as $r) {
|
||||||
|
$line = sprintf('%-10s %-4s %-9s %s', $r['operator'], $r['band'], $r['mode'], $fmtFreq($r['freq_hz']));
|
||||||
|
echo "<text x='14' y='$y' fill='#e2e8f0' font-size='13' font-family='monospace'>" . htmlspecialchars($line) . "</text>";
|
||||||
|
$y += $rowH;
|
||||||
|
}
|
||||||
|
echo "</svg>";
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── HTML page (real-time when opened directly; auto-refreshes every 20s) ─────
|
||||||
|
header('Content-Type: text/html; charset=utf-8');
|
||||||
|
?><!doctype html>
|
||||||
|
<html lang="en"><head><meta charset="utf-8">
|
||||||
|
<meta http-equiv="refresh" content="20">
|
||||||
|
<title><?= htmlspecialchars($station) ?> — live operators</title>
|
||||||
|
<style>
|
||||||
|
body { font-family: Segoe UI, Arial, sans-serif; background:#0f172a; color:#e2e8f0; margin:0; padding:16px; }
|
||||||
|
h1 { color:#38bdf8; font-size:18px; margin:0 0 12px; }
|
||||||
|
table { border-collapse:collapse; width:100%; max-width:560px; }
|
||||||
|
th,td { text-align:left; padding:6px 12px; border-bottom:1px solid #1e293b; font-size:14px; }
|
||||||
|
th { color:#94a3b8; text-transform:uppercase; font-size:11px; letter-spacing:.05em; }
|
||||||
|
td.mono { font-family:monospace; }
|
||||||
|
.none { color:#94a3b8; }
|
||||||
|
</style></head><body>
|
||||||
|
<h1><?= htmlspecialchars($station) ?> — operators active now</h1>
|
||||||
|
<?php if (!$rows): ?>
|
||||||
|
<p class="none">No operator active right now.</p>
|
||||||
|
<?php else: ?>
|
||||||
|
<table>
|
||||||
|
<tr><th>Operator</th><th>Band</th><th>Mode</th><th>Frequency</th></tr>
|
||||||
|
<?php foreach ($rows as $r): ?>
|
||||||
|
<tr>
|
||||||
|
<td><strong><?= htmlspecialchars($r['operator']) ?></strong></td>
|
||||||
|
<td><?= htmlspecialchars($r['band']) ?></td>
|
||||||
|
<td><?= htmlspecialchars($r['mode']) ?></td>
|
||||||
|
<td class="mono"><?= $fmtFreq($r['freq_hz']) ?></td>
|
||||||
|
</tr>
|
||||||
|
<?php endforeach; ?>
|
||||||
|
</table>
|
||||||
|
<?php endif; ?>
|
||||||
|
</body></html>
|
||||||
+1279
-335
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,256 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
|
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
||||||
|
} from '@/components/ui/dialog';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import {
|
||||||
|
ListAlertRules, SaveAlertRule, DeleteAlertRule, GetAlertEmailTo, SetAlertEmailTo,
|
||||||
|
} from '@/../wailsjs/go/main/App';
|
||||||
|
import { alerts } from '@/../wailsjs/go/models';
|
||||||
|
|
||||||
|
type Rule = alerts.Rule;
|
||||||
|
|
||||||
|
const CONTINENTS = ['AF', 'AN', 'AS', 'EU', 'NA', 'OC', 'SA'];
|
||||||
|
|
||||||
|
function emptyRule(): Rule {
|
||||||
|
return alerts.Rule.createFrom({
|
||||||
|
id: '', name: 'New alert', enabled: true,
|
||||||
|
calls: [], countries: [], continents: [], bands: [], modes: [],
|
||||||
|
spotter_call: '', spotter_continents: [], spotter_countries: [],
|
||||||
|
sound: true, visual: true, email: false, again_after_min: 0, skip_worked: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// MultiCheck — a scrollable checkbox list for a set of options with an optional
|
||||||
|
// search box (used for the long country list). Empty selection = ALL.
|
||||||
|
function MultiCheck({ options, selected, onToggle, searchable, height = 'h-52' }: {
|
||||||
|
options: string[]; selected: string[]; onToggle: (v: string) => void; searchable?: boolean; height?: string;
|
||||||
|
}) {
|
||||||
|
const [q, setQ] = useState('');
|
||||||
|
const shown = useMemo(
|
||||||
|
() => (q ? options.filter((o) => o.toLowerCase().includes(q.toLowerCase())) : options),
|
||||||
|
[options, q],
|
||||||
|
);
|
||||||
|
const sel = new Set((selected ?? []).map((s) => s.toLowerCase()));
|
||||||
|
return (
|
||||||
|
<div className="rounded-md border border-border">
|
||||||
|
{searchable && (
|
||||||
|
<div className="flex items-center gap-1.5 px-2 py-1 border-b border-border/60">
|
||||||
|
<Search className="size-3 text-muted-foreground" />
|
||||||
|
<input className="flex-1 bg-transparent text-xs outline-none" placeholder="Filter…" value={q} onChange={(e) => setQ(e.target.value)} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className={cn('overflow-y-auto p-1', height)}>
|
||||||
|
{shown.map((o) => (
|
||||||
|
<label key={o} className="flex items-center gap-2 text-xs px-1.5 py-0.5 rounded hover:bg-accent/40 cursor-pointer">
|
||||||
|
<Checkbox checked={sel.has(o.toLowerCase())} onCheckedChange={() => onToggle(o)} />
|
||||||
|
<span className="truncate">{o}</span>
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
{shown.length === 0 && <div className="text-[11px] text-muted-foreground px-2 py-3 text-center">no match</div>}
|
||||||
|
</div>
|
||||||
|
<div className="px-2 py-1 border-t border-border/60 text-[10px] text-muted-foreground">
|
||||||
|
{(selected?.length ?? 0) === 0 ? 'none selected = ALL' : `${selected!.length} selected`}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AlertsModal({ onClose, bands, modes, countries }: {
|
||||||
|
onClose: () => void; bands: string[]; modes: string[]; countries: string[];
|
||||||
|
}) {
|
||||||
|
const [rules, setRules] = useState<Rule[]>([]);
|
||||||
|
const [draft, setDraft] = useState<Rule | null>(null);
|
||||||
|
const [tab, setTab] = useState('def'); // active editor tab (reset to Definition on new/select)
|
||||||
|
const [emailTo, setEmailTo] = useState('');
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
|
||||||
|
const refresh = useCallback(async () => {
|
||||||
|
try { setRules(((await ListAlertRules()) ?? []) as Rule[]); }
|
||||||
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
}, []);
|
||||||
|
useEffect(() => { refresh(); GetAlertEmailTo().then((v) => setEmailTo(v || '')).catch(() => {}); }, [refresh]);
|
||||||
|
|
||||||
|
const patch = (p: Partial<Rule>) => setDraft((d) => (d ? alerts.Rule.createFrom({ ...d, ...p }) : d));
|
||||||
|
const toggleIn = (key: keyof Rule, v: string) => setDraft((d) => {
|
||||||
|
if (!d) return d;
|
||||||
|
const cur = ((d as any)[key] as string[]) ?? [];
|
||||||
|
const has = cur.some((x) => x.toLowerCase() === v.toLowerCase());
|
||||||
|
const next = has ? cur.filter((x) => x.toLowerCase() !== v.toLowerCase()) : [...cur, v];
|
||||||
|
return alerts.Rule.createFrom({ ...d, [key]: next });
|
||||||
|
});
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
if (!draft) return;
|
||||||
|
if (!draft.name.trim()) { setErr('Give the rule a name'); return; }
|
||||||
|
try { const saved = await SaveAlertRule(draft); await refresh(); setDraft(saved as Rule); setErr(''); }
|
||||||
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
async function del() {
|
||||||
|
if (!draft) return;
|
||||||
|
if (!draft.id) { setDraft(null); return; }
|
||||||
|
if (!window.confirm(`Delete alert "${draft.name}"?`)) return;
|
||||||
|
try { await DeleteAlertRule(draft.id); setDraft(null); await refresh(); }
|
||||||
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open onOpenChange={(o) => { if (!o) onClose(); }}>
|
||||||
|
<DialogContent className="max-w-4xl">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle className="flex items-center gap-2"><Bell className="size-4 text-primary" /> Alert management</DialogTitle>
|
||||||
|
<DialogDescription>Alert when a spot matches a rule. Empty filters = ANY; the filters you set are ANDed (e.g. France + 20m = French stations on 20m).</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<div className="flex gap-3 min-h-0 px-5" style={{ height: '60vh' }}>
|
||||||
|
{/* Rule list */}
|
||||||
|
<div className="w-56 shrink-0 flex flex-col border border-border rounded-md">
|
||||||
|
<div className="flex items-center gap-1 px-2 py-1.5 border-b border-border/60">
|
||||||
|
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground flex-1">Rules</span>
|
||||||
|
<Button variant="ghost" size="sm" className="h-6 px-1.5" onClick={() => { setDraft(emptyRule()); setTab('def'); }}><Plus className="size-3.5" /></Button>
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 overflow-y-auto p-1">
|
||||||
|
{rules.length === 0 && <div className="text-[11px] text-muted-foreground px-2 py-4 text-center">No rules yet — click +</div>}
|
||||||
|
{rules.map((r) => (
|
||||||
|
<button key={r.id} onClick={() => { setDraft(alerts.Rule.createFrom(r)); setTab('def'); }}
|
||||||
|
className={cn('w-full text-left px-2 py-1.5 rounded text-xs flex items-center gap-1.5',
|
||||||
|
draft?.id === r.id ? 'bg-accent text-accent-foreground font-semibold' : 'hover:bg-muted/60')}>
|
||||||
|
<span className={cn('size-1.5 rounded-full shrink-0', r.enabled ? 'bg-emerald-500' : 'bg-muted-foreground/40')} />
|
||||||
|
<span className="truncate flex-1">{r.name}</span>
|
||||||
|
{r.sound && <Volume2 className="size-3 text-muted-foreground shrink-0" />}
|
||||||
|
{r.email && <Mail className="size-3 text-muted-foreground shrink-0" />}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className="px-2 py-1.5 border-t border-border/60">
|
||||||
|
<Label className="text-[10px] text-muted-foreground">Alert e-mail to</Label>
|
||||||
|
<Input className="h-7 text-xs mt-0.5" placeholder="[email protected]" value={emailTo}
|
||||||
|
onChange={(e) => setEmailTo(e.target.value)}
|
||||||
|
onBlur={() => SetAlertEmailTo(emailTo).catch(() => {})} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Editor */}
|
||||||
|
<div className="flex-1 min-w-0 border border-border rounded-md flex flex-col">
|
||||||
|
{!draft ? (
|
||||||
|
<div className="flex-1 flex items-center justify-center text-sm text-muted-foreground">Select or create a rule.</div>
|
||||||
|
) : (
|
||||||
|
<Tabs value={tab} onValueChange={setTab} className="flex flex-col flex-1 min-h-0">
|
||||||
|
<div className="flex items-center gap-2 px-2 pt-2">
|
||||||
|
<TabsList>
|
||||||
|
<TabsTrigger value="def">Definition</TabsTrigger>
|
||||||
|
<TabsTrigger value="call">Call / DXCC</TabsTrigger>
|
||||||
|
<TabsTrigger value="bm">Band / Mode</TabsTrigger>
|
||||||
|
<TabsTrigger value="orig">Origin</TabsTrigger>
|
||||||
|
</TabsList>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex-1 min-h-0 overflow-y-auto p-3">
|
||||||
|
<TabsContent value="def" className="mt-0 space-y-3">
|
||||||
|
<div>
|
||||||
|
<Label className="text-xs">Rule name</Label>
|
||||||
|
<Input value={draft.name} onChange={(e) => patch({ name: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={draft.enabled} onCheckedChange={(c) => patch({ enabled: !!c })} /> Alert enabled
|
||||||
|
</label>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Label className="text-xs w-40 shrink-0">Alert again after (min)</Label>
|
||||||
|
<Input type="number" className="h-8 w-24" value={draft.again_after_min}
|
||||||
|
onChange={(e) => patch({ again_after_min: parseInt(e.target.value) || 0 })} />
|
||||||
|
<span className="text-[11px] text-muted-foreground">0 = once/session · -1 = always</span>
|
||||||
|
</div>
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||||
|
<Label className="text-xs font-semibold">Actions</Label>
|
||||||
|
<div className="flex gap-4">
|
||||||
|
<label className="flex items-center gap-1.5 text-sm cursor-pointer"><Checkbox checked={draft.visual} onCheckedChange={(c) => patch({ visual: !!c })} /><Eye className="size-3.5" /> Visual</label>
|
||||||
|
<label className="flex items-center gap-1.5 text-sm cursor-pointer"><Checkbox checked={draft.sound} onCheckedChange={(c) => patch({ sound: !!c })} /><Volume2 className="size-3.5" /> Sound</label>
|
||||||
|
<label className="flex items-center gap-1.5 text-sm cursor-pointer"><Checkbox checked={draft.email} onCheckedChange={(c) => patch({ email: !!c })} /><Mail className="size-3.5" /> E-mail</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer border-t border-border/60 pt-3">
|
||||||
|
<Checkbox checked={draft.skip_worked} onCheckedChange={(c) => patch({ skip_worked: !!c })} /> Skip calls already worked (same band + mode)
|
||||||
|
</label>
|
||||||
|
</TabsContent>
|
||||||
|
|
||||||
|
<TabsContent value="call" className="mt-0 grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs">Callsigns (one per line, wildcards: IW3*, */P)</Label>
|
||||||
|
<textarea className="w-full h-52 rounded-md border border-border bg-background p-2 text-xs font-mono resize-none"
|
||||||
|
placeholder={'DL1ABC\nIW3*\n*/P'}
|
||||||
|
value={(draft.calls ?? []).join('\n')}
|
||||||
|
onChange={(e) => patch({ calls: e.target.value.split('\n').map((x) => x.trim()).filter(Boolean) })} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs">Countries (DXCC)</Label>
|
||||||
|
<MultiCheck options={countries} selected={draft.countries ?? []} onToggle={(v) => toggleIn('countries', v)} searchable />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1 col-span-2">
|
||||||
|
<Label className="text-xs">Continents</Label>
|
||||||
|
<div className="flex gap-3 flex-wrap">
|
||||||
|
{CONTINENTS.map((c) => (
|
||||||
|
<label key={c} className="flex items-center gap-1.5 text-xs cursor-pointer">
|
||||||
|
<Checkbox checked={(draft.continents ?? []).includes(c)} onCheckedChange={() => toggleIn('continents', c)} /> {c}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</TabsContent>
|
||||||
|
|
||||||
|
<TabsContent value="bm" className="mt-0 grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs">Bands</Label>
|
||||||
|
<MultiCheck options={bands} selected={draft.bands ?? []} onToggle={(v) => toggleIn('bands', v)} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs">Modes</Label>
|
||||||
|
<MultiCheck options={modes} selected={draft.modes ?? []} onToggle={(v) => toggleIn('modes', v)} />
|
||||||
|
</div>
|
||||||
|
</TabsContent>
|
||||||
|
|
||||||
|
<TabsContent value="orig" className="mt-0 grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs">Spotter callsign (wildcard)</Label>
|
||||||
|
<Input className="font-mono" placeholder="e.g. F* or DL1ABC" value={draft.spotter_call ?? ''}
|
||||||
|
onChange={(e) => patch({ spotter_call: e.target.value })} />
|
||||||
|
<Label className="text-xs mt-2 block">Spotter continents</Label>
|
||||||
|
<div className="flex gap-3 flex-wrap">
|
||||||
|
{CONTINENTS.map((c) => (
|
||||||
|
<label key={c} className="flex items-center gap-1.5 text-xs cursor-pointer">
|
||||||
|
<Checkbox checked={(draft.spotter_continents ?? []).includes(c)} onCheckedChange={() => toggleIn('spotter_continents', c)} /> {c}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-xs">Spotter countries</Label>
|
||||||
|
<MultiCheck options={countries} selected={draft.spotter_countries ?? []} onToggle={(v) => toggleIn('spotter_countries', v)} searchable />
|
||||||
|
</div>
|
||||||
|
</TabsContent>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Editor actions */}
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
||||||
|
{err && <span className="text-[11px] text-rose-600 flex-1 truncate">{err}</span>}
|
||||||
|
<div className="flex-1" />
|
||||||
|
<Button variant="ghost" size="sm" className="text-rose-700" onClick={del}><Trash2 className="size-3.5" /> Delete</Button>
|
||||||
|
<Button size="sm" onClick={save}>Save rule</Button>
|
||||||
|
</div>
|
||||||
|
</Tabs>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex justify-end px-5 pb-4">
|
||||||
|
<Button variant="outline" size="sm" onClick={onClose}><X className="size-3.5" /> Close</Button>
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
import { Antenna, X } from 'lucide-react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
export type AGAntenna = { index: number; name: string };
|
||||||
|
export type AGStatus = {
|
||||||
|
connected: boolean; host?: string; last_error?: string;
|
||||||
|
port_a: number; port_b: number; tx_a?: boolean; tx_b?: boolean;
|
||||||
|
antennas: AGAntenna[];
|
||||||
|
};
|
||||||
|
|
||||||
|
// Format an antenna name: first letter uppercase, the rest lowercase
|
||||||
|
// (e.g. "DX COMMANDER" → "Dx commander").
|
||||||
|
function pretty(name: string): string {
|
||||||
|
const t = name.trim();
|
||||||
|
if (!t) return t;
|
||||||
|
return t.charAt(0).toUpperCase() + t.slice(1).toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
// AntGeniusPanel — antenna-switch widget for a 4O3A Antenna Genius, styled to
|
||||||
|
// match the app's light theme with soft gradients + glows. Each antenna row has
|
||||||
|
// a port-A button (left) and port-B button (right). Colours: green = selected on
|
||||||
|
// port A, blue = selected on port B, red (pulsing) = that port is transmitting.
|
||||||
|
// Clicking an already-selected port deselects it (port → None).
|
||||||
|
export function AntGeniusPanel({ status, onActivate, onClose }: {
|
||||||
|
status: AGStatus;
|
||||||
|
onActivate: (port: number, antenna: number) => void; // antenna 0 = deselect
|
||||||
|
onClose: () => void;
|
||||||
|
}) {
|
||||||
|
const list = status.antennas ?? [];
|
||||||
|
|
||||||
|
const PortBtn = ({ port, index, active, tx }: { port: 1 | 2; index: number; active: boolean; tx: boolean }) => {
|
||||||
|
const letter = port === 1 ? 'A' : 'B';
|
||||||
|
const cls = tx
|
||||||
|
? 'bg-gradient-to-b from-red-500 to-rose-600 text-white border-red-400/50 shadow-[0_0_10px_rgba(244,63,94,0.5)] animate-pulse'
|
||||||
|
: active
|
||||||
|
? (port === 1
|
||||||
|
? 'bg-gradient-to-b from-emerald-400 to-emerald-600 text-white border-emerald-300/60 shadow-[0_0_9px_rgba(16,185,129,0.45)]'
|
||||||
|
: 'bg-gradient-to-b from-sky-400 to-sky-600 text-white border-sky-300/60 shadow-[0_0_9px_rgba(14,165,233,0.45)]')
|
||||||
|
: 'bg-card text-muted-foreground border-border hover:bg-muted hover:text-foreground';
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => onActivate(port, active ? 0 : index)}
|
||||||
|
title={active ? `Port ${letter} — click to deselect` : `Select on port ${letter}`}
|
||||||
|
className={cn('w-8 shrink-0 rounded-lg text-xs font-bold py-1.5 border transition-all active:scale-95', cls)}
|
||||||
|
>
|
||||||
|
{letter}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full flex flex-col rounded-xl border border-border bg-gradient-to-b from-card to-muted/30 shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/40 shrink-0">
|
||||||
|
<Antenna className={cn('size-4', status.connected ? 'text-emerald-600 drop-shadow-[0_0_3px_rgba(16,185,129,0.55)]' : 'text-muted-foreground')} />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-[0.18em] text-foreground/80">Antenna Genius</span>
|
||||||
|
<span className="flex-1" />
|
||||||
|
<span className="inline-flex items-center gap-1.5 text-[10px] font-mono uppercase tracking-wider">
|
||||||
|
<span className={cn('size-1.5 rounded-full', status.connected ? 'bg-emerald-500 shadow-[0_0_6px_rgba(16,185,129,0.8)] animate-pulse' : 'bg-rose-500')} />
|
||||||
|
<span className={status.connected ? 'text-emerald-600' : 'text-rose-500'}>{status.connected ? 'online' : 'offline'}</span>
|
||||||
|
</span>
|
||||||
|
<button type="button" onClick={onClose} className="ml-1 text-muted-foreground hover:text-foreground transition-colors" title="Close">
|
||||||
|
<X className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex-1 min-h-0 overflow-y-auto p-2 space-y-1.5">
|
||||||
|
{!status.connected ? (
|
||||||
|
<div className="text-center py-6 text-xs space-y-2">
|
||||||
|
<div className="text-muted-foreground italic animate-pulse">Connecting…</div>
|
||||||
|
{status.last_error && <div className="text-rose-500 font-mono text-[10px] break-words px-2">{status.last_error}</div>}
|
||||||
|
</div>
|
||||||
|
) : list.length === 0 ? (
|
||||||
|
<div className="text-muted-foreground italic text-center py-6 text-xs">No antennas configured.</div>
|
||||||
|
) : list.map((a) => {
|
||||||
|
const aActive = status.port_a === a.index;
|
||||||
|
const bActive = status.port_b === a.index;
|
||||||
|
const aTx = aActive && !!status.tx_a;
|
||||||
|
const bTx = bActive && !!status.tx_b;
|
||||||
|
const nameCls = (aTx || bTx)
|
||||||
|
? 'bg-gradient-to-r from-red-500 to-rose-600 text-white border-red-400/40 shadow-[0_0_11px_rgba(244,63,94,0.35)]'
|
||||||
|
: aActive
|
||||||
|
? 'bg-gradient-to-r from-emerald-500 to-emerald-600 text-white border-emerald-400/40 shadow-[0_0_11px_rgba(16,185,129,0.3)]'
|
||||||
|
: bActive
|
||||||
|
? 'bg-gradient-to-r from-sky-500 to-sky-600 text-white border-sky-400/40 shadow-[0_0_11px_rgba(14,165,233,0.3)]'
|
||||||
|
: 'bg-card/70 text-foreground/80 border-border hover:bg-muted/60';
|
||||||
|
return (
|
||||||
|
<div key={a.index} className="flex items-center gap-1.5">
|
||||||
|
<PortBtn port={1} index={a.index} active={aActive} tx={aTx} />
|
||||||
|
<div className={cn('flex-1 min-w-0 truncate text-center text-xs font-semibold tracking-wide rounded-lg px-2 py-1.5 border transition-all', nameCls)}>
|
||||||
|
{pretty(a.name)}
|
||||||
|
</div>
|
||||||
|
<PortBtn port={2} index={a.index} active={bActive} tx={bTx} />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -31,11 +31,17 @@ export type AwardDef = {
|
|||||||
url?: string; download_url?: string; ref_url?: string; valid_from?: string; valid_to?: string; alias?: string;
|
url?: string; download_url?: string; ref_url?: string; valid_from?: string; valid_to?: string; alias?: string;
|
||||||
type?: string; field: string; match_by?: string; exact_match?: boolean; pattern: string;
|
type?: string; field: string; match_by?: string; exact_match?: boolean; pattern: string;
|
||||||
leading_str?: string; trailing_str?: string; multi?: boolean; dynamic?: boolean; add_prefixes?: string[];
|
leading_str?: string; trailing_str?: string; multi?: boolean; dynamic?: boolean; add_prefixes?: string[];
|
||||||
|
or_rules?: AwardOrRule[];
|
||||||
dxcc_filter: number[] | null; valid_bands?: string[]; valid_modes?: string[]; emission?: string[];
|
dxcc_filter: number[] | null; valid_bands?: string[]; valid_modes?: string[]; emission?: string[];
|
||||||
confirm: string[] | null; validate?: string[] | null; grant_codes?: string; export_credit_granted?: boolean;
|
confirm: string[] | null; validate?: string[] | null; grant_codes?: string; export_credit_granted?: boolean;
|
||||||
total: number; builtin?: boolean;
|
total: number; builtin?: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type AwardOrRule = {
|
||||||
|
field: string; match_by?: string; exact_match?: boolean; pattern?: string;
|
||||||
|
leading_str?: string; trailing_str?: string; prefix?: string;
|
||||||
|
};
|
||||||
|
|
||||||
type AwardRef = {
|
type AwardRef = {
|
||||||
code: string; name: string; dxcc: number; group: string; subgrp: string;
|
code: string; name: string; dxcc: number; group: string; subgrp: string;
|
||||||
dxcc_list?: number[]; pattern?: string; valid: boolean; valid_from?: string; valid_to?: string;
|
dxcc_list?: number[]; pattern?: string; valid: boolean; valid_from?: string; valid_to?: string;
|
||||||
@@ -162,7 +168,7 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
if (!open) return;
|
if (!open) return;
|
||||||
setErr('');
|
setErr('');
|
||||||
Promise.all([GetAwardDefs(), AwardFields(), GetAwardPresets(), ListCountries()])
|
Promise.all([GetAwardDefs(), AwardFields(), GetAwardPresets(), ListCountries()])
|
||||||
.then(([d, f, p, c]) => { setDefs((d ?? []) as any); setFields((f ?? []) as any); setPresets((p ?? []) as any); setCountries((c ?? []) as any); })
|
.then(([d, f, p, c]) => { setDefs((d ?? []) as any); setFields(((f ?? []) as string[]).slice().sort((a, b) => a.localeCompare(b))); setPresets((p ?? []) as any); setCountries((c ?? []) as any); })
|
||||||
.catch((e) => setErr(String(e?.message ?? e)));
|
.catch((e) => setErr(String(e?.message ?? e)));
|
||||||
loadMeta();
|
loadMeta();
|
||||||
}, [open]);
|
}, [open]);
|
||||||
@@ -344,6 +350,46 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
<Field2 label="Leading string"><Input className="h-8 font-mono text-xs" value={cur.leading_str ?? ''} onChange={(e) => patch({ leading_str: e.target.value })} /></Field2>
|
<Field2 label="Leading string"><Input className="h-8 font-mono text-xs" value={cur.leading_str ?? ''} onChange={(e) => patch({ leading_str: e.target.value })} /></Field2>
|
||||||
<Field2 label="Trailing string"><Input className="h-8 font-mono text-xs" value={cur.trailing_str ?? ''} onChange={(e) => patch({ trailing_str: e.target.value })} /></Field2>
|
<Field2 label="Trailing string"><Input className="h-8 font-mono text-xs" value={cur.trailing_str ?? ''} onChange={(e) => patch({ trailing_str: e.target.value })} /></Field2>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Additional OR searches: a QSO earns a reference if the
|
||||||
|
primary rule OR any of these match. */}
|
||||||
|
<div className="border-t pt-2.5 space-y-2">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<p className="text-[11px] text-muted-foreground">Additional searches <span className="font-semibold">(OR)</span> — also match the reference if any of these hit</p>
|
||||||
|
<Button size="sm" variant="outline" className="h-7"
|
||||||
|
onClick={() => patch({ or_rules: [...(cur.or_rules ?? []), { field: cur.field || 'note', match_by: 'pattern', pattern: '', prefix: '' }] })}>
|
||||||
|
<Plus className="size-3.5" /> Add OR
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
{(cur.or_rules ?? []).map((r, ri) => {
|
||||||
|
const upd = (p: Partial<AwardOrRule>) => patch({ or_rules: (cur.or_rules ?? []).map((x, j) => (j === ri ? { ...x, ...p } : x)) });
|
||||||
|
const del = () => patch({ or_rules: (cur.or_rules ?? []).filter((_, j) => j !== ri) });
|
||||||
|
return (
|
||||||
|
<div key={ri} className="rounded-md border border-border bg-muted/20 p-2 space-y-2">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="text-[11px] text-muted-foreground">OR — search in</span>
|
||||||
|
<Select value={r.field} onValueChange={(v) => upd({ field: v })}>
|
||||||
|
<SelectTrigger className="h-7 text-xs w-44"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent className="max-h-72">{fields.map((f) => <SelectItem key={f} value={f}>{f}</SelectItem>)}</SelectContent>
|
||||||
|
</Select>
|
||||||
|
<div className="flex items-center gap-2 text-[11px]">
|
||||||
|
{['code', 'description', 'pattern'].map((m) => (
|
||||||
|
<label key={m} className="flex items-center gap-1 cursor-pointer">
|
||||||
|
<input type="radio" name={`orby-${ri}`} checked={(r.match_by || 'code') === m} onChange={() => upd({ match_by: m })} className="accent-primary" /> {m}
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<label className="flex items-center gap-1.5 text-[11px] cursor-pointer"><Checkbox checked={!!r.exact_match} onCheckedChange={(c) => upd({ exact_match: !!c })} /> exact</label>
|
||||||
|
<button className="ml-auto text-destructive hover:opacity-70" onClick={del} title="Remove this OR search"><Trash2 className="size-4" /></button>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-[1fr_120px] gap-2">
|
||||||
|
<Input className="h-7 font-mono text-xs" value={r.pattern ?? ''} onChange={(e) => upd({ pattern: e.target.value })} placeholder="regex — group 1 = reference (e.g. \b(\d{2})\d{3}\b for postal → dept)" />
|
||||||
|
<Input className="h-7 font-mono text-xs" value={r.prefix ?? ''} onChange={(e) => upd({ prefix: e.target.value })} placeholder="prefix (D)" title="Prepended to each found reference, e.g. 74 → D74" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
|
|||||||
@@ -29,9 +29,13 @@ interface Props {
|
|||||||
// of these and it's already filled (e.g. VE9CF → state NB), the award counts
|
// of these and it's already filled (e.g. VE9CF → state NB), the award counts
|
||||||
// automatically — we surface that so the operator needn't pick it by hand.
|
// automatically — we surface that so the operator needn't pick it by hand.
|
||||||
fieldValues?: Record<string, string>;
|
fieldValues?: Record<string, string>;
|
||||||
|
// Height of the selector. Default is a fixed 210px (the QSO editor modal);
|
||||||
|
// the live entry panel passes "flex-1 min-h-0" so it fills the available
|
||||||
|
// space instead of overflowing and forcing a scrollbar.
|
||||||
|
heightClass?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function AwardRefSelector({ dxcc, value, onChange, fieldValues }: Props) {
|
export function AwardRefSelector({ dxcc, value, onChange, fieldValues, heightClass = 'h-[210px]' }: Props) {
|
||||||
const [defs, setDefs] = useState<AwardDef[]>([]);
|
const [defs, setDefs] = useState<AwardDef[]>([]);
|
||||||
const [metas, setMetas] = useState<Record<string, Meta>>({});
|
const [metas, setMetas] = useState<Record<string, Meta>>({});
|
||||||
const [awardCode, setAwardCode] = useState('POTA');
|
const [awardCode, setAwardCode] = useState('POTA');
|
||||||
@@ -63,13 +67,16 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues }: Props)
|
|||||||
// for a French call but not for others.
|
// for a French call but not for others.
|
||||||
const awards = useMemo(() => {
|
const awards = useMemo(() => {
|
||||||
return defs.filter((d) => {
|
return defs.filter((d) => {
|
||||||
// Computed awards (field = dxcc/state/cqz/…) are derived automatically.
|
// Computed awards (field = dxcc/cqz/…) are derived automatically.
|
||||||
if (COMPUTED_FIELDS.has(String(d.field ?? '').toLowerCase())) return false;
|
if (COMPUTED_FIELDS.has(String(d.field ?? '').toLowerCase())) return false;
|
||||||
const m = metas[String(d.code).toUpperCase()];
|
|
||||||
const hasRefs = (m?.count ?? 0) > 0 || !!m?.can_update || !!d.dynamic;
|
|
||||||
if (!hasRefs) return false;
|
|
||||||
const scope = d.dxcc_filter ?? [];
|
const scope = d.dxcc_filter ?? [];
|
||||||
if (scope.length > 0 && (!dxcc || !scope.includes(dxcc))) return false;
|
if (scope.length > 0 && (!dxcc || !scope.includes(dxcc))) return false;
|
||||||
|
// Offer the award even when its reference list isn't loaded yet: a custom
|
||||||
|
// award (e.g. "Worked All Provinces of China") has no built-in list, so
|
||||||
|
// requiring one would make it impossible to assign references by hand. The
|
||||||
|
// operator can pick from a loaded list when present, or add an unlisted
|
||||||
|
// reference (the right-hand panel). Dynamic / list-backed awards behave as
|
||||||
|
// before — they just always pass here now.
|
||||||
return true;
|
return true;
|
||||||
}).map((d) => ({ code: d.code, name: d.name, field: String(d.field ?? '').toLowerCase() }))
|
}).map((d) => ({ code: d.code, name: d.name, field: String(d.field ?? '').toLowerCase() }))
|
||||||
.sort((a, b) => a.code.localeCompare(b.code));
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
@@ -169,7 +176,7 @@ export function AwardRefSelector({ dxcc, value, onChange, fieldValues }: Props)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex gap-2 h-[210px]">
|
<div className={`flex gap-2 ${heightClass}`}>
|
||||||
{/* Left panel */}
|
{/* Left panel */}
|
||||||
<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">
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { Award as AwardIcon, RefreshCw, Loader2, Search, Pencil, X, Grid3x3, List, BarChart3, AlertTriangle } from 'lucide-react';
|
import { Award as AwardIcon, RefreshCw, Loader2, Search, Pencil, X, Grid3x3, List, BarChart3, AlertTriangle, ChevronUp, ChevronDown } from 'lucide-react';
|
||||||
import { GetAwardDefs, GetAward, AwardCellQSOs, GetAwardStats, AwardMissingQSOs } from '../../wailsjs/go/main/App';
|
import { GetAwardDefs, GetAward, AwardCellQSOs, GetAwardStats, AwardMissingQSOs, ListAwardReferences, AssignAwardRefToQSOs, RescanAwards } from '../../wailsjs/go/main/App';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
|
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 { AwardEditor } from '@/components/AwardEditor';
|
import { AwardEditor } from '@/components/AwardEditor';
|
||||||
@@ -57,7 +58,7 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type AwardListItem = { code: string; name: string; valid?: boolean };
|
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[] };
|
||||||
|
|
||||||
export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
|
export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
|
||||||
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
||||||
@@ -75,6 +76,9 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
const [showMissing, setShowMissing] = useState(false);
|
const [showMissing, setShowMissing] = useState(false);
|
||||||
const [stats, setStats] = useState<AwardStats | null>(null);
|
const [stats, setStats] = useState<AwardStats | null>(null);
|
||||||
const [statsLoading, setStatsLoading] = useState(false);
|
const [statsLoading, setStatsLoading] = useState(false);
|
||||||
|
// Bumped by Rescan to force the stats matrix to re-fetch (the selected award
|
||||||
|
// didn't change, but the backend snapshot did).
|
||||||
|
const [rescanTick, setRescanTick] = useState(0);
|
||||||
|
|
||||||
// Lazily fetch the statistics matrix when the Stats view is shown.
|
// Lazily fetch the statistics matrix when the Stats view is shown.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -84,7 +88,24 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
.then((s) => setStats(s as any))
|
.then((s) => setStats(s as any))
|
||||||
.catch(() => setStats(null))
|
.catch(() => setStats(null))
|
||||||
.finally(() => setStatsLoading(false));
|
.finally(() => setStatsLoading(false));
|
||||||
}, [view, selected]);
|
}, [view, selected, rescanTick]);
|
||||||
|
|
||||||
|
// Rescan: drop the backend snapshot (so confirmations from a fresh LoTW/QRZ
|
||||||
|
// download are picked up) and the cached results, then recompute everything.
|
||||||
|
async function rescan() {
|
||||||
|
if (!selected) return;
|
||||||
|
setLoading(true);
|
||||||
|
try {
|
||||||
|
await RescanAwards();
|
||||||
|
setByCode({});
|
||||||
|
setRescanTick((t) => t + 1);
|
||||||
|
await compute(selected, true);
|
||||||
|
} catch (e: any) {
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Compute one award (cached). force=true bypasses the cache (Rescan).
|
// Compute one award (cached). force=true bypasses the cache (Rescan).
|
||||||
async function compute(code: string, force = false) {
|
async function compute(code: string, force = false) {
|
||||||
@@ -108,7 +129,7 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
try {
|
try {
|
||||||
const defs = ((await GetAwardDefs()) ?? []) as any[];
|
const defs = ((await GetAwardDefs()) ?? []) as any[];
|
||||||
const list: AwardListItem[] = defs
|
const list: AwardListItem[] = defs
|
||||||
.map((d) => ({ code: d.code, name: d.name, valid: d.valid }))
|
.map((d) => ({ code: d.code, name: d.name, valid: d.valid, bands: d.valid_bands ?? [], emission: d.emission ?? [] }))
|
||||||
.sort((a, b) => a.code.localeCompare(b.code));
|
.sort((a, b) => a.code.localeCompare(b.code));
|
||||||
setAwardList(list);
|
setAwardList(list);
|
||||||
const first = list.find((a) => a.code === selected) ?? list[0];
|
const first = list.find((a) => a.code === selected) ?? list[0];
|
||||||
@@ -121,6 +142,53 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
|
|
||||||
const current = byCode[selected];
|
const current = byCode[selected];
|
||||||
|
|
||||||
|
// Bands relevant to the selected award, used by BOTH the grid and the stats
|
||||||
|
// matrix so neither is padded with bands the award doesn't use. Rule: the
|
||||||
|
// award's explicit valid_bands if it has any (e.g. WAPC = 40/20/15/10m); else
|
||||||
|
// the bands the operator actually has contacts on (so DXCC, which has no band
|
||||||
|
// restriction, shows 160m–6m instead of empty VHF/UHF columns). Empty set =
|
||||||
|
// no basis yet → callers fall back to all bands.
|
||||||
|
const awardBands = useMemo(() => {
|
||||||
|
const vb = (awardList.find((a) => a.code === selected)?.bands ?? []).map((b) => b.toLowerCase());
|
||||||
|
if (vb.length > 0) return new Set(vb);
|
||||||
|
const worked = (current?.bands ?? [])
|
||||||
|
.filter((b) => (b.worked ?? 0) > 0)
|
||||||
|
.map((b) => String(b.band).toLowerCase());
|
||||||
|
return new Set(worked);
|
||||||
|
}, [awardList, selected, current]);
|
||||||
|
|
||||||
|
const gridBands = useMemo(() => {
|
||||||
|
if (awardBands.size === 0) return GRID_BANDS;
|
||||||
|
const filtered = GRID_BANDS.filter((b) => awardBands.has(b));
|
||||||
|
return filtered.length ? filtered : GRID_BANDS;
|
||||||
|
}, [awardBands]);
|
||||||
|
|
||||||
|
// Stats rows to show: drop the mode-category rows (CW / DIGITAL / PHONE) the
|
||||||
|
// award doesn't cover. The "ALL" rows (no suffix) always show; a category row
|
||||||
|
// shows only when the award has no emission restriction or lists that emission.
|
||||||
|
const statsRows = useMemo(() => {
|
||||||
|
if (!stats) return [];
|
||||||
|
const em = new Set((awardList.find((a) => a.code === selected)?.emission ?? []).map((e) => e.toUpperCase()));
|
||||||
|
if (em.size === 0) return stats.rows;
|
||||||
|
return stats.rows.filter((r) => {
|
||||||
|
const m = String(r.label).toUpperCase().match(/\b(CW|DIGITAL|PHONE)$/);
|
||||||
|
return !m || em.has(m[1]);
|
||||||
|
});
|
||||||
|
}, [stats, awardList, selected]);
|
||||||
|
|
||||||
|
// Indices into stats.bands to display (and to slice each row's cells by), same
|
||||||
|
// band basis as the grid.
|
||||||
|
const statsBandIdx = useMemo(() => {
|
||||||
|
if (!stats) return [] as number[];
|
||||||
|
const all = stats.bands.map((_, i) => i);
|
||||||
|
if (awardBands.size === 0) return all;
|
||||||
|
const idx = stats.bands
|
||||||
|
.map((b, i) => ({ b: b.toLowerCase(), i }))
|
||||||
|
.filter((x) => awardBands.has(x.b))
|
||||||
|
.map((x) => x.i);
|
||||||
|
return idx.length ? idx : all;
|
||||||
|
}, [stats, awardBands]);
|
||||||
|
|
||||||
const filteredRefs = useMemo(() => {
|
const filteredRefs = useMemo(() => {
|
||||||
if (!current) return [];
|
if (!current) return [];
|
||||||
const q = refSearch.trim().toUpperCase();
|
const q = refSearch.trim().toUpperCase();
|
||||||
@@ -144,8 +212,8 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
<Button variant="ghost" size="sm" className="h-7 px-2" onClick={() => setEditing(true)} title="Edit awards">
|
<Button variant="ghost" size="sm" className="h-7 px-2" onClick={() => setEditing(true)} title="Edit awards">
|
||||||
<Pencil className="size-3.5" />
|
<Pencil className="size-3.5" />
|
||||||
</Button>
|
</Button>
|
||||||
<Button variant="outline" size="sm" className="h-7 px-2" onClick={() => compute(selected, true)} disabled={loading || !selected}
|
<Button variant="outline" size="sm" className="h-7 px-2" onClick={rescan} disabled={loading || !selected}
|
||||||
title="Rescan all QSOs and recompute this award">
|
title="Re-pull the logbook and recompute (picks up new LoTW/QRZ confirmations)">
|
||||||
{loading ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <RefreshCw className="size-3.5 mr-1" />}
|
{loading ? <Loader2 className="size-3.5 mr-1 animate-spin" /> : <RefreshCw className="size-3.5 mr-1" />}
|
||||||
Rescan
|
Rescan
|
||||||
</Button>
|
</Button>
|
||||||
@@ -228,10 +296,10 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
{/* Band breakdown */}
|
{/* Band breakdown */}
|
||||||
{(current.bands ?? []).length > 0 && (
|
{(current.bands ?? []).length > 0 && (
|
||||||
<div className="px-4 py-2 border-b border-border/60">
|
<div className="px-4 py-2 border-b border-border/60">
|
||||||
<div className="text-[11px] uppercase tracking-wider text-muted-foreground mb-1.5">By band (confirmed / worked)</div>
|
<div className="text-xs uppercase tracking-wider text-muted-foreground mb-1.5">By band (confirmed / worked)</div>
|
||||||
<div className="flex flex-wrap gap-1.5">
|
<div className="flex flex-wrap gap-1.5">
|
||||||
{(current.bands ?? []).map((b) => (
|
{(current.bands ?? []).map((b) => (
|
||||||
<div key={b.band} className="rounded-md border border-border bg-card px-2 py-1 text-xs">
|
<div key={b.band} className="rounded-md border border-border bg-card px-2.5 py-1 text-sm">
|
||||||
<span className="font-mono font-semibold">{b.band}</span>{' '}
|
<span className="font-mono font-semibold">{b.band}</span>{' '}
|
||||||
<span className="text-emerald-600 font-mono">{b.confirmed}</span>
|
<span className="text-emerald-600 font-mono">{b.confirmed}</span>
|
||||||
<span className="text-muted-foreground font-mono">/{b.worked}</span>
|
<span className="text-muted-foreground font-mono">/{b.worked}</span>
|
||||||
@@ -245,9 +313,9 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
<div className="flex items-center gap-2 px-4 py-2 flex-wrap">
|
<div className="flex items-center gap-2 px-4 py-2 flex-wrap">
|
||||||
<div className="relative">
|
<div className="relative">
|
||||||
<Search className="size-3.5 absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground" />
|
<Search className="size-3.5 absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground" />
|
||||||
<Input className="h-7 w-56 pl-7 text-xs" placeholder="Filter references…" value={refSearch} onChange={(e) => setRefSearch(e.target.value)} />
|
<Input className="h-8 w-56 pl-7 text-sm" placeholder="Filter references…" value={refSearch} onChange={(e) => setRefSearch(e.target.value)} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center rounded-md border border-border overflow-hidden text-xs">
|
<div className="flex items-center rounded-md border border-border overflow-hidden text-sm">
|
||||||
{([['all', 'All'], ['worked', 'Wkd'], ['notworked', 'Not wkd'], ['worked_notconf', 'Wkd not cfmd']] as const).map(([k, label]) => (
|
{([['all', 'All'], ['worked', 'Wkd'], ['notworked', 'Not wkd'], ['worked_notconf', 'Wkd not cfmd']] as const).map(([k, label]) => (
|
||||||
<button key={k} onClick={() => setRefFilter(k)}
|
<button key={k} onClick={() => setRefFilter(k)}
|
||||||
className={cn('px-2 py-1', refFilter === k ? 'bg-accent font-medium' : 'hover:bg-accent/50 text-muted-foreground')}>
|
className={cn('px-2 py-1', refFilter === k ? 'bg-accent font-medium' : 'hover:bg-accent/50 text-muted-foreground')}>
|
||||||
@@ -255,10 +323,10 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
<span className="text-[11px] text-muted-foreground">{filteredRefs.length} ref{filteredRefs.length > 1 ? 's' : ''}</span>
|
<span className="text-xs text-muted-foreground">{filteredRefs.length} ref{filteredRefs.length > 1 ? 's' : ''}</span>
|
||||||
<button
|
<button
|
||||||
onClick={() => setShowMissing(true)}
|
onClick={() => setShowMissing(true)}
|
||||||
className="flex items-center gap-1 text-[11px] text-amber-700 hover:text-amber-900 border border-amber-300 bg-amber-50 rounded px-2 py-1"
|
className="flex items-center gap-1 text-xs text-amber-700 hover:text-amber-900 border border-amber-300 bg-amber-50 rounded px-2 py-1"
|
||||||
title="Contacts in this award's scope (right DXCC/band/mode) but with no reference — they're excluded until you add it"
|
title="Contacts in this award's scope (right DXCC/band/mode) but with no reference — they're excluded until you add it"
|
||||||
>
|
>
|
||||||
<AlertTriangle className="size-3" /> Missing refs
|
<AlertTriangle className="size-3" /> Missing refs
|
||||||
@@ -283,27 +351,27 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
{statsLoading || !stats ? (
|
{statsLoading || !stats ? (
|
||||||
<div className="p-4 text-xs text-muted-foreground flex items-center gap-2"><Loader2 className="size-3.5 animate-spin" /> Computing…</div>
|
<div className="p-4 text-xs text-muted-foreground flex items-center gap-2"><Loader2 className="size-3.5 animate-spin" /> Computing…</div>
|
||||||
) : (
|
) : (
|
||||||
<table className="text-xs border-separate" style={{ borderSpacing: 0 }}>
|
<table className="text-sm border-separate" style={{ borderSpacing: 0 }}>
|
||||||
<thead className="sticky top-0 z-10">
|
<thead className="sticky top-0 z-10">
|
||||||
<tr className="bg-card">
|
<tr className="bg-card">
|
||||||
<th className="sticky left-0 z-20 bg-card text-left py-1 pr-3 font-medium border-b border-border">Statistic</th>
|
<th className="sticky left-0 z-20 bg-card text-left py-1.5 pr-3 font-medium border-b border-border">Statistic</th>
|
||||||
{stats.bands.map((b) => <th key={b} className="py-1 px-1 font-mono font-medium border-b border-border text-center w-10">{b}</th>)}
|
{statsBandIdx.map((i) => <th key={stats.bands[i]} className="py-1.5 px-1 font-mono font-medium border-b border-border text-center w-11">{stats.bands[i]}</th>)}
|
||||||
<th className="py-1 px-2 font-medium border-b border-border text-center">Total</th>
|
<th className="py-1.5 px-2 font-medium border-b border-border text-center">Total</th>
|
||||||
<th className="py-1 px-2 font-medium border-b border-border text-center">Grand</th>
|
<th className="py-1.5 px-2 font-medium border-b border-border text-center">Grand</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{stats.rows.map((row, i) => {
|
{statsRows.map((row, i) => {
|
||||||
const isGroupStart = row.label === 'WORKED' || /^WORKED /.test(row.label);
|
const isGroupStart = row.label === 'WORKED' || /^WORKED /.test(row.label);
|
||||||
return (
|
return (
|
||||||
<tr key={row.label} className={cn(i % 3 === 0 && i > 0 && 'border-t-2 border-border')}>
|
<tr key={row.label} className={cn(i % 3 === 0 && i > 0 && 'border-t-2 border-border')}>
|
||||||
<td className={cn('sticky left-0 bg-card py-0.5 pr-3 border-b border-border/30 whitespace-nowrap',
|
<td className={cn('sticky left-0 bg-card py-1 pr-3 border-b border-border/30 whitespace-nowrap',
|
||||||
isGroupStart ? 'font-semibold text-foreground' : 'text-muted-foreground')}>{row.label}</td>
|
isGroupStart ? 'font-semibold text-foreground' : 'text-muted-foreground')}>{row.label}</td>
|
||||||
{row.cells.map((c, j) => (
|
{statsBandIdx.map((i) => { const c = row.cells[i] ?? 0; return (
|
||||||
<td key={j} className={cn('text-center py-0.5 border-b border-l border-border/20 font-mono', c > 0 ? 'bg-emerald-500/15 text-emerald-700' : 'text-muted-foreground/30')}>{c || ''}</td>
|
<td key={i} className={cn('text-center py-1 border-b border-l border-border/20 font-mono', c > 0 ? 'bg-emerald-500/15 text-emerald-700' : 'text-muted-foreground/30')}>{c || ''}</td>
|
||||||
))}
|
); })}
|
||||||
<td className="text-center py-0.5 px-2 border-b border-l border-border font-mono font-semibold">{row.total || ''}</td>
|
<td className="text-center py-1 px-2 border-b border-l border-border font-mono font-semibold">{row.total || ''}</td>
|
||||||
<td className="text-center py-0.5 px-2 border-b border-l border-border/20 font-mono text-muted-foreground">{row.grand_total || ''}</td>
|
<td className="text-center py-1 px-2 border-b border-l border-border/20 font-mono text-muted-foreground">{row.grand_total || ''}</td>
|
||||||
</tr>
|
</tr>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -313,30 +381,30 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
</div>
|
</div>
|
||||||
) : view === 'grid' ? (
|
) : view === 'grid' ? (
|
||||||
<div className="flex-1 overflow-auto px-4 pb-3">
|
<div className="flex-1 overflow-auto px-4 pb-3">
|
||||||
<table className="text-xs border-separate" style={{ borderSpacing: 0 }}>
|
<table className="text-sm border-separate" style={{ borderSpacing: 0 }}>
|
||||||
<thead className="sticky top-0 z-10">
|
<thead className="sticky top-0 z-10">
|
||||||
<tr className="bg-card">
|
<tr className="bg-card">
|
||||||
<th className="sticky left-0 z-20 bg-card text-left py-1 pr-2 font-medium border-b border-border w-24">Ref</th>
|
<th className="sticky left-0 z-20 bg-card text-left py-1.5 pr-2 font-medium border-b border-border w-24">Ref</th>
|
||||||
<th className="text-left py-1 pr-3 font-medium border-b border-border">Description</th>
|
<th className="text-left py-1.5 pr-3 font-medium border-b border-border">Description</th>
|
||||||
{GRID_BANDS.map((b) => (
|
{gridBands.map((b) => (
|
||||||
<th key={b} className="py-1 px-1 font-mono font-medium border-b border-border text-center w-9">{b}</th>
|
<th key={b} className="py-1.5 px-1 font-mono font-medium border-b border-border text-center w-11">{b}</th>
|
||||||
))}
|
))}
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{filteredRefs.map((r) => (
|
{filteredRefs.map((r) => (
|
||||||
<tr key={r.ref} className={cn('hover:bg-accent/20', !r.worked && 'opacity-60')}>
|
<tr key={r.ref} className={cn('hover:bg-accent/20', !r.worked && 'opacity-60')}>
|
||||||
<td className="sticky left-0 bg-card hover:bg-accent/20 py-0.5 pr-2 font-mono font-semibold border-b border-border/30">{r.ref}</td>
|
<td className="sticky left-0 bg-card hover:bg-accent/20 py-1 pr-2 font-mono font-semibold border-b border-border/30">{r.ref}</td>
|
||||||
<td className="py-0.5 pr-3 text-muted-foreground truncate max-w-[260px] border-b border-border/30">
|
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[360px] border-b border-border/30">
|
||||||
{r.name}{r.group ? <span className="text-muted-foreground/60"> · {r.group}</span> : ''}
|
{r.name}{r.group ? <span className="text-muted-foreground/60"> · {r.group}</span> : ''}
|
||||||
</td>
|
</td>
|
||||||
{GRID_BANDS.map((b) => {
|
{gridBands.map((b) => {
|
||||||
const s = cellStatus(r, b);
|
const s = cellStatus(r, b);
|
||||||
return (
|
return (
|
||||||
<td key={b} className="border-b border-l border-border/30 p-0 text-center">
|
<td key={b} className="border-b border-l border-border/30 p-0 text-center">
|
||||||
{s === 'none' ? <span className="block w-9 h-5" /> : (
|
{s === 'none' ? <span className="block w-11 h-7" /> : (
|
||||||
<button
|
<button
|
||||||
className={cn('block w-9 h-5 text-[10px] font-bold', CELL_STYLE[s], 'hover:brightness-110')}
|
className={cn('block w-11 h-7 text-[11px] font-bold', CELL_STYLE[s], 'hover:brightness-110')}
|
||||||
title={`${r.ref} · ${b} — click to view QSOs`}
|
title={`${r.ref} · ${b} — click to view QSOs`}
|
||||||
onClick={() => setCell({ ref: r.ref, band: b, name: r.name })}
|
onClick={() => setCell({ ref: r.ref, band: b, name: r.name })}
|
||||||
>{CELL_LABEL[s]}</button>
|
>{CELL_LABEL[s]}</button>
|
||||||
@@ -351,22 +419,22 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="flex-1 overflow-auto px-4 pb-3">
|
<div className="flex-1 overflow-auto px-4 pb-3">
|
||||||
<table className="w-full text-xs">
|
<table className="w-full text-sm">
|
||||||
<thead className="sticky top-0 bg-card">
|
<thead className="sticky top-0 bg-card">
|
||||||
<tr className="text-left text-muted-foreground border-b border-border">
|
<tr className="text-left text-muted-foreground border-b border-border">
|
||||||
<th className="py-1 pr-2 font-medium w-24">Ref</th>
|
<th className="py-1.5 pr-2 font-medium w-24">Ref</th>
|
||||||
<th className="py-1 pr-2 font-medium">Name</th>
|
<th className="py-1.5 pr-2 font-medium">Name</th>
|
||||||
<th className="py-1 pr-2 font-medium w-40">Group</th>
|
<th className="py-1.5 pr-2 font-medium w-40">Group</th>
|
||||||
<th className="py-1 pr-2 font-medium w-24">Status</th>
|
<th className="py-1.5 pr-2 font-medium w-24">Status</th>
|
||||||
<th className="py-1 font-medium">Bands</th>
|
<th className="py-1.5 font-medium">Bands</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{filteredRefs.map((r) => (
|
{filteredRefs.map((r) => (
|
||||||
<tr key={r.ref} className={cn('border-b border-border/30', !r.worked && 'opacity-50')}>
|
<tr key={r.ref} className={cn('border-b border-border/30', !r.worked && 'opacity-50')}>
|
||||||
<td className="py-1 pr-2 font-mono font-semibold">{r.ref}</td>
|
<td className="py-1 pr-2 font-mono font-semibold">{r.ref}</td>
|
||||||
<td className="py-1 pr-2 text-muted-foreground truncate max-w-[240px]">{r.name}</td>
|
<td className="py-1 pr-2 text-muted-foreground truncate max-w-[340px]">{r.name}</td>
|
||||||
<td className="py-1 pr-2 text-muted-foreground truncate max-w-[150px]">{r.group}</td>
|
<td className="py-1 pr-2 text-muted-foreground truncate max-w-[200px]">{r.group}</td>
|
||||||
<td className="py-1 pr-2">
|
<td className="py-1 pr-2">
|
||||||
{!r.worked ? <span className="text-muted-foreground/70">— missing</span>
|
{!r.worked ? <span className="text-muted-foreground/70">— missing</span>
|
||||||
: r.validated ? <span className="text-emerald-600">validated</span>
|
: r.validated ? <span className="text-emerald-600">validated</span>
|
||||||
@@ -401,23 +469,91 @@ export function AwardsPanel({ onEditQSO }: { onEditQSO?: (id: number) => void }
|
|||||||
// MissingQSOModal lists contacts within an award's scope that carry NO
|
// MissingQSOModal lists contacts within an award's scope that carry NO
|
||||||
// reference — the silent gaps. Rows open the QSO editor so the operator can add
|
// reference — the silent gaps. Rows open the QSO editor so the operator can add
|
||||||
// the missing reference (e.g. a department for DDFM).
|
// the missing reference (e.g. a department for DDFM).
|
||||||
|
type MissingSortKey = 'qso_date' | 'callsign' | 'band' | 'mode' | 'country' | 'qth';
|
||||||
|
|
||||||
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
|
function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; name: string; onClose: () => void; onEditQSO?: (id: number) => void }) {
|
||||||
const [qsos, setQsos] = useState<any[]>([]);
|
const [qsos, setQsos] = useState<any[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [sel, setSel] = useState<Set<number>>(new Set());
|
||||||
|
const [sortKey, setSortKey] = useState<MissingSortKey>('callsign');
|
||||||
|
const [sortDir, setSortDir] = useState<'asc' | 'desc'>('asc');
|
||||||
|
const [refs, setRefs] = useState<Array<{ code: string; name: string }>>([]);
|
||||||
|
const [assignRef, setAssignRef] = useState('');
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [msg, setMsg] = useState('');
|
||||||
|
|
||||||
const load = () => {
|
const load = () => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
|
setSel(new Set());
|
||||||
AwardMissingQSOs(code)
|
AwardMissingQSOs(code)
|
||||||
.then((r) => setQsos((r ?? []) as any))
|
.then((r) => setQsos((r ?? []) as any))
|
||||||
.catch(() => setQsos([]))
|
.catch(() => setQsos([]))
|
||||||
.finally(() => setLoading(false));
|
.finally(() => setLoading(false));
|
||||||
};
|
};
|
||||||
useEffect(() => { load(); }, [code]);
|
useEffect(() => { load(); }, [code]);
|
||||||
// Distinct stations vs total contacts (a station may appear on several QSOs).
|
// The award's reference list drives the "assign" dropdown (e.g. China provinces).
|
||||||
|
useEffect(() => {
|
||||||
|
ListAwardReferences(code)
|
||||||
|
.then((r) => setRefs(((r ?? []) as any[]).map((x) => ({ code: String(x.code).toUpperCase(), name: String(x.name ?? '') }))))
|
||||||
|
.catch(() => setRefs([]));
|
||||||
|
}, [code]);
|
||||||
|
|
||||||
|
const qthOf = (q: any) => String(q.qth || q.notes || '');
|
||||||
|
const sorted = useMemo(() => {
|
||||||
|
const dir = sortDir === 'asc' ? 1 : -1;
|
||||||
|
const val = (q: any): string => {
|
||||||
|
switch (sortKey) {
|
||||||
|
case 'qso_date': return String(q.qso_date ?? '');
|
||||||
|
case 'callsign': return String(q.callsign ?? '').toUpperCase();
|
||||||
|
case 'band': return String(q.band ?? '');
|
||||||
|
case 'mode': return String(q.mode ?? '');
|
||||||
|
case 'country': return String(q.country ?? '').toUpperCase();
|
||||||
|
case 'qth': return qthOf(q).toUpperCase();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
return [...qsos].sort((a, b) => val(a).localeCompare(val(b)) * dir);
|
||||||
|
}, [qsos, sortKey, sortDir]);
|
||||||
|
|
||||||
|
const ids = useMemo(() => sorted.map((q) => q.id as number).filter(Boolean), [sorted]);
|
||||||
|
const allSelected = ids.length > 0 && ids.every((id) => sel.has(id));
|
||||||
|
const toggleAll = () => setSel(allSelected ? new Set() : new Set(ids));
|
||||||
|
const toggle = (id: number) => setSel((s) => { const n = new Set(s); n.has(id) ? n.delete(id) : n.add(id); return n; });
|
||||||
|
const setSort = (k: MissingSortKey) => {
|
||||||
|
if (k === sortKey) setSortDir((d) => (d === 'asc' ? 'desc' : 'asc'));
|
||||||
|
else { setSortKey(k); setSortDir('asc'); }
|
||||||
|
};
|
||||||
|
|
||||||
|
async function applyAssign() {
|
||||||
|
if (!assignRef || sel.size === 0) return;
|
||||||
|
setBusy(true); setMsg('');
|
||||||
|
try {
|
||||||
|
const assignedIds = Array.from(sel);
|
||||||
|
const n = await AssignAwardRefToQSOs(code, assignRef, assignedIds);
|
||||||
|
// Optimistic: the assigned contacts now carry a reference, so drop them
|
||||||
|
// from the list locally instead of re-running the slow whole-log scan.
|
||||||
|
const done = new Set(assignedIds);
|
||||||
|
setQsos((list) => list.filter((q) => !done.has(q.id as number)));
|
||||||
|
setSel(new Set());
|
||||||
|
setMsg(`Assigned ${code}@${assignRef} to ${n} contact${n > 1 ? 's' : ''}.`);
|
||||||
|
} catch (e: any) {
|
||||||
|
setMsg(String(e?.message ?? e));
|
||||||
|
} finally { setBusy(false); }
|
||||||
|
}
|
||||||
|
|
||||||
const stations = useMemo(() => new Set(qsos.map((q) => String(q.callsign || '').toUpperCase())).size, [qsos]);
|
const stations = useMemo(() => new Set(qsos.map((q) => String(q.callsign || '').toUpperCase())).size, [qsos]);
|
||||||
const fmt = (s: any) => { const d = new Date(s); return isNaN(d.getTime()) ? '' : d.toISOString().slice(0, 16).replace('T', ' '); };
|
const fmt = (s: any) => { const d = new Date(s); return isNaN(d.getTime()) ? '' : d.toISOString().slice(0, 16).replace('T', ' '); };
|
||||||
|
|
||||||
|
const SortTh = ({ k, label, className }: { k: MissingSortKey; label: string; className?: string }) => (
|
||||||
|
<th className={cn('py-1 pr-2 font-medium cursor-pointer select-none hover:text-foreground', className)} onClick={() => setSort(k)}>
|
||||||
|
<span className="inline-flex items-center gap-0.5">{label}
|
||||||
|
{sortKey === k && (sortDir === 'asc' ? <ChevronUp className="size-3" /> : <ChevronDown className="size-3" />)}
|
||||||
|
</span>
|
||||||
|
</th>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed inset-0 z-50 bg-black/40 grid place-items-center" onClick={onClose}>
|
<div className="fixed inset-0 z-50 bg-black/40 grid place-items-center" onClick={onClose}>
|
||||||
<div className="bg-card border border-border rounded-lg shadow-xl w-[760px] max-h-[80vh] flex flex-col" onClick={(e) => e.stopPropagation()}>
|
<div className="bg-card border border-border rounded-lg shadow-xl w-[860px] max-h-[80vh] flex flex-col" onClick={(e) => e.stopPropagation()}>
|
||||||
<div className="flex items-center gap-2 px-4 py-2.5 border-b">
|
<div className="flex items-center gap-2 px-4 py-2.5 border-b">
|
||||||
<AlertTriangle className="size-4 text-amber-600" />
|
<AlertTriangle className="size-4 text-amber-600" />
|
||||||
<span className="font-semibold text-sm">{code} — contacts missing a reference</span>
|
<span className="font-semibold text-sm">{code} — contacts missing a reference</span>
|
||||||
@@ -432,8 +568,28 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
</div>
|
</div>
|
||||||
<div className="px-4 py-2 text-[11px] text-muted-foreground border-b border-border/50">
|
<div className="px-4 py-2 text-[11px] text-muted-foreground border-b border-border/50">
|
||||||
In this award's scope (DXCC / band / mode / dates) but no reference was found — so they don't count yet.
|
In this award's scope (DXCC / band / mode / dates) but no reference was found — so they don't count yet.
|
||||||
{onEditQSO && ' Click a row to open the QSO and add the reference.'}
|
Sort by a column, tick the matching contacts, then assign the reference below.{onEditQSO && ' (Or click a row to open the QSO.)'}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Bulk-assign toolbar */}
|
||||||
|
<div className="flex items-center gap-2 px-4 py-2 border-b border-border/50 bg-muted/20">
|
||||||
|
<span className="text-xs text-muted-foreground">{sel.size} selected →</span>
|
||||||
|
<Select value={assignRef} onValueChange={setAssignRef}>
|
||||||
|
<SelectTrigger className="h-7 w-64 text-xs"><SelectValue placeholder="Choose a reference to assign…" /></SelectTrigger>
|
||||||
|
<SelectContent className="max-h-72">
|
||||||
|
{refs.map((r) => (
|
||||||
|
<SelectItem key={r.code} value={r.code}>
|
||||||
|
<span className="font-mono font-semibold">{r.code}</span>{r.name ? <span className="text-muted-foreground"> · {r.name}</span> : ''}
|
||||||
|
</SelectItem>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
<Button size="sm" disabled={!assignRef || sel.size === 0 || busy} onClick={applyAssign}>
|
||||||
|
{busy ? <Loader2 className="size-3.5 animate-spin" /> : null} Assign to {sel.size} selected
|
||||||
|
</Button>
|
||||||
|
{msg && <span className="text-[11px] text-emerald-700">{msg}</span>}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div className="flex-1 overflow-auto">
|
<div className="flex-1 overflow-auto">
|
||||||
{loading ? (
|
{loading ? (
|
||||||
<div className="p-4 text-xs text-muted-foreground flex items-center gap-2"><Loader2 className="size-3.5 animate-spin" /> Scanning…</div>
|
<div className="p-4 text-xs text-muted-foreground flex items-center gap-2"><Loader2 className="size-3.5 animate-spin" /> Scanning…</div>
|
||||||
@@ -443,22 +599,35 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<table className="w-full text-xs">
|
<table className="w-full text-xs">
|
||||||
<thead className="sticky top-0 bg-card text-left text-muted-foreground border-b border-border">
|
<thead className="sticky top-0 bg-card text-left text-muted-foreground border-b border-border z-10">
|
||||||
<tr><th className="py-1 px-3 font-medium">Date (UTC)</th><th className="py-1 pr-2 font-medium">Callsign</th><th className="py-1 pr-2 font-medium">Band</th><th className="py-1 pr-2 font-medium">Mode</th><th className="py-1 pr-2 font-medium">Country</th><th className="py-1 pr-3 font-medium">QTH / Note</th></tr>
|
<tr>
|
||||||
|
<th className="py-1 px-3 w-8"><Checkbox checked={allSelected} onCheckedChange={toggleAll} /></th>
|
||||||
|
<SortTh k="qso_date" label="Date (UTC)" className="pl-0" />
|
||||||
|
<SortTh k="callsign" label="Callsign" />
|
||||||
|
<SortTh k="band" label="Band" />
|
||||||
|
<SortTh k="mode" label="Mode" />
|
||||||
|
<SortTh k="country" label="Country" />
|
||||||
|
<SortTh k="qth" label="QTH / Note" />
|
||||||
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{qsos.map((q, i) => (
|
{sorted.map((q, i) => {
|
||||||
<tr key={q.id ?? i}
|
const id = q.id as number;
|
||||||
className={cn('border-b border-border/30', onEditQSO && 'cursor-pointer hover:bg-accent/40')}
|
return (
|
||||||
onClick={() => onEditQSO && q.id && onEditQSO(q.id as number)}>
|
<tr key={id ?? i}
|
||||||
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
className={cn('border-b border-border/30', sel.has(id) && 'bg-accent/30', onEditQSO && 'hover:bg-accent/40')}>
|
||||||
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
<td className="py-1 px-3" onClick={(e) => e.stopPropagation()}>
|
||||||
<td className="py-1 pr-2">{q.band}</td>
|
<Checkbox checked={sel.has(id)} onCheckedChange={() => toggle(id)} />
|
||||||
<td className="py-1 pr-2">{q.mode}</td>
|
</td>
|
||||||
<td className="py-1 pr-2 text-muted-foreground truncate max-w-[120px]">{q.country}</td>
|
<td className={cn('py-1 font-mono', onEditQSO && 'cursor-pointer')} onClick={() => onEditQSO && id && onEditQSO(id)}>{fmt(q.qso_date)}</td>
|
||||||
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[200px]">{q.qth || q.notes}</td>
|
<td className={cn('py-1 pr-2 font-mono font-semibold', onEditQSO && 'cursor-pointer')} onClick={() => onEditQSO && id && onEditQSO(id)}>{q.callsign}</td>
|
||||||
</tr>
|
<td className="py-1 pr-2">{q.band}</td>
|
||||||
))}
|
<td className="py-1 pr-2">{q.mode}</td>
|
||||||
|
<td className="py-1 pr-2 text-muted-foreground truncate max-w-[140px]">{q.country}</td>
|
||||||
|
<td className="py-1 pr-3 text-muted-foreground truncate max-w-[260px]">{qthOf(q)}</td>
|
||||||
|
</tr>
|
||||||
|
);
|
||||||
|
})}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ interface Props {
|
|||||||
currentBand: string;
|
currentBand: string;
|
||||||
currentMode: string;
|
currentMode: string;
|
||||||
bands?: string[]; // operator's configured bands; falls back to DEFAULT_BANDS
|
bands?: string[]; // operator's configured bands; falls back to DEFAULT_BANDS
|
||||||
|
hasCall?: boolean; // a callsign is being entered — only then highlight the "current entry" cell
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
// Compact column label for a band tag: keep the classic V/U for 2m/70cm,
|
||||||
@@ -78,7 +79,7 @@ function cellTitle(band: string, cls: string, status: string, current: boolean):
|
|||||||
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
return `${band} ${cls}: ${desc}${current ? ' — current entry' : ''}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands }: Props) {
|
export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands, hasCall = true }: Props) {
|
||||||
// Columns from the operator's configured bands (so the matrix shows only the
|
// Columns from the operator's configured bands (so the matrix shows only the
|
||||||
// bands they actually use), falling back to the built-in default set.
|
// bands they actually use), falling back to the built-in default set.
|
||||||
const cols = useMemo(
|
const cols = useMemo(
|
||||||
@@ -100,6 +101,29 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands }: Prop
|
|||||||
return m;
|
return m;
|
||||||
}, [wb]);
|
}, [wb]);
|
||||||
|
|
||||||
|
// "Newness" of the current band+mode entry, for the award/DX-chase badges.
|
||||||
|
// Derived straight from the entity's real band_status (all bands it was
|
||||||
|
// worked on — not just the operator's configured column list).
|
||||||
|
// Newness uses the ACTUAL mode (FT8 / FT4 / RTTY…), not the PH/CW/DIG class:
|
||||||
|
// DIG is a group, so FT4 after FT8 is genuinely a new mode. dxcc_band_modes
|
||||||
|
// lists every real (band, mode) the entity was worked on.
|
||||||
|
const bandModes = (wb?.dxcc_band_modes ?? []) as { band: string; mode: string }[];
|
||||||
|
const curMode = (currentMode || '').toUpperCase().trim();
|
||||||
|
const bandWorked = bandModes.some((bm) => bm.band === currentBand); // entity worked on this band (any mode)
|
||||||
|
const modeWorked = !!curMode && bandModes.some((bm) => (bm.mode || '').toUpperCase() === curMode); // …in this exact mode (any band)
|
||||||
|
const slotWorked = !!curMode && bandModes.some((bm) => bm.band === currentBand && (bm.mode || '').toUpperCase() === curMode);
|
||||||
|
// Mutually-exclusive badges, shown only when the entity is worked but this
|
||||||
|
// exact band+mode is NOT yet:
|
||||||
|
// New Band & Mode = both the band AND the mode are new for this entity.
|
||||||
|
// New Band = the band is new (the mode was worked on another band).
|
||||||
|
// New Mode = the mode is new (the band was worked in another mode).
|
||||||
|
// New Slot = both band and mode already worked — just not together.
|
||||||
|
const slotNew = hasDxcc && !newOne && !!curMode && !slotWorked;
|
||||||
|
const newBandMode = slotNew && !bandWorked && !modeWorked;
|
||||||
|
const newBand = slotNew && !bandWorked && modeWorked;
|
||||||
|
const newMode = slotNew && bandWorked && !modeWorked;
|
||||||
|
const newSlot = slotNew && bandWorked && modeWorked;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section
|
<section
|
||||||
className={cn(
|
className={cn(
|
||||||
@@ -135,6 +159,14 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands }: Prop
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
|
{(newBand || newMode || newBandMode || newSlot) && (
|
||||||
|
<div className="flex flex-wrap items-center gap-1">
|
||||||
|
{newBandMode && <Badge className="bg-amber-500 text-white px-1.5 py-0 text-[10px]">New Band & Mode</Badge>}
|
||||||
|
{newBand && <Badge className="bg-amber-600 text-white px-1.5 py-0 text-[10px]">New Band</Badge>}
|
||||||
|
{newMode && <Badge className="bg-amber-600 text-white px-1.5 py-0 text-[10px]">New Mode</Badge>}
|
||||||
|
{newSlot && <Badge className="bg-sky-600 text-white px-1.5 py-0 text-[10px]">New Slot</Badge>}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</>
|
</>
|
||||||
) : busy ? (
|
) : busy ? (
|
||||||
<span className="flex items-center gap-2 text-xs text-muted-foreground italic">
|
<span className="flex items-center gap-2 text-xs text-muted-foreground italic">
|
||||||
@@ -181,7 +213,7 @@ export function BandSlotGrid({ wb, busy, currentBand, currentMode, bands }: Prop
|
|||||||
</th>
|
</th>
|
||||||
{cols.map((b) => {
|
{cols.map((b) => {
|
||||||
const st = statusMap.get(`${b.tag}|${cls}`) ?? '';
|
const st = statusMap.get(`${b.tag}|${cls}`) ?? '';
|
||||||
const isCurrent = b.tag === currentBand && classCurrent;
|
const isCurrent = hasCall && b.tag === currentBand && classCurrent;
|
||||||
return (
|
return (
|
||||||
<td
|
<td
|
||||||
key={b.tag}
|
key={b.tag}
|
||||||
|
|||||||
@@ -0,0 +1,167 @@
|
|||||||
|
import { useMemo, useState } from 'react';
|
||||||
|
import { Loader2 } from 'lucide-react';
|
||||||
|
import { BulkUpdateField } from '../../wailsjs/go/main/App';
|
||||||
|
import {
|
||||||
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||||
|
} from '@/components/ui/dialog';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import {
|
||||||
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
|
} from '@/components/ui/select';
|
||||||
|
|
||||||
|
type FieldKind = 'status' | 'text';
|
||||||
|
type FieldDef = { id: string; label: string; group: string; kind: FieldKind; upper?: boolean };
|
||||||
|
|
||||||
|
// Fields a bulk edit may target. status → Y/N/R/I dropdown; text → free input.
|
||||||
|
// upper:true uppercases code-like values (callsign, grid, refs). The id matches
|
||||||
|
// the backend BulkUpdateField whitelist.
|
||||||
|
const FIELDS: FieldDef[] = [
|
||||||
|
// QSL / upload status
|
||||||
|
{ id: 'lotw_sent', label: 'LoTW sent', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'lotw_rcvd', label: 'LoTW received', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'eqsl_sent', label: 'eQSL sent', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'eqsl_rcvd', label: 'eQSL received', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'qsl_sent', label: 'Paper QSL sent', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'qsl_rcvd', label: 'Paper QSL received', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'qrz_upload', label: 'QRZ.com upload', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'clublog_upload', label: 'Club Log upload', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'hrdlog_upload', label: 'HRDLog upload', group: 'QSL / upload', kind: 'status' },
|
||||||
|
{ id: 'qsl_via', label: 'QSL via', group: 'QSL / upload', kind: 'text' },
|
||||||
|
// My station / operator
|
||||||
|
{ id: 'station_callsign', label: 'Station callsign', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'operator', label: 'Operator', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_grid', label: 'My grid', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_antenna', label: 'My antenna', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_rig', label: 'My rig', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_street', label: 'My street', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_city', label: 'My city', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_postal_code', label: 'My postal code', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_country', label: 'My country', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_state', label: 'My state', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_cnty', label: 'My county', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_iota', label: 'My IOTA', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_sota_ref', label: 'My SOTA ref', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_pota_ref', label: 'My POTA ref', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_wwff_ref', label: 'My WWFF ref', group: 'My station', kind: 'text', upper: true },
|
||||||
|
{ id: 'my_sig', label: 'My SIG', group: 'My station', kind: 'text' },
|
||||||
|
{ id: 'my_sig_info', label: 'My SIG info', group: 'My station', kind: 'text' },
|
||||||
|
// Misc
|
||||||
|
{ id: 'comment', label: 'Comment', group: 'Misc', kind: 'text' },
|
||||||
|
{ id: 'notes', label: 'Notes', group: 'Misc', kind: 'text' },
|
||||||
|
{ id: 'rig', label: 'Rig (contacted)', group: 'Misc', kind: 'text' },
|
||||||
|
{ id: 'ant', label: 'Antenna (contacted)', group: 'Misc', kind: 'text' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const STATUS_VALUES: { v: string; label: string }[] = [
|
||||||
|
{ v: 'Y', label: 'Y — Yes / uploaded' },
|
||||||
|
{ v: 'N', label: 'N — No' },
|
||||||
|
{ v: 'R', label: 'R — Requested' },
|
||||||
|
{ v: 'I', label: 'I — Ignore' },
|
||||||
|
{ v: '_', label: '(blank — clear)' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const GROUPS = ['QSL / upload', 'My station', 'Misc'];
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
open: boolean;
|
||||||
|
ids: number[];
|
||||||
|
onClose: () => void;
|
||||||
|
onApplied: (n: number) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
// BulkEditModal sets one QSL/upload status field to a chosen value across the
|
||||||
|
// selected QSOs — e.g. flip a filtered batch of imported contacts from N to R
|
||||||
|
// so they become eligible for upload.
|
||||||
|
export function BulkEditModal({ open, ids, onClose, onApplied }: Props) {
|
||||||
|
const [field, setField] = useState('hrdlog_upload');
|
||||||
|
const [statusValue, setStatusValue] = useState('R');
|
||||||
|
const [textValue, setTextValue] = useState('');
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
const [error, setError] = useState('');
|
||||||
|
|
||||||
|
const def = useMemo(() => FIELDS.find((f) => f.id === field) ?? FIELDS[0], [field]);
|
||||||
|
const isStatus = def.kind === 'status';
|
||||||
|
const effectiveValue = isStatus
|
||||||
|
? (statusValue === '_' ? '' : statusValue)
|
||||||
|
: textValue.trim();
|
||||||
|
|
||||||
|
async function apply() {
|
||||||
|
setBusy(true);
|
||||||
|
setError('');
|
||||||
|
try {
|
||||||
|
const n = await BulkUpdateField(ids as any, field, effectiveValue);
|
||||||
|
onApplied(Number(n) || 0);
|
||||||
|
onClose();
|
||||||
|
} catch (e: any) {
|
||||||
|
setError(String(e?.message ?? e));
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={(o) => { if (!o) onClose(); }}>
|
||||||
|
<DialogContent className="max-w-md">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Bulk edit field</DialogTitle>
|
||||||
|
<DialogDescription>
|
||||||
|
Set one field on the {ids.length} selected QSO{ids.length > 1 ? 's' : ''}.
|
||||||
|
This overwrites the current value — there is no undo.
|
||||||
|
</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<div className="px-5 py-2 space-y-3">
|
||||||
|
<div className="grid grid-cols-[90px_1fr] gap-3 items-center">
|
||||||
|
<Label className="text-sm">Field</Label>
|
||||||
|
<Select value={field} onValueChange={setField}>
|
||||||
|
<SelectTrigger className="h-8"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{GROUPS.map((g) => (
|
||||||
|
<div key={g}>
|
||||||
|
<div className="px-2 py-1 text-[10px] uppercase tracking-wider text-muted-foreground">{g}</div>
|
||||||
|
{FIELDS.filter((f) => f.group === g).map((f) => (
|
||||||
|
<SelectItem key={f.id} value={f.id}>{f.label}</SelectItem>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
|
||||||
|
<Label className="text-sm">Value</Label>
|
||||||
|
{isStatus ? (
|
||||||
|
<Select value={statusValue} onValueChange={setStatusValue}>
|
||||||
|
<SelectTrigger className="h-8"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
{STATUS_VALUES.map((v) => <SelectItem key={v.v} value={v.v}>{v.label}</SelectItem>)}
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
) : (
|
||||||
|
<Input
|
||||||
|
className="h-8 text-xs"
|
||||||
|
value={textValue}
|
||||||
|
placeholder="leave empty to clear the field"
|
||||||
|
onChange={(e) => setTextValue(def.upper ? e.target.value.toUpperCase() : e.target.value)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="text-[11px] text-muted-foreground">
|
||||||
|
Will set <span className="font-semibold">{def.label}</span> ={' '}
|
||||||
|
<span className="font-mono">{effectiveValue === '' ? '(blank)' : effectiveValue}</span> on {ids.length} QSO{ids.length > 1 ? 's' : ''}.
|
||||||
|
</div>
|
||||||
|
{error && <div className="text-xs text-rose-700">{error}</div>}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<DialogFooter>
|
||||||
|
<Button variant="outline" onClick={onClose} disabled={busy}>Cancel</Button>
|
||||||
|
<Button onClick={apply} disabled={busy || ids.length === 0}>
|
||||||
|
{busy ? <Loader2 className="size-3.5 animate-spin" /> : null}
|
||||||
|
Apply to {ids.length}
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { MessageSquare, Send, Users, X } from 'lucide-react';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
export type ChatMsg = { id: number; operator: string; station: string; message: string; created_at: string };
|
||||||
|
export type ChatPresence = { operator: string; station: string; ago_secs: number };
|
||||||
|
|
||||||
|
function hhmm(iso: string): string {
|
||||||
|
const d = new Date(iso);
|
||||||
|
if (isNaN(d.getTime())) return '';
|
||||||
|
const p = (n: number) => String(n).padStart(2, '0');
|
||||||
|
return `${p(d.getUTCHours())}:${p(d.getUTCMinutes())}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChatPanel — presentational multi-op chat panel, docked in the aside row next
|
||||||
|
// to the rotor / WinKeyer / DVK panels. All data + state lives in App.tsx.
|
||||||
|
export function ChatPanel({ msgs, online, myCall, onSend, onClose }: {
|
||||||
|
msgs: ChatMsg[]; online: ChatPresence[]; myCall?: string;
|
||||||
|
onSend: (text: string) => void; onClose: () => void;
|
||||||
|
}) {
|
||||||
|
const [text, setText] = useState('');
|
||||||
|
const listRef = useRef<HTMLDivElement>(null);
|
||||||
|
const me = (myCall || '').toUpperCase();
|
||||||
|
useEffect(() => { const el = listRef.current; if (el) el.scrollTop = el.scrollHeight; }, [msgs]);
|
||||||
|
|
||||||
|
function send() {
|
||||||
|
const t = text.trim();
|
||||||
|
if (!t) return;
|
||||||
|
setText('');
|
||||||
|
onSend(t);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full flex flex-col rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30 shrink-0">
|
||||||
|
<MessageSquare className="size-4 text-sky-600" />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">Chat</span>
|
||||||
|
<span className="flex-1" />
|
||||||
|
{/* Online count — hover to see who's connected. */}
|
||||||
|
<div className="relative group">
|
||||||
|
<span className="inline-flex items-center gap-1 text-[11px] text-muted-foreground cursor-default">
|
||||||
|
<Users className="size-3.5" />{online.length}
|
||||||
|
</span>
|
||||||
|
{online.length > 0 && (
|
||||||
|
<div className="hidden group-hover:block absolute right-0 top-5 z-20 min-w-[130px] rounded-md border border-border bg-popover shadow-lg p-1.5">
|
||||||
|
<div className="text-[9px] uppercase tracking-wider text-muted-foreground mb-1">Online</div>
|
||||||
|
{online.map((o) => (
|
||||||
|
<div key={o.operator} className="font-mono text-[11px] whitespace-nowrap">
|
||||||
|
{o.operator}{o.station && o.station.toUpperCase() !== o.operator.toUpperCase() ? <span className="text-muted-foreground"> · {o.station}</span> : null}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<button type="button" onClick={onClose} className="ml-1 text-muted-foreground hover:text-foreground" title="Close">
|
||||||
|
<X className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div ref={listRef} className="flex-1 min-h-0 overflow-y-auto px-3 py-2 space-y-1.5 text-xs">
|
||||||
|
{msgs.length === 0 ? (
|
||||||
|
<div className="text-muted-foreground italic text-center py-6">No messages yet.</div>
|
||||||
|
) : msgs.map((m) => {
|
||||||
|
const mine = m.operator.toUpperCase() === me;
|
||||||
|
return (
|
||||||
|
<div key={m.id} className={cn('flex flex-col', mine && 'items-end')}>
|
||||||
|
<div className={cn('max-w-[85%] rounded-lg px-2 py-1', mine ? 'bg-sky-100 text-sky-900' : 'bg-muted')}>
|
||||||
|
{!mine && <span className="font-mono font-bold text-[10px] text-primary mr-1">{m.operator}</span>}
|
||||||
|
<span className="whitespace-pre-wrap break-words">{m.message}</span>
|
||||||
|
</div>
|
||||||
|
<span className="text-[9px] text-muted-foreground/70 px-1">{hhmm(m.created_at)}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-1.5 p-2 border-t border-border/60 shrink-0">
|
||||||
|
<input
|
||||||
|
value={text}
|
||||||
|
onChange={(e) => setText(e.target.value)}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter') { e.preventDefault(); send(); } }}
|
||||||
|
placeholder="Message…"
|
||||||
|
maxLength={1000}
|
||||||
|
className="flex-1 h-8 rounded-md border border-border bg-background px-2 text-xs outline-none focus:border-primary"
|
||||||
|
/>
|
||||||
|
<button type="button" onClick={send} disabled={!text.trim()}
|
||||||
|
className="inline-flex items-center justify-center size-8 rounded-md bg-primary text-primary-foreground disabled:opacity-40">
|
||||||
|
<Send className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
AllCommunityModule, ModuleRegistry, themeQuartz,
|
AllCommunityModule, ModuleRegistry, themeQuartz,
|
||||||
type ColDef, type ColumnState, type GridReadyEvent, type RowClickedEvent,
|
type ColDef, type ColumnState, type GridReadyEvent, type RowClickedEvent,
|
||||||
@@ -113,6 +113,20 @@ function statusFor(p: any): SpotStatusEntry | undefined {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// statusBadge maps a resolved spot status to a short labelled badge for the
|
||||||
|
// Status column, using the same colours as the per-cell fills (NEW DXCC =
|
||||||
|
// call cell, NEW BAND = band cell, NEW SLOT = mode cell). Returns null when
|
||||||
|
// there's nothing notable to show.
|
||||||
|
function statusBadge(s: SpotStatusEntry | undefined): { text: string; fg: string; bg: string } | null {
|
||||||
|
switch (s?.status) {
|
||||||
|
case 'new': return { text: 'NEW DXCC', fg: '#be123c', bg: '#ffe4e6' };
|
||||||
|
case 'new-band': return { text: 'NEW BAND', fg: '#92400e', bg: '#fde68a' };
|
||||||
|
case 'new-mode': return { text: 'NEW MODE', fg: '#854d0e', bg: '#fef08a' };
|
||||||
|
case 'new-slot': return { text: 'NEW SLOT', fg: '#854d0e', bg: '#fef08a' };
|
||||||
|
default: return s?.worked_call ? { text: 'WKD CALL', fg: '#0369a1', bg: '#e0f2fe' } : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const COL_CATALOG: ColEntry[] = [
|
const COL_CATALOG: ColEntry[] = [
|
||||||
{
|
{
|
||||||
group: 'Spot', label: 'Time', colId: 'time',
|
group: 'Spot', label: 'Time', colId: 'time',
|
||||||
@@ -136,6 +150,39 @@ const COL_CATALOG: ColEntry[] = [
|
|||||||
return s?.status === 'new' ? `NEW DXCC: ${s?.country ?? ''}` : s?.worked_call ? 'Already worked this call' : undefined;
|
return s?.status === 'new' ? `NEW DXCC: ${s?.country ?? ''}` : s?.worked_call ? 'Already worked this call' : undefined;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
group: 'Spot', label: 'Status', colId: 'status',
|
||||||
|
headerName: 'Status', width: 96, sortable: true,
|
||||||
|
defaultVisible: true,
|
||||||
|
// Spells out the slot status as a text badge so NEW SLOT (and the others)
|
||||||
|
// is obvious at the row level, not just a single coloured cell.
|
||||||
|
valueGetter: (p: any) => {
|
||||||
|
const s = statusFor(p);
|
||||||
|
if (s?.status === 'new') return 'NEW DXCC';
|
||||||
|
if (s?.status === 'new-band') return 'NEW BAND';
|
||||||
|
if (s?.status === 'new-mode') return 'NEW MODE';
|
||||||
|
if (s?.status === 'new-slot') return 'NEW SLOT';
|
||||||
|
return s?.worked_call ? 'WKD CALL' : '';
|
||||||
|
},
|
||||||
|
cellRenderer: (p: any) => {
|
||||||
|
const b = statusBadge(statusFor(p));
|
||||||
|
if (!b) return <span style={{ color: '#a8a29e', fontSize: 10 }}>—</span>;
|
||||||
|
return (
|
||||||
|
<span style={{
|
||||||
|
backgroundColor: b.bg, color: b.fg, fontWeight: 700, fontSize: 10,
|
||||||
|
padding: '1px 6px', borderRadius: 4, letterSpacing: 0.3, whiteSpace: 'nowrap',
|
||||||
|
}}>{b.text}</span>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
tooltipValueGetter: (p: any) => {
|
||||||
|
const s = statusFor(p);
|
||||||
|
if (s?.status === 'new') return `NEW DXCC: ${s?.country ?? ''}`;
|
||||||
|
if (s?.status === 'new-band') return 'NEW BAND for this entity';
|
||||||
|
if (s?.status === 'new-slot') return 'NEW SLOT (mode not yet worked on this band)';
|
||||||
|
if (s?.worked_call) return 'Already worked this call';
|
||||||
|
return undefined;
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
group: 'Spot', label: 'POTA', colId: 'pota',
|
group: 'Spot', label: 'POTA', colId: 'pota',
|
||||||
headerName: 'POTA', field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
headerName: 'POTA', field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
||||||
@@ -167,12 +214,22 @@ const COL_CATALOG: ColEntry[] = [
|
|||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
valueGetter: (p: any) => p.data ? inferSpotMode(p.data.comment ?? '', p.data.freq_hz) : '',
|
valueGetter: (p: any) => p.data ? inferSpotMode(p.data.comment ?? '', p.data.freq_hz) : '',
|
||||||
// NEW SLOT (mode not yet worked on this band) → fill the cell.
|
// Fill the mode cell: teal = NEW MODE (mode never worked on this entity),
|
||||||
cellStyle: (p: any) => (statusFor(p)?.status === 'new-slot'
|
// yellow = NEW SLOT (this band+mode combo new, but the mode was worked elsewhere).
|
||||||
? { backgroundColor: '#fef08a', color: '#854d0e', fontWeight: 700 }
|
cellStyle: (p: any) => {
|
||||||
: undefined),
|
const st = statusFor(p)?.status;
|
||||||
|
// Both NEW MODE and NEW SLOT highlight the mode cell (same yellow); the
|
||||||
|
// Status badge text tells them apart.
|
||||||
|
if (st === 'new-mode' || st === 'new-slot') return { backgroundColor: '#fef08a', color: '#854d0e', fontWeight: 700 };
|
||||||
|
return undefined;
|
||||||
|
},
|
||||||
cellRenderer: (p: any) => p.value ? p.value : <span style={{ color: '#a8a29e', fontSize: 10 }}>—</span>,
|
cellRenderer: (p: any) => p.value ? p.value : <span style={{ color: '#a8a29e', fontSize: 10 }}>—</span>,
|
||||||
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-slot' ? 'NEW SLOT (mode not yet worked on this band)' : undefined),
|
tooltipValueGetter: (p: any) => {
|
||||||
|
const st = statusFor(p)?.status;
|
||||||
|
if (st === 'new-mode') return 'NEW MODE (this mode never worked on this entity)';
|
||||||
|
if (st === 'new-slot') return 'NEW SLOT (this band+mode not yet worked)';
|
||||||
|
return undefined;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
group: 'Spot', label: 'Pfx', colId: 'pfx',
|
group: 'Spot', label: 'Pfx', colId: 'pfx',
|
||||||
@@ -282,6 +339,14 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
|||||||
// change below.
|
// change below.
|
||||||
const context = useMemo(() => ({ spotStatus }), [spotStatus]);
|
const context = useMemo(() => ({ spotStatus }), [spotStatus]);
|
||||||
|
|
||||||
|
// Spot statuses arrive asynchronously (~after the rows render). The Call/Band/
|
||||||
|
// Mode cellStyles depend on them but their cell VALUE doesn't change, so ag-grid
|
||||||
|
// won't re-render those cells on its own — force a refresh so e.g. a worked call
|
||||||
|
// turns blue once its status loads.
|
||||||
|
useEffect(() => {
|
||||||
|
gridRef.current?.api?.refreshCells({ force: true });
|
||||||
|
}, [spotStatus]);
|
||||||
|
|
||||||
function onGridReady(e: GridReadyEvent) {
|
function onGridReady(e: GridReadyEvent) {
|
||||||
const local = loadLocal(COL_STATE_KEY);
|
const local = loadLocal(COL_STATE_KEY);
|
||||||
if (local) e.api.applyColumnState({ state: local as ColumnState[], applyOrder: true });
|
if (local) e.api.applyColumnState({ state: local as ColumnState[], applyOrder: true });
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
|
import { ComputeQSOAwardRefs } from '../../wailsjs/go/main/App';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
@@ -34,8 +35,11 @@ export interface DetailsState {
|
|||||||
sat_name: string;
|
sat_name: string;
|
||||||
sat_mode: string;
|
sat_mode: string;
|
||||||
contest_id: string;
|
contest_id: string;
|
||||||
srx?: number;
|
// Contest exchanges as free text — most are serials (001) but some are
|
||||||
stx?: number;
|
// alphanumeric (e.g. a section/zone like "ON4"). Stored to ADIF SRX/STX when
|
||||||
|
// purely numeric, else to SRX_STRING/STX_STRING (handled in App on save).
|
||||||
|
srx_string?: string;
|
||||||
|
stx_string?: string;
|
||||||
email: string;
|
email: 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".
|
||||||
@@ -118,9 +122,43 @@ function Field({ label, span = 1, children }: { label: string; span?: 1 | 2 | 3
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function DetailsPanel({ callsign: _cs, prefix, operatorGrid, remoteGrid, details, onChange, wb, wbBusy, band, mode, bands, tab, onTab, keyerActive }: Props) {
|
export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, details, onChange, wb, wbBusy, band, mode, bands, tab, onTab, keyerActive }: Props) {
|
||||||
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
const [internalOpen, setInternalOpen] = useState<TabName>('stats');
|
||||||
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
const open = tab ?? internalOpen; // controlled when `tab` is provided
|
||||||
|
|
||||||
|
// Live award detection: run the SAME engine used at log time over the current
|
||||||
|
// contact (callsign + looked-up address/state/zones) so award references the
|
||||||
|
// QSO will earn — e.g. WAPC matching "Beijing" inside the address — are
|
||||||
|
// surfaced and auto-added the moment you enter a call or click a spot, instead
|
||||||
|
// of only appearing after logging. Pickable matches are merged into award_refs
|
||||||
|
// (idempotent; award_refs is NOT a dependency, so removing one by hand sticks).
|
||||||
|
const [detected, setDetected] = useState<Array<{ code: string; ref: string; name?: string; pickable?: boolean }>>([]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (open !== 'awards' || !callsign.trim()) { setDetected([]); return; }
|
||||||
|
const t = window.setTimeout(async () => {
|
||||||
|
try {
|
||||||
|
const q: any = {
|
||||||
|
callsign, band, mode,
|
||||||
|
address: details.address ?? '', state: details.state ?? '', cnty: details.cnty ?? '',
|
||||||
|
cont: details.cont ?? '', dxcc: details.dxcc, cqz: details.cqz, ituz: details.ituz,
|
||||||
|
qso_date: new Date().toISOString(),
|
||||||
|
};
|
||||||
|
const all = ((await ComputeQSOAwardRefs(q)) ?? []) as any[];
|
||||||
|
setDetected(all as any);
|
||||||
|
const cur = details.award_refs ?? '';
|
||||||
|
const have = new Set(cur.split(';').filter(Boolean));
|
||||||
|
let next = cur;
|
||||||
|
for (const r of all) {
|
||||||
|
if (!r.pickable) continue;
|
||||||
|
const entry = `${String(r.code).toUpperCase()}@${String(r.ref).toUpperCase()}`;
|
||||||
|
if (!have.has(entry)) { next = next ? `${next};${entry}` : entry; have.add(entry); }
|
||||||
|
}
|
||||||
|
if (next !== cur) onChange({ award_refs: next });
|
||||||
|
} catch { /* leave detection empty on failure */ }
|
||||||
|
}, 400);
|
||||||
|
return () => window.clearTimeout(t);
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [open, callsign, details.address, details.state, details.cnty, details.dxcc, details.cqz, details.ituz, band, mode]);
|
||||||
// Bearing/distance from operator's home grid to the remote station.
|
// Bearing/distance from operator's home grid to the remote station.
|
||||||
// Recomputed only when either grid actually changes.
|
// Recomputed only when either grid actually changes.
|
||||||
const path = useMemo(() => {
|
const path = useMemo(() => {
|
||||||
@@ -179,10 +217,10 @@ export function DetailsPanel({ callsign: _cs, prefix, operatorGrid, remoteGrid,
|
|||||||
))}
|
))}
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<div className="overflow-y-auto min-h-0">
|
<div className={cn('flex-1 min-h-0', open === 'stats' ? 'overflow-hidden' : 'overflow-y-auto')}>
|
||||||
{open === 'stats' && (
|
{open === 'stats' && (
|
||||||
<div className="px-3 py-2.5">
|
<div className="px-3 py-2.5">
|
||||||
<BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} />
|
<BandSlotGrid wb={wb} busy={!!wbBusy} currentBand={band} currentMode={mode} bands={bands} hasCall={callsign.trim() !== ''} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -205,8 +243,18 @@ export function DetailsPanel({ callsign: _cs, prefix, operatorGrid, remoteGrid,
|
|||||||
<Input inputMode="numeric" maxLength={2} className="font-mono" value={details.ituz ?? ''} placeholder="—"
|
<Input inputMode="numeric" maxLength={2} className="font-mono" value={details.ituz ?? ''} placeholder="—"
|
||||||
onChange={(e) => { const v = e.target.value.replace(/\D/g, ''); onChange({ ituz: v === '' ? undefined : parseInt(v, 10) }); }} />
|
onChange={(e) => { const v = e.target.value.replace(/\D/g, ''); onChange({ ituz: v === '' ? undefined : parseInt(v, 10) }); }} />
|
||||||
</Field>
|
</Field>
|
||||||
{/* DXCC #, Continent and Azimuth SP live in the main entry strip /
|
{/* DXCC # closes the top row (next to the zones); Continent and
|
||||||
bandeau. F2 keeps CQ/ITU zones, the long-path bearing and distances. */}
|
Azimuth SP live in the main entry strip / bandeau. The long-path
|
||||||
|
bearing and distances move to the row below. */}
|
||||||
|
<Field label="DXCC #">
|
||||||
|
<Input
|
||||||
|
readOnly
|
||||||
|
tabIndex={-1}
|
||||||
|
className="font-mono bg-muted/40 cursor-default"
|
||||||
|
value={details.dxcc ?? ''}
|
||||||
|
placeholder="—"
|
||||||
|
/>
|
||||||
|
</Field>
|
||||||
<Field label="Azimuth LP">
|
<Field label="Azimuth LP">
|
||||||
<Input
|
<Input
|
||||||
readOnly
|
readOnly
|
||||||
@@ -247,13 +295,24 @@ export function DetailsPanel({ callsign: _cs, prefix, operatorGrid, remoteGrid,
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{open === 'awards' && (
|
{open === 'awards' && (
|
||||||
<div className="px-3 py-2.5">
|
<div className="px-3 py-2.5 h-full flex flex-col min-h-0">
|
||||||
<AwardRefSelector
|
<AwardRefSelector
|
||||||
dxcc={details.dxcc}
|
dxcc={details.dxcc}
|
||||||
value={details.award_refs ?? ''}
|
value={details.award_refs ?? ''}
|
||||||
onChange={(v) => onChange({ award_refs: v })}
|
onChange={(v) => onChange({ award_refs: v })}
|
||||||
fieldValues={{ state: details.state ?? '', cnty: details.cnty ?? '' }}
|
fieldValues={{ state: details.state ?? '', cnty: details.cnty ?? '' }}
|
||||||
|
heightClass="flex-1 min-h-0"
|
||||||
/>
|
/>
|
||||||
|
{detected.length > 0 && (
|
||||||
|
<div className="mt-2 text-[11px] text-muted-foreground shrink-0">
|
||||||
|
<span className="font-medium text-foreground/70">Detected — this contact will count for:</span>{' '}
|
||||||
|
{detected.map((r) => (
|
||||||
|
<span key={`${r.code}@${r.ref}`} className="inline-block mr-2 font-mono">
|
||||||
|
{r.code}{r.ref ? `@${r.ref}` : ''}{r.name ? <span className="text-muted-foreground/70"> {r.name}</span> : null}
|
||||||
|
</span>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -315,10 +374,10 @@ export function DetailsPanel({ callsign: _cs, prefix, operatorGrid, remoteGrid,
|
|||||||
<Input value={details.contest_id} onChange={(e) => onChange({ contest_id: e.target.value })} />
|
<Input value={details.contest_id} onChange={(e) => onChange({ contest_id: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
<Field label="SRX">
|
<Field label="SRX">
|
||||||
<Input type="number" value={details.srx ?? ''} onChange={(e) => onChange({ srx: numOrUndef(e.target.value) })} />
|
<Input value={details.srx_string ?? ''} placeholder="rcvd exchange" onChange={(e) => onChange({ srx_string: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
<Field label="STX">
|
<Field label="STX">
|
||||||
<Input type="number" value={details.stx ?? ''} onChange={(e) => onChange({ stx: numOrUndef(e.target.value) })} />
|
<Input value={details.stx_string ?? ''} placeholder="sent exchange" onChange={(e) => onChange({ stx_string: e.target.value })} />
|
||||||
</Field>
|
</Field>
|
||||||
<Field label="Contacted email" span={3}>
|
<Field label="Contacted email" span={3}>
|
||||||
<Input value={details.email} placeholder="[email protected]" onChange={(e) => onChange({ email: e.target.value })} />
|
<Input value={details.email} placeholder="[email protected]" onChange={(e) => onChange({ email: e.target.value })} />
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export function DvkPanel({ messages, status, onPlay, onStop, onClose }: Props) {
|
|||||||
<Mic className="size-3.5 text-primary" />
|
<Mic className="size-3.5 text-primary" />
|
||||||
<span className="text-[11px] font-semibold uppercase tracking-wider">Voice keyer</span>
|
<span className="text-[11px] font-semibold uppercase tracking-wider">Voice keyer</span>
|
||||||
<span className={cn('size-2 rounded-full', status.playing ? 'bg-amber-500 animate-pulse' : 'bg-emerald-500')} />
|
<span className={cn('size-2 rounded-full', status.playing ? 'bg-amber-500 animate-pulse' : 'bg-emerald-500')} />
|
||||||
{status.playing && <span className="text-[10px] text-amber-600 font-medium">transmitting…</span>}
|
{status.playing && <span className="text-[10px] text-amber-600 font-medium">tx...</span>}
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
<Button variant="ghost" size="sm" className="h-6 px-2 text-[11px]" onClick={onStop} disabled={!status.playing}>
|
<Button variant="ghost" size="sm" className="h-6 px-2 text-[11px]" onClick={onStop} disabled={!status.playing}>
|
||||||
<Square className="size-3" /> Stop
|
<Square className="size-3" /> Stop
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
|||||||
{ value: 'iota', label: 'IOTA', type: 'text' },
|
{ value: 'iota', label: 'IOTA', type: 'text' },
|
||||||
{ value: 'sota_ref', label: 'SOTA ref', type: 'text' },
|
{ value: 'sota_ref', label: 'SOTA ref', type: 'text' },
|
||||||
{ value: 'pota_ref', label: 'POTA ref', type: 'text' },
|
{ value: 'pota_ref', label: 'POTA ref', type: 'text' },
|
||||||
|
{ value: 'wwff_ref', label: 'WWFF ref', type: 'text' },
|
||||||
{ value: 'rig', label: 'Rig', type: 'text' },
|
{ value: 'rig', label: 'Rig', type: 'text' },
|
||||||
{ value: 'ant', label: 'Antenna', type: 'text' },
|
{ value: 'ant', label: 'Antenna', type: 'text' },
|
||||||
{ value: 'qsl_sent', label: 'QSL sent', type: 'text' },
|
{ value: 'qsl_sent', label: 'QSL sent', type: 'text' },
|
||||||
@@ -64,6 +65,7 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
|||||||
{ value: 'eqsl_rcvd', label: 'eQSL rcvd', type: 'text' },
|
{ value: 'eqsl_rcvd', label: 'eQSL rcvd', type: 'text' },
|
||||||
{ value: 'qrzcom_qso_upload_status', label: 'QRZ upload status', type: 'text' },
|
{ value: 'qrzcom_qso_upload_status', label: 'QRZ upload status', type: 'text' },
|
||||||
{ value: 'clublog_qso_upload_status', label: 'ClubLog upload status', type: 'text' },
|
{ value: 'clublog_qso_upload_status', label: 'ClubLog upload status', type: 'text' },
|
||||||
|
{ value: 'hrdlog_qso_upload_status', label: 'HRDLog upload status', type: 'text' },
|
||||||
{ value: 'contest_id', label: 'Contest ID', type: 'text' },
|
{ value: 'contest_id', label: 'Contest ID', type: 'text' },
|
||||||
{ value: 'srx', label: 'Serial rcvd', type: 'number' },
|
{ value: 'srx', label: 'Serial rcvd', type: 'number' },
|
||||||
{ value: 'stx', label: 'Serial sent', type: 'number' },
|
{ value: 'stx', label: 'Serial sent', type: 'number' },
|
||||||
@@ -74,6 +76,17 @@ const FIELDS: { value: string; label: string; type: FieldType }[] = [
|
|||||||
{ value: 'owner_callsign', label: 'Owner callsign', type: 'text' },
|
{ value: 'owner_callsign', label: 'Owner callsign', type: 'text' },
|
||||||
{ value: 'my_grid', label: 'My grid', type: 'text' },
|
{ value: 'my_grid', label: 'My grid', type: 'text' },
|
||||||
{ value: 'my_country', label: 'My country', type: 'text' },
|
{ value: 'my_country', label: 'My country', type: 'text' },
|
||||||
|
{ value: 'my_state', label: 'My state', type: 'text' },
|
||||||
|
{ value: 'my_cnty', label: 'My county', type: 'text' },
|
||||||
|
{ value: 'my_iota', label: 'My IOTA', type: 'text' },
|
||||||
|
{ value: 'my_sota_ref', label: 'My SOTA ref', type: 'text' },
|
||||||
|
{ value: 'my_pota_ref', label: 'My POTA ref', type: 'text' },
|
||||||
|
{ value: 'my_wwff_ref', label: 'My WWFF ref', type: 'text' },
|
||||||
|
{ value: 'my_street', label: 'My street', type: 'text' },
|
||||||
|
{ value: 'my_city', label: 'My city', type: 'text' },
|
||||||
|
{ value: 'my_postal_code', label: 'My postal code', type: 'text' },
|
||||||
|
{ value: 'my_rig', label: 'My rig', type: 'text' },
|
||||||
|
{ value: 'my_antenna', label: 'My antenna', type: 'text' },
|
||||||
{ value: 'tx_pwr', label: 'TX power (W)', type: 'number' },
|
{ value: 'tx_pwr', label: 'TX power (W)', type: 'number' },
|
||||||
{ value: 'comment', label: 'Comment', type: 'text' },
|
{ value: 'comment', label: 'Comment', type: 'text' },
|
||||||
{ value: 'notes', label: 'Notes', type: 'text' },
|
{ value: 'notes', label: 'Notes', type: 'text' },
|
||||||
@@ -211,6 +224,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
)}
|
)}
|
||||||
{conditions.map((c, i) => {
|
{conditions.map((c, i) => {
|
||||||
const needsValue = c.op !== 'empty' && c.op !== 'notempty';
|
const needsValue = c.op !== 'empty' && c.op !== 'notempty';
|
||||||
|
const fieldType = FIELDS.find((f) => f.value === c.field)?.type ?? 'text';
|
||||||
return (
|
return (
|
||||||
<div key={i} className="flex items-center gap-2">
|
<div key={i} className="flex items-center gap-2">
|
||||||
<span className="text-[10px] w-8 text-right text-muted-foreground font-mono">{i === 0 ? 'WHERE' : match}</span>
|
<span className="text-[10px] w-8 text-right text-muted-foreground font-mono">{i === 0 ? 'WHERE' : match}</span>
|
||||||
@@ -231,9 +245,10 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
<Input
|
<Input
|
||||||
|
type={fieldType === 'date' ? 'date' : fieldType === 'number' ? 'number' : 'text'}
|
||||||
className="h-8 flex-1 text-xs"
|
className="h-8 flex-1 text-xs"
|
||||||
disabled={!needsValue}
|
disabled={!needsValue}
|
||||||
placeholder={needsValue ? 'value' : '—'}
|
placeholder={needsValue ? (fieldType === 'date' ? 'YYYY-MM-DD' : 'value') : '—'}
|
||||||
value={c.value}
|
value={c.value}
|
||||||
onChange={(e) => setCond(i, { value: e.target.value })}
|
onChange={(e) => setCond(i, { value: e.target.value })}
|
||||||
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
|
onKeyDown={(e) => { if (e.key === 'Enter') apply(); }}
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { Radio } from 'lucide-react';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { GetActiveProfile, SaveProfile, DownloadAllReferenceLists } from '../../wailsjs/go/main/App';
|
||||||
|
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||||
|
|
||||||
|
type Profile = Omit<profileModels.Profile, 'convertValues'>;
|
||||||
|
|
||||||
|
// FirstRunModal collects the mandatory station identity on the very first launch
|
||||||
|
// (no callsign configured yet). It writes straight into the active profile, so
|
||||||
|
// OpsLog has a valid station before any QSO is logged. Not dismissable.
|
||||||
|
export function FirstRunModal({ onDone }: { onDone: () => void }) {
|
||||||
|
const [p, setP] = useState<Profile | null>(null);
|
||||||
|
const [saving, setSaving] = useState(false);
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
const [refsState, setRefsState] = useState<'idle' | 'loading' | 'done'>('idle');
|
||||||
|
const [refsMsg, setRefsMsg] = useState('');
|
||||||
|
|
||||||
|
async function downloadRefs() {
|
||||||
|
setRefsState('loading');
|
||||||
|
try {
|
||||||
|
const summary = await DownloadAllReferenceLists();
|
||||||
|
setRefsMsg(summary);
|
||||||
|
setRefsState('done');
|
||||||
|
} catch (e: any) {
|
||||||
|
setRefsMsg(String(e?.message ?? e));
|
||||||
|
setRefsState('idle');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
GetActiveProfile().then((x) => setP(x as Profile)).catch(() => setP({} as Profile));
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const set = (patch: Partial<Profile>) => setP((s: Profile | null) => ({ ...(s as Profile), ...patch }));
|
||||||
|
|
||||||
|
const callsign = (p?.callsign ?? '').trim().toUpperCase();
|
||||||
|
const grid = (p?.my_grid ?? '').trim().toUpperCase();
|
||||||
|
const operator = (p?.operator ?? '').trim().toUpperCase();
|
||||||
|
const canSave = callsign.length >= 3 && grid.length >= 4;
|
||||||
|
|
||||||
|
async function save() {
|
||||||
|
if (!p || !canSave) return;
|
||||||
|
setSaving(true);
|
||||||
|
setErr('');
|
||||||
|
try {
|
||||||
|
await SaveProfile({
|
||||||
|
...p,
|
||||||
|
callsign,
|
||||||
|
my_grid: grid,
|
||||||
|
operator: operator || callsign,
|
||||||
|
owner_callsign: (p.owner_callsign ?? '').trim().toUpperCase() || callsign,
|
||||||
|
op_name: (p.op_name ?? '').trim(),
|
||||||
|
} as any);
|
||||||
|
onDone();
|
||||||
|
} catch (e: any) {
|
||||||
|
setErr(String(e?.message ?? e));
|
||||||
|
} finally {
|
||||||
|
setSaving(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="fixed inset-0 z-[200] flex items-center justify-center bg-black/40 backdrop-blur-sm">
|
||||||
|
<div className="w-full max-w-md rounded-xl border border-border bg-card shadow-2xl p-6 animate-in fade-in zoom-in-95">
|
||||||
|
<div className="flex items-center gap-2 mb-1">
|
||||||
|
<Radio className="size-5 text-primary" />
|
||||||
|
<h2 className="text-lg font-semibold">Welcome to OpsLog</h2>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground mb-4">
|
||||||
|
Set up your station to start logging. These fields stamp every QSO and can be changed later in Preferences → Station Information (and per profile).
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div className="grid grid-cols-[120px_1fr] gap-x-3 gap-y-2.5 items-center">
|
||||||
|
<Label className="text-sm">Callsign <span className="text-red-500">*</span></Label>
|
||||||
|
<Input autoFocus className="h-9 font-mono uppercase" placeholder="F4BPO" value={p?.callsign ?? ''} onChange={(e) => set({ callsign: e.target.value })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">Locator <span className="text-red-500">*</span></Label>
|
||||||
|
<Input className="h-9 font-mono uppercase" placeholder="JN03" value={p?.my_grid ?? ''} onChange={(e) => set({ my_grid: e.target.value })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">Operator</Label>
|
||||||
|
<Input className="h-9 font-mono uppercase" placeholder="same as callsign" value={p?.operator ?? ''} onChange={(e) => set({ operator: e.target.value })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">Owner</Label>
|
||||||
|
<Input className="h-9 font-mono uppercase" placeholder="station owner callsign" value={p?.owner_callsign ?? ''} onChange={(e) => set({ owner_callsign: e.target.value })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">Name</Label>
|
||||||
|
<Input className="h-9" placeholder="your first name" value={p?.op_name ?? ''} onChange={(e) => set({ op_name: e.target.value })} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Optional: grab the award reference lists now (also in Tools later). */}
|
||||||
|
<div className="mt-4 rounded-lg border border-border bg-muted/30 p-3">
|
||||||
|
<div className="flex items-center justify-between gap-3">
|
||||||
|
<div className="text-xs">
|
||||||
|
<div className="font-medium">Award reference lists</div>
|
||||||
|
<div className="text-muted-foreground">IOTA · POTA · WWFF · SOTA — names & totals for those awards (optional, can take a minute).</div>
|
||||||
|
</div>
|
||||||
|
<Button size="sm" variant="outline" disabled={refsState === 'loading'} onClick={downloadRefs}>
|
||||||
|
{refsState === 'loading' ? 'Downloading…' : refsState === 'done' ? 'Re-download' : 'Download'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
{refsMsg && <div className={cn('text-[11px] mt-2', refsState === 'done' ? 'text-emerald-700' : 'text-red-600')}>{refsMsg}</div>}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{err && <div className="mt-3 text-xs text-red-600">{err}</div>}
|
||||||
|
|
||||||
|
<div className="mt-5 flex items-center justify-end gap-2">
|
||||||
|
{!canSave && <span className="text-[11px] text-muted-foreground mr-auto">Callsign and locator are required.</span>}
|
||||||
|
<Button disabled={!canSave || saving} onClick={save}>{saving ? 'Saving…' : 'Start logging'}</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,589 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { Radio, Zap, Power, AudioLines, Flame, Gauge, Volume2, VolumeX } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetFlexState, FlexSetPower, FlexSetTunePower, FlexTune, FlexSetVox, FlexSetVoxLevel, FlexSetVoxDelay,
|
||||||
|
FlexSetProcessor, FlexSetProcessorLevel, FlexSetMon, FlexSetMonLevel, FlexSetMic,
|
||||||
|
FlexMox, FlexAmpOperate,
|
||||||
|
GetPGXLStatus, PGXLSetFanMode,
|
||||||
|
FlexSetAGCMode, FlexSetAGCThreshold, FlexSetAudioLevel, FlexSetMute, FlexSetRXAntenna, FlexSetTXAntenna, FlexSetSplit,
|
||||||
|
FlexSetNB, FlexSetNBLevel, FlexSetNR, FlexSetNRLevel, FlexSetANF, FlexSetANFLevel,
|
||||||
|
FlexSetAPF, FlexSetAPFLevel, FlexSetCWSpeed, FlexSetCWPitch, FlexSetCWBreakInDelay,
|
||||||
|
FlexSetCWSidetone, FlexSetSidetoneLevel, FlexSetCWFilter, FlexSetFilter,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
type FlexState = {
|
||||||
|
available: boolean; model?: string;
|
||||||
|
rf_power: number; tune_power: number; tune: boolean; transmitting: boolean;
|
||||||
|
vox_enable: boolean; vox_level: number; vox_delay: number;
|
||||||
|
proc_enable: boolean; proc_level: number;
|
||||||
|
mon: boolean; mon_level: number; mic_level: number;
|
||||||
|
atu_status?: string; atu_memories: boolean;
|
||||||
|
rx_avail: boolean; agc_mode?: string; agc_threshold: number; audio_level: number; mute: boolean;
|
||||||
|
rx_ant?: string; tx_ant?: string; ant_list?: string[]; tx_ant_list?: string[];
|
||||||
|
split: boolean; rx_freq_hz?: number; tx_freq_hz?: number;
|
||||||
|
nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean; anf_level: number;
|
||||||
|
mode?: string;
|
||||||
|
cw_speed: number; cw_pitch: number; cw_break_in_delay: number; cw_sidetone: boolean; cw_mon_level: number;
|
||||||
|
apf: boolean; apf_level: number; filter_lo: number; filter_hi: number;
|
||||||
|
amp_available: boolean; amp_model?: string; amp_operate: boolean; amp_fault?: string;
|
||||||
|
meters?: Meter[];
|
||||||
|
};
|
||||||
|
|
||||||
|
type Meter = { id: number; src?: string; name?: string; unit?: string; value: number; lo: number; hi: number };
|
||||||
|
|
||||||
|
const ZERO: FlexState = {
|
||||||
|
available: false, rf_power: 0, tune_power: 0, tune: false, transmitting: false,
|
||||||
|
vox_enable: false, vox_level: 0, vox_delay: 0, proc_enable: false, proc_level: 0,
|
||||||
|
mon: false, mon_level: 0, mic_level: 0, atu_memories: false,
|
||||||
|
rx_avail: false, agc_threshold: 0, audio_level: 0, mute: false, split: false,
|
||||||
|
nb: false, nb_level: 0, nr: false, nr_level: 0, anf: false, anf_level: 0,
|
||||||
|
cw_speed: 25, cw_pitch: 600, cw_break_in_delay: 30, cw_sidetone: true, cw_mon_level: 0,
|
||||||
|
apf: false, apf_level: 0, filter_lo: 0, filter_hi: 0,
|
||||||
|
amp_available: false, amp_operate: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
function Slider({ value, onChange, disabled, accent = '#16a34a', step = 1, max = 100 }: {
|
||||||
|
value: number; onChange: (v: number) => void; disabled?: boolean; accent?: string; step?: number; max?: number;
|
||||||
|
}) {
|
||||||
|
const v = Math.max(0, Math.min(max, value));
|
||||||
|
const pct = max > 0 ? (v / max) * 100 : 0;
|
||||||
|
const ref = useRef<HTMLInputElement>(null);
|
||||||
|
// Mouse-wheel adjusts the slider. React's onWheel is passive (preventDefault
|
||||||
|
// is ignored), so attach a non-passive native listener; read live values via
|
||||||
|
// refs to avoid stale closures.
|
||||||
|
const valRef = useRef(value); valRef.current = value;
|
||||||
|
const cbRef = useRef(onChange); cbRef.current = onChange;
|
||||||
|
const disRef = useRef(disabled); disRef.current = disabled;
|
||||||
|
const stepRef = useRef(step); stepRef.current = step;
|
||||||
|
const maxRef = useRef(max); maxRef.current = max;
|
||||||
|
useEffect(() => {
|
||||||
|
const el = ref.current;
|
||||||
|
if (!el) return;
|
||||||
|
const onWheel = (e: WheelEvent) => {
|
||||||
|
if (disRef.current) return;
|
||||||
|
e.preventDefault();
|
||||||
|
const d = e.deltaY < 0 ? stepRef.current : -stepRef.current;
|
||||||
|
const nv = Math.max(0, Math.min(maxRef.current, valRef.current + d));
|
||||||
|
if (nv !== valRef.current) cbRef.current(nv);
|
||||||
|
};
|
||||||
|
el.addEventListener('wheel', onWheel, { passive: false });
|
||||||
|
return () => el.removeEventListener('wheel', onWheel);
|
||||||
|
}, []);
|
||||||
|
return (
|
||||||
|
<input
|
||||||
|
ref={ref}
|
||||||
|
type="range" min={0} max={max} value={v} disabled={disabled}
|
||||||
|
onChange={(e) => onChange(parseInt(e.target.value, 10))}
|
||||||
|
className={cn('flex-1 h-1.5 rounded-full appearance-none cursor-pointer disabled:opacity-30 disabled:cursor-default',
|
||||||
|
'[&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3.5 [&::-webkit-slider-thumb]:rounded-full',
|
||||||
|
'[&::-webkit-slider-thumb]:bg-white [&::-webkit-slider-thumb]:border-2 [&::-webkit-slider-thumb]:shadow-sm [&::-webkit-slider-thumb]:cursor-pointer')}
|
||||||
|
style={{ background: `linear-gradient(to right, ${accent} ${pct}%, #d8cfb8 ${pct}%)`, borderColor: accent }}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Segmented — radio-style multi-choice (AGC, Processor preset).
|
||||||
|
function Segmented({ value, options, onChange, disabled }: {
|
||||||
|
value: string; options: { v: string; l: string }[]; onChange: (v: string) => void; disabled?: boolean;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden shrink-0">
|
||||||
|
{options.map((o) => (
|
||||||
|
<button key={o.v} type="button" disabled={disabled} onClick={() => onChange(o.v)}
|
||||||
|
className={cn('px-2 py-1 text-[11px] font-bold tracking-wide transition-colors disabled:opacity-30 border-l border-border first:border-l-0',
|
||||||
|
value === o.v ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||||
|
{o.l}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Chip — a compact on/off pill (NB/NR/ANF/VOX/MON…).
|
||||||
|
function Chip({ on, onClick, label, disabled, accent = 'emerald' }: {
|
||||||
|
on: boolean; onClick: () => void; label: string; disabled?: boolean; accent?: 'emerald' | 'violet' | 'cyan' | 'amber';
|
||||||
|
}) {
|
||||||
|
const onCls = {
|
||||||
|
emerald: 'bg-emerald-600 border-emerald-600 text-white',
|
||||||
|
violet: 'bg-violet-600 border-violet-600 text-white',
|
||||||
|
cyan: 'bg-cyan-600 border-cyan-600 text-white',
|
||||||
|
amber: 'bg-amber-500 border-amber-500 text-white',
|
||||||
|
}[accent];
|
||||||
|
return (
|
||||||
|
<button type="button" onClick={onClick} disabled={disabled}
|
||||||
|
className={cn(
|
||||||
|
// min width (not fixed) so a longer label like STONE keeps symmetric
|
||||||
|
// padding instead of overflowing; short labels (NB/NR/APF) stay aligned.
|
||||||
|
'min-w-[3.5rem] shrink-0 px-2.5 py-1 rounded-md text-[11px] font-bold border text-center tracking-wide transition-all disabled:opacity-30',
|
||||||
|
on ? cn(onCls, 'shadow-sm') : 'bg-card text-muted-foreground border-border hover:bg-muted hover:border-muted-foreground/30')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function LevelRow({ label, on, onToggle, value, onLevel, disabled, accent, sliderAccent }: {
|
||||||
|
label: string; on: boolean; onToggle: () => void; value: number; onLevel: (v: number) => void;
|
||||||
|
disabled?: boolean; accent?: 'emerald' | 'violet' | 'cyan' | 'amber'; sliderAccent?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Chip on={on} onClick={onToggle} label={label} disabled={disabled} accent={accent} />
|
||||||
|
<Slider value={value} disabled={disabled || !on} accent={sliderAccent} onChange={onLevel} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{value}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// MeterBar — a segmented "LED" instrument bar (radio look) scaled by lo/hi.
|
||||||
|
// `display` overrides the numeric readout; `segColor` colours segments by their
|
||||||
|
// 0..1 position (zones); the top ~18% light red by default (overload/peak).
|
||||||
|
const METER_SEGMENTS = 26;
|
||||||
|
function MeterBar({ label, value, unit, lo, hi, accent = '#16a34a', extra, display, segColor }: {
|
||||||
|
label: string; value: number; unit?: string; lo: number; hi: number; accent?: string; extra?: string; display?: string;
|
||||||
|
segColor?: (frac: number) => string;
|
||||||
|
}) {
|
||||||
|
const span = hi - lo;
|
||||||
|
const pct = span > 0 ? Math.max(0, Math.min(100, ((value - lo) / span) * 100)) : 0;
|
||||||
|
const lit = Math.round((pct / 100) * METER_SEGMENTS);
|
||||||
|
return (
|
||||||
|
<div className="rounded-lg border border-border/70 px-2.5 py-2 bg-gradient-to-b from-card to-muted/40 shadow-sm min-w-0">
|
||||||
|
<div className="flex items-baseline justify-between gap-1 mb-1.5">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-wider text-muted-foreground truncate">{label}</span>
|
||||||
|
<span className="text-sm font-mono font-bold tabular-nums whitespace-nowrap text-foreground/90">
|
||||||
|
{display !== undefined ? display : (
|
||||||
|
<>{Math.abs(value) >= 100 ? value.toFixed(0) : value.toFixed(1)}<span className="text-muted-foreground text-[10px] ml-0.5">{unit}</span></>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
{/* LED bar — recessed track + gradient segments for a cleaner instrument look. */}
|
||||||
|
<div className="flex gap-[2px] h-3 items-stretch rounded-[3px] bg-black/10 p-[2px]">
|
||||||
|
{Array.from({ length: METER_SEGMENTS }).map((_, i) => {
|
||||||
|
const on = i < lit;
|
||||||
|
const frac = i / METER_SEGMENTS;
|
||||||
|
const col = segColor ? segColor(frac) : (frac > 0.82 ? '#dc2626' : accent);
|
||||||
|
return (
|
||||||
|
<div key={i} className="flex-1 rounded-[2px] transition-colors duration-100"
|
||||||
|
style={on
|
||||||
|
? { background: `linear-gradient(to bottom, ${col}, ${col}cc)`, boxShadow: `0 0 4px ${col}88` }
|
||||||
|
: { background: '#cfc6ad', opacity: 0.35 }} />
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
{extra && <div className="text-[10px] text-muted-foreground/70 mt-1 text-right font-mono">{extra}</div>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Card({ icon: Icon, title, accent, children }: { icon: any; title: string; accent?: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Icon className="size-4" style={{ color: accent ?? 'var(--primary)' }} />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||||
|
</div>
|
||||||
|
<div className="p-3 space-y-3">{children}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// onCWSpeed (optional): notified when the operator changes CW speed here, so the
|
||||||
|
// host can keep the WinKeyer (which actually sends the macros) in sync.
|
||||||
|
export function FlexPanel({ onCWSpeed }: { onCWSpeed?: (wpm: number) => void } = {}) {
|
||||||
|
const [st, setSt] = useState<FlexState>(ZERO);
|
||||||
|
const hold = useRef<Record<string, number>>({});
|
||||||
|
// Peak-hold: keep the highest reading for ~2 s so the jittery VITA-49 meters
|
||||||
|
// read steadily instead of jumping every poll.
|
||||||
|
const peak = useRef<Record<string, { v: number; t: number }>>({});
|
||||||
|
const peakHold = (key: string, val: number) => {
|
||||||
|
const now = Date.now();
|
||||||
|
const p = peak.current[key];
|
||||||
|
if (!p || val >= p.v || now - p.t > 2000) { peak.current[key] = { v: val, t: now }; return val; }
|
||||||
|
return p.v;
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = async () => {
|
||||||
|
try {
|
||||||
|
const s = (await GetFlexState()) as any as FlexState;
|
||||||
|
if (!alive) return;
|
||||||
|
setSt((prev) => {
|
||||||
|
const now = Date.now();
|
||||||
|
const merged: any = { ...s };
|
||||||
|
for (const k in hold.current) {
|
||||||
|
if (hold.current[k] > now) merged[k] = (prev as any)[k];
|
||||||
|
}
|
||||||
|
return merged as FlexState;
|
||||||
|
});
|
||||||
|
} catch { /* not connected */ }
|
||||||
|
};
|
||||||
|
tick();
|
||||||
|
const id = window.setInterval(tick, 400);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// PowerGenius XL direct connection (fan mode), independent of the Flex link.
|
||||||
|
const [pg, setPg] = useState<{ connected: boolean; fan_mode?: string; host?: string; last_error?: string }>({ connected: false });
|
||||||
|
useEffect(() => {
|
||||||
|
let alive = true;
|
||||||
|
const tick = async () => { try { const s: any = await GetPGXLStatus(); if (alive) setPg(s || { connected: false }); } catch {} };
|
||||||
|
tick();
|
||||||
|
const id = window.setInterval(tick, 2000);
|
||||||
|
return () => { alive = false; window.clearInterval(id); };
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const change = (key: keyof FlexState, val: number | boolean | string, send: () => Promise<any>) => {
|
||||||
|
hold.current[key] = Date.now() + 900;
|
||||||
|
setSt((p) => ({ ...p, [key]: val }));
|
||||||
|
send().catch(() => {});
|
||||||
|
};
|
||||||
|
|
||||||
|
const off = !st.available;
|
||||||
|
const rxOff = off || !st.rx_avail;
|
||||||
|
const isCW = (st.mode || '').toUpperCase().includes('CW');
|
||||||
|
const PROC = [{ v: '0', l: 'NOR' }, { v: '1', l: 'DX' }, { v: '2', l: 'DX+' }];
|
||||||
|
const AGC = [{ v: 'off', l: 'OFF' }, { v: 'slow', l: 'SLOW' }, { v: 'med', l: 'MED' }, { v: 'fast', l: 'FAST' }];
|
||||||
|
const CW_BW = [100, 200, 300, 400, 500];
|
||||||
|
const SSB_BW = [1800, 2100, 2400, 2700, 3000, 4000, 6000];
|
||||||
|
const curBW = Math.max(0, (st.filter_hi || 0) - (st.filter_lo || 0));
|
||||||
|
// Highlight the preset CLOSEST to the radio's actual filter width. The rig
|
||||||
|
// rarely reports a width that lands exactly on a preset (e.g. 2.7k presets as
|
||||||
|
// 100–2790), so an exact/±50 match would leave nothing lit — "doesn't pick up
|
||||||
|
// the current filter". Snapping to the nearest preset always reflects the rig.
|
||||||
|
const ssbActiveBW = curBW > 0
|
||||||
|
? SSB_BW.reduce((best, bw) => (Math.abs(bw - curBW) < Math.abs(best - curBW) ? bw : best), SSB_BW[0])
|
||||||
|
: -1;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full min-h-0 overflow-auto bg-background">
|
||||||
|
<div className="max-w-5xl mx-auto p-3 space-y-3">
|
||||||
|
{/* Header strip */}
|
||||||
|
<div className="flex items-center gap-3 rounded-xl px-4 py-3 text-white shadow-sm"
|
||||||
|
style={{ background: 'linear-gradient(135deg,#1e293b,#0f172a)' }}>
|
||||||
|
<Radio className="size-6 text-sky-400" />
|
||||||
|
<div className="flex flex-col leading-tight">
|
||||||
|
<span className="text-base font-extrabold tracking-tight">{st.model || 'FlexRadio'}</span>
|
||||||
|
<span className="text-[11px] text-slate-400">SmartSDR remote control</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex-1" />
|
||||||
|
<span className={cn('inline-flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-sm font-extrabold tracking-wider',
|
||||||
|
!st.available ? 'bg-slate-700 text-slate-300'
|
||||||
|
: st.transmitting ? 'bg-rose-500 text-white shadow-[0_0_16px] shadow-rose-500/60' : 'bg-emerald-500 text-white')}>
|
||||||
|
<span className="size-2 rounded-full bg-current" />
|
||||||
|
{!st.available ? 'OFFLINE' : st.transmitting ? 'TX' : 'RX'}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{off && (
|
||||||
|
<div className="text-center text-sm text-muted-foreground py-6">
|
||||||
|
Waiting for the FlexRadio… (set CAT to FlexRadio and connect)
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* TX + RX columns */}
|
||||||
|
<div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
|
||||||
|
{/* TRANSMIT */}
|
||||||
|
<Card icon={Zap} title="Transmit" accent="#dc2626">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<span className="w-20 shrink-0 text-xs font-medium text-muted-foreground">RF Power</span>
|
||||||
|
<Slider value={st.rf_power} disabled={off} accent="#dc2626" onChange={(v) => change('rf_power', v, () => FlexSetPower(v))} />
|
||||||
|
<span className="w-9 text-right text-sm font-mono font-bold tabular-nums">{st.rf_power}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<span className="w-20 shrink-0 text-xs font-medium text-muted-foreground">Tune Pwr</span>
|
||||||
|
<Slider value={st.tune_power} disabled={off} accent="#d97706" onChange={(v) => change('tune_power', v, () => FlexSetTunePower(v))} />
|
||||||
|
<span className="w-9 text-right text-sm font-mono font-bold tabular-nums">{st.tune_power}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2 pt-0.5">
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
onClick={() => change('tune', !st.tune, () => FlexTune(!st.tune))}
|
||||||
|
className={cn('flex-1 px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
st.tune ? 'bg-amber-500 text-white border-amber-500 shadow-[0_0_14px] shadow-amber-500/50' : 'bg-card text-amber-700 border-amber-400 hover:bg-amber-50')}>
|
||||||
|
TUNE
|
||||||
|
</button>
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
onClick={() => change('transmitting', !st.transmitting, () => FlexMox(!st.transmitting))}
|
||||||
|
className={cn('flex-1 px-3 py-2.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
st.transmitting ? 'bg-rose-600 text-white border-rose-600 shadow-[0_0_14px] shadow-rose-600/50' : 'bg-card text-rose-700 border-rose-400 hover:bg-rose-50')}>
|
||||||
|
<Power className="size-4 inline mr-1 -mt-0.5" /> MOX
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
title="Split: RX/TX on separate slices. ON creates a TX slice +1 kHz (CW) / +5 kHz (SSB) up, like SmartSDR."
|
||||||
|
onClick={() => change('split', !st.split, () => FlexSetSplit(!st.split))}
|
||||||
|
className={cn('px-3 py-1.5 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
st.split ? 'bg-sky-600 text-white border-sky-600 shadow-[0_0_12px] shadow-sky-600/50' : 'bg-card text-sky-700 border-sky-400 hover:bg-sky-50')}>
|
||||||
|
SPLIT
|
||||||
|
</button>
|
||||||
|
{st.split && !!st.tx_freq_hz && (
|
||||||
|
<span className="text-[11px] font-mono text-muted-foreground whitespace-nowrap">
|
||||||
|
TX {(st.tx_freq_hz / 1e6).toFixed(3)}
|
||||||
|
{!!st.rx_freq_hz && ` (${(st.tx_freq_hz - st.rx_freq_hz) >= 0 ? '+' : ''}${((st.tx_freq_hz - st.rx_freq_hz) / 1000).toFixed(1)} kHz)`}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{!isCW ? (
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Chip on={st.proc_enable} disabled={off} label="PROC" accent="violet"
|
||||||
|
onClick={() => change('proc_enable', !st.proc_enable, () => FlexSetProcessor(!st.proc_enable))} />
|
||||||
|
<Segmented value={String(st.proc_level)} options={PROC} disabled={off || !st.proc_enable}
|
||||||
|
onChange={(v) => change('proc_level', parseInt(v, 10), () => FlexSetProcessorLevel(parseInt(v, 10)))} />
|
||||||
|
<span className="flex-1" />
|
||||||
|
</div>
|
||||||
|
<LevelRow label="VOX" on={st.vox_enable} disabled={off} value={st.vox_level} sliderAccent="#16a34a"
|
||||||
|
onToggle={() => change('vox_enable', !st.vox_enable, () => FlexSetVox(!st.vox_enable))}
|
||||||
|
onLevel={(v) => change('vox_level', v, () => FlexSetVoxLevel(v))} />
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground pl-0.5">VOX Dly</span>
|
||||||
|
<Slider value={st.vox_delay} disabled={off || !st.vox_enable} accent="#16a34a"
|
||||||
|
onChange={(v) => change('vox_delay', v, () => FlexSetVoxDelay(v))} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.vox_delay}</span>
|
||||||
|
</div>
|
||||||
|
<LevelRow label="MON" on={st.mon} disabled={off} value={st.mon_level} accent="cyan" sliderAccent="#0891b2"
|
||||||
|
onToggle={() => change('mon', !st.mon, () => FlexSetMon(!st.mon))}
|
||||||
|
onLevel={(v) => change('mon_level', v, () => FlexSetMonLevel(v))} />
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">MIC</span>
|
||||||
|
<Slider value={st.mic_level} disabled={off} accent="#2563eb" onChange={(v) => change('mic_level', v, () => FlexSetMic(v))} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.mic_level}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
/* CW keyer controls (replace VOX/PROC/MIC when the slice is in CW). */
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-16 shrink-0 text-[11px] font-bold text-muted-foreground">Speed</span>
|
||||||
|
<Slider value={st.cw_speed} disabled={off} max={60} accent="#0d9488" onChange={(v) => { change('cw_speed', v, () => FlexSetCWSpeed(v)); onCWSpeed?.(v); }} />
|
||||||
|
<span className="w-12 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.cw_speed} wpm</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-16 shrink-0 text-[11px] font-bold text-muted-foreground">Pitch</span>
|
||||||
|
<Slider value={st.cw_pitch} disabled={off} max={1000} step={10} accent="#7c3aed" onChange={(v) => change('cw_pitch', v, () => FlexSetCWPitch(v))} />
|
||||||
|
<span className="w-12 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.cw_pitch} Hz</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-16 shrink-0 text-[11px] font-bold text-muted-foreground">Delay</span>
|
||||||
|
<Slider value={st.cw_break_in_delay} disabled={off} max={1000} step={1} accent="#d97706" onChange={(v) => change('cw_break_in_delay', v, () => FlexSetCWBreakInDelay(v))} />
|
||||||
|
<span className="w-12 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.cw_break_in_delay} ms</span>
|
||||||
|
</div>
|
||||||
|
<LevelRow label="STONE" on={st.cw_sidetone} disabled={off} value={st.cw_mon_level} accent="cyan" sliderAccent="#0891b2"
|
||||||
|
onToggle={() => change('cw_sidetone', !st.cw_sidetone, () => FlexSetCWSidetone(!st.cw_sidetone))}
|
||||||
|
onLevel={(v) => change('cw_mon_level', v, () => FlexSetSidetoneLevel(v))} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
{/* RECEIVE */}
|
||||||
|
<Card icon={AudioLines} title="Receive (active slice)" accent="#0891b2">
|
||||||
|
{((st.ant_list?.length ?? 0) > 0 || (st.tx_ant_list?.length ?? 0) > 0) && (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">Ant</span>
|
||||||
|
<div className="flex items-center gap-1.5 flex-1 min-w-0">
|
||||||
|
<span className="text-[10px] text-muted-foreground">RX</span>
|
||||||
|
<select disabled={rxOff} value={st.rx_ant ?? ''}
|
||||||
|
onChange={(e) => change('rx_ant', e.target.value, () => FlexSetRXAntenna(e.target.value))}
|
||||||
|
className="h-7 flex-1 min-w-0 rounded-md border border-input bg-background px-1.5 text-xs font-mono disabled:opacity-40">
|
||||||
|
{(st.ant_list ?? []).map((a) => <option key={a} value={a}>{a}</option>)}
|
||||||
|
</select>
|
||||||
|
<span className="text-[10px] text-muted-foreground">TX</span>
|
||||||
|
<select disabled={rxOff} value={st.tx_ant ?? ''}
|
||||||
|
onChange={(e) => change('tx_ant', e.target.value, () => FlexSetTXAntenna(e.target.value))}
|
||||||
|
className="h-7 flex-1 min-w-0 rounded-md border border-input bg-background px-1.5 text-xs font-mono disabled:opacity-40">
|
||||||
|
{((st.tx_ant_list?.length ? st.tx_ant_list : st.ant_list) ?? []).map((a) => <option key={a} value={a}>{a}</option>)}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">AGC</span>
|
||||||
|
<Segmented value={(st.agc_mode || 'med').toLowerCase()} options={AGC} disabled={rxOff}
|
||||||
|
onChange={(v) => change('agc_mode', v, () => FlexSetAGCMode(v))} />
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">AF</span>
|
||||||
|
<button type="button" disabled={rxOff}
|
||||||
|
title={st.mute ? 'Muted — click to unmute' : 'Mute RX audio'}
|
||||||
|
onClick={() => change('mute', !st.mute, () => FlexSetMute(!st.mute))}
|
||||||
|
className={cn('shrink-0 rounded p-1 transition-colors disabled:opacity-30',
|
||||||
|
st.mute ? 'bg-red-600 text-white' : 'text-muted-foreground hover:bg-muted')}>
|
||||||
|
{st.mute ? <VolumeX className="size-3.5" /> : <Volume2 className="size-3.5" />}
|
||||||
|
</button>
|
||||||
|
<Slider value={st.audio_level} disabled={rxOff || st.mute} accent="#16a34a" onChange={(v) => change('audio_level', v, () => FlexSetAudioLevel(v))} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.mute ? '—' : st.audio_level}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">AGC-T</span>
|
||||||
|
<Slider value={st.agc_threshold} disabled={rxOff} accent="#64748b" onChange={(v) => change('agc_threshold', v, () => FlexSetAGCThreshold(v))} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.agc_threshold}</span>
|
||||||
|
</div>
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||||
|
<LevelRow label="NB" on={st.nb} disabled={rxOff} value={st.nb_level} accent="amber" sliderAccent="#d97706"
|
||||||
|
onToggle={() => change('nb', !st.nb, () => FlexSetNB(!st.nb))}
|
||||||
|
onLevel={(v) => change('nb_level', v, () => FlexSetNBLevel(v))} />
|
||||||
|
<LevelRow label="NR" on={st.nr} disabled={rxOff} value={st.nr_level} accent="cyan" sliderAccent="#0891b2"
|
||||||
|
onToggle={() => change('nr', !st.nr, () => FlexSetNR(!st.nr))}
|
||||||
|
onLevel={(v) => change('nr_level', v, () => FlexSetNRLevel(v))} />
|
||||||
|
{/* ANF (auto notch) is for carriers in voice — meaningless on a CW tone, so hide it in CW. */}
|
||||||
|
{!isCW && (
|
||||||
|
<LevelRow label="ANF" on={st.anf} disabled={rxOff} value={st.anf_level} accent="violet" sliderAccent="#7c3aed"
|
||||||
|
onToggle={() => change('anf', !st.anf, () => FlexSetANF(!st.anf))}
|
||||||
|
onLevel={(v) => change('anf_level', v, () => FlexSetANFLevel(v))} />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{isCW && (
|
||||||
|
<div className="border-t border-border/60 pt-3 space-y-3">
|
||||||
|
<LevelRow label="APF" on={st.apf} disabled={rxOff} value={st.apf_level} accent="emerald" sliderAccent="#16a34a"
|
||||||
|
onToggle={() => change('apf', !st.apf, () => FlexSetAPF(!st.apf))}
|
||||||
|
onLevel={(v) => change('apf_level', v, () => FlexSetAPFLevel(v))} />
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">Filter</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||||
|
{CW_BW.map((bw) => (
|
||||||
|
<button key={bw} type="button" disabled={rxOff}
|
||||||
|
onClick={() => { setSt((p) => { const c = ((p.filter_lo || 0) + (p.filter_hi || 0)) ? Math.round(((p.filter_lo || 0) + (p.filter_hi || 0)) / 2) : (p.cw_pitch || 600); return { ...p, filter_lo: c - bw / 2, filter_hi: c + bw / 2 }; }); FlexSetCWFilter(bw).catch(() => {}); }}
|
||||||
|
className={cn('px-2 py-1 text-[11px] font-bold tracking-wide transition-colors disabled:opacity-30 border-l border-border first:border-l-0',
|
||||||
|
Math.abs(curBW - bw) <= 1 ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||||
|
{bw}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<span className="text-[10px] text-muted-foreground/70 font-mono">Hz</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{!isCW && (
|
||||||
|
<div className="border-t border-border/60 pt-3">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-14 shrink-0 text-[11px] font-bold text-muted-foreground">Filter</span>
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden">
|
||||||
|
{SSB_BW.map((bw) => (
|
||||||
|
<button key={bw} type="button" disabled={rxOff}
|
||||||
|
onClick={() => {
|
||||||
|
const lsb = (st.mode || '').toUpperCase().includes('LSB');
|
||||||
|
let lo: number, hi: number;
|
||||||
|
if (lsb) { const near = (st.filter_hi && st.filter_hi < 0) ? st.filter_hi : -100; hi = near; lo = near - bw; }
|
||||||
|
else { const near = (st.filter_lo && st.filter_lo > 0) ? st.filter_lo : 100; lo = near; hi = near + bw; }
|
||||||
|
setSt((p) => ({ ...p, filter_lo: lo, filter_hi: hi }));
|
||||||
|
FlexSetFilter(lo, hi).catch(() => {});
|
||||||
|
}}
|
||||||
|
className={cn('px-1.5 py-1 text-[11px] font-bold tracking-wide transition-colors disabled:opacity-30 border-l border-border first:border-l-0',
|
||||||
|
bw === ssbActiveBW ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||||
|
{(bw / 1000).toFixed(1)}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<span className="text-[10px] text-muted-foreground/70 font-mono">kHz</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* External amplifier (PowerGenius XL) — only when detected. */}
|
||||||
|
{st.amp_available && (
|
||||||
|
<Card icon={Flame} title={`Amplifier${st.amp_model ? ' · ' + st.amp_model : ''}`} accent="#ea580c">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<button type="button" disabled={off}
|
||||||
|
onClick={() => change('amp_operate', !st.amp_operate, () => FlexAmpOperate(!st.amp_operate))}
|
||||||
|
className={cn('px-4 py-2 rounded-lg text-sm font-extrabold tracking-wide border-2 transition-all disabled:opacity-30',
|
||||||
|
st.amp_operate ? 'bg-orange-600 text-white border-orange-600 shadow-[0_0_14px] shadow-orange-600/50' : 'bg-card text-orange-700 border-orange-400 hover:bg-orange-50')}>
|
||||||
|
{st.amp_operate ? 'OPERATE' : 'STANDBY'}
|
||||||
|
</button>
|
||||||
|
<span className="text-xs text-muted-foreground">
|
||||||
|
{st.amp_operate ? 'Amplifier is in line (transmitting through PA).' : 'Amplifier bypassed (standby).'}
|
||||||
|
</span>
|
||||||
|
{/* Fan mode — shown when the PowerGenius is configured (Settings →
|
||||||
|
PowerGenius). The dot shows the direct-connection state; the
|
||||||
|
selector is disabled until connected (hover it for the error). */}
|
||||||
|
{(pg.host || pg.connected) && (
|
||||||
|
<label className="flex items-center gap-1.5 text-xs" title={pg.connected ? 'PowerGenius connected' : (pg.last_error || 'PowerGenius offline')}>
|
||||||
|
<span className={cn('size-1.5 rounded-full', pg.connected ? 'bg-emerald-500 shadow-[0_0_6px_rgba(16,185,129,0.8)]' : 'bg-rose-500')} />
|
||||||
|
<span className="text-muted-foreground">Fan</span>
|
||||||
|
<select
|
||||||
|
disabled={!pg.connected}
|
||||||
|
value={(pg.fan_mode || 'CONTEST').toUpperCase()}
|
||||||
|
onChange={(e) => { const v = e.target.value; setPg((s) => ({ ...s, fan_mode: v })); PGXLSetFanMode(v).catch(() => {}); }}
|
||||||
|
className="h-8 rounded-md border border-orange-300 bg-card px-2 text-xs font-semibold text-orange-800 outline-none focus:border-orange-500 disabled:opacity-40"
|
||||||
|
>
|
||||||
|
<option value="STANDARD">Standard</option>
|
||||||
|
<option value="CONTEST">Contest</option>
|
||||||
|
<option value="BROADCAST">Broadcast</option>
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
<div className="flex-1" />
|
||||||
|
{st.amp_fault && st.amp_fault !== 'NONE' && (
|
||||||
|
<span className="px-2 py-1 rounded bg-rose-100 text-rose-800 text-xs font-bold">FAULT: {st.amp_fault}</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Live meters (UDP VITA-49 stream) */}
|
||||||
|
<Card icon={Gauge} title="Meters">
|
||||||
|
{(() => {
|
||||||
|
const meters = st.meters || [];
|
||||||
|
if (off || meters.length === 0) {
|
||||||
|
return <p className="text-[11px] text-muted-foreground text-center py-2">No meters yet — waiting for the radio's UDP stream…</p>;
|
||||||
|
}
|
||||||
|
const isDbm = (m?: Meter) => !!m && /dbm/i.test(m.unit || '');
|
||||||
|
const dbmToW = (d: number) => Math.pow(10, (d - 30) / 10);
|
||||||
|
// Radio meters (exclude the amplifier's, which we show separately).
|
||||||
|
const radio = (name: string) => meters.find((m) =>
|
||||||
|
(m.name || '').toUpperCase().includes(name) && !(m.src || '').toUpperCase().includes('AMP'));
|
||||||
|
const sig = radio('LEVEL') || radio('SIGNAL');
|
||||||
|
const fwd = radio('FWDPWR');
|
||||||
|
const swr = radio('SWR');
|
||||||
|
const amp = meters.filter((m) => (m.src || '').toUpperCase().includes('AMP')
|
||||||
|
&& !/^(RL|DRV)$/i.test((m.name || '').trim()));
|
||||||
|
const accentFor = (m: Meter) => /swr/i.test(`${m.unit}${m.name}`) ? '#dc2626'
|
||||||
|
: /temp|degc|degf/i.test(`${m.unit}${m.name}`) ? '#ea580c'
|
||||||
|
: /volt/i.test(m.unit || '') ? '#2563eb' : '#16a34a';
|
||||||
|
// S-meter: dBm → S-units (S9 = -73 dBm on HF, 6 dB per unit).
|
||||||
|
const sUnit = (dbm: number) => {
|
||||||
|
const s = (dbm + 127) / 6; // S0 = -127 dBm
|
||||||
|
if (s >= 9) {
|
||||||
|
const over = Math.round(dbm + 73); // dB over S9
|
||||||
|
return { display: over > 0 ? `S9+${over}` : 'S9', bar: s };
|
||||||
|
}
|
||||||
|
return { display: `S${Math.max(0, Math.round(s))}`, bar: Math.max(0, s) };
|
||||||
|
};
|
||||||
|
const cur = [
|
||||||
|
sig && (() => { const dbm = peakHold('s', sig.value); const s = sUnit(dbm); return (
|
||||||
|
<MeterBar key="s" label="S-METER" value={s.bar} lo={0} hi={19} accent="#16a34a" display={s.display} extra={`${dbm.toFixed(1)} dBm`}
|
||||||
|
segColor={(fr) => { const sv = fr * 19; return sv < 9 ? '#16a34a' : sv < 12.33 ? '#f59e0b' : '#dc2626'; }} />
|
||||||
|
); })(),
|
||||||
|
fwd && (() => { const w = peakHold('p', isDbm(fwd) ? dbmToW(fwd.value) : fwd.value); return (
|
||||||
|
<MeterBar key="p" label="PWR" unit="W" lo={0} hi={120} accent="#dc2626"
|
||||||
|
value={w} extra={isDbm(fwd) ? `${fwd.value.toFixed(1)} dBm` : undefined} />
|
||||||
|
); })(),
|
||||||
|
swr && <MeterBar key="w" label="SWR" value={peakHold('w', swr.value)} unit="" lo={1} hi={3} accent="#d97706" />,
|
||||||
|
].filter(Boolean);
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2">{cur}</div>
|
||||||
|
{amp.length > 0 && (
|
||||||
|
<div className="border-t border-border/60 pt-2 mt-1">
|
||||||
|
<div className="text-[10px] font-bold tracking-wider text-muted-foreground mb-1.5">AMPLIFIER</div>
|
||||||
|
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2">
|
||||||
|
{amp.map((m) => {
|
||||||
|
if (/fwd|pwr/i.test(m.name || '') && isDbm(m)) {
|
||||||
|
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, dbmToW(m.value))} unit="W" lo={0} hi={2000} accent="#dc2626" extra={`${m.value.toFixed(1)} dBm`} />;
|
||||||
|
}
|
||||||
|
return <MeterBar key={m.id} label={m.name || `AMP ${m.id}`} value={peakHold(`amp${m.id}`, m.value)} unit={m.unit} lo={m.lo} hi={m.hi} accent={accentFor(m)} />;
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
})()}
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,186 @@
|
|||||||
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { Radio, AudioLines, RefreshCw } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetIcomState, IcomRefresh,
|
||||||
|
IcomSetAFGain, IcomSetRFGain, IcomSetNB, IcomSetNBLevel, IcomSetNR, IcomSetNRLevel,
|
||||||
|
IcomSetANF, IcomSetAGC, IcomSetPreamp, IcomSetAtt, IcomSetFilter,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
type IcomState = {
|
||||||
|
available: boolean; model?: string; mode?: string;
|
||||||
|
af_gain: number; rf_gain: number;
|
||||||
|
nb: boolean; nb_level: number; nr: boolean; nr_level: number; anf: boolean;
|
||||||
|
agc?: string; preamp: number; att: number; filter: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
const ZERO: IcomState = {
|
||||||
|
available: false, af_gain: 0, rf_gain: 0,
|
||||||
|
nb: false, nb_level: 0, nr: false, nr_level: 0, anf: false,
|
||||||
|
preamp: 0, att: 0, filter: 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
function Slider({ value, onChange, disabled, accent = '#2563eb' }: {
|
||||||
|
value: number; onChange: (v: number) => void; disabled?: boolean; accent?: string;
|
||||||
|
}) {
|
||||||
|
const v = Math.max(0, Math.min(100, value));
|
||||||
|
return (
|
||||||
|
<input
|
||||||
|
type="range" min={0} max={100} value={v} disabled={disabled}
|
||||||
|
onChange={(e) => onChange(parseInt(e.target.value, 10))}
|
||||||
|
className={cn('flex-1 h-1.5 rounded-full appearance-none cursor-pointer disabled:opacity-30 disabled:cursor-default',
|
||||||
|
'[&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:size-3.5 [&::-webkit-slider-thumb]:rounded-full',
|
||||||
|
'[&::-webkit-slider-thumb]:bg-white [&::-webkit-slider-thumb]:border-2 [&::-webkit-slider-thumb]:shadow-sm')}
|
||||||
|
style={{ background: `linear-gradient(to right, ${accent} ${v}%, #d8cfb8 ${v}%)`, borderColor: accent }}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Segmented({ value, options, onChange }: {
|
||||||
|
value: string; options: { v: string; l: string }[]; onChange: (v: string) => void;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="inline-flex rounded-md border border-border overflow-hidden shrink-0">
|
||||||
|
{options.map((o) => (
|
||||||
|
<button key={o.v} type="button" onClick={() => onChange(o.v)}
|
||||||
|
className={cn('px-2 py-1 text-[11px] font-bold tracking-wide transition-colors border-l border-border first:border-l-0',
|
||||||
|
value === o.v ? 'bg-primary text-primary-foreground' : 'bg-card text-muted-foreground hover:bg-muted')}>
|
||||||
|
{o.l}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Chip({ on, onClick, label }: { on: boolean; onClick: () => void; label: string }) {
|
||||||
|
return (
|
||||||
|
<button type="button" onClick={onClick}
|
||||||
|
className={cn('w-14 shrink-0 px-2 py-1 rounded-md text-[11px] font-bold border transition-colors',
|
||||||
|
on ? 'bg-emerald-600 border-emerald-600 text-white' : 'bg-card text-muted-foreground border-border hover:bg-muted')}>
|
||||||
|
{label}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function LevelRow({ label, on, onToggle, value, onLevel }: {
|
||||||
|
label: string; on: boolean; onToggle: () => void; value: number; onLevel: (v: number) => void;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Chip on={on} onClick={onToggle} label={label} />
|
||||||
|
<Slider value={value} disabled={!on} onChange={onLevel} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{value}</span>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Card({ icon: Icon, title, accent, children }: { icon: any; title: string; accent?: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="rounded-xl border border-border bg-card shadow-sm overflow-hidden">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Icon className="size-4" style={{ color: accent ?? 'var(--primary)' }} />
|
||||||
|
<span className="text-xs font-bold uppercase tracking-wider text-foreground/80">{title}</span>
|
||||||
|
</div>
|
||||||
|
<div className="p-3 space-y-3">{children}</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function Row({ label, children }: { label: string; children: React.ReactNode }) {
|
||||||
|
return (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="w-16 shrink-0 text-[11px] font-bold uppercase tracking-wider text-muted-foreground">{label}</span>
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// IcomPanel — receive-DSP control surface for an Icom on the CI-V backend.
|
||||||
|
// Unlike the Flex (which pushes state), the Icom is polled: the cache reflects
|
||||||
|
// the last refresh plus optimistic updates. Front-panel knob changes show after
|
||||||
|
// the next ↻ Refresh.
|
||||||
|
export function IcomPanel() {
|
||||||
|
const [st, setSt] = useState<IcomState>(ZERO);
|
||||||
|
const [busy, setBusy] = useState(false);
|
||||||
|
|
||||||
|
const load = () => GetIcomState().then((s) => setSt((s ?? ZERO) as IcomState)).catch(() => {});
|
||||||
|
const refresh = async () => {
|
||||||
|
setBusy(true);
|
||||||
|
try { await IcomRefresh(); } catch {}
|
||||||
|
await load();
|
||||||
|
setBusy(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
refresh();
|
||||||
|
const id = window.setInterval(load, 1500); // cheap cache poll (mode + optimistic state)
|
||||||
|
return () => window.clearInterval(id);
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Optimistic local update + fire the command; the cache poll reconciles.
|
||||||
|
const set = (patch: Partial<IcomState>, fn: () => Promise<void>) => {
|
||||||
|
setSt((s) => ({ ...s, ...patch }));
|
||||||
|
fn().catch(() => {});
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!st.available) {
|
||||||
|
return (
|
||||||
|
<div className="h-full flex items-center justify-center text-sm text-muted-foreground p-6 text-center">
|
||||||
|
Icom not connected. Enable the Icom CI-V backend in Settings → CAT and connect the radio's USB port.
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="h-full overflow-y-auto p-3 space-y-3">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<div className="text-sm font-bold">{st.model || 'Icom'}{st.mode ? <span className="ml-2 text-xs font-mono text-muted-foreground">{st.mode}</span> : null}</div>
|
||||||
|
<button type="button" onClick={refresh} disabled={busy}
|
||||||
|
className="inline-flex items-center gap-1.5 rounded-md border border-border bg-card px-2 py-1 text-xs hover:bg-muted disabled:opacity-40">
|
||||||
|
<RefreshCw className={cn('size-3.5', busy && 'animate-spin')} /> Refresh
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Card icon={Radio} title="Receive" accent="#2563eb">
|
||||||
|
<Row label="AF">
|
||||||
|
<Slider value={st.af_gain} onChange={(v) => set({ af_gain: v }, () => IcomSetAFGain(v))} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.af_gain}</span>
|
||||||
|
</Row>
|
||||||
|
<Row label="RF">
|
||||||
|
<Slider value={st.rf_gain} onChange={(v) => set({ rf_gain: v }, () => IcomSetRFGain(v))} />
|
||||||
|
<span className="w-8 text-right text-xs font-mono tabular-nums text-muted-foreground">{st.rf_gain}</span>
|
||||||
|
</Row>
|
||||||
|
<Row label="AGC">
|
||||||
|
<Segmented value={st.agc || ''} options={[{ v: 'FAST', l: 'FAST' }, { v: 'MID', l: 'MID' }, { v: 'SLOW', l: 'SLOW' }]}
|
||||||
|
onChange={(v) => set({ agc: v }, () => IcomSetAGC(v))} />
|
||||||
|
</Row>
|
||||||
|
<Row label="Preamp">
|
||||||
|
<Segmented value={String(st.preamp)} options={[{ v: '0', l: 'OFF' }, { v: '1', l: 'P1' }, { v: '2', l: 'P2' }]}
|
||||||
|
onChange={(v) => set({ preamp: parseInt(v) }, () => IcomSetPreamp(parseInt(v)))} />
|
||||||
|
</Row>
|
||||||
|
<Row label="Att">
|
||||||
|
<Segmented value={String(st.att)} options={[{ v: '0', l: 'OFF' }, { v: '6', l: '6dB' }, { v: '12', l: '12dB' }, { v: '18', l: '18dB' }]}
|
||||||
|
onChange={(v) => set({ att: parseInt(v) }, () => IcomSetAtt(parseInt(v)))} />
|
||||||
|
</Row>
|
||||||
|
<Row label="Filter">
|
||||||
|
<Segmented value={String(st.filter)} options={[{ v: '1', l: 'FIL1' }, { v: '2', l: 'FIL2' }, { v: '3', l: 'FIL3' }]}
|
||||||
|
onChange={(v) => set({ filter: parseInt(v) }, () => IcomSetFilter(parseInt(v)))} />
|
||||||
|
</Row>
|
||||||
|
</Card>
|
||||||
|
|
||||||
|
<Card icon={AudioLines} title="Noise / Notch" accent="#16a34a">
|
||||||
|
<LevelRow label="NB" on={st.nb} value={st.nb_level}
|
||||||
|
onToggle={() => set({ nb: !st.nb }, () => IcomSetNB(!st.nb))}
|
||||||
|
onLevel={(v) => set({ nb_level: v }, () => IcomSetNBLevel(v))} />
|
||||||
|
<LevelRow label="NR" on={st.nr} value={st.nr_level}
|
||||||
|
onToggle={() => set({ nr: !st.nr }, () => IcomSetNR(!st.nr))}
|
||||||
|
onLevel={(v) => set({ nr_level: v }, () => IcomSetNRLevel(v))} />
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Chip label="ANF" on={st.anf} onClick={() => set({ anf: !st.anf }, () => IcomSetANF(!st.anf))} />
|
||||||
|
<span className="text-xs text-muted-foreground">Auto notch filter</span>
|
||||||
|
</div>
|
||||||
|
</Card>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
+231
-144
@@ -14,22 +14,15 @@ function saveMapView(m: L.Map) {
|
|||||||
writeUiPref('opslog.mapView', JSON.stringify({ lat: c.lat, lon: c.lng, zoom: m.getZoom() }));
|
writeUiPref('opslog.mapView', JSON.stringify({ lat: c.lat, lon: c.lng, zoom: m.getZoom() }));
|
||||||
}
|
}
|
||||||
|
|
||||||
// MainMap — Log4OM-style dual map for the Main tab:
|
// The Main tab is built from two independent map panes that the operator can
|
||||||
// • Left: a world map with the great-circle path drawn from the operator to
|
// place on either side (Settings → Main view):
|
||||||
// the contacted station, plus distance + short/long-path azimuth.
|
// • WorldMap ("map1"): a world map with the great-circle path from the
|
||||||
// • Right: a street map zoomed onto the contacted station's grid locator.
|
// operator to the contacted station, distance, short/long-path azimuth and
|
||||||
|
// the antenna beam lobe.
|
||||||
|
// • LocatorMap ("map2"): a street map zoomed onto the contacted station's grid.
|
||||||
// Built on Leaflet + free OSM/Carto tiles (no API key). Endpoints use
|
// Built on Leaflet + free OSM/Carto tiles (no API key). Endpoints use
|
||||||
// circleMarkers / divIcons so we don't depend on Leaflet's image assets.
|
// circleMarkers / divIcons so we don't depend on Leaflet's image assets.
|
||||||
|
|
||||||
interface Props {
|
|
||||||
fromGrid: string; // operator grid (active profile)
|
|
||||||
toGrid: string; // contacted-station grid
|
|
||||||
fromLabel?: string; // operator callsign
|
|
||||||
toLabel?: string; // DX callsign
|
|
||||||
beamAzimuths?: number[]; // antenna heading(s) (deg) → draw a beam lobe each
|
|
||||||
beamWidth?: number; // beamwidth (deg), default 30
|
|
||||||
}
|
|
||||||
|
|
||||||
// unwrapLon makes a lat/lon ring continuous in longitude (each point within
|
// unwrapLon makes a lat/lon ring continuous in longitude (each point within
|
||||||
// 180° of the previous) so a polygon crossing the antimeridian doesn't snap
|
// 180° of the previous) so a polygon crossing the antimeridian doesn't snap
|
||||||
// across the whole map. Coords may exceed ±180; Leaflet (worldCopyJump) is fine.
|
// across the whole map. Coords may exceed ±180; Leaflet (worldCopyJump) is fine.
|
||||||
@@ -53,6 +46,24 @@ const OSM = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
|||||||
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
||||||
const OSM_ATTR = '© OpenStreetMap contributors';
|
const OSM_ATTR = '© OpenStreetMap contributors';
|
||||||
|
|
||||||
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
|
// overlay on top of an imagery basemap (so satellite keeps its names too).
|
||||||
|
type BasemapKey = 'light' | 'voyager' | 'street' | 'satellite';
|
||||||
|
const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; subdomains?: string; labelsUrl?: string }> = {
|
||||||
|
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
|
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
||||||
|
attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
|
street: { label: 'Street', url: OSM, attr: OSM_ATTR },
|
||||||
|
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||||
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
|
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
||||||
|
};
|
||||||
|
function loadBasemap(): BasemapKey {
|
||||||
|
const v = localStorage.getItem('opslog.mapBasemap');
|
||||||
|
return v === 'voyager' || v === 'street' || v === 'satellite' ? v : 'light';
|
||||||
|
}
|
||||||
|
|
||||||
function dot(color: string): L.DivIcon {
|
function dot(color: string): L.DivIcon {
|
||||||
return L.divIcon({
|
return L.divIcon({
|
||||||
className: '',
|
className: '',
|
||||||
@@ -62,14 +73,25 @@ function dot(color: string): L.DivIcon {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
export function MainMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, beamWidth }: Props) {
|
interface WorldProps {
|
||||||
|
fromGrid: string; // operator grid (active profile)
|
||||||
|
toGrid: string; // contacted-station grid
|
||||||
|
fromLabel?: string; // operator callsign
|
||||||
|
toLabel?: string; // DX callsign
|
||||||
|
beamAzimuths?: number[]; // radiating heading(s) (deg) → draw a beam lobe each
|
||||||
|
beamWidth?: number; // beamwidth (deg), default 30
|
||||||
|
boomAzimuth?: number | null; // mechanical boom (rotor) heading → grey reference line
|
||||||
|
zoomSignal?: number; // bump to force an auto-zoom now (e.g. QRZ lookup finished)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WorldMap — great-circle path + beam lobe(s), the "map1" pane.
|
||||||
|
export function WorldMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, beamWidth, boomAzimuth, zoomSignal }: WorldProps) {
|
||||||
const worldRef = useRef<HTMLDivElement>(null);
|
const worldRef = useRef<HTMLDivElement>(null);
|
||||||
const locatorRef = useRef<HTMLDivElement>(null);
|
|
||||||
const worldMap = useRef<L.Map | null>(null);
|
const worldMap = useRef<L.Map | null>(null);
|
||||||
const locatorMap = useRef<L.Map | null>(null);
|
|
||||||
// Layers we add/remove as the QSO changes (kept separate from the basemap).
|
|
||||||
const worldOverlay = useRef<L.LayerGroup | null>(null);
|
const worldOverlay = useRef<L.LayerGroup | null>(null);
|
||||||
const locatorOverlay = useRef<L.LayerGroup | null>(null);
|
const baseLayer = useRef<L.TileLayer | null>(null);
|
||||||
|
const labelsLayer = useRef<L.TileLayer | null>(null);
|
||||||
|
const [basemap, setBasemap] = useState<BasemapKey>(loadBasemap);
|
||||||
|
|
||||||
// Auto-zoom the world map to fit QTH→DX on each QSO. When off, the operator
|
// Auto-zoom the world map to fit QTH→DX on each QSO. When off, the operator
|
||||||
// pans/zooms freely (e.g. a whole-world view) and the view is remembered
|
// pans/zooms freely (e.g. a whole-world view) and the view is remembered
|
||||||
@@ -83,15 +105,192 @@ export function MainMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, be
|
|||||||
if (worldRef.current && !worldMap.current) {
|
if (worldRef.current && !worldMap.current) {
|
||||||
const m = L.map(worldRef.current, { zoomControl: true, attributionControl: true, worldCopyJump: true })
|
const m = L.map(worldRef.current, { zoomControl: true, attributionControl: true, worldCopyJump: true })
|
||||||
.setView([20, 0], 1);
|
.setView([20, 0], 1);
|
||||||
L.tileLayer(CARTO_LIGHT, { attribution: CARTO_ATTR, subdomains: 'abcd', maxZoom: 19 }).addTo(m);
|
const bm = BASEMAPS[basemap];
|
||||||
|
baseLayer.current = L.tileLayer(bm.url, { attribution: bm.attr, subdomains: bm.subdomains ?? 'abc', maxZoom: 19 }).addTo(m);
|
||||||
|
if (bm.labelsUrl) labelsLayer.current = L.tileLayer(bm.labelsUrl, { maxZoom: 19 }).addTo(m);
|
||||||
worldOverlay.current = L.layerGroup().addTo(m);
|
worldOverlay.current = L.layerGroup().addTo(m);
|
||||||
worldMap.current = m;
|
worldMap.current = m;
|
||||||
// Restore the saved free-pan view when not auto-zooming.
|
|
||||||
const sv = loadMapView();
|
const sv = loadMapView();
|
||||||
if (!autoZoomRef.current && sv) m.setView([sv.lat, sv.lon], sv.zoom);
|
if (!autoZoomRef.current && sv) m.setView([sv.lat, sv.lon], sv.zoom);
|
||||||
// Remember the view as the user pans/zooms (only meaningful when free).
|
|
||||||
m.on('moveend', () => { if (!autoZoomRef.current) saveMapView(m); });
|
m.on('moveend', () => { if (!autoZoomRef.current) saveMapView(m); });
|
||||||
}
|
}
|
||||||
|
const t = window.setTimeout(() => { worldMap.current?.invalidateSize(); }, 80);
|
||||||
|
return () => window.clearTimeout(t);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Swap the basemap (and its optional place-name overlay) when the operator
|
||||||
|
// picks a different one. Vector overlays (path/beam) live in Leaflet's
|
||||||
|
// overlayPane, always above any tile layer, so nothing to re-stack there.
|
||||||
|
useEffect(() => {
|
||||||
|
const m = worldMap.current;
|
||||||
|
if (!m) return;
|
||||||
|
if (baseLayer.current) { m.removeLayer(baseLayer.current); baseLayer.current = null; }
|
||||||
|
if (labelsLayer.current) { m.removeLayer(labelsLayer.current); labelsLayer.current = null; }
|
||||||
|
const bm = BASEMAPS[basemap];
|
||||||
|
baseLayer.current = L.tileLayer(bm.url, { attribution: bm.attr, subdomains: bm.subdomains ?? 'abc', maxZoom: 19 }).addTo(m);
|
||||||
|
if (bm.labelsUrl) labelsLayer.current = L.tileLayer(bm.labelsUrl, { maxZoom: 19 }).addTo(m);
|
||||||
|
}, [basemap]);
|
||||||
|
|
||||||
|
// Redraw overlays whenever the operator/DX grids (or beam) change.
|
||||||
|
useEffect(() => {
|
||||||
|
const wm = worldMap.current, wo = worldOverlay.current;
|
||||||
|
if (!wm || !wo) return;
|
||||||
|
wo.clearLayers();
|
||||||
|
|
||||||
|
const from = gridToLatLon(fromGrid);
|
||||||
|
const to = gridToLatLon(toGrid);
|
||||||
|
|
||||||
|
// Station marker + antenna beam/boom are drawn whenever the station grid is
|
||||||
|
// known — independent of any DX. The antenna is always pointed somewhere, so
|
||||||
|
// the beam heading should show even before a callsign is entered.
|
||||||
|
if (from) {
|
||||||
|
L.marker([from.lat, from.lon], { icon: dot('#2563eb'), title: fromLabel || 'QTH' })
|
||||||
|
.bindTooltip(`${fromLabel ? fromLabel + ' · ' : ''}${fromGrid.toUpperCase()}`, { permanent: false, direction: 'top' })
|
||||||
|
.addTo(wo);
|
||||||
|
|
||||||
|
// ── Antenna beam lobe(s) (drawn first, under the arc/markers) ──
|
||||||
|
if (beamAzimuths && beamAzimuths.length) {
|
||||||
|
const half = (beamWidth ?? 30) / 2;
|
||||||
|
const D = 5500; // lobe length (km)
|
||||||
|
// Great-circle radial out to distance D, stopping just short of the pole
|
||||||
|
// so a poleward line doesn't snap across the top of the Mercator map.
|
||||||
|
const radial = (b: number): [number, number][] => {
|
||||||
|
const out: [number, number][] = [];
|
||||||
|
const N = 64;
|
||||||
|
for (let i = 1; i <= N; i++) {
|
||||||
|
const d = destinationPoint(from.lat, from.lon, b, (D * i) / N);
|
||||||
|
out.push([d.lat, d.lon]);
|
||||||
|
if (Math.abs(d.lat) > 86) break; // near a pole — stop before the snap
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
};
|
||||||
|
for (const az of beamAzimuths) {
|
||||||
|
// Draw the lobe as a DENSE fan of translucent great-circle radials, not
|
||||||
|
// a filled polygon: a polygon smears badly near the poles on Mercator
|
||||||
|
// (a poleward beam degenerates into a giant triangle), while each radial
|
||||||
|
// LINE stays clean at any azimuth. A small angular step makes the lines
|
||||||
|
// overlap into a solid-looking lobe (no separate strokes), darker near
|
||||||
|
// the antenna and fanning out toward the front.
|
||||||
|
for (let b = az - half; b <= az + half + 0.001; b += 0.5) {
|
||||||
|
const line = unwrapLon([[from.lat, from.lon], ...radial(b)]);
|
||||||
|
L.polyline(line as L.LatLngExpression[], { color: '#ff2d2d', weight: 6, opacity: 0.10, smoothFactor: 0 }).addTo(wo);
|
||||||
|
}
|
||||||
|
|
||||||
|
const cl = unwrapLon([[from.lat, from.lon], ...radial(az)]);
|
||||||
|
// Dark casing under the boresight so the bright dashed line stays
|
||||||
|
// readable on any basemap. Same dashArray so the casing tracks each dash.
|
||||||
|
L.polyline(cl as L.LatLngExpression[], { color: '#000', weight: 4, opacity: 0.4, dashArray: '5 4', smoothFactor: 0 }).addTo(wo);
|
||||||
|
L.polyline(cl as L.LatLngExpression[], { color: '#ff2d2d', weight: 2, opacity: 0.95, dashArray: '5 4', smoothFactor: 0 })
|
||||||
|
.bindTooltip(`Beam ${Math.round(az)}°`, { permanent: false, direction: 'top' }).addTo(wo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mechanical boom (rotor) direction — thin grey dashed line. Drawn when the
|
||||||
|
// Ultrabeam radiates elsewhere (reverse/bi) so the boom heading stays visible
|
||||||
|
// next to the red radiating lobe(s).
|
||||||
|
if (boomAzimuth != null) {
|
||||||
|
const bpts: [number, number][] = [[from.lat, from.lon]];
|
||||||
|
const N = 64, D = 5500;
|
||||||
|
for (let i = 1; i <= N; i++) {
|
||||||
|
const d = destinationPoint(from.lat, from.lon, boomAzimuth, (D * i) / N);
|
||||||
|
bpts.push([d.lat, d.lon]);
|
||||||
|
if (Math.abs(d.lat) > 86) break;
|
||||||
|
}
|
||||||
|
L.polyline(unwrapLon(bpts) as L.LatLngExpression[], { color: '#64748b', weight: 1.5, opacity: 0.85, dashArray: '3 4', smoothFactor: 0 })
|
||||||
|
.bindTooltip(`Boom ${Math.round(boomAzimuth)}°`, { permanent: false, direction: 'top' }).addTo(wo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// DX marker + great-circle arc — only when a DX grid is known (callsign entered).
|
||||||
|
let arcPts: [number, number][] | null = null;
|
||||||
|
if (from && to) {
|
||||||
|
L.marker([to.lat, to.lon], { icon: dot('#dc2626'), title: toLabel || 'DX' })
|
||||||
|
.bindTooltip(`${toLabel ? toLabel + ' · ' : ''}${toGrid.toUpperCase()}`, { permanent: false, direction: 'top' })
|
||||||
|
.addTo(wo);
|
||||||
|
arcPts = greatCirclePoints(from.lat, from.lon, to.lat, to.lon, 128);
|
||||||
|
// smoothFactor: 0 keeps every vertex (Leaflet otherwise simplifies the line).
|
||||||
|
L.polyline(unwrapLon(arcPts) as L.LatLngExpression[],
|
||||||
|
{ color: '#2563eb', weight: 2, opacity: 0.85, smoothFactor: 0 }).addTo(wo);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (autoZoom) {
|
||||||
|
if (from && to && arcPts) {
|
||||||
|
const bounds = L.latLngBounds([[from.lat, from.lon], [to.lat, to.lon]]);
|
||||||
|
arcPts.forEach((p) => bounds.extend(p as L.LatLngExpression));
|
||||||
|
wm.fitBounds(bounds, { padding: [30, 30], maxZoom: 6 });
|
||||||
|
} else if (to) {
|
||||||
|
wm.setView([to.lat, to.lon], 3);
|
||||||
|
} else if (from) {
|
||||||
|
wm.setView([from.lat, from.lon], 3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
setTimeout(() => { wm.invalidateSize(); }, 0);
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, [fromGrid, toGrid, fromLabel, toLabel, (beamAzimuths ?? []).map((a) => Math.round(a)).join(','), beamWidth, boomAzimuth, autoZoom, zoomSignal]);
|
||||||
|
|
||||||
|
const path = pathBetween(fromGrid, toGrid);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="relative isolate h-full w-full rounded-lg overflow-hidden border border-border">
|
||||||
|
<div ref={worldRef} className="absolute inset-0" />
|
||||||
|
{/* Basemap picker — Light / Street / Satellite (key-free tiles). */}
|
||||||
|
<div className="absolute top-1 left-12 z-[500] flex rounded-md overflow-hidden shadow border border-border backdrop-blur">
|
||||||
|
{(Object.keys(BASEMAPS) as BasemapKey[]).map((k) => (
|
||||||
|
<button
|
||||||
|
key={k}
|
||||||
|
type="button"
|
||||||
|
onClick={() => { setBasemap(k); writeUiPref('opslog.mapBasemap', k); }}
|
||||||
|
title={`Basemap: ${BASEMAPS[k].label}`}
|
||||||
|
className={`px-2 py-1 text-[11px] font-medium transition-colors ${
|
||||||
|
basemap === k ? 'bg-primary text-primary-foreground' : 'bg-card/90 text-muted-foreground hover:bg-card'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{BASEMAPS[k].label}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{/* Auto-zoom toggle: on = frame QTH→DX each QSO; off = free pan/zoom
|
||||||
|
(remembered across restarts), so the beam heading stays visible. */}
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
const v = !autoZoom;
|
||||||
|
setAutoZoom(v);
|
||||||
|
writeUiPref('opslog.mapAutoZoomDX', v ? '1' : '0');
|
||||||
|
const m = worldMap.current;
|
||||||
|
if (!v && m) saveMapView(m);
|
||||||
|
}}
|
||||||
|
title={autoZoom ? 'Auto-zoom to DX is ON — click for free pan/zoom (remembered)' : 'Free pan/zoom — click to auto-zoom to the DX'}
|
||||||
|
className={`absolute top-1 right-1 z-[500] rounded-md px-2 py-1 text-[11px] font-medium shadow border backdrop-blur transition-colors ${
|
||||||
|
autoZoom ? 'bg-primary text-primary-foreground border-primary' : 'bg-card/90 text-muted-foreground border-border hover:bg-card'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
Zoom DX
|
||||||
|
</button>
|
||||||
|
{path && (
|
||||||
|
<div className="absolute bottom-1 left-1 z-[500] rounded-md bg-card/90 backdrop-blur px-2 py-1 text-[11px] font-mono shadow border border-border pointer-events-none">
|
||||||
|
<div><span className="text-muted-foreground">Dist</span> {Math.round(path.distanceShort).toLocaleString()} km
|
||||||
|
<span className="text-muted-foreground"> · LP</span> {Math.round(path.distanceLong).toLocaleString()} km</div>
|
||||||
|
<div><span className="text-muted-foreground">Az SP</span> {Math.round(path.bearingShort)}°
|
||||||
|
<span className="text-muted-foreground"> · LP</span> {Math.round(path.bearingLong)}°</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface LocatorProps {
|
||||||
|
toGrid: string; // contacted-station grid
|
||||||
|
toLabel?: string; // DX callsign
|
||||||
|
}
|
||||||
|
|
||||||
|
// LocatorMap — street map zoomed onto the DX grid, the "map2" pane.
|
||||||
|
export function LocatorMap({ toGrid, toLabel }: LocatorProps) {
|
||||||
|
const locatorRef = useRef<HTMLDivElement>(null);
|
||||||
|
const locatorMap = useRef<L.Map | null>(null);
|
||||||
|
const locatorOverlay = useRef<L.LayerGroup | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
if (locatorRef.current && !locatorMap.current) {
|
if (locatorRef.current && !locatorMap.current) {
|
||||||
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
||||||
.setView([20, 0], 2);
|
.setView([20, 0], 2);
|
||||||
@@ -99,88 +298,15 @@ export function MainMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, be
|
|||||||
locatorOverlay.current = L.layerGroup().addTo(m);
|
locatorOverlay.current = L.layerGroup().addTo(m);
|
||||||
locatorMap.current = m;
|
locatorMap.current = m;
|
||||||
}
|
}
|
||||||
// The Main tab may have just become visible — fix tile sizing.
|
const t = window.setTimeout(() => { locatorMap.current?.invalidateSize(); }, 80);
|
||||||
const t = window.setTimeout(() => {
|
|
||||||
worldMap.current?.invalidateSize();
|
|
||||||
locatorMap.current?.invalidateSize();
|
|
||||||
}, 80);
|
|
||||||
return () => window.clearTimeout(t);
|
return () => window.clearTimeout(t);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
// Redraw overlays whenever the operator/DX grids change.
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const wm = worldMap.current, lm = locatorMap.current;
|
const lm = locatorMap.current, lo = locatorOverlay.current;
|
||||||
const wo = worldOverlay.current, lo = locatorOverlay.current;
|
if (!lm || !lo) return;
|
||||||
if (!wm || !lm || !wo || !lo) return;
|
|
||||||
wo.clearLayers();
|
|
||||||
lo.clearLayers();
|
lo.clearLayers();
|
||||||
|
|
||||||
const from = gridToLatLon(fromGrid);
|
|
||||||
const to = gridToLatLon(toGrid);
|
const to = gridToLatLon(toGrid);
|
||||||
|
|
||||||
// ── Antenna beam lobe(s) (drawn first, under the arc/markers) ──
|
|
||||||
if (from && beamAzimuths && beamAzimuths.length) {
|
|
||||||
const half = (beamWidth ?? 30) / 2;
|
|
||||||
const D = 5500; // lobe length (km) — short enough to rarely reach a pole
|
|
||||||
const radial = (b: number): [number, number][] =>
|
|
||||||
Array.from({ length: 14 }, (_, i) => {
|
|
||||||
const d = destinationPoint(from.lat, from.lon, b, (D * (i + 1)) / 14);
|
|
||||||
return [d.lat, d.lon] as [number, number];
|
|
||||||
});
|
|
||||||
const edge = { color: '#dc2626', weight: 1.5, opacity: 0.6 };
|
|
||||||
for (const az of beamAzimuths) {
|
|
||||||
const arc: [number, number][] = [];
|
|
||||||
for (let b = az - half; b <= az + half + 0.001; b += 2) {
|
|
||||||
const d = destinationPoint(from.lat, from.lon, b, D);
|
|
||||||
arc.push([d.lat, d.lon]);
|
|
||||||
}
|
|
||||||
const ring = unwrapLon([
|
|
||||||
[from.lat, from.lon],
|
|
||||||
...radial(az - half),
|
|
||||||
...arc,
|
|
||||||
...radial(az + half).reverse(),
|
|
||||||
]);
|
|
||||||
// A geodesic lobe that reaches near a pole can't be filled on a
|
|
||||||
// Mercator map without the polygon snapping across the whole world —
|
|
||||||
// draw just the two edges in that case; otherwise the translucent lobe.
|
|
||||||
if (ring.some(([la]) => Math.abs(la) > 82)) {
|
|
||||||
L.polyline(unwrapLon([[from.lat, from.lon], ...radial(az - half)]) as L.LatLngExpression[], edge).addTo(wo);
|
|
||||||
L.polyline(unwrapLon([[from.lat, from.lon], ...radial(az + half)]) as L.LatLngExpression[], edge).addTo(wo);
|
|
||||||
} else {
|
|
||||||
L.polygon(ring as L.LatLngExpression[], {
|
|
||||||
color: '#dc2626', weight: 1, opacity: 0.5, fillColor: '#dc2626', fillOpacity: 0.14,
|
|
||||||
}).addTo(wo);
|
|
||||||
}
|
|
||||||
// Boresight (dashed centre line) — always; great-circle polyline is safe.
|
|
||||||
const cl = unwrapLon([[from.lat, from.lon], ...radial(az)]);
|
|
||||||
L.polyline(cl as L.LatLngExpression[], { color: '#dc2626', weight: 1.5, opacity: 0.7, dashArray: '5 4' })
|
|
||||||
.bindTooltip(`Beam ${Math.round(az)}°`, { permanent: false, direction: 'top' }).addTo(wo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Left: world + great-circle arc ──
|
|
||||||
if (from) L.marker([from.lat, from.lon], { icon: dot('#059669'), title: fromLabel || 'Home' }).addTo(wo);
|
|
||||||
if (to) {
|
|
||||||
L.marker([to.lat, to.lon], { icon: dot('#dc2626'), title: toLabel || 'DX' })
|
|
||||||
.bindTooltip(toLabel || toGrid, { permanent: false, direction: 'top' }).addTo(wo);
|
|
||||||
}
|
|
||||||
if (from && to) {
|
|
||||||
const pts = greatCirclePoints(from.lat, from.lon, to.lat, to.lon, 96);
|
|
||||||
L.polyline(pts as L.LatLngExpression[], { color: '#dc2626', weight: 2, opacity: 0.9 }).addTo(wo);
|
|
||||||
// Only re-frame the map when auto-zoom is on; otherwise keep the user's
|
|
||||||
// chosen (remembered) view so the beam heading stays visible.
|
|
||||||
if (autoZoom) {
|
|
||||||
const bounds = L.latLngBounds([[from.lat, from.lon], [to.lat, to.lon]]);
|
|
||||||
pts.forEach((p) => bounds.extend(p as L.LatLngExpression)); // include the arc
|
|
||||||
wm.fitBounds(bounds, { padding: [30, 30], maxZoom: 6 });
|
|
||||||
}
|
|
||||||
} else if (autoZoom && to) {
|
|
||||||
wm.setView([to.lat, to.lon], 3);
|
|
||||||
} else if (autoZoom && from) {
|
|
||||||
wm.setView([from.lat, from.lon], 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Right: street map on the DX locator ──
|
|
||||||
if (to) {
|
if (to) {
|
||||||
L.marker([to.lat, to.lon], { icon: dot('#dc2626'), title: toLabel || 'DX' })
|
L.marker([to.lat, to.lon], { icon: dot('#dc2626'), title: toLabel || 'DX' })
|
||||||
.bindTooltip(`${toLabel ? toLabel + ' · ' : ''}${toGrid.toUpperCase()}`, { permanent: false, direction: 'top' })
|
.bindTooltip(`${toLabel ? toLabel + ' · ' : ''}${toGrid.toUpperCase()}`, { permanent: false, direction: 'top' })
|
||||||
@@ -190,57 +316,18 @@ export function MainMap({ fromGrid, toGrid, fromLabel, toLabel, beamAzimuths, be
|
|||||||
L.rectangle([[b.south, b.west], [b.north, b.east]], { color: '#dc2626', weight: 1, fillOpacity: 0.06 }).addTo(lo);
|
L.rectangle([[b.south, b.west], [b.north, b.east]], { color: '#dc2626', weight: 1, fillOpacity: 0.06 }).addTo(lo);
|
||||||
}
|
}
|
||||||
lm.setView([to.lat, to.lon], toGrid.trim().length >= 6 ? 9 : 7);
|
lm.setView([to.lat, to.lon], toGrid.trim().length >= 6 ? 9 : 7);
|
||||||
} else if (from) {
|
|
||||||
lm.setView([from.lat, from.lon], 5);
|
|
||||||
}
|
}
|
||||||
setTimeout(() => { wm.invalidateSize(); lm.invalidateSize(); }, 0);
|
setTimeout(() => { lm.invalidateSize(); }, 0);
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
}, [toGrid, toLabel]);
|
||||||
}, [fromGrid, toGrid, fromLabel, toLabel, (beamAzimuths ?? []).map((a) => Math.round(a)).join(','), beamWidth, autoZoom]);
|
|
||||||
|
|
||||||
const path = pathBetween(fromGrid, toGrid);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full min-h-0 gap-2 p-2">
|
<div className="relative isolate h-full w-full rounded-lg overflow-hidden border border-border">
|
||||||
<div className="grid grid-cols-2 gap-2 flex-1 min-h-0">
|
<div ref={locatorRef} className="absolute inset-0" />
|
||||||
<div className="relative isolate rounded-lg overflow-hidden border border-border">
|
{!gridToLatLon(toGrid) && (
|
||||||
<div ref={worldRef} className="absolute inset-0" />
|
<div className="absolute inset-0 z-[500] flex items-center justify-center text-xs text-muted-foreground bg-card/60 pointer-events-none">
|
||||||
{/* Auto-zoom toggle: on = frame QTH→DX each QSO; off = free pan/zoom
|
Enter a grid or look up the callsign to center the map.
|
||||||
(remembered across restarts), so the beam heading stays visible. */}
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => {
|
|
||||||
const v = !autoZoom;
|
|
||||||
setAutoZoom(v);
|
|
||||||
writeUiPref('opslog.mapAutoZoomDX', v ? '1' : '0');
|
|
||||||
const m = worldMap.current;
|
|
||||||
if (!v && m) saveMapView(m); // entering free mode → remember current view
|
|
||||||
// (turning it on re-frames via the redraw effect, which depends on autoZoom)
|
|
||||||
}}
|
|
||||||
title={autoZoom ? 'Auto-zoom to DX is ON — click for free pan/zoom (remembered)' : 'Free pan/zoom — click to auto-zoom to the DX'}
|
|
||||||
className={`absolute top-1 right-1 z-[500] rounded-md px-2 py-1 text-[11px] font-medium shadow border backdrop-blur transition-colors ${
|
|
||||||
autoZoom ? 'bg-primary text-primary-foreground border-primary' : 'bg-card/90 text-muted-foreground border-border hover:bg-card'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
Zoom DX
|
|
||||||
</button>
|
|
||||||
{path && (
|
|
||||||
<div className="absolute bottom-1 left-1 z-[500] rounded-md bg-card/90 backdrop-blur px-2 py-1 text-[11px] font-mono shadow border border-border pointer-events-none">
|
|
||||||
<div><span className="text-muted-foreground">Dist</span> {Math.round(path.distanceShort).toLocaleString()} km
|
|
||||||
<span className="text-muted-foreground"> · LP</span> {Math.round(path.distanceLong).toLocaleString()} km</div>
|
|
||||||
<div><span className="text-muted-foreground">Az SP</span> {Math.round(path.bearingShort)}°
|
|
||||||
<span className="text-muted-foreground"> · LP</span> {Math.round(path.bearingLong)}°</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
<div className="relative isolate rounded-lg overflow-hidden border border-border">
|
)}
|
||||||
<div ref={locatorRef} className="absolute inset-0" />
|
|
||||||
{!gridToLatLon(toGrid) && (
|
|
||||||
<div className="absolute inset-0 z-[500] flex items-center justify-center text-xs text-muted-foreground bg-card/60 pointer-events-none">
|
|
||||||
Enter a grid or look up the callsign to center the map.
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,397 @@
|
|||||||
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import {
|
||||||
|
AllCommunityModule, ModuleRegistry, themeQuartz,
|
||||||
|
type ColDef,
|
||||||
|
} from 'ag-grid-community';
|
||||||
|
import { AgGridReact } from 'ag-grid-react';
|
||||||
|
import { Plus, Trash2, Radio, PlusCircle, MinusCircle, Search, UserPlus } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||||
|
} from '@/components/ui/dialog';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Badge } from '@/components/ui/badge';
|
||||||
|
import { QSOEditModal } from '@/components/QSOEditModal';
|
||||||
|
import type { QSOForm } from '@/types';
|
||||||
|
import {
|
||||||
|
NetList, NetCreate, NetRename, NetDelete, NetOpen, NetClose, NetOpenID,
|
||||||
|
NetRoster, NetRosterUpsert, NetRosterRemove, NetLookup,
|
||||||
|
NetActiveList, NetActivate, NetDeactivate, NetUpdateActive, NetDiscardActive,
|
||||||
|
} from '@/../wailsjs/go/main/App';
|
||||||
|
import { netctl } from '@/../wailsjs/go/models';
|
||||||
|
|
||||||
|
ModuleRegistry.registerModules([AllCommunityModule]);
|
||||||
|
|
||||||
|
const hamlogTheme = themeQuartz.withParams({
|
||||||
|
fontFamily: 'inherit',
|
||||||
|
fontSize: 12.5,
|
||||||
|
backgroundColor: '#faf6ea',
|
||||||
|
foregroundColor: '#2a2419',
|
||||||
|
headerBackgroundColor: '#e8dfc9',
|
||||||
|
headerTextColor: '#5a4f3a',
|
||||||
|
headerFontWeight: 600,
|
||||||
|
oddRowBackgroundColor: '#f5efe0',
|
||||||
|
rowHoverColor: '#ecdcb4',
|
||||||
|
selectedRowBackgroundColor: '#f0d9a8',
|
||||||
|
borderColor: '#c8b994',
|
||||||
|
rowBorder: { color: '#d8c9a8', width: 1 },
|
||||||
|
columnBorder: { color: '#d8c9a8', width: 1 },
|
||||||
|
cellHorizontalPadding: 10,
|
||||||
|
rowHeight: 30,
|
||||||
|
headerHeight: 32,
|
||||||
|
spacing: 4,
|
||||||
|
accentColor: '#b8410c',
|
||||||
|
iconSize: 12,
|
||||||
|
});
|
||||||
|
|
||||||
|
type Net = netctl.Net;
|
||||||
|
type Station = netctl.Station;
|
||||||
|
|
||||||
|
function fmtTimeOn(s: any): string {
|
||||||
|
if (!s) return '';
|
||||||
|
const d = new Date(s);
|
||||||
|
if (isNaN(d.getTime())) return '';
|
||||||
|
const p = (n: number) => String(n).padStart(2, '0');
|
||||||
|
return `${p(d.getUTCHours())}:${p(d.getUTCMinutes())}:${p(d.getUTCSeconds())}Z`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const emptyStation = (): Station => netctl.Station.createFrom({ callsign: '' });
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
onLogged?: () => void;
|
||||||
|
countries?: string[];
|
||||||
|
bands?: string[];
|
||||||
|
modes?: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
export function NetControlPanel({ onLogged, countries, bands, modes }: Props) {
|
||||||
|
const [nets, setNets] = useState<Net[]>([]);
|
||||||
|
const [selId, setSelId] = useState<string>('');
|
||||||
|
const [openId, setOpenId] = useState<string>('');
|
||||||
|
const [roster, setRoster] = useState<Station[]>([]);
|
||||||
|
const [active, setActive] = useState<QSOForm[]>([]);
|
||||||
|
const [error, setError] = useState('');
|
||||||
|
|
||||||
|
// Full-QSO edit modal for an on-air draft (same one Recent QSOs uses).
|
||||||
|
const [editingDraft, setEditingDraft] = useState<QSOForm | null>(null);
|
||||||
|
|
||||||
|
// Add/edit-contact dialog.
|
||||||
|
const [contactOpen, setContactOpen] = useState(false);
|
||||||
|
const [contact, setContact] = useState<Station>(emptyStation());
|
||||||
|
const [looking, setLooking] = useState(false);
|
||||||
|
|
||||||
|
const activeGrid = useRef<any>(null);
|
||||||
|
const rosterGrid = useRef<any>(null);
|
||||||
|
|
||||||
|
const isOpen = openId !== '' && openId === selId;
|
||||||
|
|
||||||
|
const refreshNets = useCallback(async () => {
|
||||||
|
try {
|
||||||
|
const [list, oid] = await Promise.all([NetList(), NetOpenID()]);
|
||||||
|
const arr = (list ?? []) as Net[];
|
||||||
|
setNets(arr);
|
||||||
|
setOpenId(oid ?? '');
|
||||||
|
setSelId((cur) => cur || (oid ?? '') || (arr[0]?.id ?? ''));
|
||||||
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const refreshRoster = useCallback(async (id: string) => {
|
||||||
|
if (!id) { setRoster([]); return; }
|
||||||
|
try { setRoster(((await NetRoster(id)) ?? []) as Station[]); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const refreshActive = useCallback(async () => {
|
||||||
|
try { setActive(((await NetActiveList()) ?? []) as unknown as QSOForm[]); }
|
||||||
|
catch { /* ignore */ }
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => { refreshNets(); }, [refreshNets]);
|
||||||
|
useEffect(() => { refreshRoster(selId); }, [selId, refreshRoster]);
|
||||||
|
useEffect(() => { if (isOpen) refreshActive(); else setActive([]); }, [isOpen, refreshActive]);
|
||||||
|
|
||||||
|
// The roster side hides callsigns currently on the air (they live in the left
|
||||||
|
// grid until logged), mirroring Log4OM's two-list behaviour.
|
||||||
|
const activeCalls = useMemo(
|
||||||
|
() => new Set(active.map((a) => (a.callsign ?? '').toUpperCase())),
|
||||||
|
[active],
|
||||||
|
);
|
||||||
|
const rosterShown = useMemo(
|
||||||
|
() => roster.filter((s) => !activeCalls.has((s.callsign ?? '').toUpperCase())),
|
||||||
|
[roster, activeCalls],
|
||||||
|
);
|
||||||
|
|
||||||
|
async function newNet() {
|
||||||
|
const name = window.prompt('New NET name:');
|
||||||
|
if (!name?.trim()) return;
|
||||||
|
try { const n = await NetCreate(name.trim()); await refreshNets(); setSelId(n.id); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
async function renameNet() {
|
||||||
|
if (!selId) return;
|
||||||
|
const cur = nets.find((n) => n.id === selId);
|
||||||
|
const name = window.prompt('Rename NET:', cur?.name ?? '');
|
||||||
|
if (!name?.trim()) return;
|
||||||
|
try { await NetRename(selId, name.trim()); await refreshNets(); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
async function deleteNet() {
|
||||||
|
if (!selId) return;
|
||||||
|
const cur = nets.find((n) => n.id === selId);
|
||||||
|
if (!window.confirm(`Delete NET "${cur?.name}" and its roster? This cannot be undone.`)) return;
|
||||||
|
try { await NetDelete(selId); setSelId(''); await refreshNets(); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
async function toggleOpen() {
|
||||||
|
try {
|
||||||
|
if (isOpen) {
|
||||||
|
if (active.length > 0 &&
|
||||||
|
!window.confirm(`${active.length} station(s) still on the air will be dropped WITHOUT logging. Close anyway?`)) return;
|
||||||
|
await NetClose(); setOpenId('');
|
||||||
|
} else {
|
||||||
|
await NetOpen(selId); setOpenId(selId); await refreshActive();
|
||||||
|
}
|
||||||
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Roster → active (start QSO).
|
||||||
|
async function activate(call: string) {
|
||||||
|
if (!isOpen || !call) return;
|
||||||
|
try { await NetActivate(call); await refreshActive(); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
// Active → logged (end QSO, removed from session, written to the logbook).
|
||||||
|
async function deactivate(id?: number) {
|
||||||
|
if (id == null) return;
|
||||||
|
try { await NetDeactivate(id); await refreshActive(); onLogged?.(); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Edit-modal handlers (operate on the in-memory draft, not the DB).
|
||||||
|
async function saveDraft(q: QSOForm) {
|
||||||
|
try { await NetUpdateActive(q as any); setEditingDraft(null); await refreshActive(); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
async function discardDraft(id: number) {
|
||||||
|
try { await NetDiscardActive(id); setEditingDraft(null); await refreshActive(); }
|
||||||
|
catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add-contact dialog.
|
||||||
|
function openAddContact() { setContact(emptyStation()); setContactOpen(true); }
|
||||||
|
async function lookupContact() {
|
||||||
|
const call = (contact.callsign ?? '').trim();
|
||||||
|
if (!call) return;
|
||||||
|
setLooking(true);
|
||||||
|
try {
|
||||||
|
const r = await NetLookup(call);
|
||||||
|
setContact((c) => netctl.Station.createFrom({
|
||||||
|
...c, callsign: (r.callsign || call).toUpperCase(),
|
||||||
|
name: r.name || c.name, qth: r.qth || c.qth, country: r.country || c.country,
|
||||||
|
dxcc: r.dxcc || c.dxcc, itu: r.itu || c.itu, cq: r.cq || c.cq,
|
||||||
|
}));
|
||||||
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
finally { setLooking(false); }
|
||||||
|
}
|
||||||
|
async function saveContact() {
|
||||||
|
const call = (contact.callsign ?? '').trim().toUpperCase();
|
||||||
|
if (!call || !selId) return;
|
||||||
|
try {
|
||||||
|
await NetRosterUpsert(selId, netctl.Station.createFrom({ ...contact, callsign: call }));
|
||||||
|
setContactOpen(false);
|
||||||
|
await refreshRoster(selId);
|
||||||
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
async function removeSelectedRoster() {
|
||||||
|
const sel = (rosterGrid.current?.api?.getSelectedRows() ?? []) as Station[];
|
||||||
|
if (sel.length === 0) return;
|
||||||
|
if (!window.confirm(`Remove ${sel.length} station(s) from this NET's roster?`)) return;
|
||||||
|
try {
|
||||||
|
for (const s of sel) await NetRosterRemove(selId, s.callsign);
|
||||||
|
await refreshRoster(selId);
|
||||||
|
} catch (e: any) { setError(String(e?.message ?? e)); }
|
||||||
|
}
|
||||||
|
|
||||||
|
const activeCols = useMemo<ColDef<QSOForm>[]>(() => [
|
||||||
|
{ headerName: 'Callsign', field: 'callsign', width: 110, cellClass: 'font-mono font-semibold' },
|
||||||
|
{ headerName: 'Name', field: 'name', flex: 1 },
|
||||||
|
{ headerName: 'QTH', field: 'qth', flex: 1 },
|
||||||
|
{ headerName: 'Time on', valueGetter: (p) => fmtTimeOn((p.data as any)?.qso_date), width: 90, cellClass: 'font-mono text-[11px]' },
|
||||||
|
{ headerName: 'Band', field: 'band', width: 70, cellClass: 'font-mono' },
|
||||||
|
{ headerName: 'Mode', field: 'mode', width: 70, cellClass: 'font-mono' },
|
||||||
|
{ headerName: 'RST S', field: 'rst_sent', width: 70, cellClass: 'font-mono' },
|
||||||
|
{ headerName: 'RST R', field: 'rst_rcvd', width: 70, cellClass: 'font-mono' },
|
||||||
|
{ headerName: 'Comment', field: 'comment', flex: 1.5 },
|
||||||
|
], []);
|
||||||
|
|
||||||
|
const rosterCols = useMemo<ColDef<Station>[]>(() => [
|
||||||
|
{ headerName: 'Callsign', field: 'callsign', width: 110, cellClass: 'font-mono font-semibold' },
|
||||||
|
{ headerName: 'Name', field: 'name', flex: 1 },
|
||||||
|
{ headerName: 'QTH', field: 'qth', flex: 1 },
|
||||||
|
{ headerName: 'Country', field: 'country', width: 130 },
|
||||||
|
], []);
|
||||||
|
|
||||||
|
const defaultColDef = useMemo<ColDef>(() => ({ sortable: true, resizable: true, suppressMovable: false }), []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col min-h-0 flex-1">
|
||||||
|
{/* Toolbar */}
|
||||||
|
<div className="flex items-center gap-2 px-3 py-2 border-b border-border/60 bg-muted/30">
|
||||||
|
<Button variant="outline" size="sm" className="h-8" onClick={newNet}>
|
||||||
|
<Plus className="size-3.5" /> New NET
|
||||||
|
</Button>
|
||||||
|
<select
|
||||||
|
className="h-8 rounded-md border border-input bg-background px-2 text-sm min-w-[180px]"
|
||||||
|
value={selId}
|
||||||
|
disabled={isOpen}
|
||||||
|
onChange={(e) => setSelId(e.target.value)}
|
||||||
|
title={isOpen ? 'Close the NET to switch' : 'Select a NET'}
|
||||||
|
>
|
||||||
|
<option value="">— select a NET —</option>
|
||||||
|
{nets.map((n) => <option key={n.id} value={n.id}>{n.name}</option>)}
|
||||||
|
</select>
|
||||||
|
<Button variant={isOpen ? 'destructive' : 'default'} size="sm" className="h-8" disabled={!selId} onClick={toggleOpen}>
|
||||||
|
<Radio className="size-3.5" /> {isOpen ? 'Close NET' : 'Open NET'}
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-8" disabled={!selId || isOpen} onClick={renameNet}>Rename</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-8 text-rose-700" disabled={!selId || isOpen} onClick={deleteNet}>
|
||||||
|
<Trash2 className="size-3.5" /> Delete
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
<div className="flex-1" />
|
||||||
|
{isOpen && <Badge className="bg-emerald-600 text-white tracking-wider">NET OPEN</Badge>}
|
||||||
|
<span className="text-[11px] text-muted-foreground">
|
||||||
|
On air: <strong className="text-foreground">{active.length}</strong> ·
|
||||||
|
Roster: <strong className="text-foreground">{roster.length}</strong>
|
||||||
|
</span>
|
||||||
|
{error && <Badge variant="destructive" className="max-w-[280px] truncate" title={error}>{error}</Badge>}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex min-h-0 flex-1">
|
||||||
|
{/* ACTIVE USERS (left) */}
|
||||||
|
<div className="flex flex-col min-h-0 flex-1 border-r border-border/60">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-1.5 bg-red-600 text-white text-[11px] font-semibold uppercase tracking-wider">
|
||||||
|
On air — active QSOs
|
||||||
|
<span className="ml-auto font-normal normal-case opacity-90">double-click → edit all fields · "Log & end" to save</span>
|
||||||
|
</div>
|
||||||
|
<div style={{ flex: 1, minHeight: 0, position: 'relative' }}>
|
||||||
|
<div style={{ position: 'absolute', inset: 0 }}>
|
||||||
|
<AgGridReact<QSOForm>
|
||||||
|
ref={activeGrid}
|
||||||
|
theme={hamlogTheme}
|
||||||
|
rowData={active}
|
||||||
|
columnDefs={activeCols}
|
||||||
|
defaultColDef={defaultColDef}
|
||||||
|
onRowDoubleClicked={(e) => e.data && setEditingDraft(e.data)}
|
||||||
|
rowSelection={{ mode: 'singleRow', checkboxes: false, enableClickSelection: true }}
|
||||||
|
animateRows={false}
|
||||||
|
getRowId={(p) => String((p.data as any).id)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{isOpen && active.length > 0 && (
|
||||||
|
<div className="px-3 py-1.5 border-t border-border/60 bg-muted/30 flex items-center gap-2">
|
||||||
|
<Button variant="ghost" size="sm" className="h-7 text-[11px]"
|
||||||
|
onClick={() => { const r = activeGrid.current?.api?.getSelectedRows?.()?.[0] as QSOForm; if (r) deactivate(r.id as number); }}>
|
||||||
|
<MinusCircle className="size-3.5" /> Log & end selected
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* NET USERS / roster (right) */}
|
||||||
|
<div className="flex flex-col min-h-0 w-[40%] max-w-[560px]">
|
||||||
|
<div className="flex items-center gap-2 px-3 py-1.5 bg-emerald-700 text-white text-[11px] font-semibold uppercase tracking-wider">
|
||||||
|
NET users — roster
|
||||||
|
<span className="ml-auto font-normal normal-case opacity-90">double-click → put on air</span>
|
||||||
|
</div>
|
||||||
|
<div style={{ flex: 1, minHeight: 0, position: 'relative' }}>
|
||||||
|
<div style={{ position: 'absolute', inset: 0 }}>
|
||||||
|
<AgGridReact<Station>
|
||||||
|
ref={rosterGrid}
|
||||||
|
theme={hamlogTheme}
|
||||||
|
rowData={rosterShown}
|
||||||
|
columnDefs={rosterCols}
|
||||||
|
defaultColDef={defaultColDef}
|
||||||
|
rowSelection={{ mode: 'multiRow', checkboxes: false, headerCheckbox: false, enableClickSelection: true }}
|
||||||
|
onRowDoubleClicked={(e) => e.data && activate(e.data.callsign)}
|
||||||
|
animateRows={false}
|
||||||
|
getRowId={(p) => String((p.data as any).callsign)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="px-3 py-1.5 border-t border-border/60 bg-muted/30 flex items-center gap-2">
|
||||||
|
<Button variant="ghost" size="sm" className="h-7 text-[11px]" disabled={!selId} onClick={openAddContact}>
|
||||||
|
<UserPlus className="size-3.5" /> Add contact
|
||||||
|
</Button>
|
||||||
|
<Button variant="ghost" size="sm" className="h-7 text-[11px] text-rose-700" disabled={!selId} onClick={removeSelectedRoster}>
|
||||||
|
<MinusCircle className="size-3.5" /> Remove
|
||||||
|
</Button>
|
||||||
|
{isOpen && (
|
||||||
|
<Button variant="ghost" size="sm" className="h-7 text-[11px] ml-auto"
|
||||||
|
onClick={() => { const r = rosterGrid.current?.api?.getSelectedRows?.()?.[0] as Station; if (r) activate(r.callsign); }}>
|
||||||
|
<PlusCircle className="size-3.5" /> Put selected on air
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Full-QSO edit modal for the selected on-air draft. Save writes back to
|
||||||
|
the in-memory draft (NetUpdateActive); Delete cancels it (no log). */}
|
||||||
|
{editingDraft && (
|
||||||
|
<QSOEditModal
|
||||||
|
qso={editingDraft}
|
||||||
|
onSave={saveDraft}
|
||||||
|
onDelete={discardDraft}
|
||||||
|
onClose={() => setEditingDraft(null)}
|
||||||
|
countries={countries}
|
||||||
|
bands={bands}
|
||||||
|
modes={modes}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Add / edit contact dialog */}
|
||||||
|
<Dialog open={contactOpen} onOpenChange={setContactOpen}>
|
||||||
|
<DialogContent className="max-w-md">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>Add contact to NET</DialogTitle>
|
||||||
|
<DialogDescription>Saved in this NET's roster (reused next time you open it).</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
<div className="grid gap-3 px-5 py-2">
|
||||||
|
<div className="flex items-end gap-2">
|
||||||
|
<div className="flex-1">
|
||||||
|
<Label className="text-[11px]">Callsign</Label>
|
||||||
|
<Input className="font-mono uppercase" value={contact.callsign ?? ''}
|
||||||
|
onChange={(e) => setContact((c) => netctl.Station.createFrom({ ...c, callsign: e.target.value.toUpperCase() }))}
|
||||||
|
onKeyDown={(e) => { if (e.key === 'Enter') lookupContact(); }} />
|
||||||
|
</div>
|
||||||
|
<Button variant="outline" size="sm" className="h-9" onClick={lookupContact} disabled={looking || !(contact.callsign ?? '').trim()}>
|
||||||
|
<Search className="size-3.5" /> {looking ? '…' : 'Search'}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label className="text-[11px]">Name</Label>
|
||||||
|
<Input value={contact.name ?? ''} onChange={(e) => setContact((c) => netctl.Station.createFrom({ ...c, name: e.target.value }))} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label className="text-[11px]">QTH</Label>
|
||||||
|
<Input value={contact.qth ?? ''} onChange={(e) => setContact((c) => netctl.Station.createFrom({ ...c, qth: e.target.value }))} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label className="text-[11px]">Country</Label>
|
||||||
|
<Input value={contact.country ?? ''} onChange={(e) => setContact((c) => netctl.Station.createFrom({ ...c, country: e.target.value }))} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<DialogFooter>
|
||||||
|
<Button variant="ghost" size="sm" onClick={() => setContactOpen(false)}>Cancel</Button>
|
||||||
|
<Button size="sm" onClick={saveContact} disabled={!(contact.callsign ?? '').trim()}>
|
||||||
|
<PlusCircle className="size-3.5" /> Save in NET
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,20 +1,43 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { UploadCloud, DownloadCloud, Search, Loader2, ScrollText, ListChecks, Trees, ExternalLink } from 'lucide-react';
|
import { UploadCloud, DownloadCloud, Search, Loader2, ScrollText, ListChecks, Trees, ExternalLink } from 'lucide-react';
|
||||||
|
import { AllCommunityModule, ModuleRegistry, themeQuartz, type ColDef } from 'ag-grid-community';
|
||||||
|
import { AgGridReact } from 'ag-grid-react';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import {
|
import {
|
||||||
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
Select, SelectTrigger, SelectValue, SelectContent, SelectItem,
|
||||||
} from '@/components/ui/select';
|
} from '@/components/ui/select';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL } from '../../wailsjs/go/main/App';
|
import { FindQSOsForUpload, UploadQSOsManual, DownloadConfirmations, SyncPOTAHunterLog, ListQSO, BulkUpdateQSL, UploadCallsign } from '../../wailsjs/go/main/App';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { RecentQSOsGrid } from '@/components/RecentQSOsGrid';
|
||||||
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
import { EventsOn } from '../../wailsjs/runtime/runtime';
|
||||||
|
|
||||||
|
ModuleRegistry.registerModules([AllCommunityModule]);
|
||||||
|
|
||||||
|
// Warm theme matching the other grids (Recent QSOs / Cluster).
|
||||||
|
const qslTheme = themeQuartz.withParams({
|
||||||
|
fontFamily: 'inherit', fontSize: 12.5, backgroundColor: '#faf6ea', foregroundColor: '#2a2419',
|
||||||
|
headerBackgroundColor: '#e8dfc9', headerTextColor: '#5a4f3a', headerFontWeight: 600,
|
||||||
|
oddRowBackgroundColor: '#f5efe0', rowHoverColor: '#ecdcb4', selectedRowBackgroundColor: '#f0d9a8',
|
||||||
|
borderColor: '#c8b994', rowBorder: { color: '#d8c9a8', width: 1 }, columnBorder: { color: '#d8c9a8', width: 1 },
|
||||||
|
cellHorizontalPadding: 10, rowHeight: 30, headerHeight: 32, spacing: 4, accentColor: '#b8410c', iconSize: 12,
|
||||||
|
});
|
||||||
|
|
||||||
type UploadRow = {
|
type UploadRow = {
|
||||||
id: number; qso_date: string; callsign: string;
|
id: number; qso_date: string; callsign: string;
|
||||||
band: string; mode: string; country: string; status: string;
|
band: string; mode: string; country: string; status: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const UPLOAD_COLS: ColDef<UploadRow>[] = [
|
||||||
|
{ field: 'qso_date', headerName: 'Date UTC', valueFormatter: (p) => fmtDate(p.value), minWidth: 150 },
|
||||||
|
{ field: 'callsign', headerName: 'Callsign', cellClass: 'font-mono font-bold', width: 130 },
|
||||||
|
{ field: 'band', headerName: 'Band', width: 90 },
|
||||||
|
{ field: 'mode', headerName: 'Mode', width: 100 },
|
||||||
|
{ field: 'country', headerName: 'Country', flex: 1, minWidth: 140 },
|
||||||
|
{ field: 'status', headerName: 'Sent', width: 90, valueFormatter: (p) => p.value || '—' },
|
||||||
|
];
|
||||||
|
|
||||||
type Confirmation = {
|
type Confirmation = {
|
||||||
callsign: string; qso_date: string; band: string; mode: string; country: string;
|
callsign: string; qso_date: string; band: string; mode: string; country: string;
|
||||||
new_dxcc: boolean; new_band: boolean; new_slot: boolean;
|
new_dxcc: boolean; new_band: boolean; new_slot: boolean;
|
||||||
@@ -23,6 +46,8 @@ type Confirmation = {
|
|||||||
const SERVICES = [
|
const SERVICES = [
|
||||||
{ v: 'qrz', label: 'QRZ.com' },
|
{ v: 'qrz', label: 'QRZ.com' },
|
||||||
{ v: 'clublog', label: 'Club Log' },
|
{ v: 'clublog', label: 'Club Log' },
|
||||||
|
{ v: 'hrdlog', label: 'HRDLog.net' },
|
||||||
|
{ v: 'eqsl', label: 'eQSL.cc' },
|
||||||
{ v: 'lotw', label: 'LoTW' },
|
{ v: 'lotw', label: 'LoTW' },
|
||||||
{ v: 'pota', label: 'POTA hunter log' },
|
{ v: 'pota', label: 'POTA hunter log' },
|
||||||
{ v: 'paper', label: 'Paper QSL' },
|
{ v: 'paper', label: 'Paper QSL' },
|
||||||
@@ -36,6 +61,14 @@ const QSL_STATUSES = [
|
|||||||
{ v: 'I', label: 'Ignore' },
|
{ v: 'I', label: 'Ignore' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// QSL routing methods for the paper-QSL "Via" dropdown (was free text).
|
||||||
|
const QSL_VIA_OPTIONS = [
|
||||||
|
{ v: '_', label: '— leave —' },
|
||||||
|
{ v: 'Bureau', label: 'Bureau' },
|
||||||
|
{ v: 'Direct', label: 'Direct' },
|
||||||
|
{ v: 'Electronic', label: 'Electronic' },
|
||||||
|
];
|
||||||
|
|
||||||
type LogQSO = {
|
type LogQSO = {
|
||||||
id: number; qso_date: string; callsign: string; band: string; mode: string; country?: string;
|
id: number; qso_date: string; callsign: string; band: string; mode: string; country?: string;
|
||||||
qsl_sent?: string; qsl_rcvd?: string; qsl_via?: string; qsl_sent_date?: string; qsl_rcvd_date?: string;
|
qsl_sent?: string; qsl_rcvd?: string; qsl_via?: string; qsl_sent_date?: string; qsl_rcvd_date?: string;
|
||||||
@@ -77,6 +110,14 @@ export function fmtQslDate(s?: string): string {
|
|||||||
// and download confirmations, while the rest of the app stays usable.
|
// and download confirmations, while the rest of the app stays usable.
|
||||||
export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
|
export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => void } = {}) {
|
||||||
const [service, setService] = useState('lotw');
|
const [service, setService] = useState('lotw');
|
||||||
|
// The callsign this profile signs/uploads/downloads as for the selected
|
||||||
|
// service (Force station callsign, else the profile call). Shown so the user
|
||||||
|
// knows WHICH of their calls a download/upload targets in a mixed-call log.
|
||||||
|
const [uploadCall, setUploadCall] = useState('');
|
||||||
|
useEffect(() => {
|
||||||
|
if (service === 'pota' || service === 'paper') { setUploadCall(''); return; }
|
||||||
|
UploadCallsign(service).then((c) => setUploadCall(c || '')).catch(() => setUploadCall(''));
|
||||||
|
}, [service]);
|
||||||
const [potaSyncing, setPotaSyncing] = useState(false);
|
const [potaSyncing, setPotaSyncing] = useState(false);
|
||||||
const [potaRes, setPotaRes] = useState<POTASync | null>(null);
|
const [potaRes, setPotaRes] = useState<POTASync | null>(null);
|
||||||
const [potaErr, setPotaErr] = useState('');
|
const [potaErr, setPotaErr] = useState('');
|
||||||
@@ -95,13 +136,16 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
const [paperCall, setPaperCall] = useState('');
|
const [paperCall, setPaperCall] = useState('');
|
||||||
const [paperRows, setPaperRows] = useState<LogQSO[]>([]);
|
const [paperRows, setPaperRows] = useState<LogQSO[]>([]);
|
||||||
const [paperSel, setPaperSel] = useState<Set<number>>(new Set());
|
const [paperSel, setPaperSel] = useState<Set<number>>(new Set());
|
||||||
|
const [paperSelAllSig, setPaperSelAllSig] = useState(0); // bump → grid selects all
|
||||||
const [paperBusy, setPaperBusy] = useState(false);
|
const [paperBusy, setPaperBusy] = useState(false);
|
||||||
const [paperMsg, setPaperMsg] = useState('');
|
const [paperMsg, setPaperMsg] = useState('');
|
||||||
const [qslRcvd, setQslRcvd] = useState('Y');
|
const [qslRcvd, setQslRcvd] = useState('N');
|
||||||
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('_');
|
||||||
|
const [qslNotes, setQslNotes] = useState('');
|
||||||
|
const [qslComment, setQslComment] = useState('');
|
||||||
|
|
||||||
const searchPaper = useCallback(async () => {
|
const searchPaper = useCallback(async () => {
|
||||||
const c = paperCall.trim().toUpperCase();
|
const c = paperCall.trim().toUpperCase();
|
||||||
@@ -112,14 +156,12 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
const list = (r ?? []) as LogQSO[];
|
const list = (r ?? []) as LogQSO[];
|
||||||
setPaperRows(list);
|
setPaperRows(list);
|
||||||
setPaperSel(new Set(list.map((x) => x.id)));
|
setPaperSel(new Set(list.map((x) => x.id)));
|
||||||
|
setPaperSelAllSig((n) => n + 1); // tell the grid to select every row
|
||||||
|
|
||||||
} catch (e: any) { setPaperMsg(String(e?.message ?? e)); setPaperRows([]); }
|
} catch (e: any) { setPaperMsg(String(e?.message ?? e)); setPaperRows([]); }
|
||||||
finally { setPaperBusy(false); }
|
finally { setPaperBusy(false); }
|
||||||
}, [paperCall]);
|
}, [paperCall]);
|
||||||
|
|
||||||
function togglePaper(id: number) {
|
|
||||||
setPaperSel((s) => { const n = new Set(s); n.has(id) ? n.delete(id) : n.add(id); return n; });
|
|
||||||
}
|
|
||||||
const paperAllSel = paperRows.length > 0 && paperSel.size === paperRows.length;
|
|
||||||
|
|
||||||
async function applyPaper() {
|
async function applyPaper() {
|
||||||
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
||||||
@@ -132,7 +174,9 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
rcvd_status: qslRcvd === '_' ? '' : qslRcvd,
|
rcvd_status: qslRcvd === '_' ? '' : qslRcvd,
|
||||||
sent_date: ymd(qslSentDate),
|
sent_date: ymd(qslSentDate),
|
||||||
rcvd_date: ymd(qslRcvdDate),
|
rcvd_date: ymd(qslRcvdDate),
|
||||||
via: qslVia,
|
via: qslVia === '_' ? '' : qslVia,
|
||||||
|
notes: qslNotes,
|
||||||
|
comment: qslComment,
|
||||||
} as any);
|
} as any);
|
||||||
setPaperMsg(`${n} QSO updated.`);
|
setPaperMsg(`${n} QSO updated.`);
|
||||||
await searchPaper();
|
await searchPaper();
|
||||||
@@ -140,8 +184,11 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
finally { setPaperBusy(false); }
|
finally { setPaperBusy(false); }
|
||||||
}
|
}
|
||||||
const [sent, setSent] = useState('R');
|
const [sent, setSent] = useState('R');
|
||||||
const [rows, setRows] = useState<UploadRow[]>([]);
|
// Full QSO rows (so the upload view uses the same rich grid as Recent QSOs).
|
||||||
const [selected, setSelected] = useState<Set<number>>(new Set());
|
const [rows, setRows] = useState<any[]>([]);
|
||||||
|
const [selectedCount, setSelectedCount] = useState(0);
|
||||||
|
const [uploadSelIds, setUploadSelIds] = useState<number[]>([]); // selected QSO ids → upload
|
||||||
|
const [uploadSelAllSig, setUploadSelAllSig] = useState(0); // bump → grid selects all
|
||||||
const [searching, setSearching] = useState(false);
|
const [searching, setSearching] = useState(false);
|
||||||
const [error, setError] = useState('');
|
const [error, setError] = useState('');
|
||||||
const [addNotFound, setAddNotFound] = useState(false);
|
const [addNotFound, setAddNotFound] = useState(false);
|
||||||
@@ -172,10 +219,14 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
return () => { offLog(); offDone(); offConf(); };
|
return () => { offLog(); offDone(); offConf(); };
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const selectedCount = selected.size;
|
|
||||||
const allSelected = rows.length > 0 && selected.size === rows.length;
|
|
||||||
const serviceLabel = useMemo(() => SERVICES.find((s) => s.v === service)?.label ?? service, [service]);
|
const serviceLabel = useMemo(() => SERVICES.find((s) => s.v === service)?.label ?? service, [service]);
|
||||||
|
|
||||||
|
// Grid selection → just track the count; ids are read from the grid at upload.
|
||||||
|
function onUploadRowSelected(ids: number[]) {
|
||||||
|
setUploadSelIds(ids);
|
||||||
|
setSelectedCount(ids.length);
|
||||||
|
}
|
||||||
|
|
||||||
const shownConfs = useMemo(() => confirmations.filter((c) => {
|
const shownConfs = useMemo(() => confirmations.filter((c) => {
|
||||||
switch (confFilter) {
|
switch (confFilter) {
|
||||||
case 'new': return c.new_dxcc || c.new_band || c.new_slot;
|
case 'new': return c.new_dxcc || c.new_band || c.new_slot;
|
||||||
@@ -191,33 +242,24 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
setError('');
|
setError('');
|
||||||
try {
|
try {
|
||||||
const r: any = await FindQSOsForUpload(service, sent === '_' ? '' : sent);
|
const r: any = await FindQSOsForUpload(service, sent === '_' ? '' : sent);
|
||||||
const list = (r ?? []) as UploadRow[];
|
const list = (r ?? []) as any[];
|
||||||
setRows(list);
|
setRows(list);
|
||||||
setSelected(new Set(list.map((x) => x.id)));
|
setUploadSelIds(list.map((x) => x.id));
|
||||||
|
setSelectedCount(list.length);
|
||||||
|
setUploadSelAllSig((n) => n + 1); // pre-select everything once the grid renders
|
||||||
setViewMode('upload');
|
setViewMode('upload');
|
||||||
setShowLog(false);
|
setShowLog(false);
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
setError(String(e?.message ?? e));
|
setError(String(e?.message ?? e));
|
||||||
setRows([]);
|
setRows([]);
|
||||||
setSelected(new Set());
|
setSelectedCount(0);
|
||||||
} finally {
|
} finally {
|
||||||
setSearching(false);
|
setSearching(false);
|
||||||
}
|
}
|
||||||
}, [service, sent]);
|
}, [service, sent]);
|
||||||
|
|
||||||
function toggle(id: number) {
|
|
||||||
setSelected((s) => {
|
|
||||||
const n = new Set(s);
|
|
||||||
if (n.has(id)) n.delete(id); else n.add(id);
|
|
||||||
return n;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
function toggleAll() {
|
|
||||||
setSelected(allSelected ? new Set() : new Set(rows.map((r) => r.id)));
|
|
||||||
}
|
|
||||||
|
|
||||||
async function upload() {
|
async function upload() {
|
||||||
const ids = rows.filter((r) => selected.has(r.id)).map((r) => r.id);
|
const ids = uploadSelIds;
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
setLogLines([]); setBusy(true); setLogAction('upload'); setShowLog(true);
|
setLogLines([]); setBusy(true); setLogAction('upload'); setShowLog(true);
|
||||||
try { await UploadQSOsManual(service, ids); }
|
try { await UploadQSOsManual(service, ids); }
|
||||||
@@ -248,9 +290,20 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">Service</label>
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">Service</label>
|
||||||
<Select value={service} onValueChange={setService}>
|
<Select value={service} onValueChange={setService}>
|
||||||
<SelectTrigger className="h-8 w-36"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-8 w-36"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>{SERVICES.map((s) => <SelectItem key={s.v} value={s.v}>{s.label}</SelectItem>)}</SelectContent>
|
<SelectContent>{[...SERVICES].sort((a, b) => a.label.localeCompare(b.label)).map((s) => <SelectItem key={s.v} value={s.v}>{s.label}</SelectItem>)}</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
|
{uploadCall && (
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">Callsign</label>
|
||||||
|
<span
|
||||||
|
className="h-8 inline-flex items-center rounded border border-border bg-muted/40 px-2 font-mono text-sm font-semibold"
|
||||||
|
title="Upload/download is scoped to this callsign (Force station callsign, else the active profile's call)"
|
||||||
|
>
|
||||||
|
{uploadCall}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{service === 'pota' ? (
|
{service === 'pota' ? (
|
||||||
<>
|
<>
|
||||||
<Button size="sm" className="h-8" onClick={syncPota} disabled={potaSyncing}>
|
<Button size="sm" className="h-8" onClick={syncPota} disabled={potaSyncing}>
|
||||||
@@ -341,32 +394,16 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
paperRows.length === 0 ? (
|
paperRows.length === 0 ? (
|
||||||
<div className="text-sm text-muted-foreground py-10 text-center">Search a callsign to list its QSOs, then set QSL status below.</div>
|
<div className="text-sm text-muted-foreground py-10 text-center">Search a callsign to list its QSOs, then set QSL status below.</div>
|
||||||
) : (
|
) : (
|
||||||
<table className="w-full text-xs border-collapse">
|
// Same grid as Recent QSOs (full columns + column picker). Selection
|
||||||
<thead className="sticky top-0 bg-card">
|
// drives which QSOs the apply-form below updates; a search selects all.
|
||||||
<tr className="text-left text-muted-foreground border-b border-border">
|
<div className="flex flex-col h-full min-h-0 -mx-3 -my-2">
|
||||||
<th className="py-1.5 px-2 w-8"><Checkbox checked={paperAllSel} onCheckedChange={() => setPaperSel(paperAllSel ? new Set() : new Set(paperRows.map((r) => r.id)))} /></th>
|
<RecentQSOsGrid
|
||||||
<th className="py-1.5 px-2">Date UTC</th><th className="py-1.5 px-2">Callsign</th>
|
rows={paperRows as any}
|
||||||
<th className="py-1.5 px-2">Band</th><th className="py-1.5 px-2">Mode</th>
|
total={paperRows.length}
|
||||||
<th className="py-1.5 px-2">QSL Sent</th><th className="py-1.5 px-2">QSL Rcvd</th><th className="py-1.5 px-2">Via</th>
|
selectAllSignal={paperSelAllSig}
|
||||||
</tr>
|
onRowSelected={(ids) => setPaperSel(new Set(ids))}
|
||||||
</thead>
|
/>
|
||||||
<tbody>
|
</div>
|
||||||
{paperRows.map((r) => (
|
|
||||||
<tr key={r.id}
|
|
||||||
className={cn('border-b border-border/40 cursor-pointer hover:bg-accent/30', paperSel.has(r.id) && 'bg-primary/5')}
|
|
||||||
onClick={() => togglePaper(r.id)}>
|
|
||||||
<td className="py-1 px-2" onClick={(e) => e.stopPropagation()}><Checkbox checked={paperSel.has(r.id)} onCheckedChange={() => togglePaper(r.id)} /></td>
|
|
||||||
<td className="py-1 px-2 font-mono">{fmtDate(r.qso_date)}</td>
|
|
||||||
<td className="py-1 px-2 font-mono font-bold">{r.callsign}</td>
|
|
||||||
<td className="py-1 px-2">{r.band}</td>
|
|
||||||
<td className="py-1 px-2">{r.mode}</td>
|
|
||||||
<td className="py-1 px-2 font-mono">{r.qsl_sent || '—'}{r.qsl_sent_date ? ` ${fmtQslDate(r.qsl_sent_date)}` : ''}</td>
|
|
||||||
<td className="py-1 px-2 font-mono">{r.qsl_rcvd || '—'}{r.qsl_rcvd_date ? ` ${fmtQslDate(r.qsl_rcvd_date)}` : ''}</td>
|
|
||||||
<td className="py-1 px-2 text-muted-foreground truncate max-w-[160px]">{r.qsl_via}</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
)
|
)
|
||||||
) : service === 'pota' ? (
|
) : service === 'pota' ? (
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
@@ -463,33 +500,14 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
) : rows.length === 0 ? (
|
) : rows.length === 0 ? (
|
||||||
<div className="text-sm text-muted-foreground py-10 text-center">Pick a service + sent status, then “Select required”.</div>
|
<div className="text-sm text-muted-foreground py-10 text-center">Pick a service + sent status, then “Select required”.</div>
|
||||||
) : (
|
) : (
|
||||||
<table className="w-full text-xs border-collapse">
|
<div className="flex flex-col h-full min-h-0 -mx-3 -my-2">
|
||||||
<thead className="sticky top-0 bg-card">
|
<RecentQSOsGrid
|
||||||
<tr className="text-left text-muted-foreground border-b border-border">
|
rows={rows as any}
|
||||||
<th className="py-1.5 px-2 w-8"><Checkbox checked={allSelected} onCheckedChange={toggleAll} /></th>
|
total={rows.length}
|
||||||
<th className="py-1.5 px-2">Date UTC</th><th className="py-1.5 px-2">Callsign</th>
|
selectAllSignal={uploadSelAllSig}
|
||||||
<th className="py-1.5 px-2">Band</th><th className="py-1.5 px-2">Mode</th>
|
onRowSelected={onUploadRowSelected}
|
||||||
<th className="py-1.5 px-2">Country</th><th className="py-1.5 px-2">Sent</th>
|
/>
|
||||||
</tr>
|
</div>
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{rows.map((r) => (
|
|
||||||
<tr key={r.id}
|
|
||||||
className={cn('border-b border-border/40 cursor-pointer hover:bg-accent/30', selected.has(r.id) && 'bg-primary/5')}
|
|
||||||
onClick={() => toggle(r.id)}>
|
|
||||||
<td className="py-1 px-2" onClick={(e) => e.stopPropagation()}>
|
|
||||||
<Checkbox checked={selected.has(r.id)} onCheckedChange={() => toggle(r.id)} />
|
|
||||||
</td>
|
|
||||||
<td className="py-1 px-2 font-mono">{fmtDate(r.qso_date)}</td>
|
|
||||||
<td className="py-1 px-2 font-mono font-bold">{r.callsign}</td>
|
|
||||||
<td className="py-1 px-2">{r.band}</td>
|
|
||||||
<td className="py-1 px-2">{r.mode}</td>
|
|
||||||
<td className="py-1 px-2 text-muted-foreground">{r.country}</td>
|
|
||||||
<td className="py-1 px-2 font-mono">{r.status || '—'}</td>
|
|
||||||
</tr>
|
|
||||||
))}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -518,7 +536,18 @@ export function QSLManagerPanel({ onEditQSO }: { onEditQSO?: (id: number) => voi
|
|||||||
</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">Via</label>
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">Via</label>
|
||||||
<Input className="h-8 w-40" value={qslVia} onChange={(e) => setQslVia(e.target.value)} placeholder="BUREAU / DIRECT / manager" />
|
<Select value={qslVia} onValueChange={setQslVia}>
|
||||||
|
<SelectTrigger className="h-8 w-32"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>{QSL_VIA_OPTIONS.map((o) => <SelectItem key={o.v} value={o.v}>{o.label}</SelectItem>)}</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">Notes</label>
|
||||||
|
<Input className="h-8 w-40" value={qslNotes} onChange={(e) => setQslNotes(e.target.value)} placeholder="e.g. paid 3€" />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
<label className="text-[10px] uppercase tracking-wider text-muted-foreground">Comment</label>
|
||||||
|
<Input className="h-8 w-40" value={qslComment} onChange={(e) => setQslComment(e.target.value)} placeholder="comment" />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
{paperMsg && <span className="text-[11px] text-muted-foreground self-center">{paperMsg}</span>}
|
{paperMsg && <span className="text-[11px] text-muted-foreground self-center">{paperMsg}</span>}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useEffect } from 'react';
|
import { useEffect } from 'react';
|
||||||
import { Globe2, RefreshCw, Upload, BadgeCheck, Mail, FileDown } from 'lucide-react';
|
import { Globe2, RefreshCw, Upload, BadgeCheck, Mail, FileDown, PencilLine, Trash2 } from 'lucide-react';
|
||||||
|
|
||||||
export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
|
export type QSOMenuState = { x: number; y: number; ids: number[] } | null;
|
||||||
|
|
||||||
@@ -12,32 +12,35 @@ type Props = {
|
|||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
onExportSelected?: (ids: number[]) => void;
|
onExportSelected?: (ids: number[]) => void;
|
||||||
onExportFiltered?: () => void;
|
onExportFiltered?: () => void;
|
||||||
|
onDelete?: (ids: number[]) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
const UPLOAD_TARGETS: { service: string; label: string }[] = [
|
const UPLOAD_TARGETS: { service: string; label: string }[] = [
|
||||||
{ service: 'qrz', label: 'Send to QRZ.com' },
|
{ service: 'qrz', label: 'Send to QRZ.com' },
|
||||||
{ service: 'clublog', label: 'Send to Club Log' },
|
{ service: 'clublog', label: 'Send to Club Log' },
|
||||||
|
{ service: 'hrdlog', label: 'Send to HRDLog.net' },
|
||||||
|
{ service: 'eqsl', label: 'Send to eQSL.cc' },
|
||||||
{ service: 'lotw', label: 'Send to LoTW' },
|
{ service: 'lotw', label: 'Send to LoTW' },
|
||||||
];
|
];
|
||||||
|
|
||||||
// Lightweight right-click menu for the QSO grids. AG Grid's native context
|
// Lightweight right-click menu for the QSO grids. AG Grid's native context
|
||||||
// menu is an Enterprise feature, so this is a plain floating menu driven by
|
// menu is an Enterprise feature, so this is a plain floating menu driven by
|
||||||
// onCellContextMenu. Closes on any outside click, scroll or Escape.
|
// onCellContextMenu. Stays open until the user clicks outside, presses Escape,
|
||||||
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onExportSelected, onExportFiltered }: Props) {
|
// or picks a command. (We deliberately do NOT close on scroll/resize: the QSO
|
||||||
|
// list auto-refreshes and AG Grid fires internal scroll events on refresh,
|
||||||
|
// which used to dismiss the menu the instant it appeared.)
|
||||||
|
export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onDelete }: Props) {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!menu) return;
|
if (!menu) return;
|
||||||
const close = () => onClose();
|
const close = () => onClose();
|
||||||
const onKey = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
|
const onKey = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
|
||||||
window.addEventListener('mousedown', close);
|
window.addEventListener('mousedown', close);
|
||||||
window.addEventListener('scroll', close, true);
|
|
||||||
window.addEventListener('resize', close);
|
|
||||||
window.addEventListener('keydown', onKey);
|
window.addEventListener('keydown', onKey);
|
||||||
return () => {
|
return () => {
|
||||||
window.removeEventListener('mousedown', close);
|
window.removeEventListener('mousedown', close);
|
||||||
window.removeEventListener('scroll', close, true);
|
|
||||||
window.removeEventListener('resize', close);
|
|
||||||
window.removeEventListener('keydown', onKey);
|
window.removeEventListener('keydown', onKey);
|
||||||
};
|
};
|
||||||
}, [menu, onClose]);
|
}, [menu, onClose]);
|
||||||
@@ -90,7 +93,7 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
onClick={() => { onSendEQSL(menu.ids); onClose(); }}
|
onClick={() => { onSendEQSL(menu.ids); onClose(); }}
|
||||||
>
|
>
|
||||||
<Mail className="size-4 text-amber-600" />
|
<Mail className="size-4 text-amber-600" />
|
||||||
<span>Send eQSL by e-mail</span>
|
<span>Send OpsLog QSL by e-mail</span>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
{onSendRecording && (
|
{onSendRecording && (
|
||||||
@@ -105,6 +108,19 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{onBulkEdit && (
|
||||||
|
<>
|
||||||
|
<div className="my-1 border-t border-border" />
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left hover:bg-accent/50"
|
||||||
|
onClick={() => { onBulkEdit(menu.ids); onClose(); }}
|
||||||
|
>
|
||||||
|
<PencilLine className="size-4 text-indigo-600" />
|
||||||
|
<span>Bulk edit field… ({n})</span>
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
{(onExportSelected || onExportFiltered) && (
|
{(onExportSelected || onExportFiltered) && (
|
||||||
<>
|
<>
|
||||||
<div className="my-1 border-t border-border" />
|
<div className="my-1 border-t border-border" />
|
||||||
@@ -144,6 +160,19 @@ export function QSOContextMenu({ menu, onClose, onUpdateFromCty, onUpdateFromQRZ
|
|||||||
))}
|
))}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{onDelete && (
|
||||||
|
<>
|
||||||
|
<div className="my-1 border-t border-border" />
|
||||||
|
<button
|
||||||
|
className="flex w-full items-center gap-2 px-3 py-1.5 text-left text-rose-700 hover:bg-rose-50"
|
||||||
|
onClick={() => { onDelete(menu.ids); onClose(); }}
|
||||||
|
>
|
||||||
|
<Trash2 className="size-4" />
|
||||||
|
<span>Delete {n} QSO{n > 1 ? 's' : ''}…</span>
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,6 +94,11 @@ function toLocalISO(d: any): string {
|
|||||||
if (!d) return '';
|
if (!d) return '';
|
||||||
const date = new Date(d);
|
const date = new Date(d);
|
||||||
if (isNaN(date.getTime())) return '';
|
if (isNaN(date.getTime())) return '';
|
||||||
|
// Go's zero time.Time serialises as "0001-01-01T00:00:00Z" (json omitempty
|
||||||
|
// doesn't apply to a time struct), so a QSO with no end time arrives as a
|
||||||
|
// year-1 date. Treat anything that old as unset — otherwise the datetime
|
||||||
|
// field shows a garbage value and fights the user's typing.
|
||||||
|
if (date.getUTCFullYear() <= 1) return '';
|
||||||
const p = (n: number) => String(n).padStart(2, '0');
|
const p = (n: number) => String(n).padStart(2, '0');
|
||||||
return `${date.getUTCFullYear()}-${p(date.getUTCMonth()+1)}-${p(date.getUTCDate())}T${p(date.getUTCHours())}:${p(date.getUTCMinutes())}`;
|
return `${date.getUTCFullYear()}-${p(date.getUTCMonth()+1)}-${p(date.getUTCDate())}T${p(date.getUTCHours())}:${p(date.getUTCMinutes())}`;
|
||||||
}
|
}
|
||||||
@@ -159,8 +164,9 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
const [freqRxKHz, setFreqRxKHz] = useState(fr0.khz);
|
const [freqRxKHz, setFreqRxKHz] = useState(fr0.khz);
|
||||||
const [freqRxHz, setFreqRxHz] = useState(fr0.hz);
|
const [freqRxHz, setFreqRxHz] = useState(fr0.hz);
|
||||||
const [dateOn, setDateOn] = useState(toLocalISO(draft.qso_date));
|
const [dateOn, setDateOn] = useState(toLocalISO(draft.qso_date));
|
||||||
const [dateOff, setDateOff] = useState(toLocalISO(draft.qso_date_off));
|
const dateOffISO = toLocalISO(draft.qso_date_off); // '' when unset / Go zero time
|
||||||
const [endEnabled, setEndEnabled] = useState(!!draft.qso_date_off);
|
const [dateOff, setDateOff] = useState(dateOffISO);
|
||||||
|
const [endEnabled, setEndEnabled] = useState(!!dateOffISO);
|
||||||
const [confSel, setConfSel] = useState('QSL'); // selected confirmation channel
|
const [confSel, setConfSel] = useState('QSL'); // selected confirmation channel
|
||||||
const [localErr, setLocalErr] = useState('');
|
const [localErr, setLocalErr] = useState('');
|
||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
@@ -209,6 +215,14 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
return () => window.clearTimeout(t);
|
return () => window.clearTimeout(t);
|
||||||
}, [draft.dxcc, draft.cqz, draft.ituz, draft.cont, draft.state, draft.callsign, draft.notes, draft.band]);
|
}, [draft.dxcc, draft.cqz, draft.ituz, draft.cont, draft.state, draft.callsign, draft.notes, draft.band]);
|
||||||
|
|
||||||
|
// Contest exchange typed as free text → numeric SRX/STX when all-digits, else
|
||||||
|
// the SRX_STRING/STX_STRING field. Mirrors the entry strip (F5) so the field
|
||||||
|
// accepts letters (sections/zones), not just numbers.
|
||||||
|
function setExchange(which: 'srx' | 'stx', raw: string) {
|
||||||
|
const t = raw.trim();
|
||||||
|
const num = /^\d+$/.test(t) ? parseInt(t, 10) : undefined;
|
||||||
|
setDraft((d) => ({ ...d, [which]: num, [`${which}_string`]: num != null ? '' : t } as any));
|
||||||
|
}
|
||||||
function set<K extends keyof QSO>(key: K, value: QSO[K]) {
|
function set<K extends keyof QSO>(key: K, value: QSO[K]) {
|
||||||
setDraft((d) => ({ ...d, [key]: value }));
|
setDraft((d) => ({ ...d, [key]: value }));
|
||||||
}
|
}
|
||||||
@@ -428,7 +442,13 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<div><Label>QSO Start (UTC)</Label><Input type="datetime-local" value={dateOn} onChange={(e) => setDateOn(e.target.value)} /></div>
|
<div><Label>QSO Start (UTC)</Label><Input type="datetime-local" value={dateOn} onChange={(e) => setDateOn(e.target.value)} /></div>
|
||||||
<div>
|
<div>
|
||||||
<Label className="flex items-center gap-2">
|
<Label className="flex items-center gap-2">
|
||||||
<Checkbox checked={endEnabled} onCheckedChange={(c) => setEndEnabled(!!c)} /> QSO End (UTC)
|
<Checkbox checked={endEnabled} onCheckedChange={(c) => {
|
||||||
|
const on = !!c;
|
||||||
|
setEndEnabled(on);
|
||||||
|
// Prefill an empty end with the start time so the user
|
||||||
|
// only tweaks the minutes instead of typing a full date.
|
||||||
|
if (on && !dateOff) setDateOff(dateOn);
|
||||||
|
}} /> QSO End (UTC)
|
||||||
</Label>
|
</Label>
|
||||||
<Input type="datetime-local" value={dateOff} disabled={!endEnabled} onChange={(e) => setDateOff(e.target.value)} />
|
<Input type="datetime-local" value={dateOff} disabled={!endEnabled} onChange={(e) => setDateOff(e.target.value)} />
|
||||||
</div>
|
</div>
|
||||||
@@ -549,7 +569,7 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{CONFIRMATIONS.map((c) => (
|
{CONFIRMATIONS.map((c) => (
|
||||||
<tr key={c.key} className={cn('text-xs', c.key === confSel && 'bg-accent/40')}>
|
<tr key={c.key} className="text-xs">
|
||||||
<td className="font-medium pr-2 py-0.5">{c.label}</td>
|
<td className="font-medium pr-2 py-0.5">{c.label}</td>
|
||||||
<td className="w-24"><StatusCell value={val(c.sent)} /></td>
|
<td className="w-24"><StatusCell value={val(c.sent)} /></td>
|
||||||
<td className="w-24">{c.rcvd ? <StatusCell value={val(c.rcvd)} /> : <span className="block text-center text-[11px] text-muted-foreground">—</span>}</td>
|
<td className="w-24">{c.rcvd ? <StatusCell value={val(c.rcvd)} /> : <span className="block text-center text-[11px] text-muted-foreground">—</span>}</td>
|
||||||
@@ -566,10 +586,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<TabsContent value="contest" className="mt-0">
|
<TabsContent value="contest" className="mt-0">
|
||||||
<div className="grid grid-cols-6 gap-3">
|
<div className="grid grid-cols-6 gap-3">
|
||||||
<F label="Contest ID" span={2}><Input value={draft.contest_id ?? ''} onChange={(e) => set('contest_id', e.target.value)} /></F>
|
<F label="Contest ID" span={2}><Input value={draft.contest_id ?? ''} onChange={(e) => set('contest_id', e.target.value)} /></F>
|
||||||
<F label="SRX"><Input type="number" value={draft.srx ?? ''} onChange={(e) => set('srx', intOrUndef(e.target.value) as any)} /></F>
|
<F label="SRX" span={2}><Input value={draft.srx_string || (draft.srx ?? '')} placeholder="rcvd exchange" onChange={(e) => setExchange('srx', e.target.value)} /></F>
|
||||||
<F label="STX"><Input type="number" value={draft.stx ?? ''} onChange={(e) => set('stx', intOrUndef(e.target.value) as any)} /></F>
|
<F label="STX" span={2}><Input value={draft.stx_string || (draft.stx ?? '')} placeholder="sent exchange" onChange={(e) => setExchange('stx', e.target.value)} /></F>
|
||||||
<F label="SRX string" span={3}><Input value={draft.srx_string ?? ''} onChange={(e) => set('srx_string', e.target.value)} /></F>
|
|
||||||
<F label="STX string" span={3}><Input value={draft.stx_string ?? ''} onChange={(e) => set('stx_string', e.target.value)} /></F>
|
|
||||||
<F label="Check"><Input value={draft.check ?? ''} onChange={(e) => set('check', e.target.value)} /></F>
|
<F label="Check"><Input value={draft.check ?? ''} onChange={(e) => set('check', e.target.value)} /></F>
|
||||||
<F label="Precedence"><Input value={draft.precedence ?? ''} onChange={(e) => set('precedence', e.target.value)} /></F>
|
<F label="Precedence"><Input value={draft.precedence ?? ''} onChange={(e) => set('precedence', e.target.value)} /></F>
|
||||||
<F label="ARRL section"><Input value={draft.arrl_sect ?? ''} onChange={(e) => set('arrl_sect', e.target.value)} /></F>
|
<F label="ARRL section"><Input value={draft.arrl_sect ?? ''} onChange={(e) => set('arrl_sect', e.target.value)} /></F>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
AllCommunityModule, ModuleRegistry, themeQuartz,
|
AllCommunityModule, ModuleRegistry, themeQuartz,
|
||||||
type ColDef, type ColumnState, type GridReadyEvent, type RowDoubleClickedEvent,
|
type ColDef, type ColumnState, type GridReadyEvent, type RowDoubleClickedEvent,
|
||||||
@@ -45,16 +45,24 @@ const hamlogTheme = themeQuartz.withParams({
|
|||||||
type Props = {
|
type Props = {
|
||||||
rows: QSOForm[];
|
rows: QSOForm[];
|
||||||
total: number;
|
total: number;
|
||||||
|
// Bump this number to programmatically select every row (e.g. after a search
|
||||||
|
// in the QSL Manager, where the default is "all selected").
|
||||||
|
selectAllSignal?: number;
|
||||||
onRowDoubleClicked?: (q: QSOForm) => void;
|
onRowDoubleClicked?: (q: QSOForm) => void;
|
||||||
onRowSelected?: (id: number | null) => void;
|
onRowSelected?: (ids: number[]) => void;
|
||||||
onUpdateFromCty?: (ids: number[]) => void;
|
onUpdateFromCty?: (ids: number[]) => void;
|
||||||
onUpdateFromQRZ?: (ids: number[]) => void;
|
onUpdateFromQRZ?: (ids: number[]) => void;
|
||||||
onUpdateFromClublog?: (ids: number[]) => void;
|
onUpdateFromClublog?: (ids: number[]) => void;
|
||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
|
onBulkEdit?: (ids: number[]) => void;
|
||||||
onExportSelected?: (ids: number[]) => void;
|
onExportSelected?: (ids: number[]) => void;
|
||||||
onExportFiltered?: () => void;
|
onExportFiltered?: () => void;
|
||||||
|
onDelete?: (ids: number[]) => void;
|
||||||
|
// One column per defined award; the cell shows the reference this QSO counts
|
||||||
|
// for (from row.award_refs[CODE], attached by the parent). Hidden by default.
|
||||||
|
awardCols?: { code: string; name: string }[];
|
||||||
};
|
};
|
||||||
|
|
||||||
const COL_STATE_KEY = 'hamlog.qsoColState.v2';
|
const COL_STATE_KEY = 'hamlog.qsoColState.v2';
|
||||||
@@ -101,8 +109,8 @@ export const COL_CATALOG: ColEntry[] = [
|
|||||||
{ group: 'QSO', label: 'Band RX', colId: 'band_rx', headerName: 'Band RX', field: 'band_rx' as any, width: 75, cellClass: 'font-mono' },
|
{ group: 'QSO', label: 'Band RX', colId: 'band_rx', headerName: 'Band RX', field: 'band_rx' as any, width: 75, cellClass: 'font-mono' },
|
||||||
{ group: 'QSO', label: 'Mode', colId: 'mode', headerName: 'Mode', field: 'mode' as any, width: 80, cellClass: 'font-mono', defaultVisible: true },
|
{ group: 'QSO', label: 'Mode', colId: 'mode', headerName: 'Mode', field: 'mode' as any, width: 80, cellClass: 'font-mono', defaultVisible: true },
|
||||||
{ group: 'QSO', label: 'Submode', colId: 'submode', headerName: 'Submode', field: 'submode' as any, width: 80, cellClass: 'font-mono' },
|
{ group: 'QSO', label: 'Submode', colId: 'submode', headerName: 'Submode', field: 'submode' as any, width: 80, cellClass: 'font-mono' },
|
||||||
{ group: 'QSO', label: 'MHz (TX)', colId: 'freq_hz', headerName: 'MHz', field: 'freq_hz' as any, width: 110, type: 'rightAligned', cellClass: 'font-mono', valueFormatter: (p) => fmtMhzDots(p.value as number | undefined), comparator: (a, b) => (a ?? 0) - (b ?? 0), defaultVisible: true },
|
{ group: 'QSO', label: 'Freq (TX)', colId: 'freq_hz', headerName: 'Freq', field: 'freq_hz' as any, width: 110, cellClass: 'font-mono', valueFormatter: (p) => fmtMhzDots(p.value as number | undefined), comparator: (a, b) => (a ?? 0) - (b ?? 0), defaultVisible: true },
|
||||||
{ group: 'QSO', label: 'MHz (RX)', colId: 'freq_rx_hz', headerName: 'MHz RX', field: 'freq_rx_hz' as any, width: 110, type: 'rightAligned', cellClass: 'font-mono', valueFormatter: (p) => fmtMhzDots(p.value as number | undefined), comparator: (a, b) => (a ?? 0) - (b ?? 0) },
|
{ group: 'QSO', label: 'Freq (RX)', colId: 'freq_rx_hz', headerName: 'Freq RX', field: 'freq_rx_hz' as any, width: 110, cellClass: 'font-mono', valueFormatter: (p) => fmtMhzDots(p.value as number | undefined), comparator: (a, b) => (a ?? 0) - (b ?? 0) },
|
||||||
{ group: 'QSO', label: 'RST sent', colId: 'rst_sent', headerName: 'RST sent', field: 'rst_sent' as any, width: 85, cellClass: 'font-mono', defaultVisible: true },
|
{ group: 'QSO', label: 'RST sent', colId: 'rst_sent', headerName: 'RST sent', field: 'rst_sent' as any, width: 85, cellClass: 'font-mono', defaultVisible: true },
|
||||||
{ group: 'QSO', label: 'RST rcvd', colId: 'rst_rcvd', headerName: 'RST rcvd', field: 'rst_rcvd' as any, width: 85, cellClass: 'font-mono', defaultVisible: true },
|
{ group: 'QSO', label: 'RST rcvd', colId: 'rst_rcvd', headerName: 'RST rcvd', field: 'rst_rcvd' as any, width: 85, cellClass: 'font-mono', defaultVisible: true },
|
||||||
{ group: 'QSO', label: 'TX Power', colId: 'tx_pwr', headerName: 'TX Power', field: 'tx_pwr' as any, width: 90, type: 'rightAligned', cellClass: 'font-mono' },
|
{ group: 'QSO', label: 'TX Power', colId: 'tx_pwr', headerName: 'TX Power', field: 'tx_pwr' as any, width: 90, type: 'rightAligned', cellClass: 'font-mono' },
|
||||||
@@ -150,6 +158,10 @@ export const COL_CATALOG: ColEntry[] = [
|
|||||||
{ group: 'eQSL', label: 'eQSL rcvd', colId: 'eqsl_rcvd', headerName: 'eQSL rcvd', field: 'eqsl_rcvd' as any, width: 80 },
|
{ group: 'eQSL', label: 'eQSL rcvd', colId: 'eqsl_rcvd', headerName: 'eQSL rcvd', field: 'eqsl_rcvd' as any, width: 80 },
|
||||||
{ group: 'eQSL', label: 'eQSL sent date', colId: 'eqsl_sent_date', headerName: 'eQSL S date', field: 'eqsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
{ group: 'eQSL', label: 'eQSL sent date', colId: 'eqsl_sent_date', headerName: 'eQSL S date', field: 'eqsl_sent_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||||
{ group: 'eQSL', label: 'eQSL rcvd date', colId: 'eqsl_rcvd_date', headerName: 'eQSL R date', field: 'eqsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
{ group: 'eQSL', label: 'eQSL rcvd date', colId: 'eqsl_rcvd_date', headerName: 'eQSL R date', field: 'eqsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) },
|
||||||
|
// App-specific: when OpsLog e-mailed its own QSL card. Distinct from eQSL.cc.
|
||||||
|
{ group: 'QSL', label: 'OpsLog QSL', colId: 'opslog_qsl_card_sent', headerName: 'OpsLog QSL', width: 100, cellClass: 'font-mono', valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return (e['APP_OPSLOG_QSL_SENT'] || e['APP_OPSLOG_QSL_CARD_SENT']) ? 'Y' : 'N'; }, defaultVisible: true },
|
||||||
|
// App-specific: when the QSO's audio recording was e-mailed to the station.
|
||||||
|
{ group: 'QSL', label: 'Recording sent', colId: 'opslog_recording_sent', headerName: 'Rec sent', width: 100, cellClass: 'font-mono', valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false },
|
||||||
|
|
||||||
// ── Uploads (online logbooks) ──
|
// ── Uploads (online logbooks) ──
|
||||||
// ADIF models these as an "upload status/date" (= YOU pushed the QSO) and,
|
// ADIF models these as an "upload status/date" (= YOU pushed the QSO) and,
|
||||||
@@ -216,7 +228,7 @@ export const GROUP_ORDER = [
|
|||||||
'Contest', 'Propagation', 'My station', 'Misc',
|
'Contest', 'Propagation', 'My station', 'Misc',
|
||||||
];
|
];
|
||||||
|
|
||||||
export function RecentQSOsGrid({ rows, onRowDoubleClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onExportSelected, onExportFiltered }: Props) {
|
export function RecentQSOsGrid({ rows, selectAllSignal, onRowDoubleClicked, onRowSelected, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportFiltered, onDelete, awardCols }: Props) {
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
const [menu, setMenu] = useState<QSOMenuState>(null);
|
const [menu, setMenu] = useState<QSOMenuState>(null);
|
||||||
@@ -242,10 +254,28 @@ export function RecentQSOsGrid({ rows, onRowDoubleClicked, onRowSelected, onUpda
|
|||||||
// Compute initial column defs: all columns defined, but those not marked
|
// Compute initial column defs: all columns defined, but those not marked
|
||||||
// defaultVisible start hidden. The user's saved state (loaded onGridReady)
|
// defaultVisible start hidden. The user's saved state (loaded onGridReady)
|
||||||
// overrides this so a previously toggled column wins.
|
// overrides this so a previously toggled column wins.
|
||||||
const columnDefs = useMemo<ColDef<QSOForm>[]>(() => COL_CATALOG.map((c) => {
|
// While AG Grid rebuilds columns (award columns load async), it fires column
|
||||||
const { group: _g, label: _l, defaultVisible, ...rest } = c;
|
// events that would otherwise trigger a save of the DEFAULT visibility before
|
||||||
return { ...rest, hide: !defaultVisible };
|
// we re-apply the user's saved state — clobbering it. This flag suppresses the
|
||||||
}), []);
|
// auto-save during that window. Set in the memo (runs at render, before the
|
||||||
|
// column events) and cleared by the re-apply effect below.
|
||||||
|
const restoringRef = useRef(true);
|
||||||
|
const columnDefs = useMemo<ColDef<QSOForm>[]>(() => {
|
||||||
|
restoringRef.current = true;
|
||||||
|
const base = COL_CATALOG.map((c) => {
|
||||||
|
const { group: _g, label: _l, defaultVisible, ...rest } = c;
|
||||||
|
return { ...rest, hide: !defaultVisible };
|
||||||
|
});
|
||||||
|
const awards: ColDef<QSOForm>[] = (awardCols ?? []).map((a) => ({
|
||||||
|
colId: `award_${a.code}`,
|
||||||
|
headerName: a.code,
|
||||||
|
headerTooltip: `${a.name} — reference this QSO counts for`,
|
||||||
|
width: 110,
|
||||||
|
cellClass: 'text-[11px]',
|
||||||
|
valueGetter: (p) => (p.data as any)?.award_refs?.[a.code.toUpperCase()] ?? '',
|
||||||
|
}));
|
||||||
|
return [...base, ...awards];
|
||||||
|
}, [awardCols]);
|
||||||
|
|
||||||
const defaultColDef = useMemo<ColDef>(() => ({
|
const defaultColDef = useMemo<ColDef>(() => ({
|
||||||
sortable: true,
|
sortable: true,
|
||||||
@@ -267,17 +297,37 @@ export function RecentQSOsGrid({ rows, onRowDoubleClicked, onRowSelected, onUpda
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
const saveColumnState = useCallback(() => {
|
const saveColumnState = useCallback(() => {
|
||||||
|
if (restoringRef.current) return; // ignore the events fired by a column rebuild
|
||||||
const state = gridRef.current?.api?.getColumnState();
|
const state = gridRef.current?.api?.getColumnState();
|
||||||
if (state) saveState(COL_STATE_KEY, state);
|
if (state) saveState(COL_STATE_KEY, state);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// The award columns load asynchronously; when they arrive (or change) the
|
||||||
|
// columnDefs memo is rebuilt and AG Grid re-applies each colDef's `hide`
|
||||||
|
// default — wiping the user's saved visibility (award columns reappear,
|
||||||
|
// manually-shown ones like LoTW sent vanish). Re-apply the saved state after
|
||||||
|
// every rebuild so the user's choices win. No-op before the grid is ready.
|
||||||
|
useEffect(() => {
|
||||||
|
const api = gridRef.current?.api;
|
||||||
|
const local = loadLocal(COL_STATE_KEY);
|
||||||
|
if (api && local) api.applyColumnState({ state: local as ColumnState[], applyOrder: true });
|
||||||
|
// Re-enable saving once AG Grid has settled the column events from the rebuild.
|
||||||
|
const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
|
||||||
|
return () => window.clearTimeout(t);
|
||||||
|
}, [awardCols]);
|
||||||
|
|
||||||
function handleRowDoubleClicked(e: RowDoubleClickedEvent<QSOForm>) {
|
function handleRowDoubleClicked(e: RowDoubleClickedEvent<QSOForm>) {
|
||||||
if (e.data && onRowDoubleClicked) onRowDoubleClicked(e.data);
|
if (e.data && onRowDoubleClicked) onRowDoubleClicked(e.data);
|
||||||
}
|
}
|
||||||
function onSelectionChanged() {
|
function onSelectionChanged() {
|
||||||
const sel = gridRef.current?.api?.getSelectedRows() as QSOForm[] | undefined;
|
const sel = (gridRef.current?.api?.getSelectedRows() as QSOForm[] | undefined) ?? [];
|
||||||
onRowSelected?.(sel && sel[0] ? (sel[0].id as number) : null);
|
onRowSelected?.(sel.map((r) => r.id as number).filter((id) => id != null));
|
||||||
}
|
}
|
||||||
|
// Select every row when the caller bumps selectAllSignal (QSL Manager search).
|
||||||
|
useEffect(() => {
|
||||||
|
if (selectAllSignal === undefined) return;
|
||||||
|
gridRef.current?.api?.selectAll();
|
||||||
|
}, [selectAllSignal]);
|
||||||
|
|
||||||
// ── Column picker (visibility) ──
|
// ── Column picker (visibility) ──
|
||||||
// Drives AG Grid via setColumnsVisible(). We don't keep a parallel React
|
// Drives AG Grid via setColumnsVisible(). We don't keep a parallel React
|
||||||
@@ -363,8 +413,10 @@ export function RecentQSOsGrid({ rows, onRowDoubleClicked, onRowSelected, onUpda
|
|||||||
onSendTo={onSendTo}
|
onSendTo={onSendTo}
|
||||||
onSendRecording={onSendRecording}
|
onSendRecording={onSendRecording}
|
||||||
onSendEQSL={onSendEQSL}
|
onSendEQSL={onSendEQSL}
|
||||||
|
onBulkEdit={onBulkEdit}
|
||||||
onExportSelected={onExportSelected}
|
onExportSelected={onExportSelected}
|
||||||
onExportFiltered={onExportFiltered}
|
onExportFiltered={onExportFiltered}
|
||||||
|
onDelete={onDelete}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Dialog open={pickerOpen} onOpenChange={setPickerOpen}>
|
<Dialog open={pickerOpen} onOpenChange={setPickerOpen}>
|
||||||
@@ -403,6 +455,26 @@ export function RecentQSOsGrid({ rows, onRowDoubleClicked, onRowSelected, onUpda
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
{awardCols && awardCols.length > 0 && (
|
||||||
|
<div className="rounded-md border border-border p-2.5">
|
||||||
|
<div className="flex items-center justify-between mb-2 pb-1.5 border-b border-border/60">
|
||||||
|
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">Awards</span>
|
||||||
|
<div className="flex gap-0.5">
|
||||||
|
<button className="text-[10px] text-primary hover:underline px-1" onClick={() => { awardCols.forEach((a) => setColVisible(`award_${a.code}`, true)); }}>all</button>
|
||||||
|
<button className="text-[10px] text-muted-foreground hover:underline px-1" onClick={() => { awardCols.forEach((a) => setColVisible(`award_${a.code}`, false)); }}>none</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
{awardCols.map((a) => (
|
||||||
|
<label key={a.code} className="flex items-center gap-2 text-xs cursor-pointer hover:bg-accent/30 rounded px-1 py-0.5">
|
||||||
|
<Checkbox checked={isColVisible(`award_${a.code}`)} onCheckedChange={(v) => setColVisible(`award_${a.code}`, !!v)} />
|
||||||
|
<span className="font-mono font-semibold">{a.code}</span>
|
||||||
|
<span className="text-muted-foreground truncate">{a.name}</span>
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<DialogFooter>
|
<DialogFooter>
|
||||||
<Button variant="ghost" size="sm" onClick={resetDefaults}>Reset to defaults</Button>
|
<Button variant="ghost" size="sm" onClick={resetDefaults}>Reset to defaults</Button>
|
||||||
|
|||||||
@@ -18,7 +18,9 @@ const GRATICULE = geoGraticule10();
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
bearing?: number | null; // short-path azimuth to DX (deg)
|
bearing?: number | null; // short-path azimuth to DX (deg)
|
||||||
headings: number[]; // antenna heading(s) — rotor + Ultrabeam pattern
|
headings: number[]; // radiating heading(s) — rotor + Ultrabeam pattern
|
||||||
|
boomHeading?: number | null; // mechanical boom (rotor) azimuth, shown grey when it differs
|
||||||
|
pattern?: 'normal' | 'reverse' | 'bi' | null; // Ultrabeam pattern (for the badge)
|
||||||
centerLat?: number | null; // operator latitude (projection centre)
|
centerLat?: number | null; // operator latitude (projection centre)
|
||||||
centerLon?: number | null; // operator longitude
|
centerLon?: number | null; // operator longitude
|
||||||
rotorEnabled?: boolean;
|
rotorEnabled?: boolean;
|
||||||
@@ -36,7 +38,7 @@ function pt(az: number, radius: number): [number, number] {
|
|||||||
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
return [C + radius * Math.cos(a), C + radius * Math.sin(a)];
|
||||||
}
|
}
|
||||||
|
|
||||||
export function RotorCompass({ bearing, headings, centerLat, centerLon, rotorEnabled, onGoto, onClose }: Props) {
|
export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLat, centerLon, rotorEnabled, onGoto, onClose }: Props) {
|
||||||
const cardinals = useMemo(
|
const cardinals = useMemo(
|
||||||
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
() => [ { d: 0, l: 'N' }, { d: 45, l: 'NE' }, { d: 90, l: 'E' }, { d: 135, l: 'SE' },
|
||||||
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
{ d: 180, l: 'S' }, { d: 225, l: 'SW' }, { d: 270, l: 'W' }, { d: 315, l: 'NW' } ],
|
||||||
@@ -76,6 +78,18 @@ export function RotorCompass({ bearing, headings, centerLat, centerLon, rotorEna
|
|||||||
<span className={cn('size-2 rounded-full', rotorEnabled ? 'bg-emerald-500' : 'bg-muted-foreground/40')}
|
<span className={cn('size-2 rounded-full', rotorEnabled ? 'bg-emerald-500' : 'bg-muted-foreground/40')}
|
||||||
title={rotorEnabled ? 'Rotator connected' : 'Rotator disabled'} />
|
title={rotorEnabled ? 'Rotator connected' : 'Rotator disabled'} />
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
|
{pattern && (
|
||||||
|
<span
|
||||||
|
className={cn('px-1 py-px rounded text-[9px] font-bold tracking-wide',
|
||||||
|
pattern === 'reverse' ? 'bg-amber-200 text-amber-900'
|
||||||
|
: pattern === 'bi' ? 'bg-sky-200 text-sky-900'
|
||||||
|
: 'bg-emerald-200 text-emerald-900')}
|
||||||
|
title={pattern === 'reverse' ? 'Ultrabeam reversed — radiates opposite the boom'
|
||||||
|
: pattern === 'bi' ? 'Ultrabeam bidirectional — radiates both ways'
|
||||||
|
: 'Ultrabeam normal'}>
|
||||||
|
{pattern === 'reverse' ? 'REV' : pattern === 'bi' ? 'BI' : 'NORM'}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
<span className="font-mono text-sm font-bold text-emerald-700 tabular-nums">
|
<span className="font-mono text-sm font-bold text-emerald-700 tabular-nums">
|
||||||
{headLabel != null ? `${Math.round(headLabel).toString().padStart(3, '0')}°` : '—'}
|
{headLabel != null ? `${Math.round(headLabel).toString().padStart(3, '0')}°` : '—'}
|
||||||
</span>
|
</span>
|
||||||
@@ -123,7 +137,21 @@ export function RotorCompass({ bearing, headings, centerLat, centerLon, rotorEna
|
|||||||
<circle cx={x} cy={y} r={3} fill="#dc2626" stroke="#fff" strokeWidth={1} />
|
<circle cx={x} cy={y} r={3} fill="#dc2626" stroke="#fff" strokeWidth={1} />
|
||||||
); })()}
|
); })()}
|
||||||
|
|
||||||
{/* antenna heading needle(s) — green; two when bidirectional */}
|
{/* mechanical boom (rotor) heading — grey dashed needle, shown when the
|
||||||
|
Ultrabeam radiates somewhere other than the boom (reverse/bi) so the
|
||||||
|
operator sees where the antenna physically points vs where it boom-sits */}
|
||||||
|
{boomHeading != null && pattern && pattern !== 'normal' && (() => {
|
||||||
|
const [x, y] = pt(boomHeading, MAP_R - 2);
|
||||||
|
return (
|
||||||
|
<g>
|
||||||
|
<title>Boom (rotor) {Math.round(boomHeading)}°</title>
|
||||||
|
<line x1={C} y1={C} x2={x} y2={y} stroke="#64748b" strokeWidth={2} strokeDasharray="3 3" strokeLinecap="round" />
|
||||||
|
<circle cx={x} cy={y} r={3} fill="#64748b" stroke="#fff" strokeWidth={1} />
|
||||||
|
</g>
|
||||||
|
);
|
||||||
|
})()}
|
||||||
|
|
||||||
|
{/* radiating heading needle(s) — green; two when bidirectional */}
|
||||||
{headings.map((h, i) => { const [x, y] = pt(h, MAP_R - 2); return (
|
{headings.map((h, i) => { const [x, y] = pt(h, MAP_R - 2); return (
|
||||||
<g key={i}>
|
<g key={i}>
|
||||||
<line x1={C} y1={C} x2={x} y2={y} stroke="#15803d" strokeWidth={3} strokeLinecap="round" opacity={i === 0 ? 1 : 0.55} />
|
<line x1={C} y1={C} x2={x} y2={y} stroke="#15803d" strokeWidth={3} strokeLinecap="round" opacity={i === 0 ? 1 : 0.55} />
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -38,6 +38,10 @@ interface Props {
|
|||||||
onToggleSendOnType: (on: boolean) => void;
|
onToggleSendOnType: (on: boolean) => void;
|
||||||
onSendRaw: (chars: string) => void; // key typed chars as-is (no variables)
|
onSendRaw: (chars: string) => void; // key typed chars as-is (no variables)
|
||||||
onBackspace: () => void; // remove last not-yet-keyed char
|
onBackspace: () => void; // remove last not-yet-keyed char
|
||||||
|
autoCall: boolean; // repeat the clicked macro on a timer
|
||||||
|
autoCallSecs: number; // gap (s) after the message before repeating
|
||||||
|
onToggleAutoCall: (on: boolean) => void;
|
||||||
|
onSetAutoCallSecs: (n: number) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
// WinkeyerPanel — Log4OM-style CW keyer operating window. Lives in the
|
// WinkeyerPanel — Log4OM-style CW keyer operating window. Lives in the
|
||||||
@@ -48,6 +52,7 @@ export function WinkeyerPanel({
|
|||||||
onSelectPort, onRefreshPorts, onConnect, onDisconnect, onSetSpeed,
|
onSelectPort, onRefreshPorts, onConnect, onDisconnect, onSetSpeed,
|
||||||
onSend, onSendMacro, onStop, onClose,
|
onSend, onSendMacro, onStop, onClose,
|
||||||
sendOnType, onToggleSendOnType, onSendRaw, onBackspace,
|
sendOnType, onToggleSendOnType, onSendRaw, onBackspace,
|
||||||
|
autoCall, autoCallSecs, onToggleAutoCall, onSetAutoCallSecs,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const [cwText, setCwText] = useState('');
|
const [cwText, setCwText] = useState('');
|
||||||
const [speed, setSpeed] = useState(wpm);
|
const [speed, setSpeed] = useState(wpm);
|
||||||
@@ -172,6 +177,25 @@ export function WinkeyerPanel({
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Auto-call: repeat the clicked macro (e.g. F1 CQ) automatically until
|
||||||
|
someone answers. The seconds box is the gap AFTER the message. */}
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<label className="flex items-center gap-1.5 text-xs cursor-pointer select-none"
|
||||||
|
title="Click a CQ macro (one whose text contains CQ) to resend it on a loop — message, gap, repeat — until you send another macro (e.g. a report), press Stop, or hit ESC. Non-CQ macros send once.">
|
||||||
|
<input type="checkbox" className="accent-primary" checked={autoCall} disabled={!connected}
|
||||||
|
onChange={(e) => onToggleAutoCall(e.target.checked)} />
|
||||||
|
Auto-call
|
||||||
|
</label>
|
||||||
|
<span className="text-[11px] text-muted-foreground">gap</span>
|
||||||
|
<div className="flex items-center gap-1 h-7 rounded-md border border-border bg-muted/20 pl-2 pr-1" title="Seconds to wait after the message before resending">
|
||||||
|
<input type="number" min={0} max={120}
|
||||||
|
className="w-9 bg-transparent text-sm font-mono font-bold tabular-nums text-right outline-none"
|
||||||
|
value={autoCallSecs} onChange={(e) => onSetAutoCallSecs(parseInt(e.target.value) || 0)} />
|
||||||
|
<span className="text-[9px] text-muted-foreground">sec</span>
|
||||||
|
</div>
|
||||||
|
{autoCall && <span className="text-[10px] text-amber-600/80">click a CQ macro to loop it</span>}
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Macro buttons F1… — single-line (F-key + label) to keep the panel short. */}
|
{/* Macro buttons F1… — single-line (F-key + label) to keep the panel short. */}
|
||||||
<div className="grid grid-cols-3 gap-1">
|
<div className="grid grid-cols-3 gap-1">
|
||||||
{macros.map((m, i) => (
|
{macros.map((m, i) => (
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
AllCommunityModule, ModuleRegistry, themeQuartz,
|
AllCommunityModule, ModuleRegistry, themeQuartz,
|
||||||
type ColDef, type ColumnState, type GridReadyEvent, type RowDoubleClickedEvent,
|
type ColDef, type ColumnState, type GridReadyEvent, type RowDoubleClickedEvent,
|
||||||
@@ -53,6 +53,9 @@ type Props = {
|
|||||||
onSendTo?: (service: string, ids: number[]) => void;
|
onSendTo?: (service: string, ids: number[]) => void;
|
||||||
onSendRecording?: (ids: number[]) => void;
|
onSendRecording?: (ids: number[]) => void;
|
||||||
onSendEQSL?: (ids: number[]) => void;
|
onSendEQSL?: (ids: number[]) => void;
|
||||||
|
onDelete?: (ids: number[]) => void;
|
||||||
|
// One column per defined award (cell = the reference this QSO counts for).
|
||||||
|
awardCols?: { code: string; name: string }[];
|
||||||
};
|
};
|
||||||
|
|
||||||
const COL_STATE_KEY = 'hamlog.workedBeforeColState.v2';
|
const COL_STATE_KEY = 'hamlog.workedBeforeColState.v2';
|
||||||
@@ -65,7 +68,7 @@ function fmtDate(s: any): string {
|
|||||||
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
return `${d.getUTCFullYear()}-${p(d.getUTCMonth() + 1)}-${p(d.getUTCDate())}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL }: Props) {
|
export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onDelete, awardCols }: Props) {
|
||||||
const gridRef = useRef<any>(null);
|
const gridRef = useRef<any>(null);
|
||||||
const [pickerOpen, setPickerOpen] = useState(false);
|
const [pickerOpen, setPickerOpen] = useState(false);
|
||||||
const [menu, setMenu] = useState<QSOMenuState>(null);
|
const [menu, setMenu] = useState<QSOMenuState>(null);
|
||||||
@@ -93,10 +96,26 @@ export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, on
|
|||||||
const count = wb?.count ?? 0;
|
const count = wb?.count ?? 0;
|
||||||
const entries = wb?.entries ?? [];
|
const entries = wb?.entries ?? [];
|
||||||
|
|
||||||
const columnDefs = useMemo<ColDef<WorkedEntry>[]>(() => COL_CATALOG.map((c) => {
|
// Suppress auto-save while AG Grid rebuilds columns (award columns load async),
|
||||||
const { group: _g, label: _l, defaultVisible, ...rest } = c;
|
// so the default visibility doesn't clobber the user's saved state. See the
|
||||||
return { ...rest, hide: !defaultVisible };
|
// matching note in RecentQSOsGrid.
|
||||||
}), []);
|
const restoringRef = useRef(true);
|
||||||
|
const columnDefs = useMemo<ColDef<WorkedEntry>[]>(() => {
|
||||||
|
restoringRef.current = true;
|
||||||
|
const base = COL_CATALOG.map((c) => {
|
||||||
|
const { group: _g, label: _l, defaultVisible, ...rest } = c;
|
||||||
|
return { ...rest, hide: !defaultVisible };
|
||||||
|
});
|
||||||
|
const awards: ColDef<WorkedEntry>[] = (awardCols ?? []).map((a) => ({
|
||||||
|
colId: `award_${a.code}`,
|
||||||
|
headerName: a.code,
|
||||||
|
headerTooltip: `${a.name} — reference this QSO counts for`,
|
||||||
|
width: 110,
|
||||||
|
cellClass: 'text-[11px]',
|
||||||
|
valueGetter: (p) => (p.data as any)?.award_refs?.[a.code.toUpperCase()] ?? '',
|
||||||
|
}));
|
||||||
|
return [...base, ...awards];
|
||||||
|
}, [awardCols]);
|
||||||
|
|
||||||
const defaultColDef = useMemo<ColDef>(() => ({
|
const defaultColDef = useMemo<ColDef>(() => ({
|
||||||
sortable: true, resizable: true, filter: true, suppressMovable: false,
|
sortable: true, resizable: true, filter: true, suppressMovable: false,
|
||||||
@@ -113,10 +132,21 @@ export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, on
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
const saveColumnState = useCallback(() => {
|
const saveColumnState = useCallback(() => {
|
||||||
|
if (restoringRef.current) return; // ignore events fired by a column rebuild
|
||||||
const state = gridRef.current?.api?.getColumnState();
|
const state = gridRef.current?.api?.getColumnState();
|
||||||
if (state) saveState(COL_STATE_KEY, state);
|
if (state) saveState(COL_STATE_KEY, state);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
// Re-apply the saved column state after the award columns load (they rebuild
|
||||||
|
// the column set), so the user's visibility choices win over the defaults.
|
||||||
|
useEffect(() => {
|
||||||
|
const api = gridRef.current?.api;
|
||||||
|
const local = loadLocal(COL_STATE_KEY);
|
||||||
|
if (api && local) api.applyColumnState({ state: local as ColumnState[], applyOrder: true });
|
||||||
|
const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
|
||||||
|
return () => window.clearTimeout(t);
|
||||||
|
}, [awardCols]);
|
||||||
|
|
||||||
function isColVisible(colId: string): boolean {
|
function isColVisible(colId: string): boolean {
|
||||||
const col = gridRef.current?.api?.getColumn(colId);
|
const col = gridRef.current?.api?.getColumn(colId);
|
||||||
return col ? col.isVisible() : !!COL_CATALOG.find((c) => c.colId === colId)?.defaultVisible;
|
return col ? col.isVisible() : !!COL_CATALOG.find((c) => c.colId === colId)?.defaultVisible;
|
||||||
@@ -240,6 +270,7 @@ export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, on
|
|||||||
onSendTo={onSendTo}
|
onSendTo={onSendTo}
|
||||||
onSendRecording={onSendRecording}
|
onSendRecording={onSendRecording}
|
||||||
onSendEQSL={onSendEQSL}
|
onSendEQSL={onSendEQSL}
|
||||||
|
onDelete={onDelete}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{count > entries.length && (
|
{count > entries.length && (
|
||||||
@@ -283,6 +314,26 @@ export function WorkedBeforeGrid({ wb, busy, currentCall, onRowDoubleClicked, on
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
{awardCols && awardCols.length > 0 && (
|
||||||
|
<div className="rounded-md border border-border p-2.5">
|
||||||
|
<div className="flex items-center justify-between mb-2 pb-1.5 border-b border-border/60">
|
||||||
|
<span className="text-[11px] font-semibold uppercase tracking-wider text-muted-foreground">Awards</span>
|
||||||
|
<div className="flex gap-0.5">
|
||||||
|
<button className="text-[10px] text-primary hover:underline px-1" onClick={() => { awardCols.forEach((a) => setColVisible(`award_${a.code}`, true)); }}>all</button>
|
||||||
|
<button className="text-[10px] text-muted-foreground hover:underline px-1" onClick={() => { awardCols.forEach((a) => setColVisible(`award_${a.code}`, false)); }}>none</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col gap-1">
|
||||||
|
{awardCols.map((a) => (
|
||||||
|
<label key={a.code} className="flex items-center gap-2 text-xs cursor-pointer hover:bg-accent/30 rounded px-1 py-0.5">
|
||||||
|
<Checkbox checked={isColVisible(`award_${a.code}`)} onCheckedChange={(v) => setColVisible(`award_${a.code}`, !!v)} />
|
||||||
|
<span className="font-mono font-semibold">{a.code}</span>
|
||||||
|
<span className="text-muted-foreground truncate">{a.name}</span>
|
||||||
|
</label>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
<DialogFooter>
|
<DialogFooter>
|
||||||
<Button variant="ghost" size="sm" onClick={resetDefaults}>Reset to defaults</Button>
|
<Button variant="ghost" size="sm" onClick={resetDefaults}>Reset to defaults</Button>
|
||||||
|
|||||||
@@ -28,6 +28,14 @@ export function AutoEQSL({ onSent, onError }: Props) {
|
|||||||
const busy = useRef(false);
|
const busy = useRef(false);
|
||||||
const [current, setCurrent] = useState<{ job: Job; model: RenderModel; assets: CardAssets } | null>(null);
|
const [current, setCurrent] = useState<{ job: Job; model: RenderModel; assets: CardAssets } | null>(null);
|
||||||
const svgEl = useRef<SVGSVGElement | null>(null);
|
const svgEl = useRef<SVGSVGElement | null>(null);
|
||||||
|
const sentForRef = useRef<number | null>(null); // qsoId we've already fired SendEQSL for
|
||||||
|
|
||||||
|
// Keep the callbacks in refs so they never change the effects' identity — a
|
||||||
|
// toast/grid re-render from onSent must NOT re-run the send effect (that
|
||||||
|
// re-sent the same eQSL many times in a row).
|
||||||
|
const onSentRef = useRef(onSent);
|
||||||
|
const onErrorRef = useRef(onError);
|
||||||
|
useEffect(() => { onSentRef.current = onSent; onErrorRef.current = onError; });
|
||||||
|
|
||||||
// Pull the next job, fetch its render model + assets, then mount it (the
|
// Pull the next job, fetch its render model + assets, then mount it (the
|
||||||
// effect below rasterizes once the DOM has it).
|
// effect below rasterizes once the DOM has it).
|
||||||
@@ -41,14 +49,16 @@ export function AutoEQSL({ onSent, onError }: Props) {
|
|||||||
const assets = await loadCardAssets(model.template, job.templateId);
|
const assets = await loadCardAssets(model.template, job.templateId);
|
||||||
setCurrent({ job, model, assets });
|
setCurrent({ job, model, assets });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
onError?.(`Auto eQSL: ${e}`);
|
onErrorRef.current?.(`Auto eQSL: ${e}`);
|
||||||
busy.current = false;
|
busy.current = false;
|
||||||
void pump();
|
void pump();
|
||||||
}
|
}
|
||||||
}, [onError]);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const off = EventsOn('qsl:autosend', (p: { qsoId: number; templateId: number; callsign: string }) => {
|
const off = EventsOn('qsl:autosend', (p: { qsoId: number; templateId: number; callsign: string }) => {
|
||||||
|
// Dedupe: ignore a repeat event for a QSO we're already handling/handled.
|
||||||
|
if (sentForRef.current === p.qsoId || queue.current.some((j) => j.qsoId === p.qsoId)) return;
|
||||||
queue.current.push({ qsoId: p.qsoId, templateId: p.templateId, callsign: p.callsign });
|
queue.current.push({ qsoId: p.qsoId, templateId: p.templateId, callsign: p.callsign });
|
||||||
void pump();
|
void pump();
|
||||||
});
|
});
|
||||||
@@ -56,20 +66,23 @@ export function AutoEQSL({ onSent, onError }: Props) {
|
|||||||
}, [pump]);
|
}, [pump]);
|
||||||
|
|
||||||
// Once a job is mounted off-screen, wait for fonts + paint, rasterize, send.
|
// Once a job is mounted off-screen, wait for fonts + paint, rasterize, send.
|
||||||
|
// Sends exactly once per job (guarded by sentForRef), independent of renders.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!current) return;
|
if (!current) return;
|
||||||
|
if (sentForRef.current === current.job.qsoId) return; // already sent this one
|
||||||
let cancelled = false;
|
let cancelled = false;
|
||||||
void (async () => {
|
void (async () => {
|
||||||
try {
|
try {
|
||||||
await document.fonts.ready;
|
await document.fonts.ready;
|
||||||
await new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(() => r(null))));
|
await new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(() => r(null))));
|
||||||
if (cancelled || !svgEl.current) return;
|
if (cancelled || !svgEl.current) return;
|
||||||
|
sentForRef.current = current.job.qsoId;
|
||||||
const card = current.model.template.card;
|
const card = current.model.template.card;
|
||||||
const jpeg = await rasterizeCard(svgEl.current, card.w, card.h, 'image/jpeg');
|
const jpeg = await rasterizeCard(svgEl.current, card.w, card.h, 'image/jpeg');
|
||||||
await SendEQSL(current.job.qsoId, current.job.templateId, jpeg);
|
await SendEQSL(current.job.qsoId, current.job.templateId, jpeg);
|
||||||
onSent?.(current.job.callsign);
|
onSentRef.current?.(current.job.callsign);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
onError?.(`Auto eQSL: ${e}`);
|
onErrorRef.current?.(`Auto eQSL: ${e}`);
|
||||||
} finally {
|
} finally {
|
||||||
if (!cancelled) {
|
if (!cancelled) {
|
||||||
setCurrent(null);
|
setCurrent(null);
|
||||||
@@ -79,7 +92,7 @@ export function AutoEQSL({ onSent, onError }: Props) {
|
|||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
return () => { cancelled = true; };
|
return () => { cancelled = true; };
|
||||||
}, [current, pump, onSent, onError]);
|
}, [current, pump]);
|
||||||
|
|
||||||
if (!current) return null;
|
if (!current) return null;
|
||||||
// Off-screen at full card resolution so the rasterized output matches the
|
// Off-screen at full card resolution so the rasterized output matches the
|
||||||
|
|||||||
@@ -72,10 +72,11 @@ function buildFxParams(e: CardElement): TextFxParams | null {
|
|||||||
size: e.size,
|
size: e.size,
|
||||||
space: e.size * (kind === 'western' ? 0.08 : 0.04),
|
space: e.size * (kind === 'western' ? 0.08 : 0.04),
|
||||||
cTop: grad[0], cMid: grad[1] ?? grad[0], cBot: grad[2] ?? grad[1] ?? grad[0],
|
cTop: grad[0], cMid: grad[1] ?? grad[0], cBot: grad[2] ?? grad[1] ?? grad[0],
|
||||||
// Dark inter-letter edge — fixed near-black (the navy outline adaptStyle
|
// Dark inter-letter edge + rim — from the chosen colour palette, else the
|
||||||
// sets is for the old SVG stack, not this look).
|
// default near-black edge (the navy outline adaptStyle sets is for the old
|
||||||
cDark: kind === 'western' ? '#1c130a' : '#262630',
|
// SVG stack, not this look).
|
||||||
cOuter: silver ? '#e8edf2' : '#ced3db',
|
cDark: fx.dark ?? (kind === 'western' ? '#1c130a' : '#262630'),
|
||||||
|
cOuter: fx.outer ?? (silver ? '#e8edf2' : '#ced3db'),
|
||||||
// Per-call overrides from the editor (undefined → renderer default).
|
// Per-call overrides from the editor (undefined → renderer default).
|
||||||
plump: fx.plump, edge: fx.edge, outerw: fx.outerw, gloss: fx.gloss,
|
plump: fx.plump, edge: fx.edge, outerw: fx.outerw, gloss: fx.gloss,
|
||||||
glossH: fx.gloss_h, glossI: fx.gloss_i, innerB: fx.inner_b,
|
glossH: fx.gloss_h, glossI: fx.gloss_i, innerB: fx.inner_b,
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
async function choosePhotos() {
|
async function choosePhotos() {
|
||||||
try {
|
try {
|
||||||
const paths = ((await QSLPickPhotos()) ?? []) as string[];
|
const paths = ((await QSLPickPhotos()) ?? []) as string[];
|
||||||
if (paths.length) setPhotoPaths(paths.slice(0, 3));
|
if (paths.length) setPhotoPaths(paths.slice(0, 5));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError(String(e));
|
setError(String(e));
|
||||||
}
|
}
|
||||||
@@ -254,7 +254,7 @@ export function QslDesignerModal({ open, onClose }: Props) {
|
|||||||
<section className="space-y-2">
|
<section className="space-y-2">
|
||||||
<h3 className="text-sm font-semibold">New design</h3>
|
<h3 className="text-sm font-semibold">New design</h3>
|
||||||
<p className="text-xs text-muted-foreground">
|
<p className="text-xs text-muted-foreground">
|
||||||
Pick 1–3 photos — OpsLog analyzes them and proposes three card designs
|
Pick 1–5 photos — OpsLog analyzes them and proposes three card designs
|
||||||
with your callsign, name, zones and country placed automatically.
|
with your callsign, name, zones and country placed automatically.
|
||||||
</p>
|
</p>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ export function SendEQSLModal({ open, qsoId, onClose, onOpenDesigner }: Props) {
|
|||||||
<DialogContent className="max-w-[820px]">
|
<DialogContent className="max-w-[820px]">
|
||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
<DialogTitle className="flex items-center gap-2">
|
<DialogTitle className="flex items-center gap-2">
|
||||||
<Mail className="size-5 text-rose-600" /> Send eQSL by e-mail
|
<Mail className="size-5 text-rose-600" /> Send OpsLog QSL by e-mail
|
||||||
</DialogTitle>
|
</DialogTitle>
|
||||||
</DialogHeader>
|
</DialogHeader>
|
||||||
|
|
||||||
@@ -108,7 +108,7 @@ export function SendEQSLModal({ open, qsoId, onClose, onOpenDesigner }: Props) {
|
|||||||
<DialogFooter>
|
<DialogFooter>
|
||||||
{sent ? (
|
{sent ? (
|
||||||
<div className="flex items-center gap-2 text-sm text-emerald-600">
|
<div className="flex items-center gap-2 text-sm text-emerald-600">
|
||||||
<CheckCircle2 className="size-4" /> eQSL sent.
|
<CheckCircle2 className="size-4" /> OpsLog QSL sent.
|
||||||
<Button variant="outline" size="sm" onClick={onClose}>Close</Button>
|
<Button variant="outline" size="sm" onClick={onClose}>Close</Button>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@@ -16,6 +16,25 @@ interface Props {
|
|||||||
onChange: (preset: string, params: StyleParams) => void;
|
onChange: (preset: string, params: StyleParams) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Quick colour palettes per FX family (mirrors the reference generators):
|
||||||
|
// each sets the 3-stop gradient plus the dark edge and (glossy) silver rim.
|
||||||
|
type Palette = { name: string; top: string; mid: string; bot: string; dark: string; outer?: string };
|
||||||
|
const GLOSSY_PALETTES: Palette[] = [
|
||||||
|
{ name: 'Gold', top: '#ffe22d', mid: '#ffd600', bot: '#ffcc00', dark: '#262630', outer: '#ced3db' },
|
||||||
|
{ name: 'Silver', top: '#fbfdff', mid: '#c9d4de', bot: '#8496a8', dark: '#262630', outer: '#e8edf2' },
|
||||||
|
{ name: 'Red', top: '#ff7a66', mid: '#ee3322', bot: '#d42410', dark: '#260b08', outer: '#ead9d6' },
|
||||||
|
{ name: 'Blue', top: '#5fb8ff', mid: '#1f8fe8', bot: '#107ad0', dark: '#0d1726', outer: '#d6e2ee' },
|
||||||
|
{ name: 'Green', top: '#a5e84f', mid: '#6ec424', bot: '#5ab012', dark: '#122108', outer: '#dbe8d2' },
|
||||||
|
{ name: 'Pink', top: '#ff9ed0', mid: '#f5559f', bot: '#e83b8c', dark: '#260818', outer: '#ecd8e3' },
|
||||||
|
];
|
||||||
|
const WESTERN_PALETTES: Palette[] = [
|
||||||
|
{ name: 'Gold', top: '#f7c036', mid: '#f39612', bot: '#d06200', dark: '#20140a' },
|
||||||
|
{ name: 'Red', top: '#f0856e', mid: '#d8402a', bot: '#8c1606', dark: '#1f0805' },
|
||||||
|
{ name: 'Blue', top: '#7fc0ee', mid: '#2a7fc0', bot: '#0c4378', dark: '#081320' },
|
||||||
|
{ name: 'Green', top: '#bfd96a', mid: '#7fa82e', bot: '#3f6210', dark: '#101a06' },
|
||||||
|
{ name: 'Cream', top: '#f7ecd0', mid: '#e8d3a0', bot: '#bf9b58', dark: '#2a1f10' },
|
||||||
|
];
|
||||||
|
|
||||||
function ColorRow({ label, value, onChange }: { label: string; value: string; onChange: (v: string) => void }) {
|
function ColorRow({ label, value, onChange }: { label: string; value: string; onChange: (v: string) => void }) {
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center justify-between gap-2">
|
<div className="flex items-center justify-between gap-2">
|
||||||
@@ -76,6 +95,25 @@ export function StylePresetPicker({ presets, preset, params, onChange }: Props)
|
|||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
|
|
||||||
|
{isFx && (
|
||||||
|
<div className="flex items-center justify-between gap-2">
|
||||||
|
<Label className="text-xs text-muted-foreground">Palette</Label>
|
||||||
|
<div className="flex flex-wrap gap-1">
|
||||||
|
{(fxWestern ? WESTERN_PALETTES : GLOSSY_PALETTES).map((p) => (
|
||||||
|
<button
|
||||||
|
key={p.name} type="button" title={p.name}
|
||||||
|
className="h-6 w-6 rounded border border-border"
|
||||||
|
style={{ background: `linear-gradient(${p.top}, ${p.mid}, ${p.bot})` }}
|
||||||
|
onClick={() => onChange(preset, {
|
||||||
|
...params,
|
||||||
|
gradient: [p.top, p.mid, p.bot],
|
||||||
|
fx: { ...fx, dark: p.dark, ...(p.outer ? { outer: p.outer } : {}) },
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{has('color') && (
|
{has('color') && (
|
||||||
<ColorRow label="Color" value={params.color ?? '#ffffff'} onChange={(v) => set({ color: v })} />
|
<ColorRow label="Color" value={params.color ?? '#ffffff'} onChange={(v) => set({ color: v })} />
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -70,6 +70,8 @@ export interface FxParams {
|
|||||||
grunge?: number;
|
grunge?: number;
|
||||||
bevel?: number;
|
bevel?: number;
|
||||||
seed?: number;
|
seed?: number;
|
||||||
|
dark?: string;
|
||||||
|
outer?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface StyleParams {
|
export interface StyleParams {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { cn } from '@/lib/utils';
|
|||||||
// only an exact (case-insensitive) match — otherwise it reverts, so the field
|
// only an exact (case-insensitive) match — otherwise it reverts, so the field
|
||||||
// can't hold a typo'd value that isn't in the list.
|
// can't hold a typo'd value that isn't in the list.
|
||||||
export function Combobox({
|
export function Combobox({
|
||||||
value, onChange, options, placeholder, className, allowFreeText = false,
|
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
||||||
}: {
|
}: {
|
||||||
value: string;
|
value: string;
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
@@ -14,6 +14,10 @@ export function Combobox({
|
|||||||
placeholder?: string;
|
placeholder?: string;
|
||||||
className?: string;
|
className?: string;
|
||||||
allowFreeText?: boolean;
|
allowFreeText?: boolean;
|
||||||
|
// Commit each keystroke to the parent immediately (not just on blur). Use for
|
||||||
|
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
||||||
|
// leaving the field uses the value just typed.
|
||||||
|
commitOnType?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [query, setQuery] = useState('');
|
const [query, setQuery] = useState('');
|
||||||
@@ -41,9 +45,13 @@ export function Combobox({
|
|||||||
// Defer so a click on an option registers first.
|
// Defer so a click on an option registers first.
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
const exact = options.find((o) => o.toLowerCase() === query.trim().toLowerCase());
|
const trimmed = query.trim();
|
||||||
if (exact) { onChange(exact); setQuery(exact); }
|
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
||||||
else if (allowFreeText) { onChange(query.trim()); }
|
// Only fire onChange when the value actually changed — committing an
|
||||||
|
// unchanged value on a plain tab-through would wrongly flag the field as
|
||||||
|
// "user-edited" (e.g. RST, which then blocks the CW/SSB 599↔59 default).
|
||||||
|
if (exact) { if (exact !== value) onChange(exact); setQuery(exact); }
|
||||||
|
else if (allowFreeText) { if (trimmed !== value) onChange(trimmed); }
|
||||||
else { setQuery(value); } // revert typo
|
else { setQuery(value); } // revert typo
|
||||||
}, 120);
|
}, 120);
|
||||||
}
|
}
|
||||||
@@ -56,7 +64,7 @@ export function Combobox({
|
|||||||
// Focus selects the text so a keystroke replaces it — but does NOT
|
// Focus selects the text so a keystroke replaces it — but does NOT
|
||||||
// open the list (so tabbing in doesn't pop the dropdown).
|
// open the list (so tabbing in doesn't pop the dropdown).
|
||||||
onFocus={(e) => { setQuery(value); e.currentTarget.select(); }}
|
onFocus={(e) => { setQuery(value); e.currentTarget.select(); }}
|
||||||
onChange={(e) => { setQuery(e.target.value); setOpen(true); }}
|
onChange={(e) => { setQuery(e.target.value); setOpen(true); if (commitOnType) onChange(e.target.value); }}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }
|
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ const Input = React.forwardRef<HTMLInputElement, React.InputHTMLAttributes<HTMLI
|
|||||||
<input
|
<input
|
||||||
type={type}
|
type={type}
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex h-8 w-full rounded-md border border-input bg-background px-2.5 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-50',
|
'flex h-8 w-full rounded-md border border-input bg-background px-2.5 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring focus-visible:border-ring disabled:cursor-not-allowed disabled:opacity-50',
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, React.TextareaHTMLAttribu
|
|||||||
return (
|
return (
|
||||||
<textarea
|
<textarea
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex min-h-[60px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-50',
|
'flex min-h-[60px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring focus-visible:border-ring disabled:cursor-not-allowed disabled:opacity-50',
|
||||||
className,
|
className,
|
||||||
)}
|
)}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
|
|||||||
@@ -33,12 +33,28 @@ function appendTokens(existing: string | undefined, refs: string): string {
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
// applyAwardRefs writes picked references onto a QSO payload using each award's
|
// MANUAL_REFS_KEY mirrors award.ManualRefsKey (Go): the ADIF extras key holding
|
||||||
// scanned field. fieldOf maps an award CODE (uppercase) to its field name.
|
// the operator's per-QSO award-reference assignments as "CODE@REF;CODE@REF".
|
||||||
|
// The award engine honours these regardless of how the award matches, so a
|
||||||
|
// reference can be assigned even for awards that scan a free-text field by
|
||||||
|
// description/pattern (e.g. WAPC over ADDRESS) where writing a bare code into
|
||||||
|
// the field wouldn't match.
|
||||||
|
const MANUAL_REFS_KEY = 'APP_OPSLOG_AWARDREFS';
|
||||||
|
|
||||||
|
// applyAwardRefs writes picked references onto a QSO payload. Every assignment
|
||||||
|
// is recorded under MANUAL_REFS_KEY (authoritative for the engine); in addition,
|
||||||
|
// awards backed by a standard ADIF column also get that column written so the
|
||||||
|
// data lives in its conventional place and exports correctly. Awards that match
|
||||||
|
// a free-text field by description/pattern (address/qth/name/custom) rely solely
|
||||||
|
// on the override — we don't pollute the text field with a code.
|
||||||
export function applyAwardRefs(payload: any, awardRefs: string, fieldOf: Record<string, string>) {
|
export function applyAwardRefs(payload: any, awardRefs: string, fieldOf: Record<string, string>) {
|
||||||
const byCode = parseAwardRefs(awardRefs);
|
const byCode = parseAwardRefs(awardRefs);
|
||||||
const extras: Record<string, string> = { ...(payload.extras ?? {}) };
|
const extras: Record<string, string> = { ...(payload.extras ?? {}) };
|
||||||
|
const overrides: string[] = [];
|
||||||
for (const [code, ref] of Object.entries(byCode)) {
|
for (const [code, ref] of Object.entries(byCode)) {
|
||||||
|
for (const r of ref.split(',').map((s) => s.trim()).filter(Boolean)) {
|
||||||
|
overrides.push(`${code}@${r}`);
|
||||||
|
}
|
||||||
const field = fieldOf[code] || code.toLowerCase();
|
const field = fieldOf[code] || code.toLowerCase();
|
||||||
switch (field) {
|
switch (field) {
|
||||||
case 'iota': payload.iota = ref; break;
|
case 'iota': payload.iota = ref; break;
|
||||||
@@ -53,21 +69,24 @@ export function applyAwardRefs(payload: any, awardRefs: string, fieldOf: Record<
|
|||||||
extras['SIG'] = 'WWFF';
|
extras['SIG'] = 'WWFF';
|
||||||
extras['SIG_INFO'] = ref;
|
extras['SIG_INFO'] = ref;
|
||||||
break;
|
break;
|
||||||
// QSOFIELDS awards read their reference from a free-text field (e.g. DDFM
|
// QSOFIELDS awards that scan a free-text field for a code (e.g. DDFM finds
|
||||||
// scans the note for "D06"). Picking such a reference appends its code(s)
|
// "D06" in the note): append the code so the in-field matcher finds it too.
|
||||||
// to that field so the matcher finds it.
|
|
||||||
case 'note': case 'notes':
|
case 'note': case 'notes':
|
||||||
payload.notes = appendTokens(payload.notes, ref);
|
payload.notes = appendTokens(payload.notes, ref);
|
||||||
break;
|
break;
|
||||||
case 'comment':
|
case 'comment':
|
||||||
payload.comment = appendTokens(payload.comment, ref);
|
payload.comment = appendTokens(payload.comment, ref);
|
||||||
break;
|
break;
|
||||||
|
// address / qth / name / custom: the override above is authoritative; do
|
||||||
|
// not write a code into a free-text field the award matches by name.
|
||||||
default:
|
default:
|
||||||
extras[field.toUpperCase()] = ref;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (overrides.length > 0) extras[MANUAL_REFS_KEY] = overrides.join(';');
|
||||||
|
else delete extras[MANUAL_REFS_KEY];
|
||||||
if (Object.keys(extras).length > 0) payload.extras = extras;
|
if (Object.keys(extras).length > 0) payload.extras = extras;
|
||||||
|
else if (payload.extras) delete payload.extras;
|
||||||
}
|
}
|
||||||
|
|
||||||
// awardRefValue reads a single award's stored reference from a QSO, inverse of
|
// awardRefValue reads a single award's stored reference from a QSO, inverse of
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { GetUIPref, SetUIPref } from '../../wailsjs/go/main/App';
|
|||||||
const PORTABLE_KEYS = [
|
const PORTABLE_KEYS = [
|
||||||
'hamlog.qsoLimit', // QSO list page size
|
'hamlog.qsoLimit', // QSO list page size
|
||||||
'bandmap.side', // band map docked left / right
|
'bandmap.side', // band map docked left / right
|
||||||
|
'bandmap.show', // band map open / closed
|
||||||
'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
|
||||||
@@ -22,6 +23,8 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.mapAutoZoomDX', // Main map: auto-zoom to the DX (vs free pan/zoom)
|
'opslog.mapAutoZoomDX', // Main map: auto-zoom to the DX (vs free pan/zoom)
|
||||||
'opslog.mapView', // Main map: remembered free-pan view (lat/lon/zoom)
|
'opslog.mapView', // Main map: remembered free-pan view (lat/lon/zoom)
|
||||||
'opslog.lookupOnBlur', // run the callsign lookup on blur instead of while typing
|
'opslog.lookupOnBlur', // run the callsign lookup on blur instead of while typing
|
||||||
|
'opslog.clusterShowFilters', // cluster filter sidebar shown (tab + Main pane)
|
||||||
|
'opslog.mapBasemap', // world map basemap (light / street / satellite)
|
||||||
];
|
];
|
||||||
|
|
||||||
// syncPortablePrefs reconciles the DB with the local cache at startup:
|
// syncPortablePrefs reconciles the DB with the local cache at startup:
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
|
export const APP_VERSION = '0.16.3';
|
||||||
|
|
||||||
|
// Author / credits, shown in Help -> About.
|
||||||
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
Vendored
+253
-3
@@ -3,17 +3,21 @@
|
|||||||
import {adif} from '../models';
|
import {adif} from '../models';
|
||||||
import {qso} from '../models';
|
import {qso} from '../models';
|
||||||
import {main} from '../models';
|
import {main} from '../models';
|
||||||
|
import {cat} from '../models';
|
||||||
import {profile} from '../models';
|
import {profile} from '../models';
|
||||||
|
import {antgenius} from '../models';
|
||||||
import {award} from '../models';
|
import {award} from '../models';
|
||||||
import {awardref} from '../models';
|
import {awardref} from '../models';
|
||||||
import {cat} from '../models';
|
|
||||||
import {cluster} from '../models';
|
import {cluster} from '../models';
|
||||||
import {extsvc} from '../models';
|
import {extsvc} from '../models';
|
||||||
|
import {powergenius} from '../models';
|
||||||
import {winkeyer} from '../models';
|
import {winkeyer} from '../models';
|
||||||
|
import {alerts} from '../models';
|
||||||
import {audio} from '../models';
|
import {audio} from '../models';
|
||||||
import {operating} from '../models';
|
import {operating} from '../models';
|
||||||
import {udp} from '../models';
|
import {udp} from '../models';
|
||||||
import {lookup} from '../models';
|
import {lookup} from '../models';
|
||||||
|
import {netctl} from '../models';
|
||||||
|
|
||||||
export function ADIFFields():Promise<Array<adif.FieldDef>>;
|
export function ADIFFields():Promise<Array<adif.FieldDef>>;
|
||||||
|
|
||||||
@@ -23,16 +27,34 @@ export function ActivateProfile(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function AddQSO(arg1:qso.QSO):Promise<number>;
|
export function AddQSO(arg1:qso.QSO):Promise<number>;
|
||||||
|
|
||||||
|
export function AntGeniusActivate(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function AntGeniusDeselect(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function ApplyAwardPreset(arg1:string,arg2:string):Promise<number>;
|
export function ApplyAwardPreset(arg1:string,arg2:string):Promise<number>;
|
||||||
|
|
||||||
|
export function AssignAwardRefToQSOs(arg1:string,arg2:string,arg3:Array<number>):Promise<number>;
|
||||||
|
|
||||||
export function AwardCellQSOs(arg1:string,arg2:string,arg3:string):Promise<Array<qso.QSO>>;
|
export function AwardCellQSOs(arg1:string,arg2:string,arg3:string):Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
export function AwardFields():Promise<Array<string>>;
|
export function AwardFields():Promise<Array<string>>;
|
||||||
|
|
||||||
export function AwardMissingQSOs(arg1:string):Promise<Array<qso.QSO>>;
|
export function AwardMissingQSOs(arg1:string):Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
|
export function AwardRefsForQSOs(arg1:Array<number>):Promise<Record<number, Record<string, string>>>;
|
||||||
|
|
||||||
|
export function BrowseExecutable():Promise<string>;
|
||||||
|
|
||||||
|
export function BulkUpdateField(arg1:Array<number>,arg2:string,arg3:string):Promise<number>;
|
||||||
|
|
||||||
export function BulkUpdateQSL(arg1:Array<number>,arg2:main.QSLBulkUpdate):Promise<number>;
|
export function BulkUpdateQSL(arg1:Array<number>,arg2:main.QSLBulkUpdate):Promise<number>;
|
||||||
|
|
||||||
|
export function CWDecoderRunning():Promise<boolean>;
|
||||||
|
|
||||||
|
export function ChatAvailable():Promise<boolean>;
|
||||||
|
|
||||||
|
export function CheckForUpdate():Promise<main.UpdateInfo>;
|
||||||
|
|
||||||
export function ClearLookupCache():Promise<void>;
|
export function ClearLookupCache():Promise<void>;
|
||||||
|
|
||||||
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
||||||
@@ -67,6 +89,8 @@ export function DXCCForCountry(arg1:string):Promise<number>;
|
|||||||
|
|
||||||
export function DXCCName(arg1:number):Promise<string>;
|
export function DXCCName(arg1:number):Promise<string>;
|
||||||
|
|
||||||
|
export function DeleteAlertRule(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function DeleteAllQSO():Promise<number>;
|
export function DeleteAllQSO():Promise<number>;
|
||||||
|
|
||||||
export function DeleteAwardReference(arg1:string,arg2:string):Promise<void>;
|
export function DeleteAwardReference(arg1:string,arg2:string):Promise<void>;
|
||||||
@@ -81,12 +105,18 @@ export function DeleteProfile(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function DeleteQSO(arg1:number):Promise<void>;
|
export function DeleteQSO(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function DeleteQSOs(arg1:Array<number>):Promise<number>;
|
||||||
|
|
||||||
export function DeleteUDPIntegration(arg1:number):Promise<void>;
|
export function DeleteUDPIntegration(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function DisconnectAllClusters():Promise<void>;
|
export function DisconnectAllClusters():Promise<void>;
|
||||||
|
|
||||||
export function DisconnectClusterServer(arg1:number):Promise<void>;
|
export function DisconnectClusterServer(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function DiscoverFlexRadios():Promise<Array<cat.FlexRadio>>;
|
||||||
|
|
||||||
|
export function DownloadAllReferenceLists():Promise<string>;
|
||||||
|
|
||||||
export function DownloadClublogCty():Promise<main.ClublogCtyInfo>;
|
export function DownloadClublogCty():Promise<main.ClublogCtyInfo>;
|
||||||
|
|
||||||
export function DownloadConfirmations(arg1:string,arg2:boolean,arg3:string):Promise<void>;
|
export function DownloadConfirmations(arg1:string,arg2:boolean,arg3:string):Promise<void>;
|
||||||
@@ -103,12 +133,98 @@ export function ExportAwards():Promise<string>;
|
|||||||
|
|
||||||
export function FilterFields():Promise<Array<string>>;
|
export function FilterFields():Promise<Array<string>>;
|
||||||
|
|
||||||
export function FindQSOsForUpload(arg1:string,arg2:string):Promise<Array<qso.UploadRow>>;
|
export function FindQSOsForUpload(arg1:string,arg2:string):Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
|
export function FlexATUBypass():Promise<void>;
|
||||||
|
|
||||||
|
export function FlexATUStart():Promise<void>;
|
||||||
|
|
||||||
|
export function FlexAmpOperate(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexApplyBandAntenna(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexMox(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetAGCMode(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetAGCThreshold(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetANF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetANFLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetAPF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetAPFLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetATUMemories(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetAudioLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetCWBreakInDelay(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetCWFilter(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetCWPitch(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetCWSidetone(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetCWSpeed(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetFilter(arg1:number,arg2:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetMic(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetMon(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetMonLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetMute(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetNB(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetNBLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetNR(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetNRLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetPower(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetProcessor(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetProcessorLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetRXAntenna(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetSidetoneLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetSplit(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetTXAntenna(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetTunePower(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetVox(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetVoxDelay(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexSetVoxLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function FlexTune(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function GetActiveProfile():Promise<profile.Profile>;
|
export function GetActiveProfile():Promise<profile.Profile>;
|
||||||
|
|
||||||
|
export function GetAlertEmailTo():Promise<string>;
|
||||||
|
|
||||||
|
export function GetAntGeniusSettings():Promise<main.AntGeniusSettings>;
|
||||||
|
|
||||||
|
export function GetAntGeniusStatus():Promise<antgenius.Status>;
|
||||||
|
|
||||||
export function GetAudioSettings():Promise<main.AudioSettings>;
|
export function GetAudioSettings():Promise<main.AudioSettings>;
|
||||||
|
|
||||||
|
export function GetAutostartPrograms():Promise<Array<main.AutostartProgram>>;
|
||||||
|
|
||||||
export function GetAward(arg1:string):Promise<award.Result>;
|
export function GetAward(arg1:string):Promise<award.Result>;
|
||||||
|
|
||||||
export function GetAwardDefs():Promise<Array<award.Def>>;
|
export function GetAwardDefs():Promise<Array<award.Def>>;
|
||||||
@@ -127,6 +243,10 @@ export function GetCATSettings():Promise<main.CATSettings>;
|
|||||||
|
|
||||||
export function GetCATState():Promise<cat.RigState>;
|
export function GetCATState():Promise<cat.RigState>;
|
||||||
|
|
||||||
|
export function GetCWDecoderPitch():Promise<number>;
|
||||||
|
|
||||||
|
export function GetChatHistory(arg1:number):Promise<Array<main.ChatMessage>>;
|
||||||
|
|
||||||
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
export function GetClublogCtyInfo():Promise<main.ClublogCtyInfo>;
|
||||||
|
|
||||||
export function GetClusterAutoConnect():Promise<boolean>;
|
export function GetClusterAutoConnect():Promise<boolean>;
|
||||||
@@ -135,6 +255,10 @@ export function GetClusterStatus():Promise<Array<cluster.ServerStatus>>;
|
|||||||
|
|
||||||
export function GetCtyDatInfo():Promise<main.CtyDatInfo>;
|
export function GetCtyDatInfo():Promise<main.CtyDatInfo>;
|
||||||
|
|
||||||
|
export function GetDBBackendStatus():Promise<main.DBBackendStatus>;
|
||||||
|
|
||||||
|
export function GetDBConnectionInfo():Promise<main.DBConnectionInfo>;
|
||||||
|
|
||||||
export function GetDVKMessages():Promise<Array<main.DVKMessage>>;
|
export function GetDVKMessages():Promise<Array<main.DVKMessage>>;
|
||||||
|
|
||||||
export function GetDVKStatus():Promise<main.DVKStatus>;
|
export function GetDVKStatus():Promise<main.DVKStatus>;
|
||||||
@@ -147,12 +271,30 @@ export function GetEmailSettings():Promise<main.EmailSettings>;
|
|||||||
|
|
||||||
export function GetExternalServices():Promise<extsvc.ExternalServices>;
|
export function GetExternalServices():Promise<extsvc.ExternalServices>;
|
||||||
|
|
||||||
|
export function GetFlexBandAntennas():Promise<Record<string, main.FlexBandAnt>>;
|
||||||
|
|
||||||
|
export function GetFlexState():Promise<cat.FlexTXState>;
|
||||||
|
|
||||||
|
export function GetIcomState():Promise<cat.IcomTXState>;
|
||||||
|
|
||||||
export function GetListsSettings():Promise<main.ListsSettings>;
|
export function GetListsSettings():Promise<main.ListsSettings>;
|
||||||
|
|
||||||
|
export function GetLiveStatusEnabled():Promise<boolean>;
|
||||||
|
|
||||||
export function GetLogFilePath():Promise<string>;
|
export function GetLogFilePath():Promise<string>;
|
||||||
|
|
||||||
|
export function GetLogbookRevision():Promise<string>;
|
||||||
|
|
||||||
export function GetLookupSettings():Promise<main.LookupSettings>;
|
export function GetLookupSettings():Promise<main.LookupSettings>;
|
||||||
|
|
||||||
|
export function GetMySQLSettings():Promise<main.MySQLSettings>;
|
||||||
|
|
||||||
|
export function GetOnlineOperators():Promise<Array<main.ChatPresence>>;
|
||||||
|
|
||||||
|
export function GetPGXLSettings():Promise<main.PGXLSettings>;
|
||||||
|
|
||||||
|
export function GetPGXLStatus():Promise<powergenius.Status>;
|
||||||
|
|
||||||
export function GetPOTAToken():Promise<string>;
|
export function GetPOTAToken():Promise<string>;
|
||||||
|
|
||||||
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
export function GetQSLDefaults():Promise<main.QSLDefaults>;
|
||||||
@@ -169,6 +311,8 @@ export function GetStartupStatus():Promise<main.StartupStatus>;
|
|||||||
|
|
||||||
export function GetStationSettings():Promise<main.StationSettings>;
|
export function GetStationSettings():Promise<main.StationSettings>;
|
||||||
|
|
||||||
|
export function GetTelemetryEnabled():Promise<boolean>;
|
||||||
|
|
||||||
export function GetUIPref(arg1:string):Promise<string>;
|
export function GetUIPref(arg1:string):Promise<string>;
|
||||||
|
|
||||||
export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
|
export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
|
||||||
@@ -181,12 +325,42 @@ export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
|||||||
|
|
||||||
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
||||||
|
|
||||||
export function ImportADIF(arg1:string,arg2:string,arg3:boolean):Promise<adif.ImportResult>;
|
export function IcomRefresh():Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetAFGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetAGC(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetANF(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetAtt(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetFilter(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetNB(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetNBLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetNR(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetNRLevel(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetPreamp(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function IcomSetRFGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function ImportADIF(arg1:string,arg2:string,arg3:boolean,arg4:boolean):Promise<adif.ImportResult>;
|
||||||
|
|
||||||
export function ImportAwardReferencesText(arg1:string,arg2:string):Promise<number>;
|
export function ImportAwardReferencesText(arg1:string,arg2:string):Promise<number>;
|
||||||
|
|
||||||
export function ImportAwards():Promise<main.AwardImportResult>;
|
export function ImportAwards():Promise<main.AwardImportResult>;
|
||||||
|
|
||||||
|
export function LaunchAutostartProgram(arg1:string):Promise<main.AutostartLaunchResult>;
|
||||||
|
|
||||||
|
export function LaunchAutostartPrograms():Promise<Array<main.AutostartLaunchResult>>;
|
||||||
|
|
||||||
|
export function ListAlertRules():Promise<Array<alerts.Rule>>;
|
||||||
|
|
||||||
export function ListAudioInputDevices():Promise<Array<audio.Device>>;
|
export function ListAudioInputDevices():Promise<Array<audio.Device>>;
|
||||||
|
|
||||||
export function ListAudioOutputDevices():Promise<Array<audio.Device>>;
|
export function ListAudioOutputDevices():Promise<Array<audio.Device>>;
|
||||||
@@ -217,6 +391,40 @@ export function LookupCallsign(arg1:string):Promise<lookup.Result>;
|
|||||||
|
|
||||||
export function MoveDatabase(arg1:string):Promise<void>;
|
export function MoveDatabase(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function NetActivate(arg1:string):Promise<qso.QSO>;
|
||||||
|
|
||||||
|
export function NetActiveList():Promise<Array<qso.QSO>>;
|
||||||
|
|
||||||
|
export function NetClose():Promise<void>;
|
||||||
|
|
||||||
|
export function NetCreate(arg1:string):Promise<netctl.Net>;
|
||||||
|
|
||||||
|
export function NetDeactivate(arg1:number):Promise<number>;
|
||||||
|
|
||||||
|
export function NetDelete(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function NetDiscardActive(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function NetList():Promise<Array<netctl.Net>>;
|
||||||
|
|
||||||
|
export function NetLookup(arg1:string):Promise<netctl.Station>;
|
||||||
|
|
||||||
|
export function NetOpen(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function NetOpenID():Promise<string>;
|
||||||
|
|
||||||
|
export function NetRename(arg1:string,arg2:string):Promise<void>;
|
||||||
|
|
||||||
|
export function NetRoster(arg1:string):Promise<Array<netctl.Station>>;
|
||||||
|
|
||||||
|
export function NetRosterRemove(arg1:string,arg2:string):Promise<void>;
|
||||||
|
|
||||||
|
export function NetRosterUpsert(arg1:string,arg2:netctl.Station):Promise<void>;
|
||||||
|
|
||||||
|
export function NetSetDefaults(arg1:string,arg2:string,arg3:string,arg4:string):Promise<void>;
|
||||||
|
|
||||||
|
export function NetUpdateActive(arg1:qso.QSO):Promise<void>;
|
||||||
|
|
||||||
export function OpenADIFFile():Promise<string>;
|
export function OpenADIFFile():Promise<string>;
|
||||||
|
|
||||||
export function OpenDatabase(arg1:string):Promise<void>;
|
export function OpenDatabase(arg1:string):Promise<void>;
|
||||||
@@ -225,6 +433,8 @@ export function OpenExternalURL(arg1:string):Promise<void>;
|
|||||||
|
|
||||||
export function OperatingDefaultForBand(arg1:string):Promise<operating.BandDefault>;
|
export function OperatingDefaultForBand(arg1:string):Promise<operating.BandDefault>;
|
||||||
|
|
||||||
|
export function PGXLSetFanMode(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function PickAudioFolder():Promise<string>;
|
export function PickAudioFolder():Promise<string>;
|
||||||
|
|
||||||
export function PickBackupFolder():Promise<string>;
|
export function PickBackupFolder():Promise<string>;
|
||||||
@@ -273,6 +483,8 @@ export function QSOAudioBegin():Promise<boolean>;
|
|||||||
|
|
||||||
export function QSOAudioCancel():Promise<void>;
|
export function QSOAudioCancel():Promise<void>;
|
||||||
|
|
||||||
|
export function QSOAudioResetClock():Promise<boolean>;
|
||||||
|
|
||||||
export function QSOAudioRestart():Promise<boolean>;
|
export function QSOAudioRestart():Promise<boolean>;
|
||||||
|
|
||||||
export function QuitApp():Promise<void>;
|
export function QuitApp():Promise<void>;
|
||||||
@@ -287,6 +499,10 @@ export function RenderEQSL(arg1:number,arg2:number):Promise<string>;
|
|||||||
|
|
||||||
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 RescanAwards():Promise<void>;
|
||||||
|
|
||||||
export function ResetAwardDefs():Promise<Array<award.Def>>;
|
export function ResetAwardDefs():Promise<Array<award.Def>>;
|
||||||
|
|
||||||
export function ResetDatabaseToDefault():Promise<void>;
|
export function ResetDatabaseToDefault():Promise<void>;
|
||||||
@@ -303,8 +519,14 @@ export function RunBackupNow():Promise<string>;
|
|||||||
|
|
||||||
export function SaveADIFFile():Promise<string>;
|
export function SaveADIFFile():Promise<string>;
|
||||||
|
|
||||||
|
export function SaveAlertRule(arg1:alerts.Rule):Promise<alerts.Rule>;
|
||||||
|
|
||||||
|
export function SaveAntGeniusSettings(arg1:main.AntGeniusSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveAudioSettings(arg1:main.AudioSettings):Promise<void>;
|
export function SaveAudioSettings(arg1:main.AudioSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveAutostartPrograms(arg1:Array<main.AutostartProgram>):Promise<void>;
|
||||||
|
|
||||||
export function SaveAwardDefs(arg1:Array<award.Def>):Promise<void>;
|
export function SaveAwardDefs(arg1:Array<award.Def>):Promise<void>;
|
||||||
|
|
||||||
export function SaveAwardReference(arg1:string,arg2:awardref.Ref):Promise<void>;
|
export function SaveAwardReference(arg1:string,arg2:awardref.Ref):Promise<void>;
|
||||||
@@ -319,14 +541,20 @@ export function SaveEmailSettings(arg1:main.EmailSettings):Promise<void>;
|
|||||||
|
|
||||||
export function SaveExternalServices(arg1:extsvc.ExternalServices):Promise<void>;
|
export function SaveExternalServices(arg1:extsvc.ExternalServices):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveFlexBandAntennas(arg1:Record<string, main.FlexBandAnt>):Promise<void>;
|
||||||
|
|
||||||
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
|
export function SaveListsSettings(arg1:main.ListsSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
|
export function SaveLookupSettings(arg1:main.LookupSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveMySQLSettings(arg1:main.MySQLSettings):Promise<void>;
|
||||||
|
|
||||||
export function SaveOperatingAntenna(arg1:operating.Antenna):Promise<operating.Antenna>;
|
export function SaveOperatingAntenna(arg1:operating.Antenna):Promise<operating.Antenna>;
|
||||||
|
|
||||||
export function SaveOperatingStation(arg1:operating.Station):Promise<operating.Station>;
|
export function SaveOperatingStation(arg1:operating.Station):Promise<operating.Station>;
|
||||||
|
|
||||||
|
export function SavePGXLSettings(arg1:main.PGXLSettings):Promise<void>;
|
||||||
|
|
||||||
export function SavePOTAToken(arg1:string):Promise<void>;
|
export function SavePOTAToken(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SaveProfile(arg1:profile.Profile):Promise<profile.Profile>;
|
export function SaveProfile(arg1:profile.Profile):Promise<profile.Profile>;
|
||||||
@@ -345,6 +573,8 @@ export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
|||||||
|
|
||||||
export function SearchAwardReferences(arg1:string,arg2:string,arg3:number,arg4:number):Promise<Array<awardref.Ref>>;
|
export function SearchAwardReferences(arg1:string,arg2:string,arg3:number,arg4:number):Promise<Array<awardref.Ref>>;
|
||||||
|
|
||||||
|
export function SendChatMessage(arg1:string):Promise<main.ChatMessage>;
|
||||||
|
|
||||||
export function SendClusterCommand(arg1:string):Promise<void>;
|
export function SendClusterCommand(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<void>;
|
export function SendClusterSpot(arg1:string,arg2:number,arg3:string):Promise<void>;
|
||||||
@@ -353,10 +583,14 @@ export function SendEQSL(arg1:number,arg2:number,arg3:string):Promise<void>;
|
|||||||
|
|
||||||
export function SendQSORecordingEmail(arg1:number):Promise<void>;
|
export function SendQSORecordingEmail(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function SetAlertEmailTo(arg1:string):Promise<void>;
|
||||||
|
|
||||||
export function SetCATFrequency(arg1:number):Promise<void>;
|
export function SetCATFrequency(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetCATMode(arg1:string):Promise<void>;
|
export function SetCATMode(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function SetCWDecoderPitch(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
export function SetClublogCtyEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
||||||
@@ -365,24 +599,38 @@ 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 SetLiveStatusEnabled(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetPassphrase(arg1:string):Promise<void>;
|
export function SetPassphrase(arg1:string):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>;
|
||||||
|
|
||||||
export function SetUltrabeamDirection(arg1:number):Promise<void>;
|
export function SetUltrabeamDirection(arg1:number):Promise<void>;
|
||||||
|
|
||||||
|
export function StartCWDecoder():Promise<void>;
|
||||||
|
|
||||||
|
export function StopCWDecoder():Promise<void>;
|
||||||
|
|
||||||
export function SwitchCATRig(arg1:number):Promise<void>;
|
export function SwitchCATRig(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
export function SyncPOTAHunterLog(arg1:boolean,arg2:boolean):Promise<main.POTASyncResult>;
|
||||||
|
|
||||||
export function TestClublogUpload():Promise<string>;
|
export function TestClublogUpload():Promise<string>;
|
||||||
|
|
||||||
|
export function TestEQSLUpload():Promise<string>;
|
||||||
|
|
||||||
export function TestEmail(arg1:string):Promise<void>;
|
export function TestEmail(arg1:string):Promise<void>;
|
||||||
|
|
||||||
|
export function TestHRDLogUpload():Promise<string>;
|
||||||
|
|
||||||
export function TestLoTWUpload():Promise<string>;
|
export function TestLoTWUpload():Promise<string>;
|
||||||
|
|
||||||
export function TestLookupProvider(arg1:string,arg2:string,arg3:string,arg4:string):Promise<lookup.Result>;
|
export function TestLookupProvider(arg1:string,arg2:string,arg3:string,arg4:string):Promise<lookup.Result>;
|
||||||
|
|
||||||
|
export function TestMySQLConnection(arg1:main.MySQLSettings):Promise<void>;
|
||||||
|
|
||||||
export function TestPTT(arg1:main.AudioSettings):Promise<void>;
|
export function TestPTT(arg1:main.AudioSettings):Promise<void>;
|
||||||
|
|
||||||
export function TestQRZUpload():Promise<string>;
|
export function TestQRZUpload():Promise<string>;
|
||||||
@@ -405,6 +653,8 @@ export function UpdateQSOsFromCty(arg1:Array<number>):Promise<number>;
|
|||||||
|
|
||||||
export function UpdateQSOsFromQRZ(arg1:Array<number>):Promise<number>;
|
export function UpdateQSOsFromQRZ(arg1:Array<number>):Promise<number>;
|
||||||
|
|
||||||
|
export function UploadCallsign(arg1:string):Promise<string>;
|
||||||
|
|
||||||
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
||||||
|
|
||||||
export function WinkeyerBackspace():Promise<void>;
|
export function WinkeyerBackspace():Promise<void>;
|
||||||
|
|||||||
@@ -18,10 +18,22 @@ export function AddQSO(arg1) {
|
|||||||
return window['go']['main']['App']['AddQSO'](arg1);
|
return window['go']['main']['App']['AddQSO'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function AntGeniusActivate(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['AntGeniusActivate'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function AntGeniusDeselect(arg1) {
|
||||||
|
return window['go']['main']['App']['AntGeniusDeselect'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function ApplyAwardPreset(arg1, arg2) {
|
export function ApplyAwardPreset(arg1, arg2) {
|
||||||
return window['go']['main']['App']['ApplyAwardPreset'](arg1, arg2);
|
return window['go']['main']['App']['ApplyAwardPreset'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function AssignAwardRefToQSOs(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['AssignAwardRefToQSOs'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function AwardCellQSOs(arg1, arg2, arg3) {
|
export function AwardCellQSOs(arg1, arg2, arg3) {
|
||||||
return window['go']['main']['App']['AwardCellQSOs'](arg1, arg2, arg3);
|
return window['go']['main']['App']['AwardCellQSOs'](arg1, arg2, arg3);
|
||||||
}
|
}
|
||||||
@@ -34,10 +46,34 @@ export function AwardMissingQSOs(arg1) {
|
|||||||
return window['go']['main']['App']['AwardMissingQSOs'](arg1);
|
return window['go']['main']['App']['AwardMissingQSOs'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function AwardRefsForQSOs(arg1) {
|
||||||
|
return window['go']['main']['App']['AwardRefsForQSOs'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function BrowseExecutable() {
|
||||||
|
return window['go']['main']['App']['BrowseExecutable']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function BulkUpdateField(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['BulkUpdateField'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
export function BulkUpdateQSL(arg1, arg2) {
|
export function BulkUpdateQSL(arg1, arg2) {
|
||||||
return window['go']['main']['App']['BulkUpdateQSL'](arg1, arg2);
|
return window['go']['main']['App']['BulkUpdateQSL'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CWDecoderRunning() {
|
||||||
|
return window['go']['main']['App']['CWDecoderRunning']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ChatAvailable() {
|
||||||
|
return window['go']['main']['App']['ChatAvailable']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CheckForUpdate() {
|
||||||
|
return window['go']['main']['App']['CheckForUpdate']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ClearLookupCache() {
|
export function ClearLookupCache() {
|
||||||
return window['go']['main']['App']['ClearLookupCache']();
|
return window['go']['main']['App']['ClearLookupCache']();
|
||||||
}
|
}
|
||||||
@@ -106,6 +142,10 @@ export function DXCCName(arg1) {
|
|||||||
return window['go']['main']['App']['DXCCName'](arg1);
|
return window['go']['main']['App']['DXCCName'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DeleteAlertRule(arg1) {
|
||||||
|
return window['go']['main']['App']['DeleteAlertRule'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function DeleteAllQSO() {
|
export function DeleteAllQSO() {
|
||||||
return window['go']['main']['App']['DeleteAllQSO']();
|
return window['go']['main']['App']['DeleteAllQSO']();
|
||||||
}
|
}
|
||||||
@@ -134,6 +174,10 @@ export function DeleteQSO(arg1) {
|
|||||||
return window['go']['main']['App']['DeleteQSO'](arg1);
|
return window['go']['main']['App']['DeleteQSO'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DeleteQSOs(arg1) {
|
||||||
|
return window['go']['main']['App']['DeleteQSOs'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function DeleteUDPIntegration(arg1) {
|
export function DeleteUDPIntegration(arg1) {
|
||||||
return window['go']['main']['App']['DeleteUDPIntegration'](arg1);
|
return window['go']['main']['App']['DeleteUDPIntegration'](arg1);
|
||||||
}
|
}
|
||||||
@@ -146,6 +190,14 @@ export function DisconnectClusterServer(arg1) {
|
|||||||
return window['go']['main']['App']['DisconnectClusterServer'](arg1);
|
return window['go']['main']['App']['DisconnectClusterServer'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function DiscoverFlexRadios() {
|
||||||
|
return window['go']['main']['App']['DiscoverFlexRadios']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DownloadAllReferenceLists() {
|
||||||
|
return window['go']['main']['App']['DownloadAllReferenceLists']();
|
||||||
|
}
|
||||||
|
|
||||||
export function DownloadClublogCty() {
|
export function DownloadClublogCty() {
|
||||||
return window['go']['main']['App']['DownloadClublogCty']();
|
return window['go']['main']['App']['DownloadClublogCty']();
|
||||||
}
|
}
|
||||||
@@ -182,14 +234,186 @@ export function FindQSOsForUpload(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['FindQSOsForUpload'](arg1, arg2);
|
return window['go']['main']['App']['FindQSOsForUpload'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function FlexATUBypass() {
|
||||||
|
return window['go']['main']['App']['FlexATUBypass']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexATUStart() {
|
||||||
|
return window['go']['main']['App']['FlexATUStart']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexAmpOperate(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexAmpOperate'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexApplyBandAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexApplyBandAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexMox(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexMox'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetAGCMode(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetAGCMode'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetAGCThreshold(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetAGCThreshold'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetANF(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetANF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetANFLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetANFLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetAPF(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetAPF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetAPFLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetAPFLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetATUMemories(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetATUMemories'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetAudioLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetAudioLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetCWBreakInDelay(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetCWBreakInDelay'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetCWFilter(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetCWFilter'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetCWPitch(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetCWPitch'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetCWSidetone(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetCWSidetone'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetCWSpeed(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetCWSpeed'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetFilter(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['FlexSetFilter'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetMic(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetMic'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetMon(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetMon'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetMonLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetMonLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetMute(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetMute'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetNB(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetNB'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetNBLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetNBLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetNR(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetNR'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetNRLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetNRLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetPower(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetPower'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetProcessor(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetProcessor'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetProcessorLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetProcessorLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetRXAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetRXAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetSidetoneLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetSidetoneLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetSplit(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetSplit'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetTXAntenna(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetTXAntenna'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetTunePower(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetTunePower'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetVox(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetVox'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetVoxDelay(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetVoxDelay'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexSetVoxLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexSetVoxLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function FlexTune(arg1) {
|
||||||
|
return window['go']['main']['App']['FlexTune'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function GetActiveProfile() {
|
export function GetActiveProfile() {
|
||||||
return window['go']['main']['App']['GetActiveProfile']();
|
return window['go']['main']['App']['GetActiveProfile']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetAlertEmailTo() {
|
||||||
|
return window['go']['main']['App']['GetAlertEmailTo']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetAntGeniusSettings() {
|
||||||
|
return window['go']['main']['App']['GetAntGeniusSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetAntGeniusStatus() {
|
||||||
|
return window['go']['main']['App']['GetAntGeniusStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetAudioSettings() {
|
export function GetAudioSettings() {
|
||||||
return window['go']['main']['App']['GetAudioSettings']();
|
return window['go']['main']['App']['GetAudioSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetAutostartPrograms() {
|
||||||
|
return window['go']['main']['App']['GetAutostartPrograms']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetAward(arg1) {
|
export function GetAward(arg1) {
|
||||||
return window['go']['main']['App']['GetAward'](arg1);
|
return window['go']['main']['App']['GetAward'](arg1);
|
||||||
}
|
}
|
||||||
@@ -226,6 +450,14 @@ export function GetCATState() {
|
|||||||
return window['go']['main']['App']['GetCATState']();
|
return window['go']['main']['App']['GetCATState']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetCWDecoderPitch() {
|
||||||
|
return window['go']['main']['App']['GetCWDecoderPitch']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetChatHistory(arg1) {
|
||||||
|
return window['go']['main']['App']['GetChatHistory'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function GetClublogCtyInfo() {
|
export function GetClublogCtyInfo() {
|
||||||
return window['go']['main']['App']['GetClublogCtyInfo']();
|
return window['go']['main']['App']['GetClublogCtyInfo']();
|
||||||
}
|
}
|
||||||
@@ -242,6 +474,14 @@ export function GetCtyDatInfo() {
|
|||||||
return window['go']['main']['App']['GetCtyDatInfo']();
|
return window['go']['main']['App']['GetCtyDatInfo']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetDBBackendStatus() {
|
||||||
|
return window['go']['main']['App']['GetDBBackendStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetDBConnectionInfo() {
|
||||||
|
return window['go']['main']['App']['GetDBConnectionInfo']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetDVKMessages() {
|
export function GetDVKMessages() {
|
||||||
return window['go']['main']['App']['GetDVKMessages']();
|
return window['go']['main']['App']['GetDVKMessages']();
|
||||||
}
|
}
|
||||||
@@ -266,18 +506,54 @@ export function GetExternalServices() {
|
|||||||
return window['go']['main']['App']['GetExternalServices']();
|
return window['go']['main']['App']['GetExternalServices']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetFlexBandAntennas() {
|
||||||
|
return window['go']['main']['App']['GetFlexBandAntennas']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetFlexState() {
|
||||||
|
return window['go']['main']['App']['GetFlexState']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetIcomState() {
|
||||||
|
return window['go']['main']['App']['GetIcomState']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetListsSettings() {
|
export function GetListsSettings() {
|
||||||
return window['go']['main']['App']['GetListsSettings']();
|
return window['go']['main']['App']['GetListsSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetLiveStatusEnabled() {
|
||||||
|
return window['go']['main']['App']['GetLiveStatusEnabled']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetLogFilePath() {
|
export function GetLogFilePath() {
|
||||||
return window['go']['main']['App']['GetLogFilePath']();
|
return window['go']['main']['App']['GetLogFilePath']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetLogbookRevision() {
|
||||||
|
return window['go']['main']['App']['GetLogbookRevision']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetLookupSettings() {
|
export function GetLookupSettings() {
|
||||||
return window['go']['main']['App']['GetLookupSettings']();
|
return window['go']['main']['App']['GetLookupSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetMySQLSettings() {
|
||||||
|
return window['go']['main']['App']['GetMySQLSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetOnlineOperators() {
|
||||||
|
return window['go']['main']['App']['GetOnlineOperators']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetPGXLSettings() {
|
||||||
|
return window['go']['main']['App']['GetPGXLSettings']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetPGXLStatus() {
|
||||||
|
return window['go']['main']['App']['GetPGXLStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetPOTAToken() {
|
export function GetPOTAToken() {
|
||||||
return window['go']['main']['App']['GetPOTAToken']();
|
return window['go']['main']['App']['GetPOTAToken']();
|
||||||
}
|
}
|
||||||
@@ -310,6 +586,10 @@ export function GetStationSettings() {
|
|||||||
return window['go']['main']['App']['GetStationSettings']();
|
return window['go']['main']['App']['GetStationSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetTelemetryEnabled() {
|
||||||
|
return window['go']['main']['App']['GetTelemetryEnabled']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetUIPref(arg1) {
|
export function GetUIPref(arg1) {
|
||||||
return window['go']['main']['App']['GetUIPref'](arg1);
|
return window['go']['main']['App']['GetUIPref'](arg1);
|
||||||
}
|
}
|
||||||
@@ -334,8 +614,56 @@ export function HasBuiltinReferences(arg1) {
|
|||||||
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
return window['go']['main']['App']['HasBuiltinReferences'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ImportADIF(arg1, arg2, arg3) {
|
export function IcomRefresh() {
|
||||||
return window['go']['main']['App']['ImportADIF'](arg1, arg2, arg3);
|
return window['go']['main']['App']['IcomRefresh']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetAFGain(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetAFGain'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetAGC(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetAGC'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetANF(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetANF'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetAtt(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetAtt'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetFilter(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetFilter'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetNB(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetNB'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetNBLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetNBLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetNR(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetNR'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetNRLevel(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetNRLevel'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetPreamp(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetPreamp'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IcomSetRFGain(arg1) {
|
||||||
|
return window['go']['main']['App']['IcomSetRFGain'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ImportADIF(arg1, arg2, arg3, arg4) {
|
||||||
|
return window['go']['main']['App']['ImportADIF'](arg1, arg2, arg3, arg4);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function ImportAwardReferencesText(arg1, arg2) {
|
export function ImportAwardReferencesText(arg1, arg2) {
|
||||||
@@ -346,6 +674,18 @@ export function ImportAwards() {
|
|||||||
return window['go']['main']['App']['ImportAwards']();
|
return window['go']['main']['App']['ImportAwards']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function LaunchAutostartProgram(arg1) {
|
||||||
|
return window['go']['main']['App']['LaunchAutostartProgram'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function LaunchAutostartPrograms() {
|
||||||
|
return window['go']['main']['App']['LaunchAutostartPrograms']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ListAlertRules() {
|
||||||
|
return window['go']['main']['App']['ListAlertRules']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ListAudioInputDevices() {
|
export function ListAudioInputDevices() {
|
||||||
return window['go']['main']['App']['ListAudioInputDevices']();
|
return window['go']['main']['App']['ListAudioInputDevices']();
|
||||||
}
|
}
|
||||||
@@ -406,6 +746,74 @@ export function MoveDatabase(arg1) {
|
|||||||
return window['go']['main']['App']['MoveDatabase'](arg1);
|
return window['go']['main']['App']['MoveDatabase'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function NetActivate(arg1) {
|
||||||
|
return window['go']['main']['App']['NetActivate'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetActiveList() {
|
||||||
|
return window['go']['main']['App']['NetActiveList']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetClose() {
|
||||||
|
return window['go']['main']['App']['NetClose']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetCreate(arg1) {
|
||||||
|
return window['go']['main']['App']['NetCreate'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetDeactivate(arg1) {
|
||||||
|
return window['go']['main']['App']['NetDeactivate'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetDelete(arg1) {
|
||||||
|
return window['go']['main']['App']['NetDelete'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetDiscardActive(arg1) {
|
||||||
|
return window['go']['main']['App']['NetDiscardActive'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetList() {
|
||||||
|
return window['go']['main']['App']['NetList']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetLookup(arg1) {
|
||||||
|
return window['go']['main']['App']['NetLookup'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetOpen(arg1) {
|
||||||
|
return window['go']['main']['App']['NetOpen'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetOpenID() {
|
||||||
|
return window['go']['main']['App']['NetOpenID']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetRename(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['NetRename'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetRoster(arg1) {
|
||||||
|
return window['go']['main']['App']['NetRoster'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetRosterRemove(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['NetRosterRemove'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetRosterUpsert(arg1, arg2) {
|
||||||
|
return window['go']['main']['App']['NetRosterUpsert'](arg1, arg2);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetSetDefaults(arg1, arg2, arg3, arg4) {
|
||||||
|
return window['go']['main']['App']['NetSetDefaults'](arg1, arg2, arg3, arg4);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetUpdateActive(arg1) {
|
||||||
|
return window['go']['main']['App']['NetUpdateActive'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function OpenADIFFile() {
|
export function OpenADIFFile() {
|
||||||
return window['go']['main']['App']['OpenADIFFile']();
|
return window['go']['main']['App']['OpenADIFFile']();
|
||||||
}
|
}
|
||||||
@@ -422,6 +830,10 @@ export function OperatingDefaultForBand(arg1) {
|
|||||||
return window['go']['main']['App']['OperatingDefaultForBand'](arg1);
|
return window['go']['main']['App']['OperatingDefaultForBand'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function PGXLSetFanMode(arg1) {
|
||||||
|
return window['go']['main']['App']['PGXLSetFanMode'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function PickAudioFolder() {
|
export function PickAudioFolder() {
|
||||||
return window['go']['main']['App']['PickAudioFolder']();
|
return window['go']['main']['App']['PickAudioFolder']();
|
||||||
}
|
}
|
||||||
@@ -518,6 +930,10 @@ export function QSOAudioCancel() {
|
|||||||
return window['go']['main']['App']['QSOAudioCancel']();
|
return window['go']['main']['App']['QSOAudioCancel']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function QSOAudioResetClock() {
|
||||||
|
return window['go']['main']['App']['QSOAudioResetClock']();
|
||||||
|
}
|
||||||
|
|
||||||
export function QSOAudioRestart() {
|
export function QSOAudioRestart() {
|
||||||
return window['go']['main']['App']['QSOAudioRestart']();
|
return window['go']['main']['App']['QSOAudioRestart']();
|
||||||
}
|
}
|
||||||
@@ -546,6 +962,14 @@ export function ReplaceAwardReferences(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
|
return window['go']['main']['App']['ReplaceAwardReferences'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function ReportLiveActivity(arg1, arg2, arg3) {
|
||||||
|
return window['go']['main']['App']['ReportLiveActivity'](arg1, arg2, arg3);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function RescanAwards() {
|
||||||
|
return window['go']['main']['App']['RescanAwards']();
|
||||||
|
}
|
||||||
|
|
||||||
export function ResetAwardDefs() {
|
export function ResetAwardDefs() {
|
||||||
return window['go']['main']['App']['ResetAwardDefs']();
|
return window['go']['main']['App']['ResetAwardDefs']();
|
||||||
}
|
}
|
||||||
@@ -578,10 +1002,22 @@ export function SaveADIFFile() {
|
|||||||
return window['go']['main']['App']['SaveADIFFile']();
|
return window['go']['main']['App']['SaveADIFFile']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveAlertRule(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveAlertRule'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function SaveAntGeniusSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveAntGeniusSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveAudioSettings(arg1) {
|
export function SaveAudioSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveAudioSettings'](arg1);
|
return window['go']['main']['App']['SaveAudioSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveAutostartPrograms(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveAutostartPrograms'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveAwardDefs(arg1) {
|
export function SaveAwardDefs(arg1) {
|
||||||
return window['go']['main']['App']['SaveAwardDefs'](arg1);
|
return window['go']['main']['App']['SaveAwardDefs'](arg1);
|
||||||
}
|
}
|
||||||
@@ -610,6 +1046,10 @@ export function SaveExternalServices(arg1) {
|
|||||||
return window['go']['main']['App']['SaveExternalServices'](arg1);
|
return window['go']['main']['App']['SaveExternalServices'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveFlexBandAntennas(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveFlexBandAntennas'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveListsSettings(arg1) {
|
export function SaveListsSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveListsSettings'](arg1);
|
return window['go']['main']['App']['SaveListsSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -618,6 +1058,10 @@ export function SaveLookupSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveLookupSettings'](arg1);
|
return window['go']['main']['App']['SaveLookupSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveMySQLSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveMySQLSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveOperatingAntenna(arg1) {
|
export function SaveOperatingAntenna(arg1) {
|
||||||
return window['go']['main']['App']['SaveOperatingAntenna'](arg1);
|
return window['go']['main']['App']['SaveOperatingAntenna'](arg1);
|
||||||
}
|
}
|
||||||
@@ -626,6 +1070,10 @@ export function SaveOperatingStation(arg1) {
|
|||||||
return window['go']['main']['App']['SaveOperatingStation'](arg1);
|
return window['go']['main']['App']['SaveOperatingStation'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SavePGXLSettings(arg1) {
|
||||||
|
return window['go']['main']['App']['SavePGXLSettings'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SavePOTAToken(arg1) {
|
export function SavePOTAToken(arg1) {
|
||||||
return window['go']['main']['App']['SavePOTAToken'](arg1);
|
return window['go']['main']['App']['SavePOTAToken'](arg1);
|
||||||
}
|
}
|
||||||
@@ -662,6 +1110,10 @@ export function SearchAwardReferences(arg1, arg2, arg3, arg4) {
|
|||||||
return window['go']['main']['App']['SearchAwardReferences'](arg1, arg2, arg3, arg4);
|
return window['go']['main']['App']['SearchAwardReferences'](arg1, arg2, arg3, arg4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SendChatMessage(arg1) {
|
||||||
|
return window['go']['main']['App']['SendChatMessage'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SendClusterCommand(arg1) {
|
export function SendClusterCommand(arg1) {
|
||||||
return window['go']['main']['App']['SendClusterCommand'](arg1);
|
return window['go']['main']['App']['SendClusterCommand'](arg1);
|
||||||
}
|
}
|
||||||
@@ -678,6 +1130,10 @@ export function SendQSORecordingEmail(arg1) {
|
|||||||
return window['go']['main']['App']['SendQSORecordingEmail'](arg1);
|
return window['go']['main']['App']['SendQSORecordingEmail'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetAlertEmailTo(arg1) {
|
||||||
|
return window['go']['main']['App']['SetAlertEmailTo'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetCATFrequency(arg1) {
|
export function SetCATFrequency(arg1) {
|
||||||
return window['go']['main']['App']['SetCATFrequency'](arg1);
|
return window['go']['main']['App']['SetCATFrequency'](arg1);
|
||||||
}
|
}
|
||||||
@@ -686,6 +1142,10 @@ export function SetCATMode(arg1) {
|
|||||||
return window['go']['main']['App']['SetCATMode'](arg1);
|
return window['go']['main']['App']['SetCATMode'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetCWDecoderPitch(arg1) {
|
||||||
|
return window['go']['main']['App']['SetCWDecoderPitch'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetClublogCtyEnabled(arg1) {
|
export function SetClublogCtyEnabled(arg1) {
|
||||||
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
return window['go']['main']['App']['SetClublogCtyEnabled'](arg1);
|
||||||
}
|
}
|
||||||
@@ -702,10 +1162,18 @@ export function SetDVKLabel(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
|
return window['go']['main']['App']['SetDVKLabel'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetLiveStatusEnabled(arg1) {
|
||||||
|
return window['go']['main']['App']['SetLiveStatusEnabled'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetPassphrase(arg1) {
|
export function SetPassphrase(arg1) {
|
||||||
return window['go']['main']['App']['SetPassphrase'](arg1);
|
return window['go']['main']['App']['SetPassphrase'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetTelemetryEnabled(arg1) {
|
||||||
|
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetUIPref(arg1, arg2) {
|
export function SetUIPref(arg1, arg2) {
|
||||||
return window['go']['main']['App']['SetUIPref'](arg1, arg2);
|
return window['go']['main']['App']['SetUIPref'](arg1, arg2);
|
||||||
}
|
}
|
||||||
@@ -714,6 +1182,14 @@ export function SetUltrabeamDirection(arg1) {
|
|||||||
return window['go']['main']['App']['SetUltrabeamDirection'](arg1);
|
return window['go']['main']['App']['SetUltrabeamDirection'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function StartCWDecoder() {
|
||||||
|
return window['go']['main']['App']['StartCWDecoder']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function StopCWDecoder() {
|
||||||
|
return window['go']['main']['App']['StopCWDecoder']();
|
||||||
|
}
|
||||||
|
|
||||||
export function SwitchCATRig(arg1) {
|
export function SwitchCATRig(arg1) {
|
||||||
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
return window['go']['main']['App']['SwitchCATRig'](arg1);
|
||||||
}
|
}
|
||||||
@@ -726,10 +1202,18 @@ export function TestClublogUpload() {
|
|||||||
return window['go']['main']['App']['TestClublogUpload']();
|
return window['go']['main']['App']['TestClublogUpload']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function TestEQSLUpload() {
|
||||||
|
return window['go']['main']['App']['TestEQSLUpload']();
|
||||||
|
}
|
||||||
|
|
||||||
export function TestEmail(arg1) {
|
export function TestEmail(arg1) {
|
||||||
return window['go']['main']['App']['TestEmail'](arg1);
|
return window['go']['main']['App']['TestEmail'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function TestHRDLogUpload() {
|
||||||
|
return window['go']['main']['App']['TestHRDLogUpload']();
|
||||||
|
}
|
||||||
|
|
||||||
export function TestLoTWUpload() {
|
export function TestLoTWUpload() {
|
||||||
return window['go']['main']['App']['TestLoTWUpload']();
|
return window['go']['main']['App']['TestLoTWUpload']();
|
||||||
}
|
}
|
||||||
@@ -738,6 +1222,10 @@ export function TestLookupProvider(arg1, arg2, arg3, arg4) {
|
|||||||
return window['go']['main']['App']['TestLookupProvider'](arg1, arg2, arg3, arg4);
|
return window['go']['main']['App']['TestLookupProvider'](arg1, arg2, arg3, arg4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function TestMySQLConnection(arg1) {
|
||||||
|
return window['go']['main']['App']['TestMySQLConnection'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function TestPTT(arg1) {
|
export function TestPTT(arg1) {
|
||||||
return window['go']['main']['App']['TestPTT'](arg1);
|
return window['go']['main']['App']['TestPTT'](arg1);
|
||||||
}
|
}
|
||||||
@@ -782,6 +1270,10 @@ export function UpdateQSOsFromQRZ(arg1) {
|
|||||||
return window['go']['main']['App']['UpdateQSOsFromQRZ'](arg1);
|
return window['go']['main']['App']['UpdateQSOsFromQRZ'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function UploadCallsign(arg1) {
|
||||||
|
return window['go']['main']['App']['UploadCallsign'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function UploadQSOsManual(arg1, arg2) {
|
export function UploadQSOsManual(arg1, arg2) {
|
||||||
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|||||||
+703
-28
@@ -65,6 +65,116 @@ export namespace adif {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace alerts {
|
||||||
|
|
||||||
|
export class Rule {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
enabled: boolean;
|
||||||
|
calls?: string[];
|
||||||
|
countries?: string[];
|
||||||
|
continents?: string[];
|
||||||
|
bands?: string[];
|
||||||
|
modes?: string[];
|
||||||
|
spotter_call?: string;
|
||||||
|
spotter_continents?: string[];
|
||||||
|
spotter_countries?: string[];
|
||||||
|
sound: boolean;
|
||||||
|
visual: boolean;
|
||||||
|
email: boolean;
|
||||||
|
again_after_min: number;
|
||||||
|
skip_worked: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Rule(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.calls = source["calls"];
|
||||||
|
this.countries = source["countries"];
|
||||||
|
this.continents = source["continents"];
|
||||||
|
this.bands = source["bands"];
|
||||||
|
this.modes = source["modes"];
|
||||||
|
this.spotter_call = source["spotter_call"];
|
||||||
|
this.spotter_continents = source["spotter_continents"];
|
||||||
|
this.spotter_countries = source["spotter_countries"];
|
||||||
|
this.sound = source["sound"];
|
||||||
|
this.visual = source["visual"];
|
||||||
|
this.email = source["email"];
|
||||||
|
this.again_after_min = source["again_after_min"];
|
||||||
|
this.skip_worked = source["skip_worked"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export namespace antgenius {
|
||||||
|
|
||||||
|
export class Antenna {
|
||||||
|
index: number;
|
||||||
|
name: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Antenna(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.index = source["index"];
|
||||||
|
this.name = source["name"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class Status {
|
||||||
|
connected: boolean;
|
||||||
|
host?: string;
|
||||||
|
last_error?: string;
|
||||||
|
port_a: number;
|
||||||
|
port_b: number;
|
||||||
|
tx_a: boolean;
|
||||||
|
tx_b: boolean;
|
||||||
|
antennas: Antenna[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.host = source["host"];
|
||||||
|
this.last_error = source["last_error"];
|
||||||
|
this.port_a = source["port_a"];
|
||||||
|
this.port_b = source["port_b"];
|
||||||
|
this.tx_a = source["tx_a"];
|
||||||
|
this.tx_b = source["tx_b"];
|
||||||
|
this.antennas = this.convertValues(source["antennas"], Antenna);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace audio {
|
export namespace audio {
|
||||||
|
|
||||||
export class Device {
|
export class Device {
|
||||||
@@ -104,6 +214,30 @@ export namespace award {
|
|||||||
this.confirmed = source["confirmed"];
|
this.confirmed = source["confirmed"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class OrRule {
|
||||||
|
field: string;
|
||||||
|
match_by?: string;
|
||||||
|
exact_match?: boolean;
|
||||||
|
pattern?: string;
|
||||||
|
leading_str?: string;
|
||||||
|
trailing_str?: string;
|
||||||
|
prefix?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new OrRule(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.field = source["field"];
|
||||||
|
this.match_by = source["match_by"];
|
||||||
|
this.exact_match = source["exact_match"];
|
||||||
|
this.pattern = source["pattern"];
|
||||||
|
this.leading_str = source["leading_str"];
|
||||||
|
this.trailing_str = source["trailing_str"];
|
||||||
|
this.prefix = source["prefix"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class Def {
|
export class Def {
|
||||||
code: string;
|
code: string;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -126,6 +260,7 @@ export namespace award {
|
|||||||
multi?: boolean;
|
multi?: boolean;
|
||||||
dynamic?: boolean;
|
dynamic?: boolean;
|
||||||
add_prefixes?: string[];
|
add_prefixes?: string[];
|
||||||
|
or_rules?: OrRule[];
|
||||||
dxcc_filter: number[];
|
dxcc_filter: number[];
|
||||||
valid_bands?: string[];
|
valid_bands?: string[];
|
||||||
valid_modes?: string[];
|
valid_modes?: string[];
|
||||||
@@ -164,6 +299,7 @@ export namespace award {
|
|||||||
this.multi = source["multi"];
|
this.multi = source["multi"];
|
||||||
this.dynamic = source["dynamic"];
|
this.dynamic = source["dynamic"];
|
||||||
this.add_prefixes = source["add_prefixes"];
|
this.add_prefixes = source["add_prefixes"];
|
||||||
|
this.or_rules = this.convertValues(source["or_rules"], OrRule);
|
||||||
this.dxcc_filter = source["dxcc_filter"];
|
this.dxcc_filter = source["dxcc_filter"];
|
||||||
this.valid_bands = source["valid_bands"];
|
this.valid_bands = source["valid_bands"];
|
||||||
this.valid_modes = source["valid_modes"];
|
this.valid_modes = source["valid_modes"];
|
||||||
@@ -175,7 +311,26 @@ export namespace award {
|
|||||||
this.total = source["total"];
|
this.total = source["total"];
|
||||||
this.builtin = source["builtin"];
|
this.builtin = source["builtin"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 Ref {
|
export class Ref {
|
||||||
ref: string;
|
ref: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
@@ -340,6 +495,216 @@ export namespace awardref {
|
|||||||
|
|
||||||
export namespace cat {
|
export namespace cat {
|
||||||
|
|
||||||
|
export class FlexMeter {
|
||||||
|
id: number;
|
||||||
|
src?: string;
|
||||||
|
name?: string;
|
||||||
|
unit?: string;
|
||||||
|
value: number;
|
||||||
|
lo: number;
|
||||||
|
hi: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FlexMeter(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.src = source["src"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.unit = source["unit"];
|
||||||
|
this.value = source["value"];
|
||||||
|
this.lo = source["lo"];
|
||||||
|
this.hi = source["hi"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FlexRadio {
|
||||||
|
ip: string;
|
||||||
|
port: number;
|
||||||
|
model: string;
|
||||||
|
nickname: string;
|
||||||
|
serial: string;
|
||||||
|
callsign: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FlexRadio(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.ip = source["ip"];
|
||||||
|
this.port = source["port"];
|
||||||
|
this.model = source["model"];
|
||||||
|
this.nickname = source["nickname"];
|
||||||
|
this.serial = source["serial"];
|
||||||
|
this.callsign = source["callsign"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class FlexTXState {
|
||||||
|
available: boolean;
|
||||||
|
model?: string;
|
||||||
|
rf_power: number;
|
||||||
|
tune_power: number;
|
||||||
|
tune: boolean;
|
||||||
|
transmitting: boolean;
|
||||||
|
vox_enable: boolean;
|
||||||
|
vox_level: number;
|
||||||
|
vox_delay: number;
|
||||||
|
proc_enable: boolean;
|
||||||
|
proc_level: number;
|
||||||
|
mon: boolean;
|
||||||
|
mon_level: number;
|
||||||
|
mic_level: number;
|
||||||
|
atu_status?: string;
|
||||||
|
atu_memories: boolean;
|
||||||
|
rx_avail: boolean;
|
||||||
|
split: boolean;
|
||||||
|
rx_freq_hz?: number;
|
||||||
|
tx_freq_hz?: number;
|
||||||
|
agc_mode?: string;
|
||||||
|
agc_threshold: number;
|
||||||
|
audio_level: number;
|
||||||
|
mute: boolean;
|
||||||
|
rx_ant?: string;
|
||||||
|
tx_ant?: string;
|
||||||
|
ant_list?: string[];
|
||||||
|
tx_ant_list?: string[];
|
||||||
|
nb: boolean;
|
||||||
|
nb_level: number;
|
||||||
|
nr: boolean;
|
||||||
|
nr_level: number;
|
||||||
|
anf: boolean;
|
||||||
|
anf_level: number;
|
||||||
|
mode?: string;
|
||||||
|
cw_speed: number;
|
||||||
|
cw_pitch: number;
|
||||||
|
cw_break_in_delay: number;
|
||||||
|
cw_sidetone: boolean;
|
||||||
|
cw_mon_level: number;
|
||||||
|
apf: boolean;
|
||||||
|
apf_level: number;
|
||||||
|
filter_lo: number;
|
||||||
|
filter_hi: number;
|
||||||
|
amp_available: boolean;
|
||||||
|
amp_model?: string;
|
||||||
|
amp_operate: boolean;
|
||||||
|
amp_fault?: string;
|
||||||
|
meters?: FlexMeter[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new FlexTXState(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.available = source["available"];
|
||||||
|
this.model = source["model"];
|
||||||
|
this.rf_power = source["rf_power"];
|
||||||
|
this.tune_power = source["tune_power"];
|
||||||
|
this.tune = source["tune"];
|
||||||
|
this.transmitting = source["transmitting"];
|
||||||
|
this.vox_enable = source["vox_enable"];
|
||||||
|
this.vox_level = source["vox_level"];
|
||||||
|
this.vox_delay = source["vox_delay"];
|
||||||
|
this.proc_enable = source["proc_enable"];
|
||||||
|
this.proc_level = source["proc_level"];
|
||||||
|
this.mon = source["mon"];
|
||||||
|
this.mon_level = source["mon_level"];
|
||||||
|
this.mic_level = source["mic_level"];
|
||||||
|
this.atu_status = source["atu_status"];
|
||||||
|
this.atu_memories = source["atu_memories"];
|
||||||
|
this.rx_avail = source["rx_avail"];
|
||||||
|
this.split = source["split"];
|
||||||
|
this.rx_freq_hz = source["rx_freq_hz"];
|
||||||
|
this.tx_freq_hz = source["tx_freq_hz"];
|
||||||
|
this.agc_mode = source["agc_mode"];
|
||||||
|
this.agc_threshold = source["agc_threshold"];
|
||||||
|
this.audio_level = source["audio_level"];
|
||||||
|
this.mute = source["mute"];
|
||||||
|
this.rx_ant = source["rx_ant"];
|
||||||
|
this.tx_ant = source["tx_ant"];
|
||||||
|
this.ant_list = source["ant_list"];
|
||||||
|
this.tx_ant_list = source["tx_ant_list"];
|
||||||
|
this.nb = source["nb"];
|
||||||
|
this.nb_level = source["nb_level"];
|
||||||
|
this.nr = source["nr"];
|
||||||
|
this.nr_level = source["nr_level"];
|
||||||
|
this.anf = source["anf"];
|
||||||
|
this.anf_level = source["anf_level"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
this.cw_speed = source["cw_speed"];
|
||||||
|
this.cw_pitch = source["cw_pitch"];
|
||||||
|
this.cw_break_in_delay = source["cw_break_in_delay"];
|
||||||
|
this.cw_sidetone = source["cw_sidetone"];
|
||||||
|
this.cw_mon_level = source["cw_mon_level"];
|
||||||
|
this.apf = source["apf"];
|
||||||
|
this.apf_level = source["apf_level"];
|
||||||
|
this.filter_lo = source["filter_lo"];
|
||||||
|
this.filter_hi = source["filter_hi"];
|
||||||
|
this.amp_available = source["amp_available"];
|
||||||
|
this.amp_model = source["amp_model"];
|
||||||
|
this.amp_operate = source["amp_operate"];
|
||||||
|
this.amp_fault = source["amp_fault"];
|
||||||
|
this.meters = this.convertValues(source["meters"], FlexMeter);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 IcomTXState {
|
||||||
|
available: boolean;
|
||||||
|
model?: string;
|
||||||
|
mode?: string;
|
||||||
|
af_gain: number;
|
||||||
|
rf_gain: number;
|
||||||
|
nb: boolean;
|
||||||
|
nb_level: number;
|
||||||
|
nr: boolean;
|
||||||
|
nr_level: number;
|
||||||
|
anf: boolean;
|
||||||
|
agc?: string;
|
||||||
|
preamp: number;
|
||||||
|
att: number;
|
||||||
|
filter: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new IcomTXState(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.available = source["available"];
|
||||||
|
this.model = source["model"];
|
||||||
|
this.mode = source["mode"];
|
||||||
|
this.af_gain = source["af_gain"];
|
||||||
|
this.rf_gain = source["rf_gain"];
|
||||||
|
this.nb = source["nb"];
|
||||||
|
this.nb_level = source["nb_level"];
|
||||||
|
this.nr = source["nr"];
|
||||||
|
this.nr_level = source["nr_level"];
|
||||||
|
this.anf = source["anf"];
|
||||||
|
this.agc = source["agc"];
|
||||||
|
this.preamp = source["preamp"];
|
||||||
|
this.att = source["att"];
|
||||||
|
this.filter = source["filter"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class RigState {
|
export class RigState {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
connected: boolean;
|
connected: boolean;
|
||||||
@@ -488,11 +853,13 @@ export namespace extsvc {
|
|||||||
username: string;
|
username: string;
|
||||||
password: string;
|
password: string;
|
||||||
callsign: string;
|
callsign: string;
|
||||||
|
code: string;
|
||||||
|
qth_nickname: string;
|
||||||
force_station_callsign: string;
|
force_station_callsign: string;
|
||||||
tqsl_path: string;
|
tqsl_path: string;
|
||||||
station_location: string;
|
station_location: string;
|
||||||
key_password: string;
|
key_password: string;
|
||||||
upload_flag: string;
|
upload_flags: string[];
|
||||||
write_log: boolean;
|
write_log: boolean;
|
||||||
auto_upload: boolean;
|
auto_upload: boolean;
|
||||||
upload_mode: string;
|
upload_mode: string;
|
||||||
@@ -508,11 +875,13 @@ export namespace extsvc {
|
|||||||
this.username = source["username"];
|
this.username = source["username"];
|
||||||
this.password = source["password"];
|
this.password = source["password"];
|
||||||
this.callsign = source["callsign"];
|
this.callsign = source["callsign"];
|
||||||
|
this.code = source["code"];
|
||||||
|
this.qth_nickname = source["qth_nickname"];
|
||||||
this.force_station_callsign = source["force_station_callsign"];
|
this.force_station_callsign = source["force_station_callsign"];
|
||||||
this.tqsl_path = source["tqsl_path"];
|
this.tqsl_path = source["tqsl_path"];
|
||||||
this.station_location = source["station_location"];
|
this.station_location = source["station_location"];
|
||||||
this.key_password = source["key_password"];
|
this.key_password = source["key_password"];
|
||||||
this.upload_flag = source["upload_flag"];
|
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.upload_mode = source["upload_mode"];
|
this.upload_mode = source["upload_mode"];
|
||||||
@@ -522,6 +891,8 @@ export namespace extsvc {
|
|||||||
qrz: ServiceConfig;
|
qrz: ServiceConfig;
|
||||||
clublog: ServiceConfig;
|
clublog: ServiceConfig;
|
||||||
lotw: ServiceConfig;
|
lotw: ServiceConfig;
|
||||||
|
hrdlog: ServiceConfig;
|
||||||
|
eqsl: ServiceConfig;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new ExternalServices(source);
|
return new ExternalServices(source);
|
||||||
@@ -532,6 +903,8 @@ export namespace extsvc {
|
|||||||
this.qrz = this.convertValues(source["qrz"], ServiceConfig);
|
this.qrz = this.convertValues(source["qrz"], ServiceConfig);
|
||||||
this.clublog = this.convertValues(source["clublog"], ServiceConfig);
|
this.clublog = this.convertValues(source["clublog"], ServiceConfig);
|
||||||
this.lotw = this.convertValues(source["lotw"], ServiceConfig);
|
this.lotw = this.convertValues(source["lotw"], ServiceConfig);
|
||||||
|
this.hrdlog = this.convertValues(source["hrdlog"], ServiceConfig);
|
||||||
|
this.eqsl = this.convertValues(source["eqsl"], ServiceConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
@@ -648,6 +1021,20 @@ export namespace lookup {
|
|||||||
|
|
||||||
export namespace main {
|
export namespace main {
|
||||||
|
|
||||||
|
export class AntGeniusSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
host: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new AntGeniusSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.host = source["host"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class AudioSettings {
|
export class AudioSettings {
|
||||||
from_radio: string;
|
from_radio: string;
|
||||||
to_radio: string;
|
to_radio: string;
|
||||||
@@ -682,6 +1069,44 @@ export namespace main {
|
|||||||
this.mic_gain = source["mic_gain"];
|
this.mic_gain = source["mic_gain"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class AutostartLaunchResult {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
status: string;
|
||||||
|
message: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new AutostartLaunchResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.status = source["status"];
|
||||||
|
this.message = source["message"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class AutostartProgram {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
path: string;
|
||||||
|
args: string;
|
||||||
|
enabled: boolean;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new AutostartProgram(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.path = source["path"];
|
||||||
|
this.args = source["args"];
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class AwardImportResult {
|
export class AwardImportResult {
|
||||||
awards: number;
|
awards: number;
|
||||||
references: number;
|
references: number;
|
||||||
@@ -792,6 +1217,15 @@ export namespace main {
|
|||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
backend: string;
|
backend: string;
|
||||||
omnirig_rig: number;
|
omnirig_rig: number;
|
||||||
|
flex_host: string;
|
||||||
|
flex_port: number;
|
||||||
|
flex_spots: boolean;
|
||||||
|
icom_port: string;
|
||||||
|
icom_baud: number;
|
||||||
|
icom_addr: number;
|
||||||
|
tci_host: string;
|
||||||
|
tci_port: number;
|
||||||
|
tci_spots: boolean;
|
||||||
poll_ms: number;
|
poll_ms: number;
|
||||||
delay_ms: number;
|
delay_ms: number;
|
||||||
digital_default: string;
|
digital_default: string;
|
||||||
@@ -805,11 +1239,56 @@ export namespace main {
|
|||||||
this.enabled = source["enabled"];
|
this.enabled = source["enabled"];
|
||||||
this.backend = source["backend"];
|
this.backend = source["backend"];
|
||||||
this.omnirig_rig = source["omnirig_rig"];
|
this.omnirig_rig = source["omnirig_rig"];
|
||||||
|
this.flex_host = source["flex_host"];
|
||||||
|
this.flex_port = source["flex_port"];
|
||||||
|
this.flex_spots = source["flex_spots"];
|
||||||
|
this.icom_port = source["icom_port"];
|
||||||
|
this.icom_baud = source["icom_baud"];
|
||||||
|
this.icom_addr = source["icom_addr"];
|
||||||
|
this.tci_host = source["tci_host"];
|
||||||
|
this.tci_port = source["tci_port"];
|
||||||
|
this.tci_spots = source["tci_spots"];
|
||||||
this.poll_ms = source["poll_ms"];
|
this.poll_ms = source["poll_ms"];
|
||||||
this.delay_ms = source["delay_ms"];
|
this.delay_ms = source["delay_ms"];
|
||||||
this.digital_default = source["digital_default"];
|
this.digital_default = source["digital_default"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class ChatMessage {
|
||||||
|
id: number;
|
||||||
|
operator: string;
|
||||||
|
station: string;
|
||||||
|
message: string;
|
||||||
|
created_at: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new ChatMessage(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.operator = source["operator"];
|
||||||
|
this.station = source["station"];
|
||||||
|
this.message = source["message"];
|
||||||
|
this.created_at = source["created_at"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class ChatPresence {
|
||||||
|
operator: string;
|
||||||
|
station: string;
|
||||||
|
ago_secs: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new ChatPresence(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.operator = source["operator"];
|
||||||
|
this.station = source["station"];
|
||||||
|
this.ago_secs = source["ago_secs"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ClublogCtyInfo {
|
export class ClublogCtyInfo {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
loaded: boolean;
|
loaded: boolean;
|
||||||
@@ -846,6 +1325,36 @@ export namespace main {
|
|||||||
this.file_mod_time = source["file_mod_time"];
|
this.file_mod_time = source["file_mod_time"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class DBBackendStatus {
|
||||||
|
active: string;
|
||||||
|
fallback: boolean;
|
||||||
|
error: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new DBBackendStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.active = source["active"];
|
||||||
|
this.fallback = source["fallback"];
|
||||||
|
this.error = source["error"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class DBConnectionInfo {
|
||||||
|
backend: string;
|
||||||
|
label: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new DBConnectionInfo(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.backend = source["backend"];
|
||||||
|
this.label = source["label"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class DVKMessage {
|
export class DVKMessage {
|
||||||
slot: number;
|
slot: number;
|
||||||
label: string;
|
label: string;
|
||||||
@@ -903,6 +1412,7 @@ export namespace main {
|
|||||||
smtp_user: string;
|
smtp_user: string;
|
||||||
smtp_password: string;
|
smtp_password: string;
|
||||||
from: string;
|
from: string;
|
||||||
|
reply_to: string;
|
||||||
encryption: string;
|
encryption: string;
|
||||||
auth: boolean;
|
auth: boolean;
|
||||||
auto_send: boolean;
|
auto_send: boolean;
|
||||||
@@ -921,6 +1431,7 @@ export namespace main {
|
|||||||
this.smtp_user = source["smtp_user"];
|
this.smtp_user = source["smtp_user"];
|
||||||
this.smtp_password = source["smtp_password"];
|
this.smtp_password = source["smtp_password"];
|
||||||
this.from = source["from"];
|
this.from = source["from"];
|
||||||
|
this.reply_to = source["reply_to"];
|
||||||
this.encryption = source["encryption"];
|
this.encryption = source["encryption"];
|
||||||
this.auth = source["auth"];
|
this.auth = source["auth"];
|
||||||
this.auto_send = source["auto_send"];
|
this.auto_send = source["auto_send"];
|
||||||
@@ -1009,6 +1520,44 @@ export namespace main {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class MySQLSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
host: string;
|
||||||
|
port: number;
|
||||||
|
user: string;
|
||||||
|
password: string;
|
||||||
|
database: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new MySQLSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.host = source["host"];
|
||||||
|
this.port = source["port"];
|
||||||
|
this.user = source["user"];
|
||||||
|
this.password = source["password"];
|
||||||
|
this.database = source["database"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class PGXLSettings {
|
||||||
|
enabled: boolean;
|
||||||
|
host: string;
|
||||||
|
port: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new PGXLSettings(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.host = source["host"];
|
||||||
|
this.port = source["port"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class POTAUnmatched {
|
export class POTAUnmatched {
|
||||||
activator: string;
|
activator: string;
|
||||||
date: string;
|
date: string;
|
||||||
@@ -1082,6 +1631,8 @@ export namespace main {
|
|||||||
sent_date: string;
|
sent_date: string;
|
||||||
rcvd_date: string;
|
rcvd_date: string;
|
||||||
via: string;
|
via: string;
|
||||||
|
notes: string;
|
||||||
|
comment: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new QSLBulkUpdate(source);
|
return new QSLBulkUpdate(source);
|
||||||
@@ -1094,6 +1645,8 @@ 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.notes = source["notes"];
|
||||||
|
this.comment = source["comment"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class QSLDefaults {
|
export class QSLDefaults {
|
||||||
@@ -1328,7 +1881,6 @@ export namespace main {
|
|||||||
ok: boolean;
|
ok: boolean;
|
||||||
err: string;
|
err: string;
|
||||||
db_path: string;
|
db_path: string;
|
||||||
migrated_from_app_data: boolean;
|
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new StartupStatus(source);
|
return new StartupStatus(source);
|
||||||
@@ -1339,7 +1891,6 @@ export namespace main {
|
|||||||
this.ok = source["ok"];
|
this.ok = source["ok"];
|
||||||
this.err = source["err"];
|
this.err = source["err"];
|
||||||
this.db_path = source["db_path"];
|
this.db_path = source["db_path"];
|
||||||
this.migrated_from_app_data = source["migrated_from_app_data"];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StationInfoComputed {
|
export class StationInfoComputed {
|
||||||
@@ -1428,6 +1979,24 @@ export namespace main {
|
|||||||
this.moving = source["moving"];
|
this.moving = source["moving"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class UpdateInfo {
|
||||||
|
current: string;
|
||||||
|
latest: string;
|
||||||
|
available: boolean;
|
||||||
|
url: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new UpdateInfo(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.current = source["current"];
|
||||||
|
this.latest = source["latest"];
|
||||||
|
this.available = source["available"];
|
||||||
|
this.url = source["url"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class WKMacro {
|
export class WKMacro {
|
||||||
label: string;
|
label: string;
|
||||||
text: string;
|
text: string;
|
||||||
@@ -1511,6 +2080,81 @@ export namespace main {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace netctl {
|
||||||
|
|
||||||
|
export class Station {
|
||||||
|
callsign: string;
|
||||||
|
name?: string;
|
||||||
|
qth?: string;
|
||||||
|
country?: string;
|
||||||
|
dxcc?: number;
|
||||||
|
itu?: number;
|
||||||
|
cq?: number;
|
||||||
|
groups?: string;
|
||||||
|
sig?: string;
|
||||||
|
sig_info?: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Station(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.callsign = source["callsign"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.qth = source["qth"];
|
||||||
|
this.country = source["country"];
|
||||||
|
this.dxcc = source["dxcc"];
|
||||||
|
this.itu = source["itu"];
|
||||||
|
this.cq = source["cq"];
|
||||||
|
this.groups = source["groups"];
|
||||||
|
this.sig = source["sig"];
|
||||||
|
this.sig_info = source["sig_info"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export class Net {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
default_rst_sent?: string;
|
||||||
|
default_rst_rcvd?: string;
|
||||||
|
default_comment?: string;
|
||||||
|
stations?: Station[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Net(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.id = source["id"];
|
||||||
|
this.name = source["name"];
|
||||||
|
this.default_rst_sent = source["default_rst_sent"];
|
||||||
|
this.default_rst_rcvd = source["default_rst_rcvd"];
|
||||||
|
this.default_comment = source["default_comment"];
|
||||||
|
this.stations = this.convertValues(source["stations"], Station);
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace operating {
|
export namespace operating {
|
||||||
|
|
||||||
export class AntennaBand {
|
export class AntennaBand {
|
||||||
@@ -1629,8 +2273,57 @@ export namespace operating {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace powergenius {
|
||||||
|
|
||||||
|
export class Status {
|
||||||
|
connected: boolean;
|
||||||
|
host?: string;
|
||||||
|
last_error?: string;
|
||||||
|
state?: string;
|
||||||
|
fan_mode?: string;
|
||||||
|
temperature: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Status(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.connected = source["connected"];
|
||||||
|
this.host = source["host"];
|
||||||
|
this.last_error = source["last_error"];
|
||||||
|
this.state = source["state"];
|
||||||
|
this.fan_mode = source["fan_mode"];
|
||||||
|
this.temperature = source["temperature"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace profile {
|
export namespace profile {
|
||||||
|
|
||||||
|
export class ProfileDB {
|
||||||
|
backend: string;
|
||||||
|
host: string;
|
||||||
|
port: number;
|
||||||
|
user: string;
|
||||||
|
password: string;
|
||||||
|
database: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new ProfileDB(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.backend = source["backend"];
|
||||||
|
this.host = source["host"];
|
||||||
|
this.port = source["port"];
|
||||||
|
this.user = source["user"];
|
||||||
|
this.password = source["password"];
|
||||||
|
this.database = source["database"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class Profile {
|
export class Profile {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -1657,6 +2350,7 @@ export namespace profile {
|
|||||||
tx_pwr?: number;
|
tx_pwr?: number;
|
||||||
is_active: boolean;
|
is_active: boolean;
|
||||||
sort_order: number;
|
sort_order: number;
|
||||||
|
db: ProfileDB;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
created_at: any;
|
created_at: any;
|
||||||
// Go type: time
|
// Go type: time
|
||||||
@@ -1693,6 +2387,7 @@ export namespace profile {
|
|||||||
this.tx_pwr = source["tx_pwr"];
|
this.tx_pwr = source["tx_pwr"];
|
||||||
this.is_active = source["is_active"];
|
this.is_active = source["is_active"];
|
||||||
this.sort_order = source["sort_order"];
|
this.sort_order = source["sort_order"];
|
||||||
|
this.db = this.convertValues(source["db"], ProfileDB);
|
||||||
this.created_at = this.convertValues(source["created_at"], null);
|
this.created_at = this.convertValues(source["created_at"], null);
|
||||||
this.updated_at = this.convertValues(source["updated_at"], null);
|
this.updated_at = this.convertValues(source["updated_at"], null);
|
||||||
}
|
}
|
||||||
@@ -1752,6 +2447,8 @@ export namespace qslcard {
|
|||||||
grunge?: number;
|
grunge?: number;
|
||||||
bevel?: number;
|
bevel?: number;
|
||||||
seed?: number;
|
seed?: number;
|
||||||
|
dark?: string;
|
||||||
|
outer?: string;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new FxParams(source);
|
return new FxParams(source);
|
||||||
@@ -1772,6 +2469,8 @@ export namespace qslcard {
|
|||||||
this.grunge = source["grunge"];
|
this.grunge = source["grunge"];
|
||||||
this.bevel = source["bevel"];
|
this.bevel = source["bevel"];
|
||||||
this.seed = source["seed"];
|
this.seed = source["seed"];
|
||||||
|
this.dark = source["dark"];
|
||||||
|
this.outer = source["outer"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class Halo {
|
export class Halo {
|
||||||
@@ -2269,30 +2968,6 @@ export namespace qso {
|
|||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class UploadRow {
|
|
||||||
id: number;
|
|
||||||
qso_date: string;
|
|
||||||
callsign: string;
|
|
||||||
band: string;
|
|
||||||
mode: string;
|
|
||||||
country: string;
|
|
||||||
status: string;
|
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
|
||||||
return new UploadRow(source);
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(source: any = {}) {
|
|
||||||
if ('string' === typeof source) source = JSON.parse(source);
|
|
||||||
this.id = source["id"];
|
|
||||||
this.qso_date = source["qso_date"];
|
|
||||||
this.callsign = source["callsign"];
|
|
||||||
this.band = source["band"];
|
|
||||||
this.mode = source["mode"];
|
|
||||||
this.country = source["country"];
|
|
||||||
this.status = source["status"];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
export class WorkedBefore {
|
export class WorkedBefore {
|
||||||
callsign: string;
|
callsign: string;
|
||||||
count: number;
|
count: number;
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ go 1.25.0
|
|||||||
require (
|
require (
|
||||||
github.com/braheezy/shine-mp3 v0.1.0
|
github.com/braheezy/shine-mp3 v0.1.0
|
||||||
github.com/go-ole/go-ole v1.3.0
|
github.com/go-ole/go-ole v1.3.0
|
||||||
|
github.com/go-sql-driver/mysql v1.10.0
|
||||||
|
github.com/gorilla/websocket v1.5.3
|
||||||
github.com/moutend/go-wca v0.3.0
|
github.com/moutend/go-wca v0.3.0
|
||||||
github.com/wailsapp/wails/v2 v2.11.0
|
github.com/wailsapp/wails/v2 v2.11.0
|
||||||
github.com/wneessen/go-mail v0.7.3
|
github.com/wneessen/go-mail v0.7.3
|
||||||
@@ -16,11 +18,11 @@ require (
|
|||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
filippo.io/edwards25519 v1.2.0 // indirect
|
||||||
github.com/bep/debounce v1.2.1 // indirect
|
github.com/bep/debounce v1.2.1 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
github.com/godbus/dbus/v5 v5.1.0 // indirect
|
||||||
github.com/google/uuid v1.6.0 // indirect
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/gorilla/websocket v1.5.3 // indirect
|
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
|
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
|
||||||
github.com/labstack/echo/v4 v4.13.3 // indirect
|
github.com/labstack/echo/v4 v4.13.3 // indirect
|
||||||
github.com/labstack/gommon v0.4.2 // indirect
|
github.com/labstack/gommon v0.4.2 // indirect
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
|
||||||
|
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
|
||||||
github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
|
github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
|
||||||
github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
|
github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
|
||||||
github.com/braheezy/shine-mp3 v0.1.0 h1:N2wZhv6ipCFduTSftaPNdDgZ5xFmQAPvB7JcqA4sSi8=
|
github.com/braheezy/shine-mp3 v0.1.0 h1:N2wZhv6ipCFduTSftaPNdDgZ5xFmQAPvB7JcqA4sSi8=
|
||||||
@@ -9,6 +11,8 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
|
|||||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
||||||
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
|
||||||
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
|
||||||
|
github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw=
|
||||||
|
github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
|
||||||
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
||||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
||||||
|
|||||||
@@ -120,6 +120,25 @@ func SingleRecordADIF(q qso.QSO) string {
|
|||||||
return b.String()
|
return b.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BatchRecordsADIF wraps already-serialised records (each terminated by <EOR>,
|
||||||
|
// e.g. from SingleRecordADIF) in a minimal ADIF document with a standard
|
||||||
|
// header. Used by file-based batch upload APIs such as Club Log's putlogs.php.
|
||||||
|
func BatchRecordsADIF(records []string) string {
|
||||||
|
var b strings.Builder
|
||||||
|
now := time.Now().UTC().Format("20060102 150405")
|
||||||
|
fmt.Fprintf(&b, "<ADIF_VER:%d>%s <PROGRAMID:6>OpsLog <CREATED_TIMESTAMP:15>%s <EOH>\n\n",
|
||||||
|
len(adifVersion), adifVersion, now)
|
||||||
|
for _, r := range records {
|
||||||
|
r = strings.TrimRight(r, "\r\n")
|
||||||
|
if r == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
b.WriteString(r)
|
||||||
|
b.WriteString("\n")
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
// writeRecord serialises one QSO as ADIF tags terminated by <EOR>.
|
// writeRecord serialises one QSO as ADIF tags terminated by <EOR>.
|
||||||
// Empty fields are omitted. MODE/SUBMODE are massaged so a "promoted"
|
// Empty fields are omitted. MODE/SUBMODE are massaged so a "promoted"
|
||||||
// mode (e.g. FT4 stored without a parent) is exported as the canonical
|
// mode (e.g. FT4 stored without a parent) is exported as the canonical
|
||||||
|
|||||||
@@ -0,0 +1,309 @@
|
|||||||
|
// Package alerts evaluates incoming DX-cluster spots against user-defined rules
|
||||||
|
// and reports which rules fire, so the app can notify the operator (sound /
|
||||||
|
// visual / e-mail) when a wanted station is spotted — like Log4OM's Alert
|
||||||
|
// Management. Rules are persisted as JSON (global, machine-local).
|
||||||
|
package alerts
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"os"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Rule is one alert definition. Every filter dimension is optional: an empty
|
||||||
|
// list/string matches ANY value, and the dimensions are ANDed together, so a
|
||||||
|
// rule with Countries=[France] and Bands=[20m] fires only for French stations
|
||||||
|
// on 20m. Calls / SpotterCall accept wildcards (IW3*, */P).
|
||||||
|
type Rule struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
|
||||||
|
// DX filters.
|
||||||
|
Calls []string `json:"calls,omitempty"` // wildcard patterns on the DX call
|
||||||
|
Countries []string `json:"countries,omitempty"` // DXCC entity names
|
||||||
|
Continents []string `json:"continents,omitempty"` // AF/AN/AS/EU/NA/OC/SA
|
||||||
|
|
||||||
|
// Band / mode filters.
|
||||||
|
Bands []string `json:"bands,omitempty"`
|
||||||
|
Modes []string `json:"modes,omitempty"`
|
||||||
|
|
||||||
|
// Spotter (origin) filters.
|
||||||
|
SpotterCall string `json:"spotter_call,omitempty"` // wildcard
|
||||||
|
SpotterContinents []string `json:"spotter_continents,omitempty"`
|
||||||
|
SpotterCountries []string `json:"spotter_countries,omitempty"`
|
||||||
|
|
||||||
|
// Actions.
|
||||||
|
Sound bool `json:"sound"`
|
||||||
|
Visual bool `json:"visual"`
|
||||||
|
Email bool `json:"email"`
|
||||||
|
|
||||||
|
// Throttling: minutes to wait before re-alerting the same callsign. 0 = only
|
||||||
|
// once per session, -1 = always, >0 = that many minutes.
|
||||||
|
AgainAfterMin int `json:"again_after_min"`
|
||||||
|
|
||||||
|
// Skip a spot whose DX call is already worked on this band+mode.
|
||||||
|
SkipWorked bool `json:"skip_worked"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spot is the subset of a cluster spot the engine matches against.
|
||||||
|
type Spot struct {
|
||||||
|
DXCall string
|
||||||
|
Band string
|
||||||
|
Mode string // inferred (see InferMode)
|
||||||
|
Country string // DXCC entity name
|
||||||
|
Continent string
|
||||||
|
Spotter string
|
||||||
|
SpotterCountry string
|
||||||
|
SpotterContinent string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store persists the rule set as a JSON file.
|
||||||
|
type Store struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
path string
|
||||||
|
rules []Rule
|
||||||
|
// last fired time per (ruleID|call), for the AgainAfter throttle.
|
||||||
|
lastFired map[string]time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open loads the store (empty when the file is absent).
|
||||||
|
func Open(path string) (*Store, error) {
|
||||||
|
s := &Store{path: path, lastFired: map[string]time.Time{}}
|
||||||
|
b, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(b) > 0 {
|
||||||
|
_ = json.Unmarshal(b, &s.rules) // corrupt file → start empty
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Store) save() error {
|
||||||
|
b, err := json.MarshalIndent(s.rules, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tmp := s.path + ".tmp"
|
||||||
|
if err := os.WriteFile(tmp, b, 0o644); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return os.Rename(tmp, s.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
// List returns a copy of all rules.
|
||||||
|
func (s *Store) List() []Rule {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
out := make([]Rule, len(s.rules))
|
||||||
|
copy(out, s.rules)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func newID() string { return strconv.FormatInt(time.Now().UnixNano(), 36) }
|
||||||
|
|
||||||
|
// Save upserts a rule (creating an id when empty) and returns it.
|
||||||
|
func (s *Store) Save(r Rule) (Rule, error) {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
if strings.TrimSpace(r.ID) == "" {
|
||||||
|
r.ID = newID()
|
||||||
|
s.rules = append(s.rules, r)
|
||||||
|
} else {
|
||||||
|
found := false
|
||||||
|
for i := range s.rules {
|
||||||
|
if s.rules[i].ID == r.ID {
|
||||||
|
s.rules[i] = r
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
s.rules = append(s.rules, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return r, s.save()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete removes a rule by id.
|
||||||
|
func (s *Store) Delete(id string) error {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
for i := range s.rules {
|
||||||
|
if s.rules[i].ID == id {
|
||||||
|
s.rules = append(s.rules[:i], s.rules[i+1:]...)
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match is a rule that fired for a spot (returned by Evaluate).
|
||||||
|
type Match struct {
|
||||||
|
Rule Rule
|
||||||
|
Spot Spot
|
||||||
|
}
|
||||||
|
|
||||||
|
// Evaluate returns every enabled rule that matches the spot AND isn't currently
|
||||||
|
// throttled. It records the fire time for matched rules so the AgainAfter window
|
||||||
|
// is honoured. workedFn (may be nil) reports whether the DX call is already
|
||||||
|
// worked on this band+mode — used by rules with SkipWorked.
|
||||||
|
func (s *Store) Evaluate(sp Spot, now time.Time, workedFn func(call, band, mode string) bool) []Match {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
var out []Match
|
||||||
|
for _, r := range s.rules {
|
||||||
|
if !r.Enabled || !ruleMatches(r, sp) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if r.SkipWorked && workedFn != nil && workedFn(sp.DXCall, sp.Band, sp.Mode) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
key := r.ID + "|" + strings.ToUpper(sp.DXCall)
|
||||||
|
if r.AgainAfterMin >= 0 {
|
||||||
|
last, seen := s.lastFired[key]
|
||||||
|
if seen {
|
||||||
|
if r.AgainAfterMin == 0 {
|
||||||
|
continue // once per session
|
||||||
|
}
|
||||||
|
if now.Sub(last) < time.Duration(r.AgainAfterMin)*time.Minute {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s.lastFired[key] = now
|
||||||
|
out = append(out, Match{Rule: r, Spot: sp})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// ruleMatches reports whether every specified filter dimension matches the spot.
|
||||||
|
func ruleMatches(r Rule, sp Spot) bool {
|
||||||
|
if len(r.Calls) > 0 && !anyWildcard(r.Calls, sp.DXCall) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(r.Countries) > 0 && !containsFold(r.Countries, sp.Country) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(r.Continents) > 0 && !containsFold(r.Continents, sp.Continent) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(r.Bands) > 0 && !containsFold(r.Bands, sp.Band) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(r.Modes) > 0 && !containsFold(r.Modes, sp.Mode) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(r.SpotterCall) != "" && !matchWildcard(r.SpotterCall, sp.Spotter) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(r.SpotterContinents) > 0 && !containsFold(r.SpotterContinents, sp.SpotterContinent) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(r.SpotterCountries) > 0 && !containsFold(r.SpotterCountries, sp.SpotterCountry) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func containsFold(list []string, v string) bool {
|
||||||
|
v = strings.TrimSpace(v)
|
||||||
|
if v == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, x := range list {
|
||||||
|
if strings.EqualFold(strings.TrimSpace(x), v) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func anyWildcard(patterns []string, v string) bool {
|
||||||
|
for _, p := range patterns {
|
||||||
|
if matchWildcard(p, v) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// matchWildcard does a case-insensitive full-string match where '*' matches any
|
||||||
|
// run of characters and '?' matches one (e.g. "IW3*", "*/P", "F?BPO").
|
||||||
|
func matchWildcard(pattern, v string) bool {
|
||||||
|
pattern = strings.TrimSpace(pattern)
|
||||||
|
v = strings.TrimSpace(v)
|
||||||
|
if pattern == "" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("(?i)^")
|
||||||
|
for _, r := range pattern {
|
||||||
|
switch r {
|
||||||
|
case '*':
|
||||||
|
b.WriteString(".*")
|
||||||
|
case '?':
|
||||||
|
b.WriteString(".")
|
||||||
|
default:
|
||||||
|
b.WriteString(regexp.QuoteMeta(string(r)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b.WriteString("$")
|
||||||
|
re, err := regexp.Compile(b.String())
|
||||||
|
if err != nil {
|
||||||
|
return strings.EqualFold(pattern, v)
|
||||||
|
}
|
||||||
|
return re.MatchString(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InferMode guesses a spot's mode from its comment and frequency. Cluster spots
|
||||||
|
// don't carry a mode field, so we read common tags (FT8/FT4/CW/RTTY/…) then fall
|
||||||
|
// back to the digital watering holes and the band-plan CW/phone split.
|
||||||
|
func InferMode(comment string, freqHz int64) string {
|
||||||
|
c := strings.ToUpper(comment)
|
||||||
|
switch {
|
||||||
|
case strings.Contains(c, "FT8"):
|
||||||
|
return "FT8"
|
||||||
|
case strings.Contains(c, "FT4"):
|
||||||
|
return "FT4"
|
||||||
|
case strings.Contains(c, "RTTY"):
|
||||||
|
return "RTTY"
|
||||||
|
case strings.Contains(c, "PSK"):
|
||||||
|
return "PSK"
|
||||||
|
case strings.Contains(c, "JS8"):
|
||||||
|
return "JS8"
|
||||||
|
case strings.Contains(c, "CW"):
|
||||||
|
return "CW"
|
||||||
|
case strings.Contains(c, "SSB") || strings.Contains(c, "USB") || strings.Contains(c, "LSB") || strings.Contains(c, "PH"):
|
||||||
|
return "SSB"
|
||||||
|
}
|
||||||
|
khz := float64(freqHz) / 1000
|
||||||
|
// FT8 watering holes (…074) and FT4 (…080/…140) as a fallback.
|
||||||
|
for _, f := range []float64{1840, 3573, 7074, 10136, 14074, 18100, 21074, 24915, 28074, 50313} {
|
||||||
|
if khz >= f-1 && khz <= f+3 {
|
||||||
|
return "FT8"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Band-plan CW segments (bottom of each band).
|
||||||
|
switch {
|
||||||
|
case khz >= 1810 && khz <= 1840,
|
||||||
|
khz >= 3500 && khz <= 3570,
|
||||||
|
khz >= 7000 && khz <= 7040,
|
||||||
|
khz >= 10100 && khz <= 10130,
|
||||||
|
khz >= 14000 && khz <= 14070,
|
||||||
|
khz >= 18068 && khz <= 18095,
|
||||||
|
khz >= 21000 && khz <= 21070,
|
||||||
|
khz >= 24890 && khz <= 24910,
|
||||||
|
khz >= 28000 && khz <= 28070:
|
||||||
|
return "CW"
|
||||||
|
}
|
||||||
|
return "SSB"
|
||||||
|
}
|
||||||
@@ -0,0 +1,369 @@
|
|||||||
|
// Package antgenius drives a 4O3A Antenna Genius switch over its v4 TCP/IP
|
||||||
|
// text API (default port 9007). On connect the device sends a banner line
|
||||||
|
// (e.g. "V4.1.16 AG"); commands are "C<seq>|<command>\r" and the device replies
|
||||||
|
// with "R<seq>|<hex>|<message>" (hex "0" = success) plus asynchronous
|
||||||
|
// "S<0>|<message>" status pushes once you subscribe with "sub port/antenna".
|
||||||
|
//
|
||||||
|
// (The older "GSCP" binary-ish framing documented at gscp.arula.rs is only used
|
||||||
|
// by pre-v4 firmware and is NOT what v4 speaks.)
|
||||||
|
package antgenius
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultPort = 9007
|
||||||
|
dialTimeout = 5 * time.Second
|
||||||
|
writeTimeout = 3 * time.Second
|
||||||
|
readIdleTimeout = 12 * time.Second // no data for this long → assume the link is dead
|
||||||
|
keepaliveEvery = 3 * time.Second // periodic "port get" refreshes state + keeps the link alive
|
||||||
|
reconnectDelay = 2 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
// Antenna is one configured antenna (index + name as stored on the device).
|
||||||
|
type Antenna struct {
|
||||||
|
Index int `json:"index"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status is the snapshot the UI renders.
|
||||||
|
type Status struct {
|
||||||
|
Connected bool `json:"connected"`
|
||||||
|
Host string `json:"host,omitempty"`
|
||||||
|
LastError string `json:"last_error,omitempty"`
|
||||||
|
PortA int `json:"port_a"` // active antenna index on port A (0 = none)
|
||||||
|
PortB int `json:"port_b"` // active antenna index on port B
|
||||||
|
TxA bool `json:"tx_a"` // port A is transmitting
|
||||||
|
TxB bool `json:"tx_b"` // port B is transmitting
|
||||||
|
Antennas []Antenna `json:"antennas"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Client struct {
|
||||||
|
host string
|
||||||
|
port int
|
||||||
|
|
||||||
|
mu sync.Mutex // guards conn + writes
|
||||||
|
conn net.Conn
|
||||||
|
|
||||||
|
statusMu sync.RWMutex
|
||||||
|
status Status
|
||||||
|
antennas map[int]string // index → name (rebuilt into status.Antennas)
|
||||||
|
|
||||||
|
stop chan struct{}
|
||||||
|
running bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(host string, port int) *Client {
|
||||||
|
if port <= 0 || port > 65535 {
|
||||||
|
port = defaultPort
|
||||||
|
}
|
||||||
|
return &Client{
|
||||||
|
host: host,
|
||||||
|
port: port,
|
||||||
|
stop: make(chan struct{}),
|
||||||
|
antennas: map[int]string{},
|
||||||
|
status: Status{Host: host},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Start() error {
|
||||||
|
c.running = true
|
||||||
|
go c.runLoop()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Stop() {
|
||||||
|
if !c.running {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.running = false
|
||||||
|
close(c.stop)
|
||||||
|
c.mu.Lock()
|
||||||
|
if c.conn != nil {
|
||||||
|
c.conn.Close()
|
||||||
|
c.conn = nil
|
||||||
|
}
|
||||||
|
c.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) GetStatus() Status {
|
||||||
|
c.statusMu.RLock()
|
||||||
|
defer c.statusMu.RUnlock()
|
||||||
|
return c.status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) setStatus(fn func(*Status)) {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
fn(&c.status)
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Activate selects antenna on a port (1 = A, 2 = B). antenna 0 deselects (sets
|
||||||
|
// the port to "None"). We set both RX and TX antennas and force manual mode so
|
||||||
|
// the choice sticks regardless of the device's auto band-following.
|
||||||
|
func (c *Client) Activate(port, antenna int) error {
|
||||||
|
if port != 1 && port != 2 {
|
||||||
|
return fmt.Errorf("antgenius: invalid port %d (1=A, 2=B)", port)
|
||||||
|
}
|
||||||
|
if antenna < 0 {
|
||||||
|
return fmt.Errorf("antgenius: invalid antenna %d", antenna)
|
||||||
|
}
|
||||||
|
// Set only rxant (like the reference ShackMaster client): the AG mirrors it
|
||||||
|
// to the TX antenna automatically. Forcing txant too can be rejected on the
|
||||||
|
// 8x2 (an antenna can't be TX on both ports at once), which broke port-B
|
||||||
|
// selection and deselection.
|
||||||
|
if err := c.send(fmt.Sprintf("port set %d rxant=%d", port, antenna)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Ask for the new port state so the snapshot reflects it promptly (the
|
||||||
|
// subscription also pushes it, but this makes the change deterministic).
|
||||||
|
_ = c.send(fmt.Sprintf("port get %d", port))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) runLoop() {
|
||||||
|
for {
|
||||||
|
if !c.running {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
conn, err := net.DialTimeout("tcp", net.JoinHostPort(c.host, strconv.Itoa(c.port)), dialTimeout)
|
||||||
|
if err != nil {
|
||||||
|
c.setStatus(func(s *Status) { s.Connected = false; s.LastError = "dial: " + err.Error() })
|
||||||
|
if c.sleep(reconnectDelay) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
c.mu.Lock()
|
||||||
|
c.conn = conn
|
||||||
|
c.mu.Unlock()
|
||||||
|
c.setStatus(func(s *Status) { s.Connected = true; s.LastError = ""; s.Host = c.host })
|
||||||
|
|
||||||
|
// Subscribe to live updates and pull the initial state. Command set and
|
||||||
|
// order mirror a known-working Node-RED v4 client (WA9WUD).
|
||||||
|
_ = c.send("antenna list")
|
||||||
|
_ = c.send("sub port all")
|
||||||
|
_ = c.send("port get 1")
|
||||||
|
_ = c.send("port get 2")
|
||||||
|
|
||||||
|
done := make(chan struct{})
|
||||||
|
go c.keepalive(conn, done)
|
||||||
|
err = c.readLoop(conn) // blocks until the link errors
|
||||||
|
close(done)
|
||||||
|
|
||||||
|
c.mu.Lock()
|
||||||
|
if c.conn == conn {
|
||||||
|
c.conn = nil
|
||||||
|
}
|
||||||
|
c.mu.Unlock()
|
||||||
|
conn.Close()
|
||||||
|
c.setStatus(func(s *Status) {
|
||||||
|
s.Connected = false
|
||||||
|
if err != nil {
|
||||||
|
s.LastError = "read: " + err.Error()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if c.sleep(reconnectDelay) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// keepalive periodically re-reads a port so an idle-but-dead link is detected
|
||||||
|
// (the read loop's idle timeout fires if these stop producing replies).
|
||||||
|
func (c *Client) keepalive(conn net.Conn, done chan struct{}) {
|
||||||
|
t := time.NewTicker(keepaliveEvery)
|
||||||
|
defer t.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
return
|
||||||
|
case <-c.stop:
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
_ = c.send("port get 1")
|
||||||
|
_ = c.send("port get 2")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) readLoop(conn net.Conn) error {
|
||||||
|
r := bufio.NewReader(conn)
|
||||||
|
var sb strings.Builder
|
||||||
|
for {
|
||||||
|
_ = conn.SetReadDeadline(time.Now().Add(readIdleTimeout))
|
||||||
|
b, err := r.ReadByte()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if b == '\r' || b == '\n' {
|
||||||
|
if sb.Len() > 0 {
|
||||||
|
c.handleLine(sb.String())
|
||||||
|
sb.Reset()
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
sb.WriteByte(b)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// send writes a "C<seq>|<command>\r" line to the device.
|
||||||
|
func (c *Client) send(command string) error {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
if c.conn == nil {
|
||||||
|
return fmt.Errorf("antgenius: not connected")
|
||||||
|
}
|
||||||
|
_ = c.conn.SetWriteDeadline(time.Now().Add(writeTimeout))
|
||||||
|
// The device only accepts the constant "C1|" sequence prefix for every
|
||||||
|
// command (using incrementing sequence numbers makes it drop the link);
|
||||||
|
// commands are LF-terminated.
|
||||||
|
_, err := fmt.Fprintf(c.conn, "C1|%s\n", command)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleLine parses one response/status/banner line and updates the snapshot.
|
||||||
|
func (c *Client) handleLine(line string) {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if line == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Banner like "V4.1.16 AG" — just confirms the link is up.
|
||||||
|
if line[0] == 'V' && strings.Contains(line, "AG") {
|
||||||
|
c.setStatus(func(s *Status) { s.Connected = true; s.LastError = "" })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// R<seq>|<hex>|<message> or S<seq>|<message>
|
||||||
|
var msg string
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(line, "R"):
|
||||||
|
p := strings.SplitN(line, "|", 3)
|
||||||
|
if len(p) == 3 {
|
||||||
|
msg = p[2]
|
||||||
|
}
|
||||||
|
case strings.HasPrefix(line, "S"):
|
||||||
|
p := strings.SplitN(line, "|", 2)
|
||||||
|
if len(p) == 2 {
|
||||||
|
msg = p[1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
msg = strings.TrimSpace(msg)
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(msg, "antenna "):
|
||||||
|
c.parseAntenna(msg)
|
||||||
|
case strings.HasPrefix(msg, "port "):
|
||||||
|
c.parsePort(msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseAntenna handles "antenna <id> name=<name> tx=.. rx=.. inband=..".
|
||||||
|
// The name may contain spaces, so it's extracted up to the " tx=" field.
|
||||||
|
func (c *Client) parseAntenna(msg string) {
|
||||||
|
fields := strings.Fields(msg)
|
||||||
|
if len(fields) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, err := strconv.Atoi(fields[1])
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name := ""
|
||||||
|
if i := strings.Index(msg, "name="); i >= 0 {
|
||||||
|
name = msg[i+len("name="):]
|
||||||
|
if j := strings.Index(name, " tx="); j >= 0 {
|
||||||
|
name = name[:j]
|
||||||
|
}
|
||||||
|
// The device stores spaces as underscores in names.
|
||||||
|
name = strings.TrimSpace(strings.ReplaceAll(name, "_", " "))
|
||||||
|
}
|
||||||
|
c.statusMu.Lock()
|
||||||
|
if name != "" && !isPlaceholderName(name) {
|
||||||
|
c.antennas[id] = name
|
||||||
|
} else {
|
||||||
|
delete(c.antennas, id) // unconfigured slot ("Antenna 4", etc.) → not shown
|
||||||
|
}
|
||||||
|
c.status.Antennas = sortedAntennas(c.antennas)
|
||||||
|
c.status.Connected = true
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// parsePort handles "port <id> ... rxant=<n> txant=<n> ...". The active antenna
|
||||||
|
// shown is the TX antenna, falling back to the RX antenna when TX is none.
|
||||||
|
func (c *Client) parsePort(msg string) {
|
||||||
|
fields := strings.Fields(msg)
|
||||||
|
if len(fields) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, err := strconv.Atoi(fields[1])
|
||||||
|
if err != nil || (id != 1 && id != 2) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tx := kvInt(msg, "txant")
|
||||||
|
rx := kvInt(msg, "rxant")
|
||||||
|
active := tx
|
||||||
|
if active == 0 {
|
||||||
|
active = rx
|
||||||
|
}
|
||||||
|
txOn := kvInt(msg, "tx") != 0 // the standalone "tx=0|1" transmit flag
|
||||||
|
c.setStatus(func(s *Status) {
|
||||||
|
s.Connected = true
|
||||||
|
if id == 1 {
|
||||||
|
s.PortA, s.TxA = active, txOn
|
||||||
|
} else {
|
||||||
|
s.PortB, s.TxB = active, txOn
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) sleep(d time.Duration) (stopped bool) {
|
||||||
|
select {
|
||||||
|
case <-c.stop:
|
||||||
|
return true
|
||||||
|
case <-time.After(d):
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// kvInt extracts the integer value of a "key=<int>" token from a space-
|
||||||
|
// separated string (returns 0 if absent).
|
||||||
|
func kvInt(s, key string) int {
|
||||||
|
i := strings.Index(s, key+"=")
|
||||||
|
if i < 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
v := s[i+len(key)+1:]
|
||||||
|
if sp := strings.IndexByte(v, ' '); sp >= 0 {
|
||||||
|
v = v[:sp]
|
||||||
|
}
|
||||||
|
n, _ := strconv.Atoi(strings.TrimSpace(v))
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
|
||||||
|
// isPlaceholderName reports whether name is an unconfigured-slot default like
|
||||||
|
// "Antenna 4" / "antenna_5" (after underscores become spaces): the word
|
||||||
|
// "antenna" followed by a number, which the UI shouldn't list.
|
||||||
|
func isPlaceholderName(name string) bool {
|
||||||
|
f := strings.Fields(strings.ToLower(name))
|
||||||
|
if len(f) != 2 || f[0] != "antenna" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
_, err := strconv.Atoi(f[1])
|
||||||
|
return err == nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func sortedAntennas(m map[int]string) []Antenna {
|
||||||
|
out := make([]Antenna, 0, len(m))
|
||||||
|
for idx, name := range m {
|
||||||
|
out = append(out, Antenna{Index: idx, Name: name})
|
||||||
|
}
|
||||||
|
sort.Slice(out, func(i, j int) bool { return out[i].Index < out[j].Index })
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package antgenius
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestHandleAntennaList(t *testing.T) {
|
||||||
|
c := New("x", 9007)
|
||||||
|
// Names may contain spaces — must be captured up to " tx=".
|
||||||
|
c.handleLine("R3|0|antenna 1 name=UB VL2.3 tx=ffff rx=ffff inband=0000")
|
||||||
|
c.handleLine("R3|0|antenna 2 name=DX Commander tx=00ff rx=00ff inband=0000")
|
||||||
|
st := c.GetStatus()
|
||||||
|
if len(st.Antennas) != 2 {
|
||||||
|
t.Fatalf("got %d antennas, want 2: %+v", len(st.Antennas), st.Antennas)
|
||||||
|
}
|
||||||
|
if st.Antennas[0].Index != 1 || st.Antennas[0].Name != "UB VL2.3" {
|
||||||
|
t.Errorf("antenna 1 = %+v", st.Antennas[0])
|
||||||
|
}
|
||||||
|
if st.Antennas[1].Name != "DX Commander" {
|
||||||
|
t.Errorf("antenna 2 name = %q", st.Antennas[1].Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAntennaUnderscoreAndPlaceholder(t *testing.T) {
|
||||||
|
c := New("x", 9007)
|
||||||
|
c.handleLine("R3|0|antenna 1 name=Hex_Beam tx=ffff rx=ffff inband=0000") // underscore → space
|
||||||
|
c.handleLine("R3|0|antenna 4 name=Antenna_4 tx=0000 rx=0000 inband=0000") // default → filtered
|
||||||
|
c.handleLine("R3|0|antenna 5 name=antenna 5 tx=0000 rx=0000 inband=0000") // default → filtered
|
||||||
|
st := c.GetStatus()
|
||||||
|
if len(st.Antennas) != 1 || st.Antennas[0].Name != "Hex Beam" {
|
||||||
|
t.Fatalf("want only [Hex Beam], got %+v", st.Antennas)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandlePortStatus(t *testing.T) {
|
||||||
|
c := New("x", 9007)
|
||||||
|
// Async push after "sub port all": active antenna is txant (fallback rxant).
|
||||||
|
c.handleLine("S0|port 1 source=MANUAL band=6 rxant=2 txant=2 inband=0 inhibit=0")
|
||||||
|
c.handleLine("S0|port 2 source=AUTO band=0 rxant=0 txant=0 inband=0 inhibit=0")
|
||||||
|
st := c.GetStatus()
|
||||||
|
if st.PortA != 2 {
|
||||||
|
t.Errorf("PortA = %d, want 2", st.PortA)
|
||||||
|
}
|
||||||
|
if st.PortB != 0 {
|
||||||
|
t.Errorf("PortB = %d, want 0 (none)", st.PortB)
|
||||||
|
}
|
||||||
|
// A "port get" reply (R-line) must parse the same way.
|
||||||
|
c.handleLine("R15|0|port 2 source=MANUAL band=3 rxant=5 txant=5 inband=0 inhibit=0")
|
||||||
|
if st = c.GetStatus(); st.PortB != 5 {
|
||||||
|
t.Errorf("PortB after port get = %d, want 5", st.PortB)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPortTxFallbackToRx(t *testing.T) {
|
||||||
|
c := New("x", 9007)
|
||||||
|
c.handleLine("S0|port 1 source=MANUAL band=6 rxant=3 txant=0 inband=0 inhibit=0")
|
||||||
|
if st := c.GetStatus(); st.PortA != 3 {
|
||||||
|
t.Errorf("PortA = %d, want 3 (rx fallback when tx=0)", st.PortA)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKvInt(t *testing.T) {
|
||||||
|
s := "port 1 source=MANUAL band=6 rxant=2 txant=7 inhibit=0"
|
||||||
|
if v := kvInt(s, "txant"); v != 7 {
|
||||||
|
t.Errorf("txant = %d, want 7", v)
|
||||||
|
}
|
||||||
|
if v := kvInt(s, "rxant"); v != 2 {
|
||||||
|
t.Errorf("rxant = %d, want 2", v)
|
||||||
|
}
|
||||||
|
if v := kvInt(s, "missing"); v != 0 {
|
||||||
|
t.Errorf("missing = %d, want 0", v)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -11,14 +11,16 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime/debug"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
file *os.File
|
file *os.File
|
||||||
path string
|
path string
|
||||||
|
crashFile *os.File // kept open so the runtime can write a crash traceback to it
|
||||||
)
|
)
|
||||||
|
|
||||||
// Init opens (creates) the log file in dataDir. On rotation we truncate
|
// Init opens (creates) the log file in dataDir. On rotation we truncate
|
||||||
@@ -57,6 +59,17 @@ func Init(dataDir string) (string, error) {
|
|||||||
file = f
|
file = f
|
||||||
path = logPath
|
path = logPath
|
||||||
|
|
||||||
|
// Capture a full traceback on a FATAL crash (a Go panic that escapes our
|
||||||
|
// recover()s, or a runtime-fatal error like a concurrent map write, or a
|
||||||
|
// Windows access violation routed through the Go signal handler) into a
|
||||||
|
// dedicated file the runtime writes directly — so otherwise-silent process
|
||||||
|
// deaths leave a stack we can read.
|
||||||
|
if cf, cerr := os.OpenFile(filepath.Join(dataDir, "opslog-crash.log"),
|
||||||
|
os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0o644); cerr == nil {
|
||||||
|
crashFile = cf
|
||||||
|
_ = debug.SetCrashOutput(cf, debug.CrashOptions{})
|
||||||
|
}
|
||||||
|
|
||||||
// Redirect log.Print* and the standard logger to the file too, so
|
// Redirect log.Print* and the standard logger to the file too, so
|
||||||
// any third-party output stays consistent.
|
// any third-party output stays consistent.
|
||||||
log.SetOutput(io.MultiWriter(file, os.Stderr))
|
log.SetOutput(io.MultiWriter(file, os.Stderr))
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package audio
|
||||||
|
|
||||||
|
// SampleRate is the fixed capture rate (mono 16-bit PCM). Exported so consumers
|
||||||
|
// like the CW decoder can configure their DSP to match.
|
||||||
|
const SampleRate = sampleRate
|
||||||
|
|
||||||
|
// StreamCapture captures from deviceID and calls onSamples with mono 16-bit PCM
|
||||||
|
// frames (as int16) until stop closes. A thin wrapper over the internal capture
|
||||||
|
// loop for live consumers (the CW decoder) that want samples, not raw bytes.
|
||||||
|
func StreamCapture(deviceID string, stop <-chan struct{}, onSamples func([]int16)) error {
|
||||||
|
return captureStream(deviceID, stop, func(chunk []byte) {
|
||||||
|
if len(chunk) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
onSamples(bytesToInt16(chunk))
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -32,6 +32,20 @@ func writeMP3(path string, pcm []byte) error {
|
|||||||
for i, v := range mono32 {
|
for i, v := range mono32 {
|
||||||
stereo[2*i], stereo[2*i+1] = v, v
|
stereo[2*i], stereo[2*i+1] = v, v
|
||||||
}
|
}
|
||||||
|
// Shine's Write() reads a WHOLE frame (samplesPerPass × channels = 1152 × 2 =
|
||||||
|
// 2304 interleaved samples for MPEG-1) per pass via unsafe pointer arithmetic,
|
||||||
|
// regardless of how short the trailing chunk is. If the buffer isn't an exact
|
||||||
|
// multiple of a frame, the final pass reads past the slice and the process
|
||||||
|
// dies with an access violation (0xc0000005) inside windowFilterSubband.
|
||||||
|
// Pad with trailing silence to a whole number of frames so no partial pass
|
||||||
|
// exists. (~36 ms of silence at most — inaudible.)
|
||||||
|
const frameInterleaved = 1152 * 2 // samplesPerPass(MPEG-1) × 2 channels
|
||||||
|
if rem := len(stereo) % frameInterleaved; rem != 0 {
|
||||||
|
stereo = append(stereo, make([]int16, frameInterleaved-rem)...)
|
||||||
|
}
|
||||||
|
if len(stereo) == 0 {
|
||||||
|
return nil // nothing to encode (empty recording)
|
||||||
|
}
|
||||||
enc := mp3.NewEncoder(mp3Rate, 2)
|
enc := mp3.NewEncoder(mp3Rate, 2)
|
||||||
return enc.Write(f, stereo)
|
return enc.Write(f, stereo)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,26 @@ package audio
|
|||||||
import (
|
import (
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"runtime/debug"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// LogSink receives audio-subsystem diagnostics (set to applog.Printf at startup).
|
||||||
|
// Defaults to a no-op so the package is usable without wiring.
|
||||||
|
var LogSink = func(string, ...any) {}
|
||||||
|
|
||||||
|
// recoverGoroutine turns a panic in a long-running audio goroutine into a logged
|
||||||
|
// event with a stack trace instead of a silent process-killing crash. (It can't
|
||||||
|
// catch a hard Windows access violation from the WASAPI layer — those are fatal
|
||||||
|
// — but it catches any Go-level panic in capture/mix.)
|
||||||
|
func recoverGoroutine(what string) {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
LogSink("audio: PANIC in %s: %v\n%s", what, r, debug.Stack())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Recorder continuously captures audio into a rolling pre-roll buffer so a QSO
|
// Recorder continuously captures audio into a rolling pre-roll buffer so a QSO
|
||||||
// recording can begin a few seconds BEFORE the operator entered the callsign.
|
// recording can begin a few seconds BEFORE the operator entered the callsign.
|
||||||
// It optionally mixes two sources (the rig RX "From Radio" + your mic) into a
|
// It optionally mixes two sources (the rig RX "From Radio" + your mic) into a
|
||||||
@@ -108,6 +123,7 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
r.wg.Add(1)
|
r.wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer r.wg.Done()
|
defer r.wg.Done()
|
||||||
|
defer recoverGoroutine("recorder capture (radio)")
|
||||||
_ = captureStream(fromDev, stop, func(chunk []byte) {
|
_ = captureStream(fromDev, stop, func(chunk []byte) {
|
||||||
s := bytesToInt16(chunk)
|
s := bytesToInt16(chunk)
|
||||||
r.srcMu.Lock()
|
r.srcMu.Lock()
|
||||||
@@ -119,6 +135,7 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
r.wg.Add(1)
|
r.wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer r.wg.Done()
|
defer r.wg.Done()
|
||||||
|
defer recoverGoroutine("recorder capture (mic)")
|
||||||
_ = captureStream(micDev, stop, func(chunk []byte) {
|
_ = captureStream(micDev, stop, func(chunk []byte) {
|
||||||
s := bytesToInt16(chunk)
|
s := bytesToInt16(chunk)
|
||||||
r.srcMu.Lock()
|
r.srcMu.Lock()
|
||||||
@@ -132,6 +149,7 @@ func (r *Recorder) Start(fromDev, micDev string, prerollSec int) error {
|
|||||||
r.wg.Add(1)
|
r.wg.Add(1)
|
||||||
go func() {
|
go func() {
|
||||||
defer r.wg.Done()
|
defer r.wg.Done()
|
||||||
|
defer recoverGoroutine("recorder mixer")
|
||||||
t := time.NewTicker(40 * time.Millisecond)
|
t := time.NewTicker(40 * time.Millisecond)
|
||||||
defer t.Stop()
|
defer t.Stop()
|
||||||
for {
|
for {
|
||||||
@@ -221,27 +239,59 @@ func (r *Recorder) RestartQSO() {
|
|||||||
r.active = true
|
r.active = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// SaveQSO writes the accumulated recording to path as a WAV and stops
|
// ResetQSOClock restarts the active accumulation from ZERO — discarding
|
||||||
// accumulating. Returns an error if no recording was active.
|
// everything captured so far INCLUDING the pre-roll. Unlike RestartQSO (which
|
||||||
func (r *Recorder) SaveQSO(path string) error {
|
// re-seeds from the pre-roll ring), this keeps nothing: the saved file will
|
||||||
|
// contain only audio from this moment onward. Used when the contact you entered
|
||||||
|
// was already in a long QSO and you want to record just your own exchange.
|
||||||
|
// No-op if not running; if no take is active it begins one (empty).
|
||||||
|
func (r *Recorder) ResetQSOClock() {
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
if !r.running {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
r.acc = nil
|
||||||
|
r.active = true
|
||||||
|
}
|
||||||
|
|
||||||
|
// TakeQSO snapshots the accumulated recording as raw 16 kHz mono PCM bytes and
|
||||||
|
// stops accumulating — fast, no encoding. The next BeginQSO can safely start a
|
||||||
|
// new take immediately. Pair with WritePCM to encode/write off the hot path so
|
||||||
|
// a long recording doesn't delay logging.
|
||||||
|
func (r *Recorder) TakeQSO() ([]byte, error) {
|
||||||
r.mu.Lock()
|
r.mu.Lock()
|
||||||
if !r.active {
|
if !r.active {
|
||||||
r.mu.Unlock()
|
r.mu.Unlock()
|
||||||
return fmt.Errorf("no active recording")
|
return nil, fmt.Errorf("no active recording")
|
||||||
}
|
}
|
||||||
samples := r.acc
|
samples := r.acc
|
||||||
r.acc, r.active = nil, false
|
r.acc, r.active = nil, false
|
||||||
r.mu.Unlock()
|
r.mu.Unlock()
|
||||||
if len(samples) == 0 {
|
if len(samples) == 0 {
|
||||||
return fmt.Errorf("recording was empty")
|
return nil, fmt.Errorf("recording was empty")
|
||||||
}
|
}
|
||||||
data := int16sToBytes(samples)
|
return int16sToBytes(samples), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// WritePCM encodes raw 16 kHz mono PCM to path (WAV, or MP3 when path ends in
|
||||||
|
// .mp3). Slow for MP3 — call off the logging path.
|
||||||
|
func WritePCM(path string, data []byte) error {
|
||||||
if strings.HasSuffix(strings.ToLower(path), ".mp3") {
|
if strings.HasSuffix(strings.ToLower(path), ".mp3") {
|
||||||
return writeMP3(path, data)
|
return writeMP3(path, data)
|
||||||
}
|
}
|
||||||
return writeWAV(path, data)
|
return writeWAV(path, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SaveQSO snapshots and writes the recording in one call (synchronous).
|
||||||
|
func (r *Recorder) SaveQSO(path string) error {
|
||||||
|
data, err := r.TakeQSO()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return WritePCM(path, data)
|
||||||
|
}
|
||||||
|
|
||||||
// DiscardQSO drops the active accumulation without saving (callsign cleared).
|
// DiscardQSO drops the active accumulation without saving (callsign cleared).
|
||||||
func (r *Recorder) DiscardQSO() {
|
func (r *Recorder) DiscardQSO() {
|
||||||
r.mu.Lock()
|
r.mu.Lock()
|
||||||
|
|||||||
+120
-7
@@ -68,6 +68,12 @@ type Def struct {
|
|||||||
Dynamic bool `json:"dynamic,omitempty"` // references not predefined (any value counts)
|
Dynamic bool `json:"dynamic,omitempty"` // references not predefined (any value counts)
|
||||||
AddPrefixes []string `json:"add_prefixes,omitempty"` // possible reference additional prefixes
|
AddPrefixes []string `json:"add_prefixes,omitempty"` // possible reference additional prefixes
|
||||||
|
|
||||||
|
// OrRules are ADDITIONAL searches OR'd with the primary one above: a QSO
|
||||||
|
// earns a reference if the primary match OR any of these match. Lets a
|
||||||
|
// French department (DDFM) be found from "D74" in the note AND from a postal
|
||||||
|
// code "74140" in the address (pattern captures "74", Prefix "D" → "D74").
|
||||||
|
OrRules []OrRule `json:"or_rules,omitempty"`
|
||||||
|
|
||||||
// --- Scope ---
|
// --- Scope ---
|
||||||
DXCCFilter []int `json:"dxcc_filter"` // limit to these DXCC entities (nil = any)
|
DXCCFilter []int `json:"dxcc_filter"` // limit to these DXCC entities (nil = any)
|
||||||
ValidBands []string `json:"valid_bands,omitempty"` // empty = all bands
|
ValidBands []string `json:"valid_bands,omitempty"` // empty = all bands
|
||||||
@@ -84,6 +90,20 @@ type Def struct {
|
|||||||
Builtin bool `json:"builtin"` // shipped default (informational)
|
Builtin bool `json:"builtin"` // shipped default (informational)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OrRule is one additional search OR'd with the award's primary matching rule.
|
||||||
|
// Same knobs as the primary (field + how to match), plus Prefix which is
|
||||||
|
// prepended to each reference it finds so a captured value can be normalised to
|
||||||
|
// the award's reference codes (e.g. postal "74" + Prefix "D" → "D74").
|
||||||
|
type OrRule struct {
|
||||||
|
Field string `json:"field"` // QSO field to scan
|
||||||
|
MatchBy string `json:"match_by,omitempty"` // "code" | "description" | "pattern"
|
||||||
|
ExactMatch bool `json:"exact_match,omitempty"` // match the whole field vs substring
|
||||||
|
Pattern string `json:"pattern,omitempty"` // Go regexp; group 1 = reference
|
||||||
|
LeadingStr string `json:"leading_str,omitempty"` // strip this prefix before matching
|
||||||
|
TrailingStr string `json:"trailing_str,omitempty"` // strip this suffix before matching
|
||||||
|
Prefix string `json:"prefix,omitempty"` // prepended to each found reference
|
||||||
|
}
|
||||||
|
|
||||||
// Defaults are the built-in awards seeded on first run (then user-editable).
|
// Defaults are the built-in awards seeded on first run (then user-editable).
|
||||||
func Defaults() []Def {
|
func Defaults() []Def {
|
||||||
// Confirmed = any confirmation (LoTW or paper QSL). Validated = the stricter
|
// Confirmed = any confirmation (LoTW or paper QSL). Validated = the stricter
|
||||||
@@ -414,7 +434,73 @@ func MatchQSO(d Def, metas []RefMeta, q *qso.QSO) []string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
rl := NewRefList(metas)
|
rl := NewRefList(metas)
|
||||||
return candidates(&d, re, q, rl, len(metas) > 0)
|
found := candidates(&d, re, q, rl, len(metas) > 0)
|
||||||
|
// Merge operator-assigned references (manual override). These let the
|
||||||
|
// operator tag a QSO for an award whose field/description matching can't
|
||||||
|
// auto-detect the reference — e.g. WAPC scans the ADDRESS field for a
|
||||||
|
// province NAME, so a contact whose address doesn't spell it out needs the
|
||||||
|
// province picked by hand. For a predefined award the override is still
|
||||||
|
// validated against its reference list.
|
||||||
|
if man := manualRefs(q, d.Code); len(man) > 0 {
|
||||||
|
found = mergeManual(found, man, rl, len(metas) > 0 && !d.Dynamic)
|
||||||
|
}
|
||||||
|
return found
|
||||||
|
}
|
||||||
|
|
||||||
|
// ManualRefsKey is the ADIF extras key under which OpsLog stores per-QSO,
|
||||||
|
// operator-assigned award references as "CODE@REF;CODE@REF" (REF may be a
|
||||||
|
// comma list). Honoured by MatchQSO regardless of how the award matches.
|
||||||
|
const ManualRefsKey = "APP_OPSLOG_AWARDREFS"
|
||||||
|
|
||||||
|
// manualRefs returns the reference codes the operator assigned to award `code`
|
||||||
|
// on this QSO (from the ManualRefsKey extra).
|
||||||
|
func manualRefs(q *qso.QSO, code string) []string {
|
||||||
|
if q == nil || q.Extras == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
raw := strings.TrimSpace(q.Extras[ManualRefsKey])
|
||||||
|
if raw == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
code = strings.ToUpper(strings.TrimSpace(code))
|
||||||
|
var out []string
|
||||||
|
for _, entry := range strings.Split(raw, ";") {
|
||||||
|
entry = strings.TrimSpace(entry)
|
||||||
|
at := strings.IndexByte(entry, '@')
|
||||||
|
if at <= 0 || !strings.EqualFold(strings.TrimSpace(entry[:at]), code) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, r := range strings.FieldsFunc(entry[at+1:], func(r rune) bool { return r == ',' }) {
|
||||||
|
if r = strings.TrimSpace(r); r != "" {
|
||||||
|
out = append(out, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// mergeManual appends operator-assigned codes to the auto-found set, deduped.
|
||||||
|
// When the award is predefined, only references present and valid in its list
|
||||||
|
// are kept (so a typo can't invent a reference).
|
||||||
|
func mergeManual(found, manual []string, rl refList, predefined bool) []string {
|
||||||
|
seen := map[string]struct{}{}
|
||||||
|
for _, c := range found {
|
||||||
|
seen[normalizeRef(c)] = struct{}{}
|
||||||
|
}
|
||||||
|
for _, c := range manual {
|
||||||
|
c = normalizeRef(c)
|
||||||
|
if _, dup := seen[c]; dup {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if predefined {
|
||||||
|
if m, ok := rl.byCode[c]; !ok || !m.Valid {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
seen[c] = struct{}{}
|
||||||
|
found = append(found, c)
|
||||||
|
}
|
||||||
|
return found
|
||||||
}
|
}
|
||||||
|
|
||||||
// Confirmed reports whether a QSO satisfies any of the given confirmation
|
// Confirmed reports whether a QSO satisfies any of the given confirmation
|
||||||
@@ -445,13 +531,15 @@ func labelRef(rf *Ref, d *Def, code string, rl refList, hasList bool, nameOf Nam
|
|||||||
|
|
||||||
// candidates extracts the reference(s) a QSO contributes to an award, enforcing
|
// candidates extracts the reference(s) a QSO contributes to an award, enforcing
|
||||||
// a predefined list when one applies.
|
// a predefined list when one applies.
|
||||||
func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool) []string {
|
// searchOne runs one matching rule (the primary or an OR rule) over a QSO and
|
||||||
raw := strings.TrimSpace(stripAffix(fieldRaw(d.Field, q), d.LeadingStr, d.TrailingStr))
|
// returns the reference codes it finds, each prefixed with `prefix` (so a
|
||||||
|
// captured "74" becomes "D74"). predefined enables list-aware matching.
|
||||||
|
func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, trailing, prefix string, q *qso.QSO, rl refList, predefined bool) []string {
|
||||||
|
raw := strings.TrimSpace(stripAffix(fieldRaw(field, q), leading, trailing))
|
||||||
if raw == "" {
|
if raw == "" {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
predefined := hasList && !d.Dynamic
|
byDesc := predefined && strings.EqualFold(strings.TrimSpace(matchBy), "description")
|
||||||
byDesc := predefined && strings.EqualFold(strings.TrimSpace(d.MatchBy), "description")
|
|
||||||
|
|
||||||
var found []string
|
var found []string
|
||||||
switch {
|
switch {
|
||||||
@@ -464,7 +552,7 @@ func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool)
|
|||||||
// the field equals the name; otherwise the name is a substring of it.
|
// the field equals the name; otherwise the name is a substring of it.
|
||||||
up := strings.ToUpper(raw)
|
up := strings.ToUpper(raw)
|
||||||
for _, nc := range rl.names {
|
for _, nc := range rl.names {
|
||||||
if d.ExactMatch {
|
if exact {
|
||||||
if up == nc.name {
|
if up == nc.name {
|
||||||
found = append(found, nc.code)
|
found = append(found, nc.code)
|
||||||
}
|
}
|
||||||
@@ -472,7 +560,7 @@ func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool)
|
|||||||
found = append(found, nc.code)
|
found = append(found, nc.code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case predefined && !d.ExactMatch:
|
case predefined && !exact:
|
||||||
// "Search reference inside the field": look up each token of the field in
|
// "Search reference inside the field": look up each token of the field in
|
||||||
// the list — O(tokens), not O(all references) — plus test the few
|
// the list — O(tokens), not O(all references) — plus test the few
|
||||||
// references that declare a regex.
|
// references that declare a regex.
|
||||||
@@ -492,6 +580,31 @@ func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool)
|
|||||||
// counts each reference separately.
|
// counts each reference separately.
|
||||||
found = splitRefs(raw)
|
found = splitRefs(raw)
|
||||||
}
|
}
|
||||||
|
if prefix != "" {
|
||||||
|
for i := range found {
|
||||||
|
found[i] = prefix + found[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return found
|
||||||
|
}
|
||||||
|
|
||||||
|
func candidates(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList bool) []string {
|
||||||
|
predefined := hasList && !d.Dynamic
|
||||||
|
|
||||||
|
// Primary search, then each OR rule — a QSO earns a reference if any matches.
|
||||||
|
found := searchOne(d.Field, d.MatchBy, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, "", q, rl, predefined)
|
||||||
|
for i := range d.OrRules {
|
||||||
|
r := &d.OrRules[i]
|
||||||
|
var rre *regexp.Regexp
|
||||||
|
if p := strings.TrimSpace(r.Pattern); p != "" {
|
||||||
|
c, err := regexp.Compile(p)
|
||||||
|
if err != nil {
|
||||||
|
continue // skip a rule with a bad regex rather than failing the award
|
||||||
|
}
|
||||||
|
rre = c
|
||||||
|
}
|
||||||
|
found = append(found, searchOne(r.Field, r.MatchBy, rre, r.ExactMatch, r.LeadingStr, r.TrailingStr, r.Prefix, q, rl, predefined)...)
|
||||||
|
}
|
||||||
|
|
||||||
if !predefined {
|
if !predefined {
|
||||||
return dedupe(found)
|
return dedupe(found)
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ func (r *Repo) ReplaceAll(ctx context.Context, awardCode string, refs []Ref) (in
|
|||||||
return 0, fmt.Errorf("clear refs: %w", err)
|
return 0, fmt.Errorf("clear refs: %w", err)
|
||||||
}
|
}
|
||||||
stmt, err := tx.PrepareContext(ctx,
|
stmt, err := tx.PrepareContext(ctx,
|
||||||
`INSERT OR REPLACE INTO award_references
|
`REPLACE INTO award_references
|
||||||
(award_code, ref_code, name, dxcc, grp, subgrp, dxcc_list, pattern, valid, valid_from, valid_to, score, bonus, gridsquare, alias)
|
(award_code, ref_code, name, dxcc, grp, subgrp, dxcc_list, pattern, valid, valid_from, valid_to, score, bonus, gridsquare, alias)
|
||||||
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`)
|
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -257,7 +257,7 @@ func (r *Repo) Upsert(ctx context.Context, awardCode string, ref Ref) error {
|
|||||||
return fmt.Errorf("empty award or reference code")
|
return fmt.Errorf("empty award or reference code")
|
||||||
}
|
}
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`INSERT OR REPLACE INTO award_references
|
`REPLACE INTO award_references
|
||||||
(award_code, ref_code, name, dxcc, grp, subgrp, dxcc_list, pattern, valid, valid_from, valid_to, score, bonus, gridsquare, alias)
|
(award_code, ref_code, name, dxcc, grp, subgrp, dxcc_list, pattern, valid, valid_from, valid_to, score, bonus, gridsquare, alias)
|
||||||
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`,
|
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`,
|
||||||
code, rc, strings.TrimSpace(ref.Name), ref.DXCC, ref.Group, ref.SubGrp,
|
code, rc, strings.TrimSpace(ref.Name), ref.DXCC, ref.Group, ref.SubGrp,
|
||||||
|
|||||||
+82
-10
@@ -99,6 +99,54 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
|
|||||||
return dstPath, nil
|
return dstPath, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RunADIF writes a rotating ADIF export of the QSO logbook. It's used when the
|
||||||
|
// log lives on a shared MySQL server, where VACUUM INTO can't snapshot it — an
|
||||||
|
// ADIF export is a portable, re-importable backup of the actual contacts.
|
||||||
|
// writeADIF must write the full ADIF to the path it's handed.
|
||||||
|
func RunADIF(folder string, rotation int, doZip bool, writeADIF func(path string) error) (string, error) {
|
||||||
|
if rotation <= 0 {
|
||||||
|
rotation = 5
|
||||||
|
}
|
||||||
|
if folder == "" {
|
||||||
|
return "", fmt.Errorf("backup folder not set")
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(folder, 0o755); err != nil {
|
||||||
|
return "", fmt.Errorf("create backup folder: %w", err)
|
||||||
|
}
|
||||||
|
base := "opslog-log-" + time.Now().Format("2006-01-02")
|
||||||
|
tmp := filepath.Join(folder, base+".adi.tmp")
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
if err := writeADIF(tmp); err != nil {
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
return "", fmt.Errorf("export adif: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var dstPath string
|
||||||
|
if doZip {
|
||||||
|
dstPath = filepath.Join(folder, base+".adi.zip")
|
||||||
|
if err := copyZipped(tmp, dstPath, base+".adi"); err != nil {
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
} else {
|
||||||
|
dstPath = filepath.Join(folder, base+".adi")
|
||||||
|
_ = os.Remove(dstPath)
|
||||||
|
if err := os.Rename(tmp, dstPath); err != nil {
|
||||||
|
if cerr := copyFile(tmp, dstPath); cerr != nil {
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
return "", cerr
|
||||||
|
}
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := rotateMatch(folder, rotation, "opslog-log-", ".adi", ".adi.zip"); err != nil {
|
||||||
|
return dstPath, fmt.Errorf("rotate: %w (backup OK at %s)", err, dstPath)
|
||||||
|
}
|
||||||
|
return dstPath, nil
|
||||||
|
}
|
||||||
|
|
||||||
// copyFile performs a plain file copy. We don't use os.Rename because
|
// copyFile performs a plain file copy. We don't use os.Rename because
|
||||||
// the source is the live database; we want a fresh standalone file.
|
// the source is the live database; we want a fresh standalone file.
|
||||||
func copyFile(src, dst string) error {
|
func copyFile(src, dst string) error {
|
||||||
@@ -155,10 +203,18 @@ func copyZipped(src, dst, innerName string) error {
|
|||||||
return out.Close()
|
return out.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
// rotate keeps the most recent `keep` backups in folder and deletes the
|
// rotate keeps the most recent `keep` SQLite backups (opslog-*.db /
|
||||||
// rest. Only files matching the opslog-*.db / opslog-*.db.zip pattern
|
// opslog-*.db.zip) and deletes the rest.
|
||||||
// are touched — never user files that happen to live in the same folder.
|
|
||||||
func rotate(folder string, keep int) error {
|
func rotate(folder string, keep int) error {
|
||||||
|
return rotateMatch(folder, keep, "opslog-", ".db", ".db.zip")
|
||||||
|
}
|
||||||
|
|
||||||
|
// rotateMatch keeps the most recent `keep` files in folder whose name has the
|
||||||
|
// given prefix and one of the given suffixes, deleting older ones. Only matching
|
||||||
|
// files are touched — never unrelated user files in the same folder. The suffix
|
||||||
|
// filter keeps the .db family and the .adi family from rotating each other even
|
||||||
|
// though both share the "opslog-" prefix.
|
||||||
|
func rotateMatch(folder string, keep int, prefix string, suffixes ...string) error {
|
||||||
entries, err := os.ReadDir(folder)
|
entries, err := os.ReadDir(folder)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -173,10 +229,17 @@ func rotate(folder string, keep int) error {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
name := e.Name()
|
name := e.Name()
|
||||||
if !strings.HasPrefix(name, "opslog-") {
|
if !strings.HasPrefix(name, prefix) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if !(strings.HasSuffix(name, ".db") || strings.HasSuffix(name, ".db.zip")) {
|
ok := false
|
||||||
|
for _, sfx := range suffixes {
|
||||||
|
if strings.HasSuffix(name, sfx) {
|
||||||
|
ok = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
info, err := e.Info()
|
info, err := e.Info()
|
||||||
@@ -198,16 +261,25 @@ func rotate(folder string, keep int) error {
|
|||||||
return firstErr
|
return firstErr
|
||||||
}
|
}
|
||||||
|
|
||||||
// HasBackupToday returns true if a backup for today's date already exists
|
// HasBackupToday returns true if a SQLite backup for today's date already
|
||||||
// in folder. Used by the startup auto-backup to skip when the user has
|
// exists in folder. Used by the auto-backup to skip when the user has already
|
||||||
// already restarted the app once today.
|
// restarted the app once today.
|
||||||
func HasBackupToday(folder string) bool {
|
func HasBackupToday(folder string) bool {
|
||||||
|
return hasBackupToday(folder, "opslog-", ".db", ".db.zip")
|
||||||
|
}
|
||||||
|
|
||||||
|
// HasADIFBackupToday is HasBackupToday for the ADIF log backup (MySQL mode).
|
||||||
|
func HasADIFBackupToday(folder string) bool {
|
||||||
|
return hasBackupToday(folder, "opslog-log-", ".adi", ".adi.zip")
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasBackupToday(folder, prefix string, exts ...string) bool {
|
||||||
if folder == "" {
|
if folder == "" {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
stamp := time.Now().Format("2006-01-02")
|
stamp := time.Now().Format("2006-01-02")
|
||||||
for _, ext := range []string{".db", ".db.zip"} {
|
for _, ext := range exts {
|
||||||
if _, err := os.Stat(filepath.Join(folder, "opslog-"+stamp+ext)); err == nil {
|
if _, err := os.Stat(filepath.Join(folder, prefix+stamp+ext)); err == nil {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+309
-36
@@ -39,24 +39,25 @@ type Backend interface {
|
|||||||
// and RxFreqHz is the active VFO (where they listen). When not split,
|
// and RxFreqHz is the active VFO (where they listen). When not split,
|
||||||
// RxFreqHz is 0 — the UI shouldn't show a redundant RX field.
|
// RxFreqHz is 0 — the UI shouldn't show a redundant RX field.
|
||||||
type RigState struct {
|
type RigState struct {
|
||||||
Enabled bool `json:"enabled"` // user toggled CAT on
|
Enabled bool `json:"enabled"` // user toggled CAT on
|
||||||
Connected bool `json:"connected"` // backend says rig is online
|
Connected bool `json:"connected"` // backend says rig is online
|
||||||
Backend string `json:"backend,omitempty"` // active backend name
|
Backend string `json:"backend,omitempty"` // active backend name
|
||||||
RigNum int `json:"rig_num,omitempty"` // OmniRig slot 1 or 2 (when applicable)
|
RigNum int `json:"rig_num,omitempty"` // OmniRig slot 1 or 2 (when applicable)
|
||||||
Rig string `json:"rig,omitempty"` // rig model (best-effort)
|
Rig string `json:"rig,omitempty"` // rig model (best-effort)
|
||||||
FreqHz int64 `json:"freq_hz,omitempty"` // TX freq (= active VFO when not split)
|
FreqHz int64 `json:"freq_hz,omitempty"` // TX freq (= active VFO when not split)
|
||||||
RxFreqHz int64 `json:"freq_rx_hz,omitempty"` // RX freq, only set when Split
|
RxFreqHz int64 `json:"freq_rx_hz,omitempty"` // RX freq, only set when Split
|
||||||
Split bool `json:"split,omitempty"` // rig is in split mode
|
Split bool `json:"split,omitempty"` // rig is in split mode
|
||||||
Mode string `json:"mode,omitempty"` // ADIF mode (SSB/CW/DATA/AM/FM/RTTY)
|
Mode string `json:"mode,omitempty"` // ADIF mode (SSB/CW/DATA/AM/FM/RTTY)
|
||||||
Band string `json:"band,omitempty"` // computed from FreqHz
|
Band string `json:"band,omitempty"` // computed from FreqHz
|
||||||
Vfo string `json:"vfo,omitempty"` // "A" | "B" | "AA" | "AB" | "BA" | "BB"
|
Vfo string `json:"vfo,omitempty"` // "A" | "B" | "AA" | "AB" | "BA" | "BB"
|
||||||
Error string `json:"error,omitempty"` // last connect/poll error if any
|
Error string `json:"error,omitempty"` // last connect/poll error if any
|
||||||
UpdatedAt time.Time `json:"updated_at,omitempty"`
|
UpdatedAt time.Time `json:"updated_at,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Manager owns the active backend and runs the polling loop.
|
// Manager owns the active backend and runs the polling loop.
|
||||||
type Manager struct {
|
type Manager struct {
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
|
startMu sync.Mutex // serializes Start/Stop so concurrent calls can't leak a poller
|
||||||
state RigState
|
state RigState
|
||||||
emit func(RigState)
|
emit func(RigState)
|
||||||
backend Backend
|
backend Backend
|
||||||
@@ -115,7 +116,13 @@ func (m *Manager) State() RigState {
|
|||||||
// state.Error rather than returned, so the UI can keep retrying via the
|
// state.Error rather than returned, so the UI can keep retrying via the
|
||||||
// poll loop on next reconnect attempt.
|
// poll loop on next reconnect attempt.
|
||||||
func (m *Manager) Start(b Backend) {
|
func (m *Manager) Start(b Backend) {
|
||||||
m.Stop()
|
// Serialize the whole stop-old-then-start-new sequence. Two concurrent
|
||||||
|
// Start (or Start+Stop) calls could otherwise interleave and leave the
|
||||||
|
// previous poll goroutine alive — two pollers then fight, e.g. flipping
|
||||||
|
// OmniRig Rig1/Rig2 endlessly when the user reselects a rig.
|
||||||
|
m.startMu.Lock()
|
||||||
|
defer m.startMu.Unlock()
|
||||||
|
m.stopLocked()
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
m.stopCh = make(chan struct{})
|
m.stopCh = make(chan struct{})
|
||||||
m.doneCh = make(chan struct{})
|
m.doneCh = make(chan struct{})
|
||||||
@@ -134,6 +141,18 @@ func (m *Manager) Start(b Backend) {
|
|||||||
|
|
||||||
// Stop signals the CAT goroutine to disconnect and waits for it to exit.
|
// Stop signals the CAT goroutine to disconnect and waits for it to exit.
|
||||||
func (m *Manager) Stop() {
|
func (m *Manager) Stop() {
|
||||||
|
m.startMu.Lock()
|
||||||
|
defer m.startMu.Unlock()
|
||||||
|
m.stopLocked()
|
||||||
|
m.mu.Lock()
|
||||||
|
m.state = RigState{Enabled: false}
|
||||||
|
m.mu.Unlock()
|
||||||
|
m.emitState()
|
||||||
|
}
|
||||||
|
|
||||||
|
// stopLocked tears down any running poller and blocks until it exits. The
|
||||||
|
// caller must hold startMu so it can't race a concurrent Start.
|
||||||
|
func (m *Manager) stopLocked() {
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
stop := m.stopCh
|
stop := m.stopCh
|
||||||
done := m.doneCh
|
done := m.doneCh
|
||||||
@@ -148,10 +167,6 @@ func (m *Manager) Stop() {
|
|||||||
if done != nil {
|
if done != nil {
|
||||||
<-done
|
<-done
|
||||||
}
|
}
|
||||||
m.mu.Lock()
|
|
||||||
m.state = RigState{Enabled: false}
|
|
||||||
m.mu.Unlock()
|
|
||||||
m.emitState()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetFrequency dispatches a SetFreq call to the CAT goroutine.
|
// SetFrequency dispatches a SetFreq call to the CAT goroutine.
|
||||||
@@ -169,6 +184,254 @@ func (m *Manager) SetPTT(on bool) error {
|
|||||||
return m.exec(func(b Backend) error { return b.SetPTT(on) })
|
return m.exec(func(b Backend) error { return b.SetPTT(on) })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SpotInfo is one cluster spot to render on a backend that supports a spot
|
||||||
|
// overlay (the FlexRadio panadapter). Color is an optional "#AARRGGBB" string;
|
||||||
|
// the backend picks a default when it's empty. (Status-based colouring can be
|
||||||
|
// driven later by setting Color per spot.)
|
||||||
|
type SpotInfo struct {
|
||||||
|
FreqHz int64
|
||||||
|
Callsign string
|
||||||
|
Mode string
|
||||||
|
Color string
|
||||||
|
Comment string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spotter is an OPTIONAL backend capability: show cluster spots on the radio
|
||||||
|
// (FlexRadio panadapter). Backends that don't implement it are simply skipped.
|
||||||
|
type Spotter interface {
|
||||||
|
SendSpot(SpotInfo) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendSpot pushes a cluster spot to the backend if it supports spotting. Runs on
|
||||||
|
// the CAT goroutine and is fire-and-forget (dropped if the queue is busy) — a
|
||||||
|
// missed spot on the panadapter is harmless.
|
||||||
|
func (m *Manager) SendSpot(s SpotInfo) {
|
||||||
|
m.mu.RLock()
|
||||||
|
cmds := m.cmdCh
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if cmds == nil || b == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, ok := b.(Spotter); !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case cmds <- func() {
|
||||||
|
if sp, ok := b.(Spotter); ok {
|
||||||
|
_ = sp.SendSpot(s)
|
||||||
|
}
|
||||||
|
}:
|
||||||
|
default: // queue busy → drop this spot
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexTXState is the FlexRadio transmit/ATU state surfaced to the dedicated
|
||||||
|
// FlexRadio control tab. Levels are 0-100. (Phase 1: controls + state pushed by
|
||||||
|
// the radio over TCP; live meters arrive over a separate UDP stream later.)
|
||||||
|
type FlexTXState struct {
|
||||||
|
Available bool `json:"available"` // backend is Flex and handshaked
|
||||||
|
Model string `json:"model,omitempty"`
|
||||||
|
RFPower int `json:"rf_power"`
|
||||||
|
TunePower int `json:"tune_power"`
|
||||||
|
Tune bool `json:"tune"` // tune carrier active
|
||||||
|
Transmitting bool `json:"transmitting"` // interlock state = TRANSMITTING
|
||||||
|
VoxEnable bool `json:"vox_enable"`
|
||||||
|
VoxLevel int `json:"vox_level"`
|
||||||
|
VoxDelay int `json:"vox_delay"`
|
||||||
|
ProcEnable bool `json:"proc_enable"`
|
||||||
|
ProcLevel int `json:"proc_level"`
|
||||||
|
Mon bool `json:"mon"`
|
||||||
|
MonLevel int `json:"mon_level"`
|
||||||
|
MicLevel int `json:"mic_level"`
|
||||||
|
ATUStatus string `json:"atu_status,omitempty"`
|
||||||
|
ATUMemories bool `json:"atu_memories"`
|
||||||
|
// Active RX slice DSP controls.
|
||||||
|
RXAvail bool `json:"rx_avail"` // an RX slice exists
|
||||||
|
Split bool `json:"split"` // RX/TX on separate slices
|
||||||
|
RXFreqHz int64 `json:"rx_freq_hz,omitempty"` // RX slice freq when split
|
||||||
|
TXFreqHz int64 `json:"tx_freq_hz,omitempty"` // TX slice freq when split
|
||||||
|
AGCMode string `json:"agc_mode,omitempty"`
|
||||||
|
AGCThreshold int `json:"agc_threshold"`
|
||||||
|
AudioLevel int `json:"audio_level"`
|
||||||
|
Mute bool `json:"mute"`
|
||||||
|
RXAnt string `json:"rx_ant,omitempty"` // selected RX antenna
|
||||||
|
TXAnt string `json:"tx_ant,omitempty"` // selected TX antenna
|
||||||
|
AntList []string `json:"ant_list,omitempty"` // antennas selectable for RX
|
||||||
|
TXAntList []string `json:"tx_ant_list,omitempty"` // antennas selectable for TX
|
||||||
|
NB bool `json:"nb"`
|
||||||
|
NBLevel int `json:"nb_level"`
|
||||||
|
NR bool `json:"nr"`
|
||||||
|
NRLevel int `json:"nr_level"`
|
||||||
|
ANF bool `json:"anf"`
|
||||||
|
ANFLevel int `json:"anf_level"`
|
||||||
|
// CW / mode-specific controls.
|
||||||
|
Mode string `json:"mode,omitempty"` // active slice mode (CW/USB/LSB/DIGU…)
|
||||||
|
CWSpeed int `json:"cw_speed"`
|
||||||
|
CWPitch int `json:"cw_pitch"`
|
||||||
|
CWBreakInDelay int `json:"cw_break_in_delay"`
|
||||||
|
CWSidetone bool `json:"cw_sidetone"`
|
||||||
|
CWMonLevel int `json:"cw_mon_level"` // sidetone level
|
||||||
|
APF bool `json:"apf"`
|
||||||
|
APFLevel int `json:"apf_level"`
|
||||||
|
FilterLo int `json:"filter_lo"`
|
||||||
|
FilterHi int `json:"filter_hi"`
|
||||||
|
// External amplifier (PowerGenius XL).
|
||||||
|
AmpAvailable bool `json:"amp_available"`
|
||||||
|
AmpModel string `json:"amp_model,omitempty"`
|
||||||
|
AmpOperate bool `json:"amp_operate"`
|
||||||
|
AmpFault string `json:"amp_fault,omitempty"`
|
||||||
|
// Live meters streamed over UDP (S-meter, PWR, SWR, temp, voltage…).
|
||||||
|
Meters []FlexMeter `json:"meters,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexMeter is one live meter value (already scaled to real units).
|
||||||
|
type FlexMeter struct {
|
||||||
|
ID int `json:"id"`
|
||||||
|
Src string `json:"src,omitempty"` // SLC / TX- / RAD / AMP…
|
||||||
|
Name string `json:"name,omitempty"` // FWDPWR, SWR, LEVEL, PATEMP…
|
||||||
|
Unit string `json:"unit,omitempty"`
|
||||||
|
Value float64 `json:"value"`
|
||||||
|
Lo float64 `json:"lo"`
|
||||||
|
Hi float64 `json:"hi"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexController is an OPTIONAL backend capability (the FlexRadio backend): the
|
||||||
|
// SmartSDR-style transmit controls. Backends that don't implement it are skipped
|
||||||
|
// by the FlexRadio tab. FlexState() is mutex-guarded in the backend so it's safe
|
||||||
|
// to read off the CAT goroutine; the setters are dispatched onto it via FlexDo.
|
||||||
|
type FlexController interface {
|
||||||
|
FlexState() FlexTXState
|
||||||
|
SetRFPower(int) error
|
||||||
|
SetTunePower(int) error
|
||||||
|
SetTune(bool) error
|
||||||
|
SetVOX(bool) error
|
||||||
|
SetVOXLevel(int) error
|
||||||
|
SetVOXDelay(int) error
|
||||||
|
SetProcessor(bool) error
|
||||||
|
SetProcessorLevel(int) error
|
||||||
|
SetMon(bool) error
|
||||||
|
SetMonLevel(int) error
|
||||||
|
SetMic(int) error
|
||||||
|
ATUStart() error
|
||||||
|
ATUBypass() error
|
||||||
|
SetATUMemories(bool) error
|
||||||
|
// RX slice DSP controls (target the active receive slice).
|
||||||
|
SetAGCMode(string) error
|
||||||
|
SetAGCThreshold(int) error
|
||||||
|
SetAudioLevel(int) error
|
||||||
|
SetMute(bool) error
|
||||||
|
SetRXAntenna(string) error
|
||||||
|
SetTXAntenna(string) error
|
||||||
|
SetSplit(bool) error
|
||||||
|
SetNB(bool) error
|
||||||
|
SetNBLevel(int) error
|
||||||
|
SetNR(bool) error
|
||||||
|
SetNRLevel(int) error
|
||||||
|
SetANF(bool) error
|
||||||
|
SetANFLevel(int) error
|
||||||
|
SetAPF(bool) error
|
||||||
|
SetAPFLevel(int) error
|
||||||
|
// CW keyer + mode-specific controls.
|
||||||
|
SetCWSpeed(int) error
|
||||||
|
SetCWPitch(int) error
|
||||||
|
SetCWBreakInDelay(int) error
|
||||||
|
SetCWSidetone(bool) error
|
||||||
|
SetSidetoneLevel(int) error
|
||||||
|
SetCWFilter(int) error
|
||||||
|
SetFilter(lo, hi int) error
|
||||||
|
// External amplifier (PowerGenius XL) operate/standby.
|
||||||
|
SetAmpOperate(bool) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexState returns the current FlexRadio transmit state, or (zero, false) when
|
||||||
|
// the active backend isn't a Flex. Safe to call from any goroutine.
|
||||||
|
func (m *Manager) FlexState() (FlexTXState, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if fc, ok := b.(FlexController); ok {
|
||||||
|
return fc.FlexState(), true
|
||||||
|
}
|
||||||
|
return FlexTXState{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexDo dispatches a FlexRadio control onto the CAT goroutine. Errors if the
|
||||||
|
// active backend isn't a Flex.
|
||||||
|
func (m *Manager) FlexDo(fn func(FlexController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
fc, ok := b.(FlexController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("active CAT backend is not a FlexRadio")
|
||||||
|
}
|
||||||
|
return fn(fc)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// IcomTXState is the Icom receive-DSP state surfaced to the dedicated Icom
|
||||||
|
// control tab. Levels are 0-100 (scaled from the rig's 0-255). Unlike Flex,
|
||||||
|
// the Icom doesn't push changes, so these reflect the last RefreshIcom() read
|
||||||
|
// plus the optimistic updates each setter applies.
|
||||||
|
type IcomTXState struct {
|
||||||
|
Available bool `json:"available"`
|
||||||
|
Model string `json:"model,omitempty"`
|
||||||
|
Mode string `json:"mode,omitempty"`
|
||||||
|
AFGain int `json:"af_gain"`
|
||||||
|
RFGain int `json:"rf_gain"`
|
||||||
|
NB bool `json:"nb"`
|
||||||
|
NBLevel int `json:"nb_level"`
|
||||||
|
NR bool `json:"nr"`
|
||||||
|
NRLevel int `json:"nr_level"`
|
||||||
|
ANF bool `json:"anf"`
|
||||||
|
AGC string `json:"agc,omitempty"` // FAST | MID | SLOW
|
||||||
|
Preamp int `json:"preamp"` // 0=off, 1=P.AMP1, 2=P.AMP2
|
||||||
|
Att int `json:"att"` // dB attenuation, 0=off
|
||||||
|
Filter int `json:"filter"` // 1 | 2 | 3 (FIL1/2/3)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IcomController is an OPTIONAL backend capability (the Icom CI-V backend): the
|
||||||
|
// receive-DSP controls shown on the Icom tab. IcomState() is mutex-guarded in
|
||||||
|
// the backend so it's safe off the CAT goroutine; setters dispatch via IcomDo.
|
||||||
|
type IcomController interface {
|
||||||
|
IcomState() IcomTXState
|
||||||
|
RefreshIcom() error // re-read all DSP state from the rig
|
||||||
|
SetAFGain(int) error
|
||||||
|
SetRFGain(int) error
|
||||||
|
SetNB(bool) error
|
||||||
|
SetNBLevel(int) error
|
||||||
|
SetNR(bool) error
|
||||||
|
SetNRLevel(int) error
|
||||||
|
SetANF(bool) error
|
||||||
|
SetAGC(string) error
|
||||||
|
SetPreamp(int) error
|
||||||
|
SetAtt(int) error
|
||||||
|
SetIcomFilter(int) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// IcomState returns the current Icom DSP state, or (zero, false) when the active
|
||||||
|
// backend isn't an Icom. Safe to call from any goroutine.
|
||||||
|
func (m *Manager) IcomState() (IcomTXState, bool) {
|
||||||
|
m.mu.RLock()
|
||||||
|
b := m.backend
|
||||||
|
m.mu.RUnlock()
|
||||||
|
if ic, ok := b.(IcomController); ok {
|
||||||
|
return ic.IcomState(), true
|
||||||
|
}
|
||||||
|
return IcomTXState{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// IcomDo dispatches an Icom control onto the CAT goroutine. Errors if the
|
||||||
|
// active backend isn't an Icom.
|
||||||
|
func (m *Manager) IcomDo(fn func(IcomController) error) error {
|
||||||
|
return m.exec(func(b Backend) error {
|
||||||
|
ic, ok := b.(IcomController)
|
||||||
|
if !ok {
|
||||||
|
return fmt.Errorf("active CAT backend is not an Icom")
|
||||||
|
}
|
||||||
|
return fn(ic)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// exec marshals a backend operation onto the CAT goroutine. Returns the
|
// exec marshals a backend operation onto the CAT goroutine. Returns the
|
||||||
// operation's error or a "busy"/"not running" error if dispatch failed.
|
// operation's error or a "busy"/"not running" error if dispatch failed.
|
||||||
func (m *Manager) exec(fn func(Backend) error) error {
|
func (m *Manager) exec(fn func(Backend) error) error {
|
||||||
@@ -195,23 +458,27 @@ func (m *Manager) run(b Backend, stop, done chan struct{}, cmds chan func(), pol
|
|||||||
defer runtime.UnlockOSThread()
|
defer runtime.UnlockOSThread()
|
||||||
defer close(done)
|
defer close(done)
|
||||||
|
|
||||||
if err := b.Connect(); err != nil {
|
|
||||||
m.update(RigState{
|
|
||||||
Enabled: true, Backend: b.Name(), Connected: false,
|
|
||||||
Error: err.Error(), UpdatedAt: time.Now(),
|
|
||||||
})
|
|
||||||
// Stay idle until Stop is called — let the user fix config and re-Start.
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-stop:
|
|
||||||
return
|
|
||||||
case fn := <-cmds:
|
|
||||||
fn()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
defer b.Disconnect()
|
defer b.Disconnect()
|
||||||
|
|
||||||
|
// Connection is (re)established lazily and retried with a backoff, so a rig
|
||||||
|
// that's off at startup — or a FlexRadio that reboots/drops its TCP link —
|
||||||
|
// reconnects on its own instead of staying dead until the user toggles CAT.
|
||||||
|
const reconnectEvery = 5 * time.Second
|
||||||
|
connected := false
|
||||||
|
var lastAttempt time.Time
|
||||||
|
tryConnect := func() {
|
||||||
|
if connected || time.Since(lastAttempt) < reconnectEvery {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
lastAttempt = time.Now()
|
||||||
|
if err := b.Connect(); err != nil {
|
||||||
|
m.update(RigState{Enabled: true, Backend: b.Name(), Connected: false, Error: err.Error(), UpdatedAt: time.Now()})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
connected = true
|
||||||
|
}
|
||||||
|
tryConnect()
|
||||||
|
|
||||||
ticker := time.NewTicker(pollEvery)
|
ticker := time.NewTicker(pollEvery)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
@@ -223,12 +490,18 @@ func (m *Manager) run(b Backend, stop, done chan struct{}, cmds chan func(), pol
|
|||||||
fn()
|
fn()
|
||||||
m.applyCommandDelay()
|
m.applyCommandDelay()
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
|
if !connected {
|
||||||
|
tryConnect()
|
||||||
|
continue
|
||||||
|
}
|
||||||
ns, err := b.ReadState()
|
ns, err := b.ReadState()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.update(RigState{
|
// Lost the rig — drop the backend so the next attempt reconnects
|
||||||
Enabled: true, Backend: b.Name(), Connected: false,
|
// cleanly, then back off before retrying.
|
||||||
Error: err.Error(), UpdatedAt: time.Now(),
|
connected = false
|
||||||
})
|
lastAttempt = time.Now()
|
||||||
|
b.Disconnect()
|
||||||
|
m.update(RigState{Enabled: true, Backend: b.Name(), Connected: false, Error: err.Error(), UpdatedAt: time.Now()})
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
ns.Enabled = true
|
ns.Enabled = true
|
||||||
|
|||||||
@@ -0,0 +1,242 @@
|
|||||||
|
// Package civ implements the Icom CI-V protocol independently of the transport
|
||||||
|
// carrying it. The exact same frames travel over a USB/serial port (local
|
||||||
|
// control) and, wrapped in Icom's UDP "serial" stream, over the network
|
||||||
|
// (remote control). Keeping the wire format in one place means the USB backend
|
||||||
|
// (icomserial) and a future network backend (icomnet) share all of it — only
|
||||||
|
// the transport differs.
|
||||||
|
//
|
||||||
|
// Frame layout: FE FE <to> <from> <cmd> [sub] [data…] FD
|
||||||
|
package civ
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Protocol bytes.
|
||||||
|
const (
|
||||||
|
Pre = 0xFE // preamble (sent twice at the start of every frame)
|
||||||
|
End = 0xFD // end-of-message
|
||||||
|
OK = 0xFB // rig acknowledged a set command
|
||||||
|
NG = 0xFA // rig rejected a set command
|
||||||
|
|
||||||
|
// AddrController is the conventional address software uses for itself.
|
||||||
|
AddrController = 0xE0
|
||||||
|
)
|
||||||
|
|
||||||
|
// Commands (the few Phase-1 control needs; more get added with the panel).
|
||||||
|
const (
|
||||||
|
CmdTransceiveFreq = 0x00 // unsolicited freq update (dial turned)
|
||||||
|
CmdTransceiveMode = 0x01 // unsolicited mode update
|
||||||
|
CmdReadFreq = 0x03
|
||||||
|
CmdReadMode = 0x04
|
||||||
|
CmdSetFreq = 0x05
|
||||||
|
CmdSetMode = 0x06
|
||||||
|
CmdPTT = 0x1C // sub 0x00 = PTT
|
||||||
|
CmdExtra = 0x1A // sub 0x06 = data mode on modern Icoms
|
||||||
|
CmdReadID = 0x19 // sub 0x00 = rig's own CI-V address (identifies model)
|
||||||
|
|
||||||
|
CmdAtt = 0x11 // attenuator (1 BCD byte of dB; 0x00 = off)
|
||||||
|
CmdLevel = 0x14 // analogue levels (sub + 2 BCD bytes, 0000-0255)
|
||||||
|
CmdSwitch = 0x16 // on/off + multi-state DSP settings (sub + 1 byte)
|
||||||
|
|
||||||
|
SubDataMode = 0x06
|
||||||
|
SubPTT = 0x00
|
||||||
|
|
||||||
|
// CmdLevel sub-commands.
|
||||||
|
SubLevelAF = 0x01 // AF (volume)
|
||||||
|
SubLevelRF = 0x02 // RF gain
|
||||||
|
SubLevelNR = 0x06 // noise-reduction depth
|
||||||
|
SubLevelNB = 0x12 // noise-blanker depth
|
||||||
|
|
||||||
|
// CmdSwitch sub-commands.
|
||||||
|
SubSwPreamp = 0x02 // 0=off, 1=P.AMP1, 2=P.AMP2
|
||||||
|
SubSwAGC = 0x12 // 1=FAST, 2=MID, 3=SLOW
|
||||||
|
SubSwNB = 0x22 // noise blanker on/off
|
||||||
|
SubSwNR = 0x40 // noise reduction on/off
|
||||||
|
SubSwANF = 0x41 // auto-notch on/off
|
||||||
|
)
|
||||||
|
|
||||||
|
// Icom mode codes (used by CmdReadMode / CmdSetMode).
|
||||||
|
const (
|
||||||
|
ModeLSB = 0x00
|
||||||
|
ModeUSB = 0x01
|
||||||
|
ModeAM = 0x02
|
||||||
|
ModeCW = 0x03
|
||||||
|
ModeRTTY = 0x04
|
||||||
|
ModeFM = 0x05
|
||||||
|
ModeCWR = 0x07
|
||||||
|
ModeRTTYR = 0x08
|
||||||
|
)
|
||||||
|
|
||||||
|
// Frame builds a complete CI-V frame (preamble … end) for payload, which is the
|
||||||
|
// command byte followed by any sub-command/data bytes.
|
||||||
|
func Frame(to, from byte, payload ...byte) []byte {
|
||||||
|
f := make([]byte, 0, len(payload)+5)
|
||||||
|
f = append(f, Pre, Pre, to, from)
|
||||||
|
f = append(f, payload...)
|
||||||
|
f = append(f, End)
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
|
||||||
|
// FreqToBCD encodes a frequency in Hz as the 5 little-endian BCD bytes Icom
|
||||||
|
// expects (10 digits, 2 per byte, least-significant byte first).
|
||||||
|
func FreqToBCD(hz int64) []byte {
|
||||||
|
if hz < 0 {
|
||||||
|
hz = 0
|
||||||
|
}
|
||||||
|
b := make([]byte, 5)
|
||||||
|
for i := 0; i < 5; i++ {
|
||||||
|
lo := hz % 10
|
||||||
|
hz /= 10
|
||||||
|
hi := hz % 10
|
||||||
|
hz /= 10
|
||||||
|
b[i] = byte(lo) | byte(hi)<<4
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
// BCDToFreq decodes Icom little-endian BCD frequency bytes back to Hz.
|
||||||
|
func BCDToFreq(b []byte) int64 {
|
||||||
|
var hz int64
|
||||||
|
mult := int64(1)
|
||||||
|
for i := 0; i < len(b) && i < 5; i++ {
|
||||||
|
hz += int64(b[i]&0x0F) * mult
|
||||||
|
mult *= 10
|
||||||
|
hz += int64(b[i]>>4) * mult
|
||||||
|
mult *= 10
|
||||||
|
}
|
||||||
|
return hz
|
||||||
|
}
|
||||||
|
|
||||||
|
// LevelToBCD encodes a 0-255 level as the 2 big-endian BCD bytes Icom's
|
||||||
|
// CmdLevel commands use (e.g. 128 → 0x01 0x28, 255 → 0x02 0x55).
|
||||||
|
func LevelToBCD(v int) []byte {
|
||||||
|
if v < 0 {
|
||||||
|
v = 0
|
||||||
|
}
|
||||||
|
if v > 255 {
|
||||||
|
v = 255
|
||||||
|
}
|
||||||
|
return []byte{byte(v / 100), byte(((v/10)%10)<<4 | v%10)}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BCDToLevel decodes the 2 BCD bytes of a CmdLevel response back to 0-255.
|
||||||
|
func BCDToLevel(b []byte) int {
|
||||||
|
if len(b) < 2 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return int(b[0])*100 + int(b[1]>>4)*10 + int(b[1]&0x0F)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ByteToBCD / BCDToByte handle a single packed-BCD byte (used by the
|
||||||
|
// attenuator, where the value is dB: 0x00, 0x06, 0x12, 0x18…).
|
||||||
|
func ByteToBCD(v int) byte {
|
||||||
|
if v < 0 {
|
||||||
|
v = 0
|
||||||
|
}
|
||||||
|
if v > 99 {
|
||||||
|
v = 99
|
||||||
|
}
|
||||||
|
return byte((v/10)<<4 | v%10)
|
||||||
|
}
|
||||||
|
|
||||||
|
func BCDToByte(b byte) int { return int(b>>4)*10 + int(b&0x0F) }
|
||||||
|
|
||||||
|
// ModeToADIF maps an Icom mode byte (plus the data-mode flag) to an ADIF mode
|
||||||
|
// string. Data mode on USB/LSB is surfaced as "DATA" so the app can substitute
|
||||||
|
// the user's preferred digital mode (FT8/RTTY/…), matching the OmniRig backend.
|
||||||
|
func ModeToADIF(m byte, data bool) string {
|
||||||
|
switch m {
|
||||||
|
case ModeCW, ModeCWR:
|
||||||
|
return "CW"
|
||||||
|
case ModeRTTY, ModeRTTYR:
|
||||||
|
return "RTTY"
|
||||||
|
case ModeAM:
|
||||||
|
return "AM"
|
||||||
|
case ModeFM:
|
||||||
|
return "FM"
|
||||||
|
case ModeLSB, ModeUSB:
|
||||||
|
if data {
|
||||||
|
return "DATA"
|
||||||
|
}
|
||||||
|
return "SSB"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// ModelName maps a rig's default CI-V address (from CmdReadID) to a readable
|
||||||
|
// model. Unknown addresses fall back to a hex label.
|
||||||
|
func ModelName(addr byte) string {
|
||||||
|
switch addr {
|
||||||
|
case 0x94:
|
||||||
|
return "IC-7300"
|
||||||
|
case 0x98:
|
||||||
|
return "IC-7610"
|
||||||
|
case 0xA2:
|
||||||
|
return "IC-9700"
|
||||||
|
case 0xA4:
|
||||||
|
return "IC-705"
|
||||||
|
case 0x88:
|
||||||
|
return "IC-7700"
|
||||||
|
case 0x80:
|
||||||
|
return "IC-7800"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("Icom (0x%02X)", addr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decoded is one parsed CI-V frame. Data is everything after the command byte
|
||||||
|
// (so it still carries the sub-command for multi-byte commands like 1A 06).
|
||||||
|
type Decoded struct {
|
||||||
|
To byte
|
||||||
|
From byte
|
||||||
|
Cmd byte
|
||||||
|
Data []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scan extracts every complete frame from buf and reports how many leading
|
||||||
|
// bytes the caller may now discard. A trailing partial frame (or a lone
|
||||||
|
// preamble byte) is left unconsumed so it can be completed by the next read.
|
||||||
|
func Scan(buf []byte) (frames []Decoded, consumed int) {
|
||||||
|
pos := 0
|
||||||
|
for {
|
||||||
|
p := indexPreamble(buf, pos)
|
||||||
|
if p < 0 {
|
||||||
|
// No further preamble. Keep a trailing FE (possible start of the
|
||||||
|
// next preamble); otherwise everything seen is consumable.
|
||||||
|
if len(buf) > 0 && buf[len(buf)-1] == Pre {
|
||||||
|
return frames, len(buf) - 1
|
||||||
|
}
|
||||||
|
return frames, len(buf)
|
||||||
|
}
|
||||||
|
start := p + 2
|
||||||
|
for start < len(buf) && buf[start] == Pre { // tolerate padding FEs
|
||||||
|
start++
|
||||||
|
}
|
||||||
|
end := bytes.IndexByte(buf[start:], End)
|
||||||
|
if end < 0 {
|
||||||
|
return frames, p // incomplete frame — keep from its preamble
|
||||||
|
}
|
||||||
|
end += start
|
||||||
|
if body := buf[start:end]; len(body) >= 3 {
|
||||||
|
frames = append(frames, Decoded{
|
||||||
|
To: body[0],
|
||||||
|
From: body[1],
|
||||||
|
Cmd: body[2],
|
||||||
|
Data: append([]byte(nil), body[3:]...),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
pos = end + 1
|
||||||
|
consumed = pos
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// indexPreamble returns the index of the next FE FE pair at or after from.
|
||||||
|
func indexPreamble(buf []byte, from int) int {
|
||||||
|
for i := from; i+1 < len(buf); i++ {
|
||||||
|
if buf[i] == Pre && buf[i+1] == Pre {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
}
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
package civ
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestFreqBCDRoundTrip(t *testing.T) {
|
||||||
|
cases := []int64{0, 1, 7074000, 14250000, 28074000, 50313000, 144174000, 1296000000}
|
||||||
|
for _, hz := range cases {
|
||||||
|
b := FreqToBCD(hz)
|
||||||
|
if len(b) != 5 {
|
||||||
|
t.Fatalf("FreqToBCD(%d) len=%d, want 5", hz, len(b))
|
||||||
|
}
|
||||||
|
if got := BCDToFreq(b); got != hz {
|
||||||
|
t.Errorf("round trip %d → % X → %d", hz, b, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFreqBCDKnownEncoding(t *testing.T) {
|
||||||
|
// 14.250.000 Hz → little-endian BCD 00 00 25 14 00.
|
||||||
|
want := []byte{0x00, 0x00, 0x25, 0x14, 0x00}
|
||||||
|
if got := FreqToBCD(14250000); !bytes.Equal(got, want) {
|
||||||
|
t.Errorf("FreqToBCD(14250000) = % X, want % X", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFrame(t *testing.T) {
|
||||||
|
// Read-frequency request to a 7610 (0x98) from the controller (0xE0).
|
||||||
|
got := Frame(0x98, AddrController, CmdReadFreq)
|
||||||
|
want := []byte{0xFE, 0xFE, 0x98, 0xE0, 0x03, 0xFD}
|
||||||
|
if !bytes.Equal(got, want) {
|
||||||
|
t.Errorf("Frame = % X, want % X", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestScanSingleFreqResponse(t *testing.T) {
|
||||||
|
// Rig (0x98) → controller (0xE0): freq read response for 14.250 MHz.
|
||||||
|
in := Frame(AddrController, 0x98, CmdReadFreq, 0x00, 0x00, 0x25, 0x14, 0x00)
|
||||||
|
frames, consumed := Scan(in)
|
||||||
|
if consumed != len(in) {
|
||||||
|
t.Fatalf("consumed=%d, want %d", consumed, len(in))
|
||||||
|
}
|
||||||
|
if len(frames) != 1 {
|
||||||
|
t.Fatalf("got %d frames, want 1", len(frames))
|
||||||
|
}
|
||||||
|
f := frames[0]
|
||||||
|
if f.From != 0x98 || f.To != AddrController || f.Cmd != CmdReadFreq {
|
||||||
|
t.Errorf("addrs/cmd wrong: %+v", f)
|
||||||
|
}
|
||||||
|
if hz := BCDToFreq(f.Data); hz != 14250000 {
|
||||||
|
t.Errorf("decoded freq %d, want 14250000", hz)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestScanSkipsEchoAndKeepsPartial(t *testing.T) {
|
||||||
|
echo := Frame(0x98, AddrController, CmdReadFreq) // our outgoing (echoed back)
|
||||||
|
resp := Frame(AddrController, 0x98, CmdReadMode, ModeCW, 0x01) // a real response
|
||||||
|
buf := append(append([]byte{}, echo...), resp...)
|
||||||
|
buf = append(buf, 0xFE, 0xFE, 0x98) // a partial third frame (no FD yet)
|
||||||
|
|
||||||
|
frames, consumed := Scan(buf)
|
||||||
|
if len(frames) != 2 {
|
||||||
|
t.Fatalf("got %d frames, want 2", len(frames))
|
||||||
|
}
|
||||||
|
// The partial frame must be left unconsumed so the next read can finish it.
|
||||||
|
if consumed != len(echo)+len(resp) {
|
||||||
|
t.Errorf("consumed=%d, want %d (partial frame retained)", consumed, len(echo)+len(resp))
|
||||||
|
}
|
||||||
|
if frames[1].Cmd != CmdReadMode || len(frames[1].Data) < 1 || frames[1].Data[0] != ModeCW {
|
||||||
|
t.Errorf("second frame wrong: %+v", frames[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestModeToADIF(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
m byte
|
||||||
|
data bool
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{ModeUSB, false, "SSB"},
|
||||||
|
{ModeLSB, false, "SSB"},
|
||||||
|
{ModeUSB, true, "DATA"},
|
||||||
|
{ModeCW, false, "CW"},
|
||||||
|
{ModeCWR, false, "CW"},
|
||||||
|
{ModeRTTY, false, "RTTY"},
|
||||||
|
{ModeAM, false, "AM"},
|
||||||
|
{ModeFM, false, "FM"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := ModeToADIF(c.m, c.data); got != c.want {
|
||||||
|
t.Errorf("ModeToADIF(0x%02X, %v) = %q, want %q", c.m, c.data, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLevelBCDRoundTrip(t *testing.T) {
|
||||||
|
for _, v := range []int{0, 1, 50, 99, 100, 128, 200, 255} {
|
||||||
|
b := LevelToBCD(v)
|
||||||
|
if len(b) != 2 {
|
||||||
|
t.Fatalf("LevelToBCD(%d) len=%d", v, len(b))
|
||||||
|
}
|
||||||
|
if got := BCDToLevel(b); got != v {
|
||||||
|
t.Errorf("level round trip %d → % X → %d", v, b, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Known encodings from the Icom CI-V reference.
|
||||||
|
if got := LevelToBCD(128); !bytes.Equal(got, []byte{0x01, 0x28}) {
|
||||||
|
t.Errorf("LevelToBCD(128) = % X, want 01 28", got)
|
||||||
|
}
|
||||||
|
if got := LevelToBCD(255); !bytes.Equal(got, []byte{0x02, 0x55}) {
|
||||||
|
t.Errorf("LevelToBCD(255) = % X, want 02 55", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestByteBCDRoundTrip(t *testing.T) {
|
||||||
|
for _, v := range []int{0, 6, 12, 18, 21} {
|
||||||
|
if got := BCDToByte(ByteToBCD(v)); got != v {
|
||||||
|
t.Errorf("byte BCD round trip %d → %d", v, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestModelName(t *testing.T) {
|
||||||
|
if got := ModelName(0x98); got != "IC-7610" {
|
||||||
|
t.Errorf("ModelName(0x98) = %q, want IC-7610", got)
|
||||||
|
}
|
||||||
|
if got := ModelName(0x12); got != "Icom (0x12)" {
|
||||||
|
t.Errorf("ModelName(0x12) = %q, want fallback", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,112 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"golang.org/x/sys/windows"
|
||||||
|
)
|
||||||
|
|
||||||
|
// FlexRadio is one radio found by discovery.
|
||||||
|
type FlexRadio struct {
|
||||||
|
IP string `json:"ip"`
|
||||||
|
Port int `json:"port"`
|
||||||
|
Model string `json:"model"`
|
||||||
|
Nickname string `json:"nickname"`
|
||||||
|
Serial string `json:"serial"`
|
||||||
|
Callsign string `json:"callsign"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlexRadios on the LAN broadcast a discovery datagram to UDP :4992 about once a
|
||||||
|
// second. DiscoverFlex listens for that broadcast for the given duration and
|
||||||
|
// returns the unique radios seen. Best effort: if the port can't be bound
|
||||||
|
// (SmartSDR running, firewall…), it returns what it has (often nothing) and the
|
||||||
|
// user falls back to entering the IP by hand.
|
||||||
|
func DiscoverFlex(timeout time.Duration) ([]FlexRadio, error) {
|
||||||
|
if timeout <= 0 {
|
||||||
|
timeout = 2 * time.Second
|
||||||
|
}
|
||||||
|
// Bind :4992 with SO_REUSEADDR so we coexist with SmartSDR, which also
|
||||||
|
// listens for the same broadcast.
|
||||||
|
lc := net.ListenConfig{
|
||||||
|
Control: func(_, _ string, c syscall.RawConn) error {
|
||||||
|
var serr error
|
||||||
|
_ = c.Control(func(fd uintptr) {
|
||||||
|
serr = windows.SetsockoptInt(windows.Handle(fd), windows.SOL_SOCKET, windows.SO_REUSEADDR, 1)
|
||||||
|
})
|
||||||
|
return serr
|
||||||
|
},
|
||||||
|
}
|
||||||
|
ctx, cancel := context.WithCancel(context.Background())
|
||||||
|
defer cancel()
|
||||||
|
pc, err := lc.ListenPacket(ctx, "udp4", ":4992")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer pc.Close()
|
||||||
|
|
||||||
|
_ = pc.SetReadDeadline(time.Now().Add(timeout))
|
||||||
|
found := map[string]FlexRadio{}
|
||||||
|
buf := make([]byte, 2048)
|
||||||
|
for {
|
||||||
|
n, _, err := pc.ReadFrom(buf)
|
||||||
|
if err != nil {
|
||||||
|
break // deadline reached or socket closed
|
||||||
|
}
|
||||||
|
if r, ok := parseFlexDiscovery(buf[:n]); ok && r.IP != "" {
|
||||||
|
if _, dup := found[r.IP]; !dup {
|
||||||
|
found[r.IP] = r
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out := make([]FlexRadio, 0, len(found))
|
||||||
|
for _, r := range found {
|
||||||
|
out = append(out, r)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
reFlexModel = regexp.MustCompile(`model=(\S+)`)
|
||||||
|
reFlexIP = regexp.MustCompile(`ip=(\S+)`)
|
||||||
|
reFlexPort = regexp.MustCompile(`port=(\d+)`)
|
||||||
|
reFlexSerial = regexp.MustCompile(`serial=(\S+)`)
|
||||||
|
reFlexNickname = regexp.MustCompile(`nickname=(\S+)`)
|
||||||
|
reFlexCallsign = regexp.MustCompile(`callsign=(\S+)`)
|
||||||
|
)
|
||||||
|
|
||||||
|
// parseFlexDiscovery extracts radio fields from a VITA-49 discovery datagram.
|
||||||
|
// The payload carries a space-separated key=value ASCII blob after a binary
|
||||||
|
// header, so we scan the whole packet text for the keys we need.
|
||||||
|
func parseFlexDiscovery(pkt []byte) (FlexRadio, bool) {
|
||||||
|
s := string(pkt)
|
||||||
|
m := reFlexIP.FindStringSubmatch(s)
|
||||||
|
if m == nil {
|
||||||
|
return FlexRadio{}, false
|
||||||
|
}
|
||||||
|
r := FlexRadio{IP: m[1], Port: 4992}
|
||||||
|
if mm := reFlexPort.FindStringSubmatch(s); mm != nil {
|
||||||
|
if p, err := strconv.Atoi(mm[1]); err == nil && p > 0 {
|
||||||
|
r.Port = p
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if mm := reFlexModel.FindStringSubmatch(s); mm != nil {
|
||||||
|
r.Model = mm[1]
|
||||||
|
}
|
||||||
|
if mm := reFlexSerial.FindStringSubmatch(s); mm != nil {
|
||||||
|
r.Serial = mm[1]
|
||||||
|
}
|
||||||
|
if mm := reFlexNickname.FindStringSubmatch(s); mm != nil {
|
||||||
|
r.Nickname = mm[1]
|
||||||
|
}
|
||||||
|
if mm := reFlexCallsign.FindStringSubmatch(s); mm != nil {
|
||||||
|
r.Callsign = mm[1]
|
||||||
|
}
|
||||||
|
return r, true
|
||||||
|
}
|
||||||
@@ -0,0 +1,557 @@
|
|||||||
|
package cat
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/cat/civ"
|
||||||
|
|
||||||
|
"go.bug.st/serial"
|
||||||
|
)
|
||||||
|
|
||||||
|
// IcomSerial controls an Icom transceiver over its USB/serial CI-V port (local
|
||||||
|
// control). It speaks the shared civ protocol, so when the network backend
|
||||||
|
// (icomnet) is added it will reuse the same encode/decode — only the transport
|
||||||
|
// changes. Implements Backend; all methods run on the Manager's CAT goroutine,
|
||||||
|
// so the port is accessed single-threaded (no locking needed).
|
||||||
|
type IcomSerial struct {
|
||||||
|
portName string
|
||||||
|
baud int
|
||||||
|
rigAddr byte // rig's CI-V address (IC-7610 default 0x98)
|
||||||
|
digital string // mode to command for DATA (FT8/RTTY/…)
|
||||||
|
|
||||||
|
port serial.Port
|
||||||
|
rx []byte // accumulated bytes awaiting a complete frame
|
||||||
|
model string
|
||||||
|
|
||||||
|
curFreq int64 // last frequency read (for sideband choice)
|
||||||
|
curModeByte byte // last raw Icom mode byte (for filter re-send)
|
||||||
|
lastSetFreq int64 // last frequency commanded (spot click: freq then mode)
|
||||||
|
lastSetFreqAt time.Time
|
||||||
|
|
||||||
|
// dsp caches the receive-DSP state for the Icom control tab. Read off the
|
||||||
|
// CAT goroutine via IcomState(), written on the CAT goroutine (RefreshIcom
|
||||||
|
// / setters) — hence the mutex.
|
||||||
|
dspMu sync.Mutex
|
||||||
|
dsp IcomTXState
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
icomReadTimeout = 350 * time.Millisecond // wait for a poll response
|
||||||
|
icomCmdTimeout = 400 * time.Millisecond // wait for a set ack (FB/FA)
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewIcomSerial builds an (unconnected) Icom serial backend. baud defaults to
|
||||||
|
// 115200, rig address to the IC-7610's 0x98 when out of range.
|
||||||
|
func NewIcomSerial(portName string, baud, civAddr int, digitalDefault string) *IcomSerial {
|
||||||
|
if baud <= 0 {
|
||||||
|
baud = 115200
|
||||||
|
}
|
||||||
|
if civAddr <= 0 || civAddr > 0xFF {
|
||||||
|
civAddr = 0x98 // IC-7610
|
||||||
|
}
|
||||||
|
if digitalDefault == "" {
|
||||||
|
digitalDefault = "FT8"
|
||||||
|
}
|
||||||
|
return &IcomSerial{
|
||||||
|
portName: portName,
|
||||||
|
baud: baud,
|
||||||
|
rigAddr: byte(civAddr),
|
||||||
|
digital: strings.ToUpper(digitalDefault),
|
||||||
|
model: "Icom",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) Name() string { return "icom" }
|
||||||
|
|
||||||
|
func (b *IcomSerial) Connect() error {
|
||||||
|
if b.portName == "" {
|
||||||
|
return fmt.Errorf("no serial port configured")
|
||||||
|
}
|
||||||
|
port, err := serial.Open(b.portName, &serial.Mode{BaudRate: b.baud})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("open %s @ %d baud: %w", b.portName, b.baud, err)
|
||||||
|
}
|
||||||
|
// Short read timeout so recv() polls in a tight loop without blocking the
|
||||||
|
// CAT goroutine when the rig is silent.
|
||||||
|
_ = port.SetReadTimeout(60 * time.Millisecond)
|
||||||
|
b.port = port
|
||||||
|
b.rx = b.rx[:0]
|
||||||
|
b.model = civ.ModelName(b.rigAddr)
|
||||||
|
|
||||||
|
// Best-effort model identification: ask the rig for its own CI-V address.
|
||||||
|
if err := b.write(civ.CmdReadID, civ.SubPTT); err == nil {
|
||||||
|
if f, err := b.recv(icomReadTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdReadID && len(d.Data) >= 2 && d.Data[0] == 0x00
|
||||||
|
}); err == nil {
|
||||||
|
b.model = civ.ModelName(f.Data[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b.readDSP() // best-effort initial snapshot for the control tab
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) Disconnect() {
|
||||||
|
if b.port != nil {
|
||||||
|
_ = b.port.Close()
|
||||||
|
b.port = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadState polls the rig for frequency and mode. A failed frequency read is
|
||||||
|
// treated as "lost the rig" so the Manager reconnects.
|
||||||
|
func (b *IcomSerial) ReadState() (RigState, error) {
|
||||||
|
if b.port == nil {
|
||||||
|
return RigState{}, fmt.Errorf("not connected")
|
||||||
|
}
|
||||||
|
s := RigState{Backend: b.Name(), Connected: true, Rig: b.model}
|
||||||
|
|
||||||
|
hz, err := b.readFreq()
|
||||||
|
if err != nil {
|
||||||
|
return RigState{}, err
|
||||||
|
}
|
||||||
|
s.FreqHz = hz
|
||||||
|
b.curFreq = hz
|
||||||
|
|
||||||
|
if m, ok := b.readMode(); ok {
|
||||||
|
b.curModeByte = m
|
||||||
|
data := b.readDataMode() // best-effort; ignored on failure
|
||||||
|
s.Mode = civ.ModeToADIF(m, data)
|
||||||
|
if s.Mode == "DATA" {
|
||||||
|
s.Mode = b.digital
|
||||||
|
}
|
||||||
|
b.dspMu.Lock()
|
||||||
|
b.dsp.Mode = s.Mode
|
||||||
|
b.dspMu.Unlock()
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetFrequency(hz int64) error {
|
||||||
|
if hz <= 0 {
|
||||||
|
return fmt.Errorf("invalid frequency")
|
||||||
|
}
|
||||||
|
b.lastSetFreq, b.lastSetFreqAt = hz, time.Now()
|
||||||
|
return b.exec(append([]byte{civ.CmdSetFreq}, civ.FreqToBCD(hz)...)...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetMode(mode string) error {
|
||||||
|
code, data, err := b.modeCode(mode)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Set the base mode (keeping the rig's current filter by sending only the
|
||||||
|
// mode byte), then set the data-mode flag for digital modes.
|
||||||
|
if err := b.exec(civ.CmdSetMode, code); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
dataByte := byte(0)
|
||||||
|
if data {
|
||||||
|
dataByte = 1
|
||||||
|
}
|
||||||
|
// Filter 0x01 (FIL1) is the conventional default for the data-mode set.
|
||||||
|
_ = b.exec(civ.CmdExtra, civ.SubDataMode, dataByte, 0x01)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetPTT(on bool) error {
|
||||||
|
state := byte(0)
|
||||||
|
if on {
|
||||||
|
state = 1
|
||||||
|
}
|
||||||
|
return b.exec(civ.CmdPTT, civ.SubPTT, state)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── helpers ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
func (b *IcomSerial) write(payload ...byte) error {
|
||||||
|
_, err := b.port.Write(civ.Frame(b.rigAddr, civ.AddrController, payload...))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// recv reads from the port until a frame from the rig satisfies match or the
|
||||||
|
// timeout elapses. Frames that are our own echo (from == controller) or don't
|
||||||
|
// match are discarded.
|
||||||
|
func (b *IcomSerial) recv(timeout time.Duration, match func(civ.Decoded) bool) (civ.Decoded, error) {
|
||||||
|
deadline := time.Now().Add(timeout)
|
||||||
|
tmp := make([]byte, 256)
|
||||||
|
for time.Now().Before(deadline) {
|
||||||
|
n, err := b.port.Read(tmp)
|
||||||
|
if err != nil {
|
||||||
|
return civ.Decoded{}, err
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
b.rx = append(b.rx, tmp[:n]...)
|
||||||
|
frames, consumed := civ.Scan(b.rx)
|
||||||
|
if consumed > 0 {
|
||||||
|
b.rx = append(b.rx[:0], b.rx[consumed:]...)
|
||||||
|
}
|
||||||
|
for _, f := range frames {
|
||||||
|
if f.From != b.rigAddr {
|
||||||
|
continue // skip echo of our own commands
|
||||||
|
}
|
||||||
|
if match(f) {
|
||||||
|
return f, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return civ.Decoded{}, fmt.Errorf("icom: timeout waiting for response")
|
||||||
|
}
|
||||||
|
|
||||||
|
// exec sends a set command and waits for the rig's OK (FB) / NG (FA) ack.
|
||||||
|
func (b *IcomSerial) exec(payload ...byte) error {
|
||||||
|
if err := b.write(payload...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomCmdTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.OK || d.Cmd == civ.NG
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if f.Cmd == civ.NG {
|
||||||
|
return fmt.Errorf("icom: rig rejected command 0x%02X", payload[0])
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) readFreq() (int64, error) {
|
||||||
|
if err := b.write(civ.CmdReadFreq); err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomReadTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdReadFreq || d.Cmd == civ.CmdTransceiveFreq
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
return civ.BCDToFreq(f.Data), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) readMode() (byte, bool) {
|
||||||
|
if err := b.write(civ.CmdReadMode); err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomReadTimeout, func(d civ.Decoded) bool {
|
||||||
|
return (d.Cmd == civ.CmdReadMode || d.Cmd == civ.CmdTransceiveMode) && len(d.Data) >= 1
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return f.Data[0], true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) readDataMode() bool {
|
||||||
|
if err := b.write(civ.CmdExtra, civ.SubDataMode); err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomReadTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdExtra && len(d.Data) >= 2 && d.Data[0] == civ.SubDataMode
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return f.Data[1] != 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// modeCode maps an ADIF mode to an Icom mode byte plus whether the data-mode
|
||||||
|
// flag should be set. SSB sideband follows the usual convention (LSB below
|
||||||
|
// 10 MHz, USB above); the frequency just commanded is preferred over the last
|
||||||
|
// poll so a clicked spot (freq then mode) picks the right sideband immediately.
|
||||||
|
func (b *IcomSerial) modeCode(mode string) (code byte, data bool, err error) {
|
||||||
|
freq := b.curFreq
|
||||||
|
if b.lastSetFreq > 0 && time.Since(b.lastSetFreqAt) < 5*time.Second {
|
||||||
|
freq = b.lastSetFreq
|
||||||
|
}
|
||||||
|
usb := byte(civ.ModeUSB)
|
||||||
|
if freq > 0 && freq < 10_000_000 {
|
||||||
|
usb = civ.ModeLSB
|
||||||
|
}
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(mode)) {
|
||||||
|
case "CW":
|
||||||
|
return civ.ModeCW, false, nil
|
||||||
|
case "SSB":
|
||||||
|
return usb, false, nil
|
||||||
|
case "AM":
|
||||||
|
return civ.ModeAM, false, nil
|
||||||
|
case "FM":
|
||||||
|
return civ.ModeFM, false, nil
|
||||||
|
case "RTTY", "FSK":
|
||||||
|
return civ.ModeRTTY, false, nil
|
||||||
|
case "FT8", "FT4", "PSK31", "MFSK", "JS8", "JT65", "JT9", "OLIVIA", "DATA", "DIGITALVOICE":
|
||||||
|
// Digital data modes ride on USB with the data flag set (FT8 etc.).
|
||||||
|
return civ.ModeUSB, true, nil
|
||||||
|
}
|
||||||
|
return 0, false, fmt.Errorf("icom: unsupported mode %q", mode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── IcomController: receive-DSP controls for the Icom tab ───────────────────
|
||||||
|
|
||||||
|
func (b *IcomSerial) IcomState() IcomTXState {
|
||||||
|
b.dspMu.Lock()
|
||||||
|
defer b.dspMu.Unlock()
|
||||||
|
return b.dsp
|
||||||
|
}
|
||||||
|
|
||||||
|
// RefreshIcom re-reads the whole DSP snapshot from the rig. Runs on the CAT
|
||||||
|
// goroutine (dispatched via IcomDo).
|
||||||
|
func (b *IcomSerial) RefreshIcom() error {
|
||||||
|
if b.port == nil {
|
||||||
|
return fmt.Errorf("not connected")
|
||||||
|
}
|
||||||
|
b.readDSP()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// readDSP polls every DSP value once and replaces the cache. Best-effort: a
|
||||||
|
// value the rig doesn't answer keeps its previous cached value rather than
|
||||||
|
// stalling (each read has a short timeout).
|
||||||
|
func (b *IcomSerial) readDSP() {
|
||||||
|
st := IcomTXState{Available: true, Model: b.model}
|
||||||
|
b.dspMu.Lock()
|
||||||
|
st.Mode = b.dsp.Mode // preserve mode (set by ReadState)
|
||||||
|
b.dspMu.Unlock()
|
||||||
|
|
||||||
|
if v, ok := b.readLevel(civ.SubLevelAF); ok {
|
||||||
|
st.AFGain = from255(v)
|
||||||
|
}
|
||||||
|
if v, ok := b.readLevel(civ.SubLevelRF); ok {
|
||||||
|
st.RFGain = from255(v)
|
||||||
|
}
|
||||||
|
if v, ok := b.readLevel(civ.SubLevelNR); ok {
|
||||||
|
st.NRLevel = from255(v)
|
||||||
|
}
|
||||||
|
if v, ok := b.readLevel(civ.SubLevelNB); ok {
|
||||||
|
st.NBLevel = from255(v)
|
||||||
|
}
|
||||||
|
if v, ok := b.readSwitch(civ.SubSwNB); ok {
|
||||||
|
st.NB = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := b.readSwitch(civ.SubSwNR); ok {
|
||||||
|
st.NR = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := b.readSwitch(civ.SubSwANF); ok {
|
||||||
|
st.ANF = v != 0
|
||||||
|
}
|
||||||
|
if v, ok := b.readSwitch(civ.SubSwAGC); ok {
|
||||||
|
st.AGC = agcName(v)
|
||||||
|
}
|
||||||
|
if v, ok := b.readSwitch(civ.SubSwPreamp); ok {
|
||||||
|
st.Preamp = int(v)
|
||||||
|
}
|
||||||
|
if v, ok := b.readAtt(); ok {
|
||||||
|
st.Att = v
|
||||||
|
}
|
||||||
|
if _, f, ok := b.readModeFilter(); ok {
|
||||||
|
st.Filter = int(f)
|
||||||
|
}
|
||||||
|
|
||||||
|
b.dspMu.Lock()
|
||||||
|
b.dsp = st
|
||||||
|
b.dspMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
const icomDSPTimeout = 150 * time.Millisecond // shorter: unsupported reads mustn't stall the poll
|
||||||
|
|
||||||
|
func (b *IcomSerial) readLevel(sub byte) (int, bool) {
|
||||||
|
if err := b.write(civ.CmdLevel, sub); err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdLevel && len(d.Data) >= 3 && d.Data[0] == sub
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return civ.BCDToLevel(f.Data[1:3]), true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) readSwitch(sub byte) (byte, bool) {
|
||||||
|
if err := b.write(civ.CmdSwitch, sub); err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdSwitch && len(d.Data) >= 2 && d.Data[0] == sub
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return f.Data[1], true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) readAtt() (int, bool) {
|
||||||
|
if err := b.write(civ.CmdAtt); err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdAtt && len(d.Data) >= 1
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return civ.BCDToByte(f.Data[0]), true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) readModeFilter() (mode, filter byte, ok bool) {
|
||||||
|
if err := b.write(civ.CmdReadMode); err != nil {
|
||||||
|
return 0, 0, false
|
||||||
|
}
|
||||||
|
f, err := b.recv(icomDSPTimeout, func(d civ.Decoded) bool {
|
||||||
|
return d.Cmd == civ.CmdReadMode && len(d.Data) >= 2
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, false
|
||||||
|
}
|
||||||
|
return f.Data[0], f.Data[1], true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetAFGain(p int) error {
|
||||||
|
if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelAF}, civ.LevelToBCD(to255(p))...)...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.AFGain = clampPct(p) })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetRFGain(p int) error {
|
||||||
|
if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelRF}, civ.LevelToBCD(to255(p))...)...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.RFGain = clampPct(p) })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetNB(on bool) error {
|
||||||
|
if err := b.exec(civ.CmdSwitch, civ.SubSwNB, boolByte(on)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.NB = on })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetNBLevel(p int) error {
|
||||||
|
if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelNB}, civ.LevelToBCD(to255(p))...)...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.NBLevel = clampPct(p) })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetNR(on bool) error {
|
||||||
|
if err := b.exec(civ.CmdSwitch, civ.SubSwNR, boolByte(on)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.NR = on })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetNRLevel(p int) error {
|
||||||
|
if err := b.exec(append([]byte{civ.CmdLevel, civ.SubLevelNR}, civ.LevelToBCD(to255(p))...)...); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.NRLevel = clampPct(p) })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetANF(on bool) error {
|
||||||
|
if err := b.exec(civ.CmdSwitch, civ.SubSwANF, boolByte(on)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.ANF = on })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetAGC(name string) error {
|
||||||
|
v := agcValue(name)
|
||||||
|
if v == 0 {
|
||||||
|
return fmt.Errorf("icom: invalid AGC %q", name)
|
||||||
|
}
|
||||||
|
if err := b.exec(civ.CmdSwitch, civ.SubSwAGC, v); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.AGC = strings.ToUpper(name) })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetPreamp(n int) error {
|
||||||
|
if n < 0 || n > 2 {
|
||||||
|
return fmt.Errorf("icom: invalid preamp %d", n)
|
||||||
|
}
|
||||||
|
if err := b.exec(civ.CmdSwitch, civ.SubSwPreamp, byte(n)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.Preamp = n })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetAtt(db int) error {
|
||||||
|
if err := b.exec(civ.CmdAtt, civ.ByteToBCD(db)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.Att = db })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) SetIcomFilter(n int) error {
|
||||||
|
if n < 1 || n > 3 {
|
||||||
|
return fmt.Errorf("icom: invalid filter %d", n)
|
||||||
|
}
|
||||||
|
if b.curModeByte == 0 {
|
||||||
|
// Need the current mode to re-send with the chosen filter.
|
||||||
|
if m, _, ok := b.readModeFilter(); ok {
|
||||||
|
b.curModeByte = m
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := b.exec(civ.CmdSetMode, b.curModeByte, byte(n)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
b.setCache(func(s *IcomTXState) { s.Filter = n })
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (b *IcomSerial) setCache(fn func(*IcomTXState)) {
|
||||||
|
b.dspMu.Lock()
|
||||||
|
fn(&b.dsp)
|
||||||
|
b.dspMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── small helpers ──────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
func to255(p int) int { return clampPct(p) * 255 / 100 }
|
||||||
|
func from255(v int) int { return (v*100 + 127) / 255 }
|
||||||
|
func clampPct(p int) int { return min(100, max(0, p)) }
|
||||||
|
|
||||||
|
func boolByte(on bool) byte {
|
||||||
|
if on {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
func agcName(v byte) string {
|
||||||
|
switch v {
|
||||||
|
case 1:
|
||||||
|
return "FAST"
|
||||||
|
case 2:
|
||||||
|
return "MID"
|
||||||
|
case 3:
|
||||||
|
return "SLOW"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func agcValue(name string) byte {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(name)) {
|
||||||
|
case "FAST":
|
||||||
|
return 1
|
||||||
|
case "MID":
|
||||||
|
return 2
|
||||||
|
case "SLOW":
|
||||||
|
return 3
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
+106
-42
@@ -3,11 +3,21 @@ package cat
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/go-ole/go-ole"
|
"github.com/go-ole/go-ole"
|
||||||
"github.com/go-ole/go-ole/oleutil"
|
"github.com/go-ole/go-ole/oleutil"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// OmniRig Split is an enum, not a boolean: PM_SPLITON vs PM_SPLITOFF — both
|
||||||
|
// non-zero, so it must be compared to PM_SPLITON (testing "!= 0" reads OFF as
|
||||||
|
// split). Values confirmed empirically from real rigs (FT-710, SmartSDR):
|
||||||
|
// split ON = 0x8000, split OFF = 0x10000.
|
||||||
|
const (
|
||||||
|
pmSplitOn = 0x8000 // PM_SPLITON
|
||||||
|
pmSplitOff = 0x10000 // PM_SPLITOFF
|
||||||
|
)
|
||||||
|
|
||||||
// OmniRig talks to the user's installed OmniRig server over COM.
|
// OmniRig talks to the user's installed OmniRig server over COM.
|
||||||
//
|
//
|
||||||
// All methods MUST be called from the same OS thread (the one Manager.run
|
// All methods MUST be called from the same OS thread (the one Manager.run
|
||||||
@@ -21,6 +31,15 @@ type OmniRig struct {
|
|||||||
|
|
||||||
omnirig *ole.IDispatch
|
omnirig *ole.IDispatch
|
||||||
rig *ole.IDispatch
|
rig *ole.IDispatch
|
||||||
|
lastSig string // last logged Split/VFO signature — only log on change
|
||||||
|
|
||||||
|
// lastSetFreq is the frequency most recently COMMANDED via SetFrequency.
|
||||||
|
// SetMode uses it to pick USB vs LSB for "SSB" instead of reading OmniRig's
|
||||||
|
// async Freq property, which still reports the OLD band for a poll or two
|
||||||
|
// after a QSY — that lag is why a clicked spot needed a second click to fix
|
||||||
|
// the sideband (freq moved, but mode read the old band → wrong sideband).
|
||||||
|
lastSetFreq int64
|
||||||
|
lastSetFreqAt time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewOmniRig creates a non-connected backend. Call Connect before use.
|
// NewOmniRig creates a non-connected backend. Call Connect before use.
|
||||||
@@ -107,13 +126,19 @@ func (o *OmniRig) ReadState() (RigState, error) {
|
|||||||
if modeVar, err := oleutil.GetProperty(o.rig, "Mode"); err == nil {
|
if modeVar, err := oleutil.GetProperty(o.rig, "Mode"); err == nil {
|
||||||
s.Mode = omniRigMode(modeVar.Val)
|
s.Mode = omniRigMode(modeVar.Val)
|
||||||
}
|
}
|
||||||
|
rawVfo := int64(0)
|
||||||
if vfoVar, err := oleutil.GetProperty(o.rig, "Vfo"); err == nil {
|
if vfoVar, err := oleutil.GetProperty(o.rig, "Vfo"); err == nil {
|
||||||
|
rawVfo = vfoVar.Val
|
||||||
s.Vfo = omniRigVfo(vfoVar.Val)
|
s.Vfo = omniRigVfo(vfoVar.Val)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read both VFO frequencies separately so we can expose split TX/RX.
|
// Read the active/displayed frequency (generic Freq) AND both VFOs. The
|
||||||
// Fall back to generic Freq if the rig only exposes the merged property.
|
// generic Freq is what the rig is operating on — the reliable source for the
|
||||||
freqA, freqB := int64(0), int64(0)
|
// main/TX frequency. FreqA/FreqB are only needed to expose a genuine split.
|
||||||
|
freqMain, freqA, freqB := int64(0), int64(0), int64(0)
|
||||||
|
if v, err := oleutil.GetProperty(o.rig, "Freq"); err == nil {
|
||||||
|
freqMain = v.Val
|
||||||
|
}
|
||||||
if v, err := oleutil.GetProperty(o.rig, "FreqA"); err == nil {
|
if v, err := oleutil.GetProperty(o.rig, "FreqA"); err == nil {
|
||||||
freqA = v.Val
|
freqA = v.Val
|
||||||
}
|
}
|
||||||
@@ -121,38 +146,65 @@ func (o *OmniRig) ReadState() (RigState, error) {
|
|||||||
freqB = v.Val
|
freqB = v.Val
|
||||||
}
|
}
|
||||||
|
|
||||||
// Split detection: trust the explicit Split property when it's set,
|
// Split is an enum (PM_SPLITON / PM_SPLITOFF) — both non-zero, so it must be
|
||||||
// BUT only call it a real split if both VFO frequencies are non-zero
|
// compared to PM_SPLITON, not "!= 0".
|
||||||
// and distinct. Bridges like SmartSDR-OmniRig report Split=ON by
|
splitRaw := int64(0)
|
||||||
// default (raw bit PM_SPLITON = 65536) with FreqB=0 because the Flex's
|
if v, err := oleutil.GetProperty(o.rig, "Split"); err == nil {
|
||||||
// slice model doesn't map to VFO A/B — that would yield a useless
|
splitRaw = v.Val
|
||||||
// permanent SPLIT badge.
|
|
||||||
if v, err := oleutil.GetProperty(o.rig, "Split"); err == nil && v.Val != 0 {
|
|
||||||
s.Split = true
|
|
||||||
}
|
|
||||||
if s.Split && (freqB == 0 || freqA == freqB) {
|
|
||||||
s.Split = false
|
|
||||||
s.RxFreqHz = 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// OmniRig's Vfo enum is RX-letter then TX-letter (AB = RX A, TX B).
|
// Diagnostic logged ONLY when Split or VFO changes (not on a timer), so
|
||||||
// We follow ADIF: FreqHz = TX, RxFreqHz = RX (only meaningful in split).
|
// normal operation stays quiet but toggling split on the radio is captured —
|
||||||
switch s.Vfo {
|
// needed to pin down this rig's PM_SPLITON value.
|
||||||
case "AB":
|
if sig := fmt.Sprintf("%x:%x", splitRaw, rawVfo); sig != o.lastSig {
|
||||||
s.FreqHz = freqB // TX
|
o.lastSig = sig
|
||||||
s.RxFreqHz = freqA // RX
|
debugLog.Printf("OmniRig Rig%d raw: Freq=%d FreqA=%d FreqB=%d Vfo=%q(raw=0x%X) Split=0x%X status=%d",
|
||||||
case "BA":
|
o.RigNum, freqMain, freqA, freqB, s.Vfo, rawVfo, splitRaw, func() int64 {
|
||||||
s.FreqHz = freqA // TX
|
if v, e := oleutil.GetProperty(o.rig, "Status"); e == nil {
|
||||||
s.RxFreqHz = freqB // RX
|
return v.Val
|
||||||
case "B", "BB":
|
}
|
||||||
s.FreqHz = freqB
|
return -1
|
||||||
default: // "A", "AA", "" — single VFO on A or unknown
|
}())
|
||||||
s.FreqHz = freqA
|
|
||||||
}
|
}
|
||||||
if s.FreqHz == 0 {
|
|
||||||
// Last resort — some rigs only update generic Freq.
|
// A genuine split: the rig explicitly flags PM_SPLITON, the two VFOs are
|
||||||
if v, err := oleutil.GetProperty(o.rig, "Freq"); err == nil {
|
// distinct and non-zero, AND they're in the same band. The same-band test
|
||||||
s.FreqHz = v.Val
|
// kills the common false positive where VFO B just holds a leftover from
|
||||||
|
// another band (a "28 MHz / 7 MHz split" is nonsensical), which on the
|
||||||
|
// FT-710 / TS-570 otherwise froze the main/TX freq on the wrong VFO.
|
||||||
|
genuineSplit := splitRaw == pmSplitOn &&
|
||||||
|
freqA != 0 && freqB != 0 && freqA != freqB &&
|
||||||
|
BandFromHz(freqA) == BandFromHz(freqB)
|
||||||
|
|
||||||
|
if genuineSplit {
|
||||||
|
// ADIF: FreqHz = TX, RxFreqHz = RX. Determine which VFO is RX from the
|
||||||
|
// ACTIVE frequency (OmniRig's generic Freq — the VFO you're listening on):
|
||||||
|
// RX = the active VFO, TX = the other one. This is far more reliable than
|
||||||
|
// trusting OmniRig's Vfo AB/BA enum, which several rigs (e.g. Yaesu FTDX10)
|
||||||
|
// report inverted — the split then showed TX/RX swapped.
|
||||||
|
s.Split = true
|
||||||
|
switch {
|
||||||
|
case freqMain != 0 && freqMain == freqA:
|
||||||
|
s.RxFreqHz, s.FreqHz = freqA, freqB // listening on A → TX on B
|
||||||
|
case freqMain != 0 && freqMain == freqB:
|
||||||
|
s.RxFreqHz, s.FreqHz = freqB, freqA // listening on B → TX on A
|
||||||
|
case s.Vfo == "BA":
|
||||||
|
s.FreqHz, s.RxFreqHz = freqA, freqB // fall back to the Vfo enum
|
||||||
|
default:
|
||||||
|
s.FreqHz, s.RxFreqHz = freqB, freqA
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Simplex: the operating frequency is OmniRig's generic Freq (the active
|
||||||
|
// VFO), like Log4OM. Fall back to the per-VFO value only if Freq is 0.
|
||||||
|
s.Split = false
|
||||||
|
s.RxFreqHz = 0
|
||||||
|
s.FreqHz = freqMain
|
||||||
|
if s.FreqHz == 0 {
|
||||||
|
if s.Vfo == "B" || s.Vfo == "BB" {
|
||||||
|
s.FreqHz = freqB
|
||||||
|
} else {
|
||||||
|
s.FreqHz = freqA
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return s, nil
|
return s, nil
|
||||||
@@ -169,6 +221,10 @@ func (o *OmniRig) SetFrequency(hz int64) error {
|
|||||||
return fmt.Errorf("frequency out of OmniRig int32 range")
|
return fmt.Errorf("frequency out of OmniRig int32 range")
|
||||||
}
|
}
|
||||||
hz32 := int32(hz)
|
hz32 := int32(hz)
|
||||||
|
// Remember the commanded frequency so a mode change moments later (a clicked
|
||||||
|
// spot sets freq then mode) picks the sideband from the TARGET band, not the
|
||||||
|
// not-yet-updated OmniRig Freq property.
|
||||||
|
o.lastSetFreq, o.lastSetFreqAt = hz, time.Now()
|
||||||
|
|
||||||
// Log the rig's writable-params, status and VFO state up front so a
|
// Log the rig's writable-params, status and VFO state up front so a
|
||||||
// friend's session shows exactly what OmniRig reports for their rig.
|
// friend's session shows exactly what OmniRig reports for their rig.
|
||||||
@@ -274,9 +330,15 @@ func (o *OmniRig) SetMode(mode string) error {
|
|||||||
case "CW":
|
case "CW":
|
||||||
bit, bitName = pmCWU, "PM_CW_U"
|
bit, bitName = pmCWU, "PM_CW_U"
|
||||||
case "SSB":
|
case "SSB":
|
||||||
// Read current freq to decide USB vs LSB.
|
// Decide USB vs LSB from the frequency. Prefer the freq we just COMMANDED
|
||||||
|
// (a clicked spot sets freq then mode ~150ms later): OmniRig's Freq
|
||||||
|
// property still reports the OLD band for a poll or two after a QSY, so
|
||||||
|
// reading it here picked the wrong sideband and the user had to click a
|
||||||
|
// second time. Fall back to the live read for a standalone mode change.
|
||||||
var freq int64
|
var freq int64
|
||||||
if freqVar, err := oleutil.GetProperty(o.rig, "Freq"); err == nil {
|
if o.lastSetFreq > 0 && time.Since(o.lastSetFreqAt) < 5*time.Second {
|
||||||
|
freq = o.lastSetFreq
|
||||||
|
} else if freqVar, err := oleutil.GetProperty(o.rig, "Freq"); err == nil {
|
||||||
freq = freqVar.Val
|
freq = freqVar.Val
|
||||||
}
|
}
|
||||||
if freq > 0 && freq < 10_000_000 {
|
if freq > 0 && freq < 10_000_000 {
|
||||||
@@ -396,20 +458,22 @@ func omniRigMode(m int64) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// omniRigVfo maps the OmniRig Vfo RigParamX enum to a short label, using the
|
||||||
|
// documented PM_VFO* constants.
|
||||||
func omniRigVfo(v int64) string {
|
func omniRigVfo(v int64) string {
|
||||||
switch {
|
switch {
|
||||||
case v&1024 != 0:
|
case v&0x40 != 0: // PM_VFOAA
|
||||||
return "A"
|
|
||||||
case v&2048 != 0:
|
|
||||||
return "B"
|
|
||||||
case v&64 != 0:
|
|
||||||
return "AA"
|
return "AA"
|
||||||
case v&128 != 0:
|
case v&0x80 != 0: // PM_VFOAB
|
||||||
return "AB"
|
return "AB"
|
||||||
case v&256 != 0:
|
case v&0x100 != 0: // PM_VFOBA
|
||||||
return "BA"
|
return "BA"
|
||||||
case v&512 != 0:
|
case v&0x200 != 0: // PM_VFOBB
|
||||||
return "BB"
|
return "BB"
|
||||||
|
case v&0x400 != 0: // PM_VFOA
|
||||||
|
return "A"
|
||||||
|
case v&0x800 != 0: // PM_VFOB
|
||||||
|
return "B"
|
||||||
}
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,321 @@
|
|||||||
|
//go:build windows
|
||||||
|
|
||||||
|
package cat
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TCI is a native backend for Expert Electronics' TCI protocol (SunSDR2/MB1/
|
||||||
|
// ColibriNANO via ExpertSDR2/EESDR, and TCI-compatible apps). TCI is a text
|
||||||
|
// protocol over a WebSocket: the server streams state ("vfo:0,0,14100000;",
|
||||||
|
// "modulation:0,cw;", "trx:0,true;") and accepts the same commands to control
|
||||||
|
// the rig. We keep the pushed state cached so ReadState is instant, like Flex.
|
||||||
|
//
|
||||||
|
// Pure Go (gorilla/websocket, no CGO). Default port 40001.
|
||||||
|
type TCI struct {
|
||||||
|
host string
|
||||||
|
port int
|
||||||
|
|
||||||
|
digitalDefault string // surfaced when the rig reports a digital mode (FT8/…)
|
||||||
|
spotsEnabled bool // mirror cluster spots onto the TCI panorama
|
||||||
|
|
||||||
|
mu sync.Mutex // guards conn + writes + state
|
||||||
|
conn *websocket.Conn
|
||||||
|
ready bool
|
||||||
|
|
||||||
|
// Cached state pushed by the radio.
|
||||||
|
device string
|
||||||
|
freqA int64 // VFO A (RX) frequency, Hz (vfo:0,0)
|
||||||
|
freqB int64 // VFO B (TX in split), Hz (vfo:0,1)
|
||||||
|
mode string
|
||||||
|
split bool
|
||||||
|
tx bool
|
||||||
|
|
||||||
|
lastSig string // last logged state signature (log only on change)
|
||||||
|
}
|
||||||
|
|
||||||
|
const tciDefaultPort = 40001
|
||||||
|
|
||||||
|
// NewTCI builds a TCI backend for the given host/port. digitalDefault is the
|
||||||
|
// mode surfaced when the radio reports a generic digital modulation; spots turns
|
||||||
|
// on mirroring OpsLog's cluster spots onto the TCI panorama.
|
||||||
|
func NewTCI(host string, port int, digitalDefault string, spots bool) *TCI {
|
||||||
|
if port <= 0 || port > 65535 {
|
||||||
|
port = tciDefaultPort
|
||||||
|
}
|
||||||
|
return &TCI{host: strings.TrimSpace(host), port: port, digitalDefault: strings.TrimSpace(digitalDefault), spotsEnabled: spots}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *TCI) Name() string { return "tci" }
|
||||||
|
|
||||||
|
// Connect opens the WebSocket and starts the reader goroutine. The reader keeps
|
||||||
|
// our cached state current from the radio's push messages.
|
||||||
|
func (t *TCI) Connect() error {
|
||||||
|
t.mu.Lock()
|
||||||
|
already := t.conn != nil
|
||||||
|
host, port := t.host, t.port
|
||||||
|
t.mu.Unlock()
|
||||||
|
if already {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if host == "" {
|
||||||
|
return fmt.Errorf("tci: no host configured")
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("ws://%s", net.JoinHostPort(host, strconv.Itoa(port)))
|
||||||
|
dialer := websocket.Dialer{HandshakeTimeout: 5 * time.Second}
|
||||||
|
conn, _, err := dialer.Dial(url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("tci: connect %s: %w", url, err)
|
||||||
|
}
|
||||||
|
t.mu.Lock()
|
||||||
|
t.conn = conn
|
||||||
|
t.ready = false
|
||||||
|
t.mu.Unlock()
|
||||||
|
debugLog.Printf("TCI: connected to %s", url)
|
||||||
|
go t.reader(conn)
|
||||||
|
if t.spotsEnabled {
|
||||||
|
_ = t.send("spot_clear;") // drop any leftover spots from a previous session
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendSpot mirrors a cluster spot onto the TCI panorama (implements Spotter).
|
||||||
|
// The radio replaces a spot that has the same callsign, so re-spotting updates
|
||||||
|
// it in place. No-op when spot mirroring is disabled.
|
||||||
|
func (t *TCI) SendSpot(s SpotInfo) error {
|
||||||
|
if !t.spotsEnabled {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
call := strings.TrimSpace(s.Callsign)
|
||||||
|
if call == "" || s.FreqHz <= 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
color := strings.TrimSpace(s.Color)
|
||||||
|
if color == "" {
|
||||||
|
color = "#FFFFA500" // opaque orange default
|
||||||
|
}
|
||||||
|
color = "0x" + strings.TrimPrefix(color, "#")
|
||||||
|
mode := strings.ToLower(strings.TrimSpace(s.Mode))
|
||||||
|
// Commas/semicolons would break TCI's comma-separated argument parsing.
|
||||||
|
text := strings.NewReplacer(",", " ", ";", " ").Replace(s.Comment)
|
||||||
|
return t.send(fmt.Sprintf("spot:%s,%s,%d,%s,%s;", call, mode, s.FreqHz, color, text))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Disconnect closes the WebSocket; the reader goroutine then exits.
|
||||||
|
func (t *TCI) Disconnect() {
|
||||||
|
t.mu.Lock()
|
||||||
|
c := t.conn
|
||||||
|
t.conn = nil
|
||||||
|
t.ready = false
|
||||||
|
t.mu.Unlock()
|
||||||
|
if c != nil {
|
||||||
|
_ = c.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
|
||||||
|
_ = c.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadState returns the cached state pushed by the radio.
|
||||||
|
func (t *TCI) ReadState() (RigState, error) {
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
if t.conn == nil {
|
||||||
|
return RigState{}, fmt.Errorf("tci: not connected")
|
||||||
|
}
|
||||||
|
st := RigState{Connected: t.ready, Rig: t.device}
|
||||||
|
if !t.ready {
|
||||||
|
return st, nil
|
||||||
|
}
|
||||||
|
// ADIF convention: FreqHz is the TX freq. In split, TX is VFO B.
|
||||||
|
if t.split && t.freqB > 0 {
|
||||||
|
st.FreqHz = t.freqB
|
||||||
|
st.RxFreqHz = t.freqA
|
||||||
|
st.Split = true
|
||||||
|
} else {
|
||||||
|
st.FreqHz = t.freqA
|
||||||
|
}
|
||||||
|
st.Mode = tciModeToADIF(t.mode, t.digitalDefault)
|
||||||
|
if st.FreqHz > 0 {
|
||||||
|
st.Band = BandFromHz(st.FreqHz)
|
||||||
|
}
|
||||||
|
sig := fmt.Sprintf("%d/%d/%v/%s", st.FreqHz, st.RxFreqHz, st.Split, st.Mode)
|
||||||
|
if sig != t.lastSig {
|
||||||
|
t.lastSig = sig
|
||||||
|
debugLog.Printf("TCI: state tx=%d rx=%d split=%v mode=%s", st.FreqHz, st.RxFreqHz, st.Split, st.Mode)
|
||||||
|
}
|
||||||
|
return st, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetFrequency tunes VFO A (the main/RX VFO).
|
||||||
|
func (t *TCI) SetFrequency(hz int64) error {
|
||||||
|
return t.send(fmt.Sprintf("vfo:0,0,%d;", hz))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMode maps an ADIF mode to a TCI modulation and sets it. USB vs LSB is
|
||||||
|
// chosen from the current VFO-A frequency (< 10 MHz → LSB).
|
||||||
|
func (t *TCI) SetMode(mode string) error {
|
||||||
|
t.mu.Lock()
|
||||||
|
freq := t.freqA
|
||||||
|
t.mu.Unlock()
|
||||||
|
m := adifToTCIMode(mode, freq)
|
||||||
|
if m == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return t.send(fmt.Sprintf("modulation:0,%s;", m))
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetPTT keys or unkeys the transmitter (VFO 0).
|
||||||
|
func (t *TCI) SetPTT(on bool) error {
|
||||||
|
return t.send(fmt.Sprintf("trx:0,%t;", on))
|
||||||
|
}
|
||||||
|
|
||||||
|
// send writes a command to the WebSocket (one writer at a time).
|
||||||
|
func (t *TCI) send(cmd string) error {
|
||||||
|
t.mu.Lock()
|
||||||
|
c := t.conn
|
||||||
|
t.mu.Unlock()
|
||||||
|
if c == nil {
|
||||||
|
return fmt.Errorf("tci: not connected")
|
||||||
|
}
|
||||||
|
_ = c.SetWriteDeadline(time.Now().Add(3 * time.Second))
|
||||||
|
if err := c.WriteMessage(websocket.TextMessage, []byte(cmd)); err != nil {
|
||||||
|
debugLog.Printf("TCI: send %q failed: %v", cmd, err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
debugLog.Printf("TCI: → %s", cmd)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// reader drains push messages and keeps the cached state current until the
|
||||||
|
// connection closes.
|
||||||
|
func (t *TCI) reader(conn *websocket.Conn) {
|
||||||
|
for {
|
||||||
|
_, data, err := conn.ReadMessage()
|
||||||
|
if err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
// A frame may carry several ";"-terminated commands.
|
||||||
|
for _, cmd := range strings.Split(string(data), ";") {
|
||||||
|
t.handle(strings.TrimSpace(cmd))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.mu.Lock()
|
||||||
|
if t.conn == conn {
|
||||||
|
t.conn = nil
|
||||||
|
t.ready = false
|
||||||
|
}
|
||||||
|
t.mu.Unlock()
|
||||||
|
debugLog.Printf("TCI: reader ended")
|
||||||
|
}
|
||||||
|
|
||||||
|
// handle parses one "command:args" message and updates the cache.
|
||||||
|
func (t *TCI) handle(msg string) {
|
||||||
|
if msg == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
name, args := msg, ""
|
||||||
|
if i := strings.IndexByte(msg, ':'); i >= 0 {
|
||||||
|
name, args = msg[:i], msg[i+1:]
|
||||||
|
}
|
||||||
|
f := strings.Split(args, ",")
|
||||||
|
get := func(i int) string {
|
||||||
|
if i < len(f) {
|
||||||
|
return strings.TrimSpace(f[i])
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
t.mu.Lock()
|
||||||
|
defer t.mu.Unlock()
|
||||||
|
switch strings.ToLower(name) {
|
||||||
|
case "device":
|
||||||
|
t.device = strings.TrimSpace(args)
|
||||||
|
case "ready", "start":
|
||||||
|
t.ready = true
|
||||||
|
case "stop":
|
||||||
|
t.ready = false
|
||||||
|
case "vfo":
|
||||||
|
// vfo:<rx>,<channel>,<freq>
|
||||||
|
if get(0) == "0" {
|
||||||
|
hz, _ := strconv.ParseInt(get(2), 10, 64)
|
||||||
|
if hz > 0 {
|
||||||
|
t.ready = true // receiving live state → treat as ready even without an explicit "ready;"
|
||||||
|
switch get(1) {
|
||||||
|
case "0":
|
||||||
|
t.freqA = hz
|
||||||
|
case "1":
|
||||||
|
t.freqB = hz
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case "modulation":
|
||||||
|
if get(0) == "0" {
|
||||||
|
t.mode = strings.ToLower(get(1))
|
||||||
|
}
|
||||||
|
case "split_enable":
|
||||||
|
if get(0) == "0" {
|
||||||
|
t.split = get(1) == "true"
|
||||||
|
}
|
||||||
|
case "trx":
|
||||||
|
if get(0) == "0" {
|
||||||
|
t.tx = get(1) == "true"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// tciModeToADIF converts a TCI modulation to an ADIF mode. Generic digital
|
||||||
|
// modulations surface the operator's chosen digital default (FT8/FT4/RTTY…).
|
||||||
|
func tciModeToADIF(m, digitalDefault string) string {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(m)) {
|
||||||
|
case "usb", "lsb", "dsb":
|
||||||
|
return "SSB"
|
||||||
|
case "cw":
|
||||||
|
return "CW"
|
||||||
|
case "am", "sam":
|
||||||
|
return "AM"
|
||||||
|
case "nfm", "wfm", "fm":
|
||||||
|
return "FM"
|
||||||
|
case "digu", "digl":
|
||||||
|
if digitalDefault != "" {
|
||||||
|
return strings.ToUpper(digitalDefault)
|
||||||
|
}
|
||||||
|
return "DATA"
|
||||||
|
case "drm":
|
||||||
|
return "DIGITALVOICE"
|
||||||
|
case "":
|
||||||
|
return ""
|
||||||
|
default:
|
||||||
|
return strings.ToUpper(m)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// adifToTCIMode maps an ADIF mode to a TCI modulation. USB/LSB is chosen from
|
||||||
|
// the frequency (< 10 MHz → LSB) as usual. Digital modes → digu.
|
||||||
|
func adifToTCIMode(mode string, freqHz int64) string {
|
||||||
|
switch strings.ToUpper(strings.TrimSpace(mode)) {
|
||||||
|
case "SSB", "USB", "LSB":
|
||||||
|
if freqHz > 0 && freqHz < 10_000_000 {
|
||||||
|
return "lsb"
|
||||||
|
}
|
||||||
|
return "usb"
|
||||||
|
case "CW", "CWR", "CW-R":
|
||||||
|
return "cw"
|
||||||
|
case "AM":
|
||||||
|
return "am"
|
||||||
|
case "FM", "NFM":
|
||||||
|
return "nfm"
|
||||||
|
case "RTTY":
|
||||||
|
return "digl"
|
||||||
|
case "":
|
||||||
|
return ""
|
||||||
|
default:
|
||||||
|
// FT8/FT4/PSK/DATA/JT… → upper-sideband digital.
|
||||||
|
return "digu"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,370 @@
|
|||||||
|
// Package cwdecode is a real-time CW (Morse) decoder: it turns a stream of
|
||||||
|
// mono PCM samples into decoded text. The pipeline is the classic one — a bank
|
||||||
|
// of Goertzel tone detectors, a pitch LOCK that follows a single tone (so QRM
|
||||||
|
// at other pitches is ignored), an adaptive envelope/threshold on the LOCKED
|
||||||
|
// tone (level-independent, so weak or strong signals both key cleanly), an
|
||||||
|
// adaptive dot-length (WPM) estimate, and a timing state machine that maps
|
||||||
|
// marks/spaces to Morse and then to characters.
|
||||||
|
//
|
||||||
|
// It is deliberately self-contained and dependency-free so it can be unit
|
||||||
|
// tested with synthetic signals. As with every audio CW decoder, weak signals
|
||||||
|
// and very heavy QRM still degrade it; the pitch lock keeps QRM on other tones
|
||||||
|
// out of the decode.
|
||||||
|
package cwdecode
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"sort"
|
||||||
|
"sync/atomic"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Status is a periodic snapshot for the UI (pitch lock, speed, signal).
|
||||||
|
type Status struct {
|
||||||
|
WPM int `json:"wpm"`
|
||||||
|
Pitch int `json:"pitch"` // Hz of the locked tone (0 = not locked)
|
||||||
|
Level float64 `json:"level"` // 0..1 input audio level (RMS) for the meter
|
||||||
|
Active bool `json:"active"` // a tone is currently keyed down
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decoder consumes PCM and emits decoded characters via onChar (one or more
|
||||||
|
// characters at a time, including " " for word gaps) and periodic onStatus.
|
||||||
|
type Decoder struct {
|
||||||
|
fs int
|
||||||
|
hop int // samples between updates
|
||||||
|
win int // Goertzel window length
|
||||||
|
freqs []float64
|
||||||
|
coeffs []float64 // precomputed 2*cos(w) per freq
|
||||||
|
|
||||||
|
ring []float64 // last win samples
|
||||||
|
acc int // samples since last hop
|
||||||
|
mags []float64 // per-bin magnitude this hop
|
||||||
|
nbuf []float64 // scratch for the noise percentile
|
||||||
|
|
||||||
|
// Fixed-pitch target (Hz). 0 = auto-search; >0 = lock to the nearest bin and
|
||||||
|
// ignore everything else (e.g. follow the radio's CW pitch). Set live from
|
||||||
|
// another goroutine, so it's atomic.
|
||||||
|
targetHz atomic.Int32
|
||||||
|
|
||||||
|
// Pitch lock.
|
||||||
|
lockIdx int // index of the locked tone bin, -1 = unlocked
|
||||||
|
candIdx int // current argmax candidate while unlocked
|
||||||
|
candHops int // consecutive hops the candidate has been dominant
|
||||||
|
quietHops int // consecutive key-up hops while locked
|
||||||
|
noise float64 // broadband noise estimate (percentile of bins)
|
||||||
|
relockHops int // quiet hops before the lock is released
|
||||||
|
acqSNR float64 // tone/noise ratio to acquire after a few stable hops
|
||||||
|
strongSNR float64 // tone/noise ratio to lock immediately (1 hop)
|
||||||
|
|
||||||
|
// Adaptive keying envelope, on the LOCKED bin's magnitude.
|
||||||
|
peak, floor float64
|
||||||
|
state bool // true = mark (key down)
|
||||||
|
stateHops int
|
||||||
|
dotHops float64 // adaptive dot length, in hops
|
||||||
|
elem []byte // current "." / "-" run for the in-progress character
|
||||||
|
charEmitted bool
|
||||||
|
wordEmitted bool
|
||||||
|
|
||||||
|
lastPitch float64
|
||||||
|
lastRMS float64
|
||||||
|
|
||||||
|
statusEvery int
|
||||||
|
sinceStatus int
|
||||||
|
|
||||||
|
onChar func(string)
|
||||||
|
onStatus func(Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
var morse = map[string]byte{
|
||||||
|
".-": 'A', "-...": 'B', "-.-.": 'C', "-..": 'D', ".": 'E', "..-.": 'F',
|
||||||
|
"--.": 'G', "....": 'H', "..": 'I', ".---": 'J', "-.-": 'K', ".-..": 'L',
|
||||||
|
"--": 'M', "-.": 'N', "---": 'O', ".--.": 'P', "--.-": 'Q', ".-.": 'R',
|
||||||
|
"...": 'S', "-": 'T', "..-": 'U', "...-": 'V', ".--": 'W', "-..-": 'X',
|
||||||
|
"-.--": 'Y', "--..": 'Z',
|
||||||
|
"-----": '0', ".----": '1', "..---": '2', "...--": '3', "....-": '4',
|
||||||
|
".....": '5', "-....": '6', "--...": '7', "---..": '8', "----.": '9',
|
||||||
|
".-.-.-": '.', "--..--": ',', "..--..": '?', "-..-.": '/', "-...-": '=',
|
||||||
|
".-.-.": '+', "-.-.--": '!', "---...": ':', "-....-": '-', ".--.-.": '@',
|
||||||
|
}
|
||||||
|
|
||||||
|
// New builds a decoder for the given sample rate. onChar receives decoded text
|
||||||
|
// incrementally; onStatus receives ~10 snapshots/second. Either may be nil.
|
||||||
|
func New(sampleRate int, onChar func(string), onStatus func(Status)) *Decoder {
|
||||||
|
if sampleRate <= 0 {
|
||||||
|
sampleRate = 16000
|
||||||
|
}
|
||||||
|
d := &Decoder{
|
||||||
|
fs: sampleRate,
|
||||||
|
hop: sampleRate / 250, // ~4 ms resolution
|
||||||
|
win: sampleRate / 72, // ~14 ms Goertzel window (selective, fairly snappy)
|
||||||
|
dotHops: 15, // ~20 WPM seed
|
||||||
|
acqSNR: 1.9, // ignore noise spikes (looser locked onto noise = garbage)
|
||||||
|
strongSNR: 3.2, // only a genuinely strong tone locks in 1 hop
|
||||||
|
lockIdx: -1,
|
||||||
|
candIdx: -1,
|
||||||
|
statusEvery: 25, // ~10 Hz
|
||||||
|
onChar: onChar,
|
||||||
|
onStatus: onStatus,
|
||||||
|
}
|
||||||
|
if d.hop < 1 {
|
||||||
|
d.hop = 1
|
||||||
|
}
|
||||||
|
d.relockHops = int(0.8 * float64(d.fs) / float64(d.hop)) // release lock after ~0.8 s quiet
|
||||||
|
// Candidate CW tones: 400–1000 Hz every 25 Hz. Deliberately NOT lower: strong
|
||||||
|
// low-frequency noise/hum (pink/red noise rises toward DC) would otherwise win
|
||||||
|
// the argmax and lock the decoder onto ~250 Hz junk instead of the signal.
|
||||||
|
for f := 400.0; f <= 1000.0; f += 25 {
|
||||||
|
d.freqs = append(d.freqs, f)
|
||||||
|
d.coeffs = append(d.coeffs, 2*math.Cos(2*math.Pi*f/float64(d.fs)))
|
||||||
|
}
|
||||||
|
d.mags = make([]float64, len(d.freqs))
|
||||||
|
d.nbuf = make([]float64, len(d.freqs))
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetTarget fixes the decode pitch to hz (lock to the nearest bin, ignore other
|
||||||
|
// tones), or returns to auto-search when hz <= 0. Safe to call concurrently.
|
||||||
|
func (d *Decoder) SetTarget(hz int) { d.targetHz.Store(int32(hz)) }
|
||||||
|
|
||||||
|
// nearestBin returns the bin index closest to hz.
|
||||||
|
func (d *Decoder) nearestBin(hz float64) int {
|
||||||
|
best, bestD := 0, math.Inf(1)
|
||||||
|
for i, f := range d.freqs {
|
||||||
|
if dd := math.Abs(f - hz); dd < bestD {
|
||||||
|
bestD, best = dd, i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset clears decode state (e.g. when the user re-arms the decoder).
|
||||||
|
func (d *Decoder) Reset() {
|
||||||
|
d.ring = d.ring[:0]
|
||||||
|
d.acc = 0
|
||||||
|
d.lockIdx, d.candIdx, d.candHops, d.quietHops = -1, -1, 0, 0
|
||||||
|
d.peak, d.floor = 0, 0
|
||||||
|
d.state = false
|
||||||
|
d.stateHops = 0
|
||||||
|
d.dotHops = 15
|
||||||
|
d.elem = d.elem[:0]
|
||||||
|
d.charEmitted, d.wordEmitted = false, false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process feeds a block of mono samples through the decoder.
|
||||||
|
func (d *Decoder) Process(samples []int16) {
|
||||||
|
for _, s := range samples {
|
||||||
|
d.ring = append(d.ring, float64(s))
|
||||||
|
if len(d.ring) > d.win {
|
||||||
|
d.ring = d.ring[len(d.ring)-d.win:]
|
||||||
|
}
|
||||||
|
d.acc++
|
||||||
|
if d.acc >= d.hop && len(d.ring) >= d.win {
|
||||||
|
d.acc = 0
|
||||||
|
d.analyze()
|
||||||
|
d.step()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// analyze runs the Goertzel bank, estimates the noise floor, and maintains the
|
||||||
|
// pitch lock (which tone the envelope detector then follows).
|
||||||
|
func (d *Decoder) analyze() {
|
||||||
|
n := float64(len(d.ring))
|
||||||
|
var sumSq float64
|
||||||
|
maxIdx, maxMag := 0, -1.0
|
||||||
|
for i, coeff := range d.coeffs {
|
||||||
|
var s1, s2 float64
|
||||||
|
for _, x := range d.ring {
|
||||||
|
s0 := x + coeff*s1 - s2
|
||||||
|
s2 = s1
|
||||||
|
s1 = s0
|
||||||
|
}
|
||||||
|
m := math.Sqrt(math.Max(s1*s1+s2*s2-coeff*s1*s2, 0)) / n
|
||||||
|
d.mags[i] = m
|
||||||
|
if m > maxMag {
|
||||||
|
maxMag = m
|
||||||
|
maxIdx = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, x := range d.ring {
|
||||||
|
sumSq += x * x
|
||||||
|
}
|
||||||
|
d.lastRMS = math.Min(1, math.Sqrt(sumSq/n)/32768*4)
|
||||||
|
|
||||||
|
// Fixed-pitch mode: lock straight to the target bin, skip the auto search.
|
||||||
|
// A narrow filter at the known pitch is exactly how a skimmer avoids QRM.
|
||||||
|
if th := int(d.targetHz.Load()); th > 0 {
|
||||||
|
d.lockIdx = d.nearestBin(float64(th))
|
||||||
|
d.lastPitch = d.freqs[d.lockIdx]
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Noise floor = 40th percentile of the bins (robust to a few strong tones).
|
||||||
|
copy(d.nbuf, d.mags)
|
||||||
|
sort.Float64s(d.nbuf)
|
||||||
|
d.noise = d.nbuf[int(0.4*float64(len(d.nbuf)-1)+0.5)]
|
||||||
|
|
||||||
|
if d.lockIdx < 0 {
|
||||||
|
if maxIdx == d.candIdx {
|
||||||
|
d.candHops++
|
||||||
|
} else {
|
||||||
|
d.candIdx, d.candHops = maxIdx, 1
|
||||||
|
}
|
||||||
|
snr := maxMag / (d.noise + 1e-9)
|
||||||
|
// Tiered acquisition: a clearly strong tone locks on the FIRST hop (so we
|
||||||
|
// don't eat the first element of a strong signal), a marginal/weak tone
|
||||||
|
// locks after a couple of stable hops (so we don't lock onto pure noise).
|
||||||
|
if snr > d.strongSNR || (d.candHops >= 3 && snr > d.acqSNR) {
|
||||||
|
d.lockIdx = maxIdx
|
||||||
|
d.peak, d.floor = maxMag, d.noise // seed the envelope to this bin
|
||||||
|
d.quietHops = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if d.lockIdx >= 0 {
|
||||||
|
d.lastPitch = d.freqs[d.lockIdx]
|
||||||
|
} else {
|
||||||
|
d.lastPitch = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// step runs the adaptive envelope on the locked bin and the timing state
|
||||||
|
// machine, one hop. The envelope adapts to the signal level (not an absolute
|
||||||
|
// threshold), so weak and strong signals both key correctly.
|
||||||
|
func (d *Decoder) step() {
|
||||||
|
on := false
|
||||||
|
if d.lockIdx >= 0 {
|
||||||
|
m := d.mags[d.lockIdx]
|
||||||
|
// Peak: fast attack, slow release.
|
||||||
|
if m > d.peak {
|
||||||
|
d.peak += (m - d.peak) * 0.4
|
||||||
|
} else {
|
||||||
|
d.peak += (m - d.peak) * 0.02
|
||||||
|
}
|
||||||
|
// Floor: drops fast toward the signal, but only RISES between marks (when
|
||||||
|
// keyed up). Letting the floor rise during a long dash would shrink the
|
||||||
|
// span until the dash drops below the threshold and fragments into dots —
|
||||||
|
// the cause of the "all dots" garbage on a strong clean signal.
|
||||||
|
if m < d.floor {
|
||||||
|
d.floor += (m - d.floor) * 0.4
|
||||||
|
} else if !d.state {
|
||||||
|
d.floor += (m - d.floor) * 0.02
|
||||||
|
}
|
||||||
|
span := d.peak - d.floor
|
||||||
|
// The frozen floor already stops dashes fragmenting, so keep balanced
|
||||||
|
// thresholds: low enough that short inter-element GAPS are still seen
|
||||||
|
// (otherwise elements merge into >7-symbol runs that decode to nothing).
|
||||||
|
if span > d.floor*0.3+1e-9 {
|
||||||
|
onTh := d.floor + 0.55*span
|
||||||
|
offTh := d.floor + 0.35*span
|
||||||
|
if d.state {
|
||||||
|
on = m > offTh
|
||||||
|
} else {
|
||||||
|
on = m > onTh
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Release the lock after a long quiet so we can retune to a new signal.
|
||||||
|
if on {
|
||||||
|
d.quietHops = 0
|
||||||
|
} else {
|
||||||
|
d.quietHops++
|
||||||
|
if d.quietHops > d.relockHops {
|
||||||
|
d.lockIdx, d.candIdx, d.candHops = -1, -1, 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if on == d.state {
|
||||||
|
d.stateHops++
|
||||||
|
if !d.state {
|
||||||
|
d.spaceProgress()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if d.state {
|
||||||
|
d.endMark(d.stateHops)
|
||||||
|
}
|
||||||
|
d.state = on
|
||||||
|
d.stateHops = 1
|
||||||
|
if on {
|
||||||
|
d.charEmitted, d.wordEmitted = false, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.emitStatus(on)
|
||||||
|
}
|
||||||
|
|
||||||
|
// endMark classifies a finished key-down run as a dot or dash and adapts the
|
||||||
|
// dot-length estimate. Runs shorter than a third of a dot are rejected as
|
||||||
|
// clicks/noise.
|
||||||
|
func (d *Decoder) endMark(hops int) {
|
||||||
|
h := float64(hops)
|
||||||
|
// Reject clicks/noise: shorter than a third of a dot AND an absolute floor
|
||||||
|
// of ~4 hops (~16 ms, i.e. faster than ~75 WPM) so noise can't drag the
|
||||||
|
// dot-length estimate down to the clamp (which produced 100 WPM garbage).
|
||||||
|
if h < d.dotHops*0.35 || h < 4 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if h > d.dotHops*2 {
|
||||||
|
d.elem = append(d.elem, '-')
|
||||||
|
d.adaptDot(h / 3)
|
||||||
|
} else {
|
||||||
|
d.elem = append(d.elem, '.')
|
||||||
|
d.adaptDot(h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// adaptDot nudges the dot-length estimate toward an observation (EMA, clamped
|
||||||
|
// to ~5–100 WPM).
|
||||||
|
func (d *Decoder) adaptDot(obs float64) {
|
||||||
|
d.dotHops = d.dotHops*0.8 + obs*0.2 // slower: a few odd marks can't yank it
|
||||||
|
if d.dotHops < 5 { // 5 hops ≈ 60 WPM ceiling — never 100
|
||||||
|
d.dotHops = 5
|
||||||
|
}
|
||||||
|
if d.dotHops > 55 {
|
||||||
|
d.dotHops = 55
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// spaceProgress flushes the current character once the gap exceeds a character
|
||||||
|
// gap, and a word space once it exceeds a word gap.
|
||||||
|
func (d *Decoder) spaceProgress() {
|
||||||
|
g := float64(d.stateHops)
|
||||||
|
if !d.charEmitted && g > d.dotHops*2 {
|
||||||
|
d.flushChar()
|
||||||
|
d.charEmitted = true
|
||||||
|
}
|
||||||
|
if !d.wordEmitted && g > d.dotHops*5 {
|
||||||
|
if d.onChar != nil {
|
||||||
|
d.onChar(" ")
|
||||||
|
}
|
||||||
|
d.wordEmitted = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// flushChar looks up the accumulated element string and emits the character.
|
||||||
|
func (d *Decoder) flushChar() {
|
||||||
|
if len(d.elem) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if c, ok := morse[string(d.elem)]; ok {
|
||||||
|
if d.onChar != nil {
|
||||||
|
d.onChar(string(c))
|
||||||
|
}
|
||||||
|
} else if d.onChar != nil && len(d.elem) <= 7 {
|
||||||
|
// Only flag a genuinely Morse-shaped but unknown char with "?". An
|
||||||
|
// over-long element run is noise — drop it silently rather than spam "?".
|
||||||
|
d.onChar("?")
|
||||||
|
}
|
||||||
|
d.elem = d.elem[:0]
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Decoder) emitStatus(on bool) {
|
||||||
|
d.sinceStatus++
|
||||||
|
if d.sinceStatus < d.statusEvery || d.onStatus == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
d.sinceStatus = 0
|
||||||
|
hopMs := float64(d.hop) / float64(d.fs) * 1000
|
||||||
|
wpm := 0
|
||||||
|
if d.dotHops > 0 {
|
||||||
|
wpm = int(math.Round(1200 / (d.dotHops * hopMs)))
|
||||||
|
}
|
||||||
|
d.onStatus(Status{WPM: wpm, Pitch: int(math.Round(d.lastPitch)), Level: d.lastRMS, Active: on})
|
||||||
|
}
|
||||||
@@ -0,0 +1,201 @@
|
|||||||
|
package cwdecode
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// reverse Morse map for the synthesizer.
|
||||||
|
func charToMorse() map[byte]string {
|
||||||
|
m := map[byte]string{}
|
||||||
|
for code, ch := range morse {
|
||||||
|
m[ch] = code
|
||||||
|
}
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
// keyMessage synthesizes a clean keyed tone for msg at the given WPM/pitch.
|
||||||
|
func keyMessage(msg string, fs, wpm int, pitch float64) []int16 {
|
||||||
|
return keyMessageAmp(msg, fs, wpm, pitch, 9000)
|
||||||
|
}
|
||||||
|
|
||||||
|
func keyMessageAmp(msg string, fs, wpm int, pitch, amp float64) []int16 {
|
||||||
|
dot := fs * 1200 / (wpm * 1000) // samples per dot
|
||||||
|
c2m := charToMorse()
|
||||||
|
var out []int16
|
||||||
|
phase := 0.0
|
||||||
|
dphi := 2 * math.Pi * pitch / float64(fs)
|
||||||
|
|
||||||
|
tone := func(n int) {
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
out = append(out, int16(amp*math.Sin(phase)))
|
||||||
|
phase += dphi
|
||||||
|
}
|
||||||
|
}
|
||||||
|
silence := func(n int) {
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
out = append(out, 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
silence(fs / 4) // 250 ms lead-in for AGC warmup
|
||||||
|
for i := 0; i < len(msg); i++ {
|
||||||
|
ch := msg[i]
|
||||||
|
if ch == ' ' {
|
||||||
|
silence(7 * dot)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
code := c2m[ch]
|
||||||
|
for j := 0; j < len(code); j++ {
|
||||||
|
if code[j] == '.' {
|
||||||
|
tone(dot)
|
||||||
|
} else {
|
||||||
|
tone(3 * dot)
|
||||||
|
}
|
||||||
|
silence(dot) // inter-element gap
|
||||||
|
}
|
||||||
|
silence(3 * dot) // inter-character gap (on top of the trailing element gap)
|
||||||
|
}
|
||||||
|
silence(fs / 4)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodeCleanSignal(t *testing.T) {
|
||||||
|
const fs = 16000
|
||||||
|
var sb strings.Builder
|
||||||
|
d := New(fs, func(s string) { sb.WriteString(s) }, nil)
|
||||||
|
|
||||||
|
// Repeat so AGC warm-up only costs the first word.
|
||||||
|
samples := keyMessage("PARIS PARIS PARIS", fs, 22, 700)
|
||||||
|
// Feed in small chunks like the live capture would.
|
||||||
|
for i := 0; i < len(samples); i += 256 {
|
||||||
|
end := i + 256
|
||||||
|
if end > len(samples) {
|
||||||
|
end = len(samples)
|
||||||
|
}
|
||||||
|
d.Process(samples[i:end])
|
||||||
|
}
|
||||||
|
|
||||||
|
got := strings.ToUpper(sb.String())
|
||||||
|
if !strings.Contains(got, "PARIS") {
|
||||||
|
t.Fatalf("decoded %q, want it to contain PARIS", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodeWithQRM(t *testing.T) {
|
||||||
|
const fs = 16000
|
||||||
|
// Target at 700 Hz; a strong interfering keyed signal at 950 Hz, slightly
|
||||||
|
// quieter, sending different text. The pitch lock should hold on the target.
|
||||||
|
target := keyMessageAmp("PARIS PARIS PARIS", fs, 20, 700, 9000)
|
||||||
|
qrm := keyMessageAmp("BK DE QRZ QRZ TEST", fs, 26, 950, 6500)
|
||||||
|
mix := make([]int16, len(target))
|
||||||
|
for i := range target {
|
||||||
|
v := int(target[i])
|
||||||
|
if i < len(qrm) {
|
||||||
|
v += int(qrm[i])
|
||||||
|
}
|
||||||
|
if v > 32767 {
|
||||||
|
v = 32767
|
||||||
|
} else if v < -32768 {
|
||||||
|
v = -32768
|
||||||
|
}
|
||||||
|
mix[i] = int16(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
var sb strings.Builder
|
||||||
|
d := New(fs, func(s string) { sb.WriteString(s) }, nil)
|
||||||
|
for i := 0; i < len(mix); i += 256 {
|
||||||
|
end := i + 256
|
||||||
|
if end > len(mix) {
|
||||||
|
end = len(mix)
|
||||||
|
}
|
||||||
|
d.Process(mix[i:end])
|
||||||
|
}
|
||||||
|
got := strings.ToUpper(sb.String())
|
||||||
|
if !strings.Contains(got, "PARIS") {
|
||||||
|
t.Fatalf("with QRM, decoded %q, want it to contain PARIS", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodeFirstCharStrong(t *testing.T) {
|
||||||
|
const fs = 16000
|
||||||
|
var sb strings.Builder
|
||||||
|
d := New(fs, func(s string) { sb.WriteString(s) }, nil)
|
||||||
|
// Strong signal: the very first element (T = a dash) must not be eaten by
|
||||||
|
// lock acquisition. Output should begin with the first character.
|
||||||
|
samples := keyMessageAmp("TEST DE", fs, 20, 700, 16000)
|
||||||
|
for i := 0; i < len(samples); i += 200 {
|
||||||
|
end := i + 200
|
||||||
|
if end > len(samples) {
|
||||||
|
end = len(samples)
|
||||||
|
}
|
||||||
|
d.Process(samples[i:end])
|
||||||
|
}
|
||||||
|
got := strings.ToUpper(strings.TrimSpace(sb.String()))
|
||||||
|
if !strings.HasPrefix(got, "TEST") {
|
||||||
|
t.Fatalf("first chars lost on a strong signal: decoded %q, want it to start with TEST", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodeWithAmplitudeRipple(t *testing.T) {
|
||||||
|
const fs = 16000
|
||||||
|
// A real signal's tone amplitude wobbles within a mark; if the floor chases
|
||||||
|
// it, dashes fragment into dots ("all dots" garbage). Apply ±30% ripple.
|
||||||
|
samples := keyMessageAmp("CQ TEST DE OM", fs, 24, 800, 10000)
|
||||||
|
rp := 0.0
|
||||||
|
for i := range samples {
|
||||||
|
rp += 2 * math.Pi * 35 / float64(fs) // 35 Hz amplitude wobble
|
||||||
|
samples[i] = int16(float64(samples[i]) * (1 + 0.3*math.Sin(rp)))
|
||||||
|
}
|
||||||
|
var sb strings.Builder
|
||||||
|
d := New(fs, func(s string) { sb.WriteString(s) }, nil)
|
||||||
|
for i := 0; i < len(samples); i += 256 {
|
||||||
|
end := i + 256
|
||||||
|
if end > len(samples) {
|
||||||
|
end = len(samples)
|
||||||
|
}
|
||||||
|
d.Process(samples[i:end])
|
||||||
|
}
|
||||||
|
got := strings.ToUpper(sb.String())
|
||||||
|
if !strings.Contains(got, "TEST DE OM") {
|
||||||
|
t.Fatalf("dashes fragmented under amplitude ripple: decoded %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodeCQFixedPitch(t *testing.T) {
|
||||||
|
const fs = 16000
|
||||||
|
var sb strings.Builder
|
||||||
|
d := New(fs, func(s string) { sb.WriteString(s) }, nil)
|
||||||
|
d.SetTarget(700) // fixed pitch like the user's manual override
|
||||||
|
samples := keyMessageAmp("CQ CQ CQ DE OM", fs, 26, 700, 9000)
|
||||||
|
for i := 0; i < len(samples); i += 200 {
|
||||||
|
end := i + 200
|
||||||
|
if end > len(samples) {
|
||||||
|
end = len(samples)
|
||||||
|
}
|
||||||
|
d.Process(samples[i:end])
|
||||||
|
}
|
||||||
|
got := strings.ToUpper(sb.String())
|
||||||
|
if n := strings.Count(got, "CQ"); n < 2 {
|
||||||
|
t.Fatalf("first element of CQ dropped: decoded %q (only %d CQ)", got, n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecodeNumbersAndProsign(t *testing.T) {
|
||||||
|
const fs = 16000
|
||||||
|
var sb strings.Builder
|
||||||
|
d := New(fs, func(s string) { sb.WriteString(s) }, nil)
|
||||||
|
samples := keyMessage("TEST 599 TEST", fs, 18, 650)
|
||||||
|
for i := 0; i < len(samples); i += 200 {
|
||||||
|
end := i + 200
|
||||||
|
if end > len(samples) {
|
||||||
|
end = len(samples)
|
||||||
|
}
|
||||||
|
d.Process(samples[i:end])
|
||||||
|
}
|
||||||
|
got := strings.ToUpper(sb.String())
|
||||||
|
if !strings.Contains(got, "599") {
|
||||||
|
t.Fatalf("decoded %q, want it to contain 599", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
+164
-8
@@ -7,13 +7,143 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
_ "github.com/go-sql-driver/mysql"
|
||||||
_ "modernc.org/sqlite"
|
_ "modernc.org/sqlite"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// MySQLConfig targets a shared MySQL database for multi-operator logging
|
||||||
|
// (multiple OpsLog instances on one logbook, à la Log4OM).
|
||||||
|
type MySQLConfig struct {
|
||||||
|
Host string
|
||||||
|
Port int
|
||||||
|
User string
|
||||||
|
Password string
|
||||||
|
Database string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c MySQLConfig) dsn() string {
|
||||||
|
port := c.Port
|
||||||
|
if port == 0 {
|
||||||
|
port = 3306
|
||||||
|
}
|
||||||
|
// parseTime + UTC so DATETIME columns scan into time.Time; utf8mb4 for full
|
||||||
|
// Unicode (names, comments…). timeout bounds the TCP dial so an unreachable
|
||||||
|
// or wrong-port server fails fast with a real error instead of hanging
|
||||||
|
// startup (which would surface only as "db not initialized"); read/write
|
||||||
|
// timeouts cap a stuck statement (generous, so normal migrations/imports
|
||||||
|
// never trip them).
|
||||||
|
return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?parseTime=true&loc=UTC&charset=utf8mb4&timeout=10s&readTimeout=120s&writeTimeout=120s",
|
||||||
|
c.User, c.Password, c.Host, port, c.Database)
|
||||||
|
}
|
||||||
|
|
||||||
|
// validDBIdent guards a database name we splice into DDL (CREATE DATABASE can't
|
||||||
|
// use a placeholder). Only plain identifiers allowed.
|
||||||
|
func validDBIdent(s string) bool {
|
||||||
|
if s == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
for _, r := range s {
|
||||||
|
if r != '_' && !(r >= 'a' && r <= 'z') && !(r >= 'A' && r <= 'Z') && !(r >= '0' && r <= '9') {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// PingMySQL verifies a shared-database connection and creates the logbook
|
||||||
|
// database if it doesn't exist yet. It connects at server level first (no
|
||||||
|
// database selected), tries CREATE DATABASE IF NOT EXISTS, then confirms the
|
||||||
|
// database is actually usable. A restricted user (common on shared hosting)
|
||||||
|
// may lack the CREATE DATABASE privilege but still have full rights on a
|
||||||
|
// pre-created database — so a denied CREATE is not fatal as long as the
|
||||||
|
// database already exists and we can connect to it. Backs the "Test
|
||||||
|
// connection" button.
|
||||||
|
func PingMySQL(c MySQLConfig) error {
|
||||||
|
if strings.TrimSpace(c.Host) == "" {
|
||||||
|
return fmt.Errorf("host is required")
|
||||||
|
}
|
||||||
|
server := c
|
||||||
|
server.Database = "" // connect to the server, not a specific DB
|
||||||
|
conn, err := sql.Open("mysql", server.dsn())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("open mysql: %w", err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
conn.SetConnMaxLifetime(15 * time.Second)
|
||||||
|
if err := conn.Ping(); err != nil {
|
||||||
|
return fmt.Errorf("connect to %s:%d: %w", c.Host, c.Port, err)
|
||||||
|
}
|
||||||
|
name := strings.TrimSpace(c.Database)
|
||||||
|
if name == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if !validDBIdent(name) {
|
||||||
|
return fmt.Errorf("invalid database name %q (letters, digits, underscore only)", name)
|
||||||
|
}
|
||||||
|
createErr := error(nil)
|
||||||
|
if _, err := conn.Exec("CREATE DATABASE IF NOT EXISTS `" + name + "` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci"); err != nil {
|
||||||
|
if !isAccessDenied(err) {
|
||||||
|
return fmt.Errorf("create database %q: %w", name, err)
|
||||||
|
}
|
||||||
|
createErr = err // remember it in case the DB also turns out to be unreachable
|
||||||
|
}
|
||||||
|
// Confirm the database is usable (it may have been pre-created by an admin
|
||||||
|
// even though this user can't CREATE one).
|
||||||
|
dbConn, err := sql.Open("mysql", c.dsn())
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("open mysql db: %w", err)
|
||||||
|
}
|
||||||
|
defer dbConn.Close()
|
||||||
|
dbConn.SetConnMaxLifetime(15 * time.Second)
|
||||||
|
if err := dbConn.Ping(); err != nil {
|
||||||
|
if createErr != nil {
|
||||||
|
return fmt.Errorf("database %q does not exist and user %q cannot create it — ask your MySQL admin to create the database and grant access (%v)", name, c.User, createErr)
|
||||||
|
}
|
||||||
|
return fmt.Errorf("connect to database %q: %w", name, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
//go:embed migrations/*.sql
|
//go:embed migrations/*.sql
|
||||||
var migrationsFS embed.FS
|
var migrationsFS embed.FS
|
||||||
|
|
||||||
|
// schemaMigrationsDDL tracks which migrations have run. Authored in SQLite
|
||||||
|
// dialect; run through the dialect translator for MySQL.
|
||||||
|
const schemaMigrationsDDL = `CREATE TABLE IF NOT EXISTS schema_migrations (
|
||||||
|
name TEXT PRIMARY KEY,
|
||||||
|
applied_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
|
||||||
|
)`
|
||||||
|
|
||||||
|
// Dialect names the backend opened at startup. Repos consult it for the few
|
||||||
|
// places where SQLite and MySQL SQL genuinely differ (upserts, JSON extraction).
|
||||||
|
// Timestamps are generated in Go (NowISO) for both, so most queries are shared.
|
||||||
|
var Dialect = "sqlite"
|
||||||
|
|
||||||
|
// IsMySQL reports whether the active LOGBOOK backend is the shared MySQL
|
||||||
|
// server. Config tables always live in local SQLite, so this only governs
|
||||||
|
// qso-table SQL (see columnExpr).
|
||||||
|
func IsMySQL() bool { return Dialect == "mysql" }
|
||||||
|
|
||||||
|
// SetDialect pins the logbook dialect ("mysql" | "sqlite"). Called once at
|
||||||
|
// startup after the logbook backend is chosen, so it doesn't depend on the
|
||||||
|
// order in which the local and logbook connections were opened.
|
||||||
|
func SetDialect(d string) {
|
||||||
|
if d == "mysql" {
|
||||||
|
Dialect = "mysql"
|
||||||
|
} else {
|
||||||
|
Dialect = "sqlite"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NowISO returns the current UTC time as the ISO-8601 string OpsLog stores in
|
||||||
|
// *_at / date columns — millisecond precision, matching the old SQLite
|
||||||
|
// strftime('%Y-%m-%dT%H:%M:%fZ','now') default. Bind this as a parameter so the
|
||||||
|
// same INSERT/UPDATE works on both backends.
|
||||||
|
func NowISO() string { return time.Now().UTC().Format("2006-01-02T15:04:05.000Z") }
|
||||||
|
|
||||||
|
|
||||||
// Open opens (and creates if needed) the SQLite database at the given path,
|
// Open opens (and creates if needed) the SQLite database at the given path,
|
||||||
// enables performance PRAGMAs, and applies embedded migrations.
|
// enables performance PRAGMAs, and applies embedded migrations.
|
||||||
func Open(path string) (*sql.DB, error) {
|
func Open(path string) (*sql.DB, error) {
|
||||||
@@ -30,7 +160,8 @@ func Open(path string) (*sql.DB, error) {
|
|||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
return nil, fmt.Errorf("ping sqlite: %w", err)
|
return nil, fmt.Errorf("ping sqlite: %w", err)
|
||||||
}
|
}
|
||||||
if err := migrate(conn); err != nil {
|
Dialect = "sqlite"
|
||||||
|
if err := migrate(conn, nil); err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -39,12 +170,18 @@ func Open(path string) (*sql.DB, error) {
|
|||||||
|
|
||||||
// migrate applies all embedded *.sql migrations in alphabetical order,
|
// migrate applies all embedded *.sql migrations in alphabetical order,
|
||||||
// skipping those already applied. Intentionally minimal in-house system
|
// skipping those already applied. Intentionally minimal in-house system
|
||||||
// (no external dependency).
|
// (no external dependency). translate, when non-nil, rewrites each statement
|
||||||
func migrate(conn *sql.DB) error {
|
// for a non-SQLite backend (see mysqlDDL); nil means run the SQLite DDL as-is.
|
||||||
if _, err := conn.Exec(`CREATE TABLE IF NOT EXISTS schema_migrations (
|
func migrate(conn *sql.DB, translate func(string) string) error {
|
||||||
name TEXT PRIMARY KEY,
|
// A non-nil translator means this is the MySQL connection (use the
|
||||||
applied_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
|
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
||||||
)`); err != nil {
|
// determined by the caller's argument, NOT the global Dialect, so the
|
||||||
|
// in-memory SQLite used to build the MySQL baseline still migrates as SQLite.
|
||||||
|
mysqlPath := translate != nil
|
||||||
|
if translate == nil {
|
||||||
|
translate = func(s string) string { return s }
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(translate(schemaMigrationsDDL)); err != nil {
|
||||||
return fmt.Errorf("create schema_migrations: %w", err)
|
return fmt.Errorf("create schema_migrations: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,11 +211,30 @@ func migrate(conn *sql.DB) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("read migration %s: %w", name, err)
|
return fmt.Errorf("read migration %s: %w", name, err)
|
||||||
}
|
}
|
||||||
|
sqlText := translate(string(content))
|
||||||
|
|
||||||
|
// MySQL implicitly commits each DDL statement, so a wrapping transaction
|
||||||
|
// gives no atomicity — a mid-file failure would leave columns/tables
|
||||||
|
// behind, unrecorded, and every restart would re-run and choke on
|
||||||
|
// "duplicate column". Instead apply statement-by-statement and tolerate
|
||||||
|
// "already exists" errors, making migrations idempotent (and self-healing
|
||||||
|
// for a previously half-applied database).
|
||||||
|
if mysqlPath {
|
||||||
|
if err := applyMySQLMigration(conn, sqlText); err != nil {
|
||||||
|
return fmt.Errorf("apply migration %s: %w", name, err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
||||||
|
return fmt.Errorf("record migration %s: %w", name, err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// SQLite supports DDL inside a transaction, so keep it atomic there.
|
||||||
tx, err := conn.Begin()
|
tx, err := conn.Begin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("begin tx for %s: %w", name, err)
|
return fmt.Errorf("begin tx for %s: %w", name, err)
|
||||||
}
|
}
|
||||||
if _, err := tx.Exec(string(content)); err != nil {
|
if _, err := tx.Exec(sqlText); err != nil {
|
||||||
_ = tx.Rollback()
|
_ = tx.Rollback()
|
||||||
return fmt.Errorf("apply migration %s: %w", name, err)
|
return fmt.Errorf("apply migration %s: %w", name, err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
-- Per-profile logbook database. Each profile can target its own logbook:
|
||||||
|
-- the local SQLite file, or a specific shared MySQL database. Switching the
|
||||||
|
-- active profile switches the logbook accordingly. Stored as a small JSON
|
||||||
|
-- document {backend, host, port, user, password, database}; empty = inherit
|
||||||
|
-- the default (local SQLite).
|
||||||
|
ALTER TABLE station_profiles ADD COLUMN db_config TEXT NOT NULL DEFAULT '';
|
||||||
@@ -0,0 +1,459 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
mysqldriver "github.com/go-sql-driver/mysql"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ── SQLite → MySQL schema translation ──────────────────────────────────
|
||||||
|
//
|
||||||
|
// OpsLog's migrations are authored in SQLite dialect (the default backend).
|
||||||
|
// For the shared-MySQL backend we translate that DDL on the fly rather than
|
||||||
|
// maintaining a second set of migration files, so the two backends can never
|
||||||
|
// drift apart. The translation is deliberately narrow — it only rewrites the
|
||||||
|
// SQLite-isms that actually appear in our migrations:
|
||||||
|
//
|
||||||
|
// - INTEGER PRIMARY KEY [AUTOINCREMENT] → BIGINT AUTO_INCREMENT PRIMARY KEY
|
||||||
|
// - bare INTEGER → BIGINT (so FK child/parent types match)
|
||||||
|
// - DEFAULT (strftime(... 'now')) → DEFAULT '' (timestamps come from Go)
|
||||||
|
// - TEXT → VARCHAR(255), except a few free-text
|
||||||
|
// columns that stay TEXT/LONGTEXT
|
||||||
|
// - reserved column `key` → backticked
|
||||||
|
// - CREATE INDEX IF NOT EXISTS → CREATE INDEX (MySQL has no IF NOT EXISTS)
|
||||||
|
//
|
||||||
|
// REAL is left as-is (MySQL accepts it as an alias for DOUBLE). CREATE/DROP
|
||||||
|
// TABLE IF [NOT] EXISTS, RENAME TO, INSERT…SELECT, CHECK(...) and foreign keys
|
||||||
|
// are all valid MySQL as written.
|
||||||
|
|
||||||
|
var (
|
||||||
|
reStrftimeDefault = regexp.MustCompile(`\(strftime\('%Y-%m-%dT%H:%M:%fZ',\s*'now'\)\)`)
|
||||||
|
reBareInteger = regexp.MustCompile(`\bINTEGER\b`)
|
||||||
|
reColText = regexp.MustCompile(`(\w+)\s+TEXT\b`)
|
||||||
|
reKeyColumn = regexp.MustCompile(`(?m)^(\s*)key\b`)
|
||||||
|
// SQLite quotes identifiers with double quotes — e.g. a table renamed by
|
||||||
|
// ALTER … RENAME TO ends up as CREATE TABLE "name" in sqlite_master. MySQL
|
||||||
|
// uses backticks. Our schema has no double-quoted string literals, so it's
|
||||||
|
// safe to convert every "ident" to `ident`.
|
||||||
|
reDoubleQuoteIdent = regexp.MustCompile(`"([^"\n]*)"`)
|
||||||
|
)
|
||||||
|
|
||||||
|
// MySQL's InnoDB row-size limit is 65535 bytes (excluding off-page TEXT/BLOB).
|
||||||
|
// The qso table has ~150 columns, so making them all VARCHAR(255) (1020 bytes
|
||||||
|
// each in utf8mb4) overflows the row. We therefore emit TEXT (stored off-page,
|
||||||
|
// ~20 bytes in-row) for the bulk of columns, and VARCHAR only where a column
|
||||||
|
// actually needs in-row storage: it's indexed, a primary key, or carries a
|
||||||
|
// DEFAULT (TEXT can't hold a literal default in MySQL).
|
||||||
|
|
||||||
|
// varcharColumns must be VARCHAR because they're indexed or part of a primary
|
||||||
|
// key declared on a separate line (so the DEFAULT/PRIMARY-KEY line heuristic
|
||||||
|
// below can't catch them). MySQL can't index a TEXT column without a prefix
|
||||||
|
// length. Keyed by column name (a name may repeat across tables — harmless).
|
||||||
|
var varcharColumns = map[string]bool{
|
||||||
|
// qso indexes (0001, 0003, 0019)
|
||||||
|
"callsign": true, "qso_date": true, "band": true, "mode": true,
|
||||||
|
"grid": true, "station_callsign": true, "state": true, "contest_id": true,
|
||||||
|
"sat_name": true, "prop_mode": true, "sig": true, "wwff_ref": true, "skcc": true,
|
||||||
|
// integrations_udp index (0011)
|
||||||
|
"direction": true,
|
||||||
|
// award_references composite primary key (0017)
|
||||||
|
"award_code": true, "ref_code": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
// longTextColumns override the default TEXT with a bigger type where the
|
||||||
|
// content can be large (a full QSL-template document).
|
||||||
|
var longTextColumns = map[string]string{
|
||||||
|
"json": "LONGTEXT",
|
||||||
|
}
|
||||||
|
|
||||||
|
// mysqlDDL rewrites a SQLite DDL/DML statement (or multi-statement migration
|
||||||
|
// file) into the MySQL dialect. See the package note above for the rules.
|
||||||
|
func mysqlDDL(stmt string) string {
|
||||||
|
s := stmt
|
||||||
|
// SQLite double-quoted identifiers → MySQL backticks (renamed tables in the
|
||||||
|
// baseline dump, etc.).
|
||||||
|
s = reDoubleQuoteIdent.ReplaceAllString(s, "`$1`")
|
||||||
|
// MySQL has no IF NOT EXISTS for CREATE INDEX (migrations run once anyway).
|
||||||
|
s = strings.ReplaceAll(s, "CREATE INDEX IF NOT EXISTS", "CREATE INDEX")
|
||||||
|
// Auto-increment primary keys. Both the AUTOINCREMENT form and the bare
|
||||||
|
// "INTEGER PRIMARY KEY" (SQLite rowid alias) must become AUTO_INCREMENT so
|
||||||
|
// inserts that omit the id still get one.
|
||||||
|
s = strings.ReplaceAll(s, "INTEGER PRIMARY KEY AUTOINCREMENT", "BIGINT AUTO_INCREMENT PRIMARY KEY")
|
||||||
|
s = strings.ReplaceAll(s, "INTEGER PRIMARY KEY", "BIGINT AUTO_INCREMENT PRIMARY KEY")
|
||||||
|
// Timestamp defaults: Go supplies ISO strings, so drop the SQLite function
|
||||||
|
// default (TEXT/VARCHAR can't carry it in MySQL anyway).
|
||||||
|
s = reStrftimeDefault.ReplaceAllString(s, "''")
|
||||||
|
// Remaining INTEGER columns → BIGINT so foreign-key parent/child types match.
|
||||||
|
s = reBareInteger.ReplaceAllString(s, "BIGINT")
|
||||||
|
// TEXT columns → TEXT (off-page) by default, VARCHAR(255) only when indexed,
|
||||||
|
// a primary key, or default-bearing — keeping the row under MySQL's limit.
|
||||||
|
s = translateTextColumns(s)
|
||||||
|
// `key` is a MySQL reserved word — backtick the settings column declaration.
|
||||||
|
s = reKeyColumn.ReplaceAllString(s, "$1`key`")
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// translateTextColumns rewrites each "<col> TEXT" column declaration to the
|
||||||
|
// right MySQL type, deciding per line so it can see whether the line carries a
|
||||||
|
// DEFAULT or an inline PRIMARY KEY. See varcharColumns / longTextColumns.
|
||||||
|
func translateTextColumns(s string) string {
|
||||||
|
lines := strings.Split(s, "\n")
|
||||||
|
for i, line := range lines {
|
||||||
|
m := reColText.FindStringSubmatchIndex(line)
|
||||||
|
if m == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
col := line[m[2]:m[3]]
|
||||||
|
var typ string
|
||||||
|
switch {
|
||||||
|
case longTextColumns[col] != "":
|
||||||
|
typ = longTextColumns[col]
|
||||||
|
case varcharColumns[col],
|
||||||
|
strings.Contains(line, "DEFAULT"),
|
||||||
|
strings.Contains(line, "PRIMARY KEY"):
|
||||||
|
typ = "VARCHAR(255)"
|
||||||
|
default:
|
||||||
|
typ = "TEXT"
|
||||||
|
}
|
||||||
|
lines[i] = line[:m[0]] + col + " " + typ + line[m[1]:]
|
||||||
|
}
|
||||||
|
return strings.Join(lines, "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// OpenMySQL opens the shared MySQL logbook, creating the database if needed,
|
||||||
|
// then applies the (translated) embedded migrations. multiStatements is enabled
|
||||||
|
// so multi-statement migration files run in a single Exec.
|
||||||
|
func OpenMySQL(c MySQLConfig) (*sql.DB, error) {
|
||||||
|
if strings.TrimSpace(c.Host) == "" {
|
||||||
|
return nil, fmt.Errorf("host is required")
|
||||||
|
}
|
||||||
|
name := strings.TrimSpace(c.Database)
|
||||||
|
if !validDBIdent(name) {
|
||||||
|
return nil, fmt.Errorf("invalid database name %q (letters, digits, underscore only)", name)
|
||||||
|
}
|
||||||
|
// Ensure the database exists (connect server-level first).
|
||||||
|
if err := PingMySQL(c); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
conn, err := sql.Open("mysql", c.dsn())
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("open mysql: %w", err)
|
||||||
|
}
|
||||||
|
// The UI fires bursts of concurrent queries (the Preferences dialog alone
|
||||||
|
// loads ~8 settings in parallel, plus the grid and live cluster status). A
|
||||||
|
// low cap turns such a burst into a deadlock-like stall against a remote
|
||||||
|
// server, so keep a generous pool with idle reaping. SQLite ran uncapped.
|
||||||
|
conn.SetMaxOpenConns(50)
|
||||||
|
conn.SetMaxIdleConns(10)
|
||||||
|
conn.SetConnMaxIdleTime(90 * time.Second)
|
||||||
|
// No max lifetime: a slow server's first migration can run for minutes on a
|
||||||
|
// single connection, and reaping it mid-migration drops the selected database
|
||||||
|
// (surfacing as "Unknown database"). Idle connections are still recycled
|
||||||
|
// after 90s, and the driver retries stale pooled connections.
|
||||||
|
conn.SetConnMaxLifetime(0)
|
||||||
|
if err := conn.Ping(); err != nil {
|
||||||
|
_ = conn.Close()
|
||||||
|
return nil, fmt.Errorf("connect to %s: %w", name, err)
|
||||||
|
}
|
||||||
|
// Set the dialect before migrating so the runner takes the MySQL path
|
||||||
|
// (per-statement, idempotent) rather than the SQLite transaction path.
|
||||||
|
Dialect = "mysql"
|
||||||
|
fresh, err := isFreshMySQL(conn)
|
||||||
|
if err != nil {
|
||||||
|
_ = conn.Close()
|
||||||
|
Dialect = "sqlite"
|
||||||
|
return nil, fmt.Errorf("inspect database: %w", err)
|
||||||
|
}
|
||||||
|
if fresh {
|
||||||
|
// Empty database: build the whole final schema in one pass (one CREATE
|
||||||
|
// per table, no ALTERs) — far faster than replaying 21 migrations,
|
||||||
|
// especially on a server with slow DDL.
|
||||||
|
err = applyMySQLBaseline(conn)
|
||||||
|
} else {
|
||||||
|
// Existing database: apply only the migrations it's missing.
|
||||||
|
err = migrate(conn, mysqlDDL)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
_ = conn.Close()
|
||||||
|
Dialect = "sqlite" // migration failed; we'll fall back to SQLite
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return conn, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// isFreshMySQL reports whether the database has no OpsLog schema yet (no qso
|
||||||
|
// table), so the baseline fast-path applies. A partially-migrated database is
|
||||||
|
// NOT fresh and goes through the incremental migrator.
|
||||||
|
func isFreshMySQL(conn *sql.DB) (bool, error) {
|
||||||
|
var name string
|
||||||
|
err := conn.QueryRow("SHOW TABLES LIKE 'qso'").Scan(&name)
|
||||||
|
if err == sql.ErrNoRows {
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyMySQLBaseline creates the entire current schema on a fresh MySQL database
|
||||||
|
// in a single pass, then records every migration as already applied. The schema
|
||||||
|
// is derived from the migrations themselves (replayed on a throwaway in-memory
|
||||||
|
// SQLite, whose sqlite_master holds each table's FINAL CREATE statement with all
|
||||||
|
// ALTER-added columns folded in) and translated to MySQL — so there's no second
|
||||||
|
// schema to maintain and the two backends can't drift. Future migrations apply
|
||||||
|
// incrementally on top.
|
||||||
|
func applyMySQLBaseline(conn *sql.DB) error {
|
||||||
|
mem, err := sql.Open("sqlite", "file:opslog_baseline?mode=memory&cache=shared")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("open baseline sqlite: %w", err)
|
||||||
|
}
|
||||||
|
defer mem.Close()
|
||||||
|
if err := migrate(mem, nil); err != nil {
|
||||||
|
return fmt.Errorf("build baseline schema: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var migNames []string
|
||||||
|
mrows, err := mem.Query("SELECT name FROM schema_migrations ORDER BY name")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("read baseline migrations: %w", err)
|
||||||
|
}
|
||||||
|
for mrows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := mrows.Scan(&n); err != nil {
|
||||||
|
mrows.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
migNames = append(migNames, n)
|
||||||
|
}
|
||||||
|
mrows.Close()
|
||||||
|
|
||||||
|
var tables, indexes []string
|
||||||
|
srows, err := mem.Query("SELECT type, sql FROM sqlite_master WHERE sql IS NOT NULL AND name NOT LIKE 'sqlite_%' AND name != 'schema_migrations'")
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("read baseline schema: %w", err)
|
||||||
|
}
|
||||||
|
for srows.Next() {
|
||||||
|
var typ, s string
|
||||||
|
if err := srows.Scan(&typ, &s); err != nil {
|
||||||
|
srows.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
switch typ {
|
||||||
|
case "table":
|
||||||
|
tables = append(tables, s)
|
||||||
|
case "index":
|
||||||
|
indexes = append(indexes, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
srows.Close()
|
||||||
|
|
||||||
|
// Apply on one connection with FK checks off so table order doesn't matter.
|
||||||
|
ctx := context.Background()
|
||||||
|
c, err := conn.Conn(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("acquire conn: %w", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_, _ = c.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS=1")
|
||||||
|
_ = c.Close()
|
||||||
|
}()
|
||||||
|
if _, err := c.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS=0"); err != nil {
|
||||||
|
return fmt.Errorf("disable fk checks: %w", err)
|
||||||
|
}
|
||||||
|
if _, err := c.ExecContext(ctx, mysqlDDL(schemaMigrationsDDL)); err != nil {
|
||||||
|
return fmt.Errorf("create schema_migrations: %w", err)
|
||||||
|
}
|
||||||
|
for _, tb := range tables {
|
||||||
|
if _, err := c.ExecContext(ctx, mysqlDDL(tb)); err != nil {
|
||||||
|
if isIgnorableDDLError(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return fmt.Errorf("baseline table: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, ix := range indexes {
|
||||||
|
if _, err := c.ExecContext(ctx, mysqlDDL(ix)); err != nil {
|
||||||
|
if isIgnorableDDLError(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return fmt.Errorf("baseline index: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, n := range migNames {
|
||||||
|
if _, err := conn.Exec("INSERT INTO schema_migrations(name) VALUES(?)", n); err != nil {
|
||||||
|
if isIgnorableDDLError(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return fmt.Errorf("record migration %s: %w", n, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyMySQLMigration executes a translated migration one statement at a time.
|
||||||
|
// MySQL has no multi-statement Exec without a special flag and auto-commits DDL,
|
||||||
|
// so running statements individually (and tolerating "already exists" errors)
|
||||||
|
// keeps migrations idempotent and lets a half-applied database self-heal.
|
||||||
|
//
|
||||||
|
// It runs on a single dedicated connection with FOREIGN_KEY_CHECKS=0, because a
|
||||||
|
// few migrations recreate tables by DROP/RENAME in an order that trips MySQL's
|
||||||
|
// foreign-key enforcement (SQLite is laxer). The flag is reset to 1 before the
|
||||||
|
// connection returns to the pool, so runtime queries keep FK enforcement.
|
||||||
|
func applyMySQLMigration(conn *sql.DB, sqlText string) error {
|
||||||
|
ctx := context.Background()
|
||||||
|
c, err := conn.Conn(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("acquire conn: %w", err)
|
||||||
|
}
|
||||||
|
defer func() {
|
||||||
|
_, _ = c.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS=1")
|
||||||
|
_ = c.Close()
|
||||||
|
}()
|
||||||
|
if _, err := c.ExecContext(ctx, "SET FOREIGN_KEY_CHECKS=0"); err != nil {
|
||||||
|
return fmt.Errorf("disable fk checks: %w", err)
|
||||||
|
}
|
||||||
|
for _, stmt := range coalesceAddColumns(splitStatements(sqlText)) {
|
||||||
|
if _, err := c.ExecContext(ctx, stmt); err != nil {
|
||||||
|
if isIgnorableDDLError(err) {
|
||||||
|
// A coalesced multi-column ALTER fails wholesale if even one
|
||||||
|
// column already exists (partial prior apply). Re-run it column
|
||||||
|
// by column so the missing ones still get added.
|
||||||
|
if cols := decomposeAddColumns(stmt); len(cols) > 1 {
|
||||||
|
for _, one := range cols {
|
||||||
|
if _, e := c.ExecContext(ctx, one); e != nil && !isIgnorableDDLError(e) {
|
||||||
|
return fmt.Errorf("statement %q: %w", firstLine(one), e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return fmt.Errorf("statement %q: %w", firstLine(stmt), err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var reAddColumn = regexp.MustCompile(`(?is)^\s*ALTER\s+TABLE\s+(\S+)\s+ADD\s+COLUMN\s+(.+)$`)
|
||||||
|
|
||||||
|
// coalesceAddColumns merges consecutive "ALTER TABLE t ADD COLUMN …" statements
|
||||||
|
// on the same table into a single multi-column ALTER. SQLite needs one ALTER per
|
||||||
|
// column, but each is a full table operation in MySQL — and on a slow server
|
||||||
|
// that's seconds apiece, turning a ~50-column migration into minutes (long
|
||||||
|
// enough to trip connection lifetimes and stall startup). One combined ALTER is
|
||||||
|
// a single table rebuild instead of fifty.
|
||||||
|
func coalesceAddColumns(stmts []string) []string {
|
||||||
|
out := make([]string, 0, len(stmts))
|
||||||
|
for i := 0; i < len(stmts); {
|
||||||
|
m := reAddColumn.FindStringSubmatch(stmts[i])
|
||||||
|
if m == nil {
|
||||||
|
out = append(out, stmts[i])
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
table := m[1]
|
||||||
|
cols := []string{strings.TrimSpace(m[2])}
|
||||||
|
j := i + 1
|
||||||
|
for j < len(stmts) {
|
||||||
|
m2 := reAddColumn.FindStringSubmatch(stmts[j])
|
||||||
|
if m2 == nil || m2[1] != table {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
cols = append(cols, strings.TrimSpace(m2[2]))
|
||||||
|
j++
|
||||||
|
}
|
||||||
|
out = append(out, "ALTER TABLE "+table+" ADD COLUMN "+strings.Join(cols, ", ADD COLUMN "))
|
||||||
|
i = j
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// decomposeAddColumns splits a (possibly coalesced) ADD COLUMN ALTER back into
|
||||||
|
// one ALTER per column, for the idempotent fallback path.
|
||||||
|
func decomposeAddColumns(stmt string) []string {
|
||||||
|
m := reAddColumn.FindStringSubmatch(stmt)
|
||||||
|
if m == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
table := m[1]
|
||||||
|
var out []string
|
||||||
|
for _, col := range strings.Split(m[2], ", ADD COLUMN ") {
|
||||||
|
out = append(out, "ALTER TABLE "+table+" ADD COLUMN "+strings.TrimSpace(col))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitStatements breaks a migration file into individual SQL statements,
|
||||||
|
// dropping comments (full-line and inline "-- …") and blank fragments. Our
|
||||||
|
// migrations never embed a ';' or '--' inside a string literal, so this is safe.
|
||||||
|
func splitStatements(sqlText string) []string {
|
||||||
|
var b strings.Builder
|
||||||
|
for _, line := range strings.Split(sqlText, "\n") {
|
||||||
|
if i := strings.Index(line, "--"); i >= 0 {
|
||||||
|
line = line[:i] // strip inline / full-line comment
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(line) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
b.WriteString(line)
|
||||||
|
b.WriteByte('\n')
|
||||||
|
}
|
||||||
|
var out []string
|
||||||
|
for _, part := range strings.Split(b.String(), ";") {
|
||||||
|
if strings.TrimSpace(part) != "" {
|
||||||
|
out = append(out, part)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func firstLine(s string) string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if i := strings.IndexByte(s, '\n'); i >= 0 {
|
||||||
|
return s[:i]
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// isAccessDenied reports whether a MySQL error is a privilege denial — e.g. a
|
||||||
|
// restricted user trying to CREATE DATABASE. Such users can still operate on a
|
||||||
|
// pre-existing database they've been granted, so the caller treats this as
|
||||||
|
// non-fatal and verifies database access separately.
|
||||||
|
func isAccessDenied(err error) bool {
|
||||||
|
var me *mysqldriver.MySQLError
|
||||||
|
if !errors.As(err, &me) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
switch me.Number {
|
||||||
|
case 1044, // ER_DBACCESS_DENIED_ERROR — access denied to database
|
||||||
|
1045, // ER_ACCESS_DENIED_ERROR — access denied for user
|
||||||
|
1142: // ER_TABLEACCESS_DENIED_ERROR — command denied to user
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// isIgnorableDDLError reports whether a MySQL error means the object the
|
||||||
|
// statement creates/drops is already in the intended state — safe to skip when
|
||||||
|
// re-applying a forward-only migration.
|
||||||
|
func isIgnorableDDLError(err error) bool {
|
||||||
|
var me *mysqldriver.MySQLError
|
||||||
|
if !errors.As(err, &me) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
switch me.Number {
|
||||||
|
case 1050, // ER_TABLE_EXISTS_ERROR — CREATE TABLE on an existing table
|
||||||
|
1051, // ER_BAD_TABLE_ERROR — DROP TABLE on a missing table
|
||||||
|
1060, // ER_DUP_FIELDNAME — ADD COLUMN already present
|
||||||
|
1061, // ER_DUP_KEYNAME — CREATE INDEX already present
|
||||||
|
1091: // ER_CANT_DROP_FIELD_OR_KEY — DROP of something that doesn't exist
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMySQLDDL_Translations(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
in string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"autoinc pk", "id INTEGER PRIMARY KEY AUTOINCREMENT,", "id BIGINT AUTO_INCREMENT PRIMARY KEY,"},
|
||||||
|
{"plain pk", "id INTEGER PRIMARY KEY,", "id BIGINT AUTO_INCREMENT PRIMARY KEY,"},
|
||||||
|
{"bare integer", "freq_hz INTEGER,", "freq_hz BIGINT,"},
|
||||||
|
{"strftime default", "created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),",
|
||||||
|
"created_at VARCHAR(255) NOT NULL DEFAULT '',"},
|
||||||
|
{"strftime tight", "updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now')),",
|
||||||
|
"updated_at VARCHAR(255) NOT NULL DEFAULT '',"},
|
||||||
|
// The column-name/type whitespace collapses to a single space — harmless.
|
||||||
|
{"text default N", "qsl_sent TEXT DEFAULT 'N',", "qsl_sent VARCHAR(255) DEFAULT 'N',"},
|
||||||
|
{"indexed col → varchar", "callsign TEXT NOT NULL,", "callsign VARCHAR(255) NOT NULL,"},
|
||||||
|
{"plain non-indexed col → text", "name TEXT,", "name TEXT,"},
|
||||||
|
{"plain text stays text", "comment TEXT,", "comment TEXT,"},
|
||||||
|
{"json longtext", " json TEXT NOT NULL,", " json LONGTEXT NOT NULL,"},
|
||||||
|
{"create index", "CREATE INDEX IF NOT EXISTS idx_qso_dxcc ON qso(dxcc);",
|
||||||
|
"CREATE INDEX idx_qso_dxcc ON qso(dxcc);"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := mysqlDDL(c.in); got != c.want {
|
||||||
|
t.Errorf("%s:\n in %q\n got %q\n want %q", c.name, c.in, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMySQLDDL_KeyColumnBackticked(t *testing.T) {
|
||||||
|
in := "CREATE TABLE IF NOT EXISTS settings (\n key TEXT PRIMARY KEY,\n value TEXT NOT NULL\n);"
|
||||||
|
got := mysqlDDL(in)
|
||||||
|
if !strings.Contains(got, "`key` VARCHAR(255) PRIMARY KEY") {
|
||||||
|
t.Errorf("key column not backticked/translated:\n%s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSplitStatements(t *testing.T) {
|
||||||
|
in := "-- a comment\n" +
|
||||||
|
"ALTER TABLE qso ADD COLUMN a TEXT;\n" +
|
||||||
|
"ALTER TABLE qso ADD COLUMN b TEXT; -- inline note\n" +
|
||||||
|
"\n" +
|
||||||
|
"CREATE INDEX idx ON qso(a);\n"
|
||||||
|
got := splitStatements(in)
|
||||||
|
if len(got) != 3 {
|
||||||
|
t.Fatalf("want 3 statements, got %d: %#v", len(got), got)
|
||||||
|
}
|
||||||
|
if !strings.Contains(got[0], "ADD COLUMN a") ||
|
||||||
|
!strings.Contains(got[1], "ADD COLUMN b") ||
|
||||||
|
!strings.Contains(got[2], "CREATE INDEX") {
|
||||||
|
t.Errorf("unexpected split: %#v", got)
|
||||||
|
}
|
||||||
|
// No fragment should be a comment-only or blank statement.
|
||||||
|
for _, s := range got {
|
||||||
|
if strings.TrimSpace(s) == "" {
|
||||||
|
t.Errorf("empty statement in result: %#v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Every embedded migration must split into at least one runnable statement
|
||||||
|
// and never produce an empty fragment.
|
||||||
|
func TestSplitStatements_AllMigrations(t *testing.T) {
|
||||||
|
entries, _ := migrationsFS.ReadDir("migrations")
|
||||||
|
for _, e := range entries {
|
||||||
|
if !strings.HasSuffix(e.Name(), ".sql") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
raw, _ := migrationsFS.ReadFile("migrations/" + e.Name())
|
||||||
|
stmts := splitStatements(mysqlDDL(string(raw)))
|
||||||
|
if len(stmts) == 0 {
|
||||||
|
t.Errorf("%s: produced no statements", e.Name())
|
||||||
|
}
|
||||||
|
for _, s := range stmts {
|
||||||
|
if strings.TrimSpace(s) == "" {
|
||||||
|
t.Errorf("%s: empty statement fragment", e.Name())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestMySQLDDL_QSORowSizeUnderLimit guards against the InnoDB 65535-byte row
|
||||||
|
// limit: every VARCHAR(255) in utf8mb4 costs 1020 bytes in-row, and the qso
|
||||||
|
// table (built from 0001 + the qso-only ALTERs in 0003 and 0019) must stay well
|
||||||
|
// clear of it. TEXT columns are off-page and don't count here.
|
||||||
|
func TestMySQLDDL_QSORowSizeUnderLimit(t *testing.T) {
|
||||||
|
qsoMigrations := []string{"0001_init.sql", "0003_adif_extra.sql", "0019_adif_317_fields.sql"}
|
||||||
|
varchars := 0
|
||||||
|
for _, name := range qsoMigrations {
|
||||||
|
raw, err := migrationsFS.ReadFile("migrations/" + name)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
varchars += strings.Count(mysqlDDL(string(raw)), "VARCHAR(255)")
|
||||||
|
}
|
||||||
|
const bytesPerVarchar = 255 * 4 // utf8mb4
|
||||||
|
rowBytes := varchars * bytesPerVarchar
|
||||||
|
t.Logf("qso VARCHAR(255) columns: %d (~%d bytes in-row)", varchars, rowBytes)
|
||||||
|
if rowBytes > 60000 { // leave headroom under the 65535 hard limit
|
||||||
|
t.Errorf("qso row too large: %d VARCHAR(255) cols = ~%d bytes (limit 65535)", varchars, rowBytes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestMySQLDDL_NoLeftoverSQLiteisms translates every embedded migration and
|
||||||
|
// fails if any SQLite-only construct survives — a fast guard against a new
|
||||||
|
// migration sneaking in a dialect-ism the translator doesn't cover.
|
||||||
|
func TestMySQLDDL_NoLeftoverSQLiteisms(t *testing.T) {
|
||||||
|
entries, err := migrationsFS.ReadDir("migrations")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
reInteger := regexp.MustCompile(`\bINTEGER\b`)
|
||||||
|
for _, e := range entries {
|
||||||
|
if !strings.HasSuffix(e.Name(), ".sql") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
raw, err := migrationsFS.ReadFile("migrations/" + e.Name())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
out := mysqlDDL(string(raw))
|
||||||
|
if strings.Contains(out, "AUTOINCREMENT") {
|
||||||
|
t.Errorf("%s: AUTOINCREMENT survived", e.Name())
|
||||||
|
}
|
||||||
|
if strings.Contains(out, "strftime") {
|
||||||
|
t.Errorf("%s: strftime survived", e.Name())
|
||||||
|
}
|
||||||
|
if strings.Contains(out, "IF NOT EXISTS idx") {
|
||||||
|
t.Errorf("%s: CREATE INDEX IF NOT EXISTS survived", e.Name())
|
||||||
|
}
|
||||||
|
// Strip comment lines before checking for bare INTEGER (comments are
|
||||||
|
// prose and may legitimately mention the word).
|
||||||
|
var code strings.Builder
|
||||||
|
for _, ln := range strings.Split(out, "\n") {
|
||||||
|
if strings.HasPrefix(strings.TrimSpace(ln), "--") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
code.WriteString(ln)
|
||||||
|
code.WriteByte('\n')
|
||||||
|
}
|
||||||
|
if reInteger.MatchString(code.String()) {
|
||||||
|
t.Errorf("%s: bare INTEGER survived in code", e.Name())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+16
-14
@@ -278,36 +278,38 @@ func stripAnnotation(s string, open, close rune, cb func(string)) string {
|
|||||||
|
|
||||||
// suffixModifiers are non-DXCC-relevant callsign suffixes we strip before
|
// suffixModifiers are non-DXCC-relevant callsign suffixes we strip before
|
||||||
// matching. /P /M /QRP /A and single-digit area changes (/5 …) all keep the
|
// matching. /P /M /QRP /A and single-digit area changes (/5 …) all keep the
|
||||||
// operator's home DXCC. NOTE: "MM" and "AM" are NOT here — a TRAILING /MM or
|
// operator's home DXCC. A TRAILING /MM or /AM (maritime/aeronautical mobile) is
|
||||||
// /AM (maritime/aeronautical mobile) means "no DXCC entity", while a LEADING
|
// handled in normalizeCallsign (stripped, home entity kept) so a LEADING "MM"
|
||||||
// "MM" is the Scotland operating prefix; both are handled in normalizeCallsign.
|
// (the Scotland prefix) isn't mistaken for it.
|
||||||
var suffixModifiers = map[string]bool{
|
var suffixModifiers = map[string]bool{
|
||||||
"P": true, "M": true, "QRP": true, "A": true,
|
"P": true, "M": true, "QRP": true, "A": true,
|
||||||
"PM": true, "LH": true,
|
"PM": true, "LH": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
// normalizeCallsign uppercases, trims, and resolves the "active" call when
|
// normalizeCallsign uppercases, trims, and resolves the "active" call when the
|
||||||
// the operator uses slashes (DL/F4NIE → DL; F4NIE/P → F4NIE). Returns "" for
|
// operator uses slashes (DL/F4NIE → DL; F4NIE/P → F4NIE). A trailing /MM or /AM
|
||||||
// maritime/aeronautical mobile (.../MM, .../AM), which count for no DXCC.
|
// (maritime/aeronautical mobile) is stripped so the home entity still resolves
|
||||||
|
// (YB1SCY/AM → YB1SCY → Indonesia) — strict DXCC says no entity, but the log
|
||||||
|
// should still show the operator's country.
|
||||||
func normalizeCallsign(s string) string {
|
func normalizeCallsign(s string) string {
|
||||||
s = strings.ToUpper(strings.TrimSpace(s))
|
s = strings.ToUpper(strings.TrimSpace(s))
|
||||||
if !strings.ContainsRune(s, '/') {
|
if !strings.ContainsRune(s, '/') {
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
parts := strings.Split(s, "/")
|
parts := strings.Split(s, "/")
|
||||||
// A trailing /MM or /AM is maritime/aeronautical mobile → no DXCC entity.
|
|
||||||
// (A leading "MM" is the Scotland prefix and must NOT trigger this.)
|
|
||||||
for i, p := range parts {
|
|
||||||
if i > 0 && (p == "MM" || p == "AM") {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
keep := parts[:0]
|
keep := parts[:0]
|
||||||
var areaDigit byte // a single-digit "/N" re-homes the call to call area N
|
var areaDigit byte // a single-digit "/N" re-homes the call to call area N
|
||||||
for _, p := range parts {
|
for i, p := range parts {
|
||||||
if p == "" {
|
if p == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// A TRAILING /MM (maritime) or /AM (aeronautical) mobile is stripped and
|
||||||
|
// the operator's home entity is kept, so the contact still resolves to a
|
||||||
|
// country in the log (e.g. YB1SCY/AM → Indonesia). A LEADING "MM" is the
|
||||||
|
// Scotland operating prefix (MM/F4NIE) and must NOT be stripped.
|
||||||
|
if i > 0 && (p == "MM" || p == "AM") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if suffixModifiers[p] {
|
if suffixModifiers[p] {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -214,8 +214,8 @@ func TestNormalize(t *testing.T) {
|
|||||||
"f4bpo": "F4BPO",
|
"f4bpo": "F4BPO",
|
||||||
" F4BPO ": "F4BPO",
|
" F4BPO ": "F4BPO",
|
||||||
"F4BPO/P": "F4BPO",
|
"F4BPO/P": "F4BPO",
|
||||||
"F4BPO/MM": "", // maritime mobile → no DXCC entity
|
"F4BPO/MM": "F4BPO", // maritime mobile → strip, keep home entity for the log
|
||||||
"F4BPO/AM": "", // aeronautical mobile → no DXCC entity
|
"F4BPO/AM": "F4BPO", // aeronautical mobile → strip, keep home entity for the log
|
||||||
"F4BPO/M": "F4BPO", // plain mobile keeps the home entity
|
"F4BPO/M": "F4BPO", // plain mobile keeps the home entity
|
||||||
"F4BPO/5": "F5BPO", // "/5" re-homes to call area 5
|
"F4BPO/5": "F5BPO", // "/5" re-homes to call area 5
|
||||||
"HD5MW/8": "HD8MW", // "/8" → Galápagos call area (HD8)
|
"HD5MW/8": "HD8MW", // "/8" → Galápagos call area (HD8)
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ type Config struct {
|
|||||||
User string
|
User string
|
||||||
Password string
|
Password string
|
||||||
From string
|
From string
|
||||||
|
ReplyTo string // optional Reply-To: where replies should go (e.g. a personal inbox)
|
||||||
Encryption string // "ssl" | "starttls" | "none"
|
Encryption string // "ssl" | "starttls" | "none"
|
||||||
Auth bool // SMTP requires authorization (send username/password)
|
Auth bool // SMTP requires authorization (send username/password)
|
||||||
}
|
}
|
||||||
@@ -57,6 +58,11 @@ func Send(cfg Config, to, subject, body, attachPath string) error {
|
|||||||
if err := m.To(to); err != nil {
|
if err := m.To(to); err != nil {
|
||||||
return fmt.Errorf("bad recipient %q: %w", to, err)
|
return fmt.Errorf("bad recipient %q: %w", to, err)
|
||||||
}
|
}
|
||||||
|
if cfg.ReplyTo != "" {
|
||||||
|
if err := m.ReplyTo(cfg.ReplyTo); err != nil {
|
||||||
|
return fmt.Errorf("bad reply-to %q: %w", cfg.ReplyTo, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
m.Subject(subject)
|
m.Subject(subject)
|
||||||
m.SetBodyString(mail.TypeTextPlain, body)
|
m.SetBodyString(mail.TypeTextPlain, body)
|
||||||
if attachPath != "" {
|
if attachPath != "" {
|
||||||
|
|||||||
@@ -1,19 +1,26 @@
|
|||||||
package extsvc
|
package extsvc
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"mime/multipart"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// clublogRealtimeURL is Club Log's real-time single-QSO upload endpoint.
|
// clublogRealtimeURL is Club Log's real-time single-QSO upload endpoint, used
|
||||||
// (Batch ADIF goes to putlogs.php; we push one record per logged QSO.)
|
// when a QSO is logged. Bulk/manual uploads go to clublogBatchURL instead.
|
||||||
const clublogRealtimeURL = "https://clublog.org/realtime.php"
|
const clublogRealtimeURL = "https://clublog.org/realtime.php"
|
||||||
|
|
||||||
|
// clublogBatchURL is Club Log's batch ADIF endpoint: it accepts a whole ADIF
|
||||||
|
// file in one multipart request and dedupes server-side, so a manual upload of
|
||||||
|
// N QSOs is one HTTP request instead of N realtime.php calls.
|
||||||
|
const clublogBatchURL = "https://clublog.org/putlogs.php"
|
||||||
|
|
||||||
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
// clublogAppAPIKey is OpsLog's Club Log *application* API key. Club Log
|
||||||
// requires an api parameter that identifies the client software (not the
|
// requires an api parameter that identifies the client software (not the
|
||||||
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
// user) — the same way Log4OM embeds its own key — so we ship it baked in
|
||||||
@@ -67,6 +74,73 @@ func UploadClublog(ctx context.Context, client *http.Client, cfg ServiceConfig,
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UploadClublogADIF pushes a whole ADIF document (header + many records) to
|
||||||
|
// Club Log's batch endpoint (putlogs.php) in a single multipart request. Use
|
||||||
|
// this for manual/bulk uploads instead of calling UploadClublog per QSO. Club
|
||||||
|
// Log dedupes server-side, so re-uploading QSOs it already holds is harmless.
|
||||||
|
//
|
||||||
|
// Multipart form fields: email, password, callsign, api, clientident, and the
|
||||||
|
// ADIF as a "file" upload. Returns HTTP 200 on success with a summary body.
|
||||||
|
func UploadClublogADIF(ctx context.Context, client *http.Client, cfg ServiceConfig, adifDoc string) (UploadResult, error) {
|
||||||
|
email := strings.TrimSpace(cfg.Email)
|
||||||
|
call := strings.ToUpper(strings.TrimSpace(cfg.Callsign))
|
||||||
|
switch {
|
||||||
|
case email == "":
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: account email not set")
|
||||||
|
case cfg.Password == "":
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: password not set")
|
||||||
|
case call == "":
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: logbook callsign not set")
|
||||||
|
case strings.TrimSpace(adifDoc) == "":
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: empty adif document")
|
||||||
|
}
|
||||||
|
api := strings.TrimSpace(cfg.APIKey)
|
||||||
|
if api == "" {
|
||||||
|
api = clublogAppAPIKey
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
mw := multipart.NewWriter(&buf)
|
||||||
|
_ = mw.WriteField("email", email)
|
||||||
|
_ = mw.WriteField("password", cfg.Password)
|
||||||
|
_ = mw.WriteField("callsign", call)
|
||||||
|
_ = mw.WriteField("api", api)
|
||||||
|
_ = mw.WriteField("clientident", "OpsLog")
|
||||||
|
fw, err := mw.CreateFormFile("file", "opslog.adi")
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: build form: %w", err)
|
||||||
|
}
|
||||||
|
if _, err := io.WriteString(fw, adifDoc); err != nil {
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: write adif: %w", err)
|
||||||
|
}
|
||||||
|
if err := mw.Close(); err != nil {
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: finalise form: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, clublogBatchURL, &buf)
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: build request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", mw.FormDataContentType())
|
||||||
|
if client == nil {
|
||||||
|
client = &http.Client{Timeout: 120 * time.Second}
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{}, fmt.Errorf("clublog: request failed: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
|
||||||
|
msg := strings.TrimSpace(string(body))
|
||||||
|
if resp.StatusCode == http.StatusOK {
|
||||||
|
return UploadResult{OK: true, Message: msg}, nil
|
||||||
|
}
|
||||||
|
if msg == "" {
|
||||||
|
msg = fmt.Sprintf("HTTP %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return UploadResult{OK: false, Message: msg}, fmt.Errorf("clublog: batch upload failed: %s", msg)
|
||||||
|
}
|
||||||
|
|
||||||
// TestClublog validates the configured credentials by attempting a no-op
|
// TestClublog validates the configured credentials by attempting a no-op
|
||||||
// style check. Club Log has no dedicated status endpoint, so we report the
|
// style check. Club Log has no dedicated status endpoint, so we report the
|
||||||
// fields look complete; a real failure surfaces on the first upload.
|
// fields look complete; a real failure surfaces on the first upload.
|
||||||
|
|||||||
@@ -0,0 +1,161 @@
|
|||||||
|
package extsvc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// eqslImportURL is eQSL.cc's ADIF import endpoint. It accepts a form-encoded
|
||||||
|
// POST (or URL params) with the account credentials and the ADIF content.
|
||||||
|
const eqslImportURL = "https://www.eQSL.cc/qslcard/ImportADIF.cfm"
|
||||||
|
|
||||||
|
// eqslResultRe extracts "Result: X out of Y records added" from the reply.
|
||||||
|
var eqslResultRe = regexp.MustCompile(`(?i)result:\s*(\d+)\s+out of\s+(\d+)\s+records added`)
|
||||||
|
|
||||||
|
// eqslPost performs the import POST and returns the raw response body. eQSL
|
||||||
|
// replies HTTP 200 with a plain-text/HTML body for both success and errors;
|
||||||
|
// callers classify it via the markers below.
|
||||||
|
func eqslPost(ctx context.Context, client *http.Client, user, pswd, adif string) (string, error) {
|
||||||
|
form := url.Values{}
|
||||||
|
form.Set("EQSL_USER", user)
|
||||||
|
form.Set("EQSL_PSWD", pswd)
|
||||||
|
form.Set("ADIFData", adif)
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, eqslImportURL, strings.NewReader(form.Encode()))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("eqsl: build request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
|
||||||
|
if client == nil {
|
||||||
|
client = &http.Client{Timeout: 30 * time.Second}
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("eqsl: request failed: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 256*1024))
|
||||||
|
msg := strings.TrimSpace(string(body))
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
if msg == "" {
|
||||||
|
msg = fmt.Sprintf("HTTP %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return msg, fmt.Errorf("eqsl: http %d: %s", resp.StatusCode, msg)
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// authErrEQSL returns a reason when the response signals bad credentials, else
|
||||||
|
// "". eQSL replies "Error: No match on eQSL_User/eQSL_Pswd".
|
||||||
|
func authErrEQSL(body string) string {
|
||||||
|
if strings.Contains(strings.ToLower(body), "no match on eqsl") {
|
||||||
|
return "invalid username or password"
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// eqslRecordWithNickname prepends the APP_EQSL_QTH_NICKNAME tag to an ADIF
|
||||||
|
// record when nick is set, so eQSL files the QSO under the right QTH profile
|
||||||
|
// (required when the account has more than one). ADIF field order is free, so
|
||||||
|
// prepending before the rest of the record is valid.
|
||||||
|
func eqslRecordWithNickname(record, nick string) string {
|
||||||
|
nick = strings.TrimSpace(nick)
|
||||||
|
if nick == "" {
|
||||||
|
return record
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("<APP_EQSL_QTH_NICKNAME:%d>%s%s", len(nick), nick, record)
|
||||||
|
}
|
||||||
|
|
||||||
|
// UploadEQSL pushes one ADIF record to eQSL.cc for the given account. qthNick
|
||||||
|
// is the optional eQSL QTH nickname.
|
||||||
|
//
|
||||||
|
// eQSL replies with text: "Result: 1 out of 1 records added" on success,
|
||||||
|
// "Bad record: Duplicate" for an already-present QSO (treated as success so
|
||||||
|
// retries are idempotent), or "Error: No match on eQSL_User/eQSL_Pswd" for bad
|
||||||
|
// credentials.
|
||||||
|
func UploadEQSL(ctx context.Context, client *http.Client, user, pswd, qthNick, adifRecord string) (UploadResult, error) {
|
||||||
|
user = strings.ToUpper(strings.TrimSpace(user))
|
||||||
|
if user == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: username (callsign) not set")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(pswd) == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: password not set")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(adifRecord) == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("eqsl: empty adif record")
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := eqslPost(ctx, client, user, pswd, eqslRecordWithNickname(adifRecord, qthNick))
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{OK: false, Message: body}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
b := strings.ToLower(body)
|
||||||
|
if reason := authErrEQSL(body); reason != "" {
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: %s", reason)
|
||||||
|
}
|
||||||
|
if strings.Contains(b, "duplicate") {
|
||||||
|
return UploadResult{OK: true, Message: "already in logbook"}, nil
|
||||||
|
}
|
||||||
|
if m := eqslResultRe.FindStringSubmatch(body); m != nil {
|
||||||
|
added, _ := strconv.Atoi(m[1])
|
||||||
|
if added >= 1 {
|
||||||
|
return UploadResult{OK: true, Message: strings.TrimSpace(m[0])}, nil
|
||||||
|
}
|
||||||
|
// "0 out of N" — eQSL accepted nothing; surface why if it said so.
|
||||||
|
reason := eqslReason(body)
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
reason := eqslReason(body)
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("eqsl: upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
|
||||||
|
// eqslReason trims an eQSL reply to a short human-readable reason: the first
|
||||||
|
// "Error:" / "Warning:" / "Bad record:" line if present, else the whole body
|
||||||
|
// (capped), else a generic phrase.
|
||||||
|
func eqslReason(body string) string {
|
||||||
|
for _, line := range strings.Split(body, "\n") {
|
||||||
|
l := strings.TrimSpace(line)
|
||||||
|
ll := strings.ToLower(l)
|
||||||
|
if strings.HasPrefix(ll, "error:") || strings.HasPrefix(ll, "warning:") || strings.Contains(ll, "bad record") {
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b := strings.TrimSpace(body)
|
||||||
|
if b == "" {
|
||||||
|
return "upload rejected"
|
||||||
|
}
|
||||||
|
if len(b) > 200 {
|
||||||
|
b = b[:200]
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEQSL validates the configured eQSL credentials with a REAL request: it
|
||||||
|
// posts an empty ADIF so nothing is inserted, then checks for the bad-login
|
||||||
|
// marker. Anything else means the credentials were accepted.
|
||||||
|
func TestEQSL(ctx context.Context, client *http.Client, cfg ServiceConfig) (string, error) {
|
||||||
|
user := strings.ToUpper(strings.TrimSpace(cfg.Username))
|
||||||
|
if user == "" {
|
||||||
|
return "", fmt.Errorf("eqsl: username (callsign) not set")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(cfg.Password) == "" {
|
||||||
|
return "", fmt.Errorf("eqsl: password not set")
|
||||||
|
}
|
||||||
|
body, err := eqslPost(ctx, client, user, cfg.Password, "")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if reason := authErrEQSL(body); reason != "" {
|
||||||
|
return "", fmt.Errorf("eqsl: %s", reason)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("Credentials accepted — %s", user), nil
|
||||||
|
}
|
||||||
@@ -31,6 +31,8 @@ const (
|
|||||||
ServiceQRZ Service = "qrz" // QRZ.com Logbook
|
ServiceQRZ Service = "qrz" // QRZ.com Logbook
|
||||||
ServiceClublog Service = "clublog" // Club Log real-time upload
|
ServiceClublog Service = "clublog" // Club Log real-time upload
|
||||||
ServiceLoTW Service = "lotw" // ARRL Logbook of The World (via TQSL)
|
ServiceLoTW Service = "lotw" // ARRL Logbook of The World (via TQSL)
|
||||||
|
ServiceHRDLog Service = "hrdlog" // HRDLog.net real-time upload
|
||||||
|
ServiceEQSL Service = "eqsl" // eQSL.cc ADIF upload
|
||||||
)
|
)
|
||||||
|
|
||||||
// UploadMode selects when an auto-upload fires after a QSO is saved.
|
// UploadMode selects when an auto-upload fires after a QSO is saved.
|
||||||
@@ -64,12 +66,14 @@ type ServiceConfig struct {
|
|||||||
Email string `json:"email"` // Club Log account email
|
Email string `json:"email"` // Club Log account email
|
||||||
Username string `json:"username"` // LoTW website login (for confirmation download)
|
Username string `json:"username"` // LoTW website login (for confirmation download)
|
||||||
Password string `json:"password"` // Club Log account / LoTW website password
|
Password string `json:"password"` // Club Log account / LoTW website password
|
||||||
Callsign string `json:"callsign"` // Club Log logbook (owner) callsign
|
Callsign string `json:"callsign"` // Club Log / HRDLog logbook (owner) callsign
|
||||||
|
Code string `json:"code"` // HRDLog: account upload code
|
||||||
|
QTHNickname string `json:"qth_nickname"` // eQSL: QTH nickname (when the account has several)
|
||||||
ForceStationCallsign string `json:"force_station_callsign"` // QRZ + LoTW: override STATION_CALLSIGN
|
ForceStationCallsign string `json:"force_station_callsign"` // QRZ + LoTW: override STATION_CALLSIGN
|
||||||
TQSLPath string `json:"tqsl_path"` // LoTW: path to tqsl.exe
|
TQSLPath string `json:"tqsl_path"` // LoTW: path to tqsl.exe
|
||||||
StationLocation string `json:"station_location"` // LoTW: TQSL Station Location name
|
StationLocation string `json:"station_location"` // LoTW: TQSL Station Location name
|
||||||
KeyPassword string `json:"key_password"` // LoTW: certificate private-key password (optional)
|
KeyPassword string `json:"key_password"` // LoTW: certificate private-key password (optional)
|
||||||
UploadFlag string `json:"upload_flag"` // LoTW: sent status that means "ready to upload" — "N" or "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"`
|
||||||
UploadMode UploadMode `json:"upload_mode"`
|
UploadMode UploadMode `json:"upload_mode"`
|
||||||
@@ -81,16 +85,25 @@ func (c ServiceConfig) normalised() ServiceConfig {
|
|||||||
c.APIKey = strings.TrimSpace(c.APIKey)
|
c.APIKey = strings.TrimSpace(c.APIKey)
|
||||||
c.Email = strings.TrimSpace(c.Email)
|
c.Email = strings.TrimSpace(c.Email)
|
||||||
c.Callsign = strings.ToUpper(strings.TrimSpace(c.Callsign))
|
c.Callsign = strings.ToUpper(strings.TrimSpace(c.Callsign))
|
||||||
|
c.Code = strings.TrimSpace(c.Code)
|
||||||
|
c.Username = strings.TrimSpace(c.Username)
|
||||||
|
c.QTHNickname = strings.TrimSpace(c.QTHNickname)
|
||||||
c.ForceStationCallsign = strings.ToUpper(strings.TrimSpace(c.ForceStationCallsign))
|
c.ForceStationCallsign = strings.ToUpper(strings.TrimSpace(c.ForceStationCallsign))
|
||||||
c.TQSLPath = strings.TrimSpace(c.TQSLPath)
|
c.TQSLPath = strings.TrimSpace(c.TQSLPath)
|
||||||
c.StationLocation = strings.TrimSpace(c.StationLocation)
|
c.StationLocation = strings.TrimSpace(c.StationLocation)
|
||||||
// Upload flag is the LoTW sent-status that marks a QSO ready to upload.
|
// Upload flags are the LoTW sent-statuses that mark a QSO ready to upload.
|
||||||
// Only "N" (no) and "R" (requested) are valid; default to "R".
|
// Only "N" (no) and "R" (requested) are valid; clean + dedupe, no default
|
||||||
if uf := strings.ToUpper(strings.TrimSpace(c.UploadFlag)); uf == "N" || uf == "R" {
|
// here (the caller injects N+R when nothing is configured).
|
||||||
c.UploadFlag = uf
|
var flags []string
|
||||||
} else {
|
seen := map[string]bool{}
|
||||||
c.UploadFlag = "R"
|
for _, f := range c.UploadFlags {
|
||||||
|
f = strings.ToUpper(strings.TrimSpace(f))
|
||||||
|
if (f == "N" || f == "R") && !seen[f] {
|
||||||
|
seen[f] = true
|
||||||
|
flags = append(flags, f)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
c.UploadFlags = flags
|
||||||
switch c.UploadMode {
|
switch c.UploadMode {
|
||||||
case ModeDelayed, ModeOnClose:
|
case ModeDelayed, ModeOnClose:
|
||||||
// keep
|
// keep
|
||||||
@@ -105,6 +118,8 @@ type ExternalServices struct {
|
|||||||
QRZ ServiceConfig `json:"qrz"`
|
QRZ ServiceConfig `json:"qrz"`
|
||||||
Clublog ServiceConfig `json:"clublog"`
|
Clublog ServiceConfig `json:"clublog"`
|
||||||
LoTW ServiceConfig `json:"lotw"`
|
LoTW ServiceConfig `json:"lotw"`
|
||||||
|
HRDLog ServiceConfig `json:"hrdlog"`
|
||||||
|
EQSL ServiceConfig `json:"eqsl"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// UploadResult is the outcome of a single upload attempt.
|
// UploadResult is the outcome of a single upload attempt.
|
||||||
|
|||||||
@@ -0,0 +1,145 @@
|
|||||||
|
package extsvc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// hrdlogUploadURL is HRDLog.net's real-time upload endpoint. It accepts a
|
||||||
|
// form-encoded POST with the uploader's callsign, the account's secret upload
|
||||||
|
// Code (HRDLog account → "My Account" → upload code), an App identifier, and
|
||||||
|
// one ADIF record.
|
||||||
|
const hrdlogUploadURL = "https://robot.hrdlog.net/NewEntry.aspx"
|
||||||
|
|
||||||
|
// hrdlogApp is the App identifier sent to HRDLog so uploads are attributed to
|
||||||
|
// OpsLog in the user's HRDLog activity.
|
||||||
|
const hrdlogApp = "OpsLog"
|
||||||
|
|
||||||
|
// hrdlogPost performs the form POST to NewEntry.aspx and returns the raw
|
||||||
|
// response body. The endpoint replies HTTP 200 with a small XML document even
|
||||||
|
// for errors; callers classify it via the markers in classifyHRDLog.
|
||||||
|
func hrdlogPost(ctx context.Context, client *http.Client, callsign, code, adif string) (string, error) {
|
||||||
|
form := url.Values{}
|
||||||
|
form.Set("Callsign", callsign)
|
||||||
|
form.Set("Code", code)
|
||||||
|
form.Set("App", hrdlogApp)
|
||||||
|
form.Set("ADIFData", adif)
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, hrdlogUploadURL, strings.NewReader(form.Encode()))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("hrdlog: build request: %w", err)
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
|
||||||
|
if client == nil {
|
||||||
|
client = &http.Client{Timeout: 20 * time.Second}
|
||||||
|
}
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("hrdlog: request failed: %w", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
|
||||||
|
msg := strings.TrimSpace(string(body))
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
if msg == "" {
|
||||||
|
msg = fmt.Sprintf("HTTP %d", resp.StatusCode)
|
||||||
|
}
|
||||||
|
return msg, fmt.Errorf("hrdlog: http %d: %s", resp.StatusCode, msg)
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// authErrHRDLog returns a non-empty, human-readable reason when the response
|
||||||
|
// signals a credential problem (wrong upload code or unregistered callsign),
|
||||||
|
// or "" otherwise. Markers mirror HRDLog's documented XML replies
|
||||||
|
// ("Invalid token</error>" / "Unknown user</error>").
|
||||||
|
func authErrHRDLog(body string) string {
|
||||||
|
b := strings.ToLower(body)
|
||||||
|
switch {
|
||||||
|
case strings.Contains(b, "invalid token"):
|
||||||
|
return "invalid upload code"
|
||||||
|
case strings.Contains(b, "unknown user"):
|
||||||
|
return "callsign not registered at HRDLog"
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// UploadHRDLog pushes one ADIF record to HRDLog.net. callsign is the station
|
||||||
|
// callsign the log belongs to, code is the account's upload code.
|
||||||
|
//
|
||||||
|
// Form fields (application/x-www-form-urlencoded POST):
|
||||||
|
//
|
||||||
|
// Callsign=<station call>&Code=<upload code>&App=OpsLog&ADIFData=<one record>
|
||||||
|
//
|
||||||
|
// HRDLog replies with XML: "<insert>1" on success, "<insert>0" for a duplicate
|
||||||
|
// (already logged — treated as success so retries are idempotent), or an
|
||||||
|
// "<error>…</error>" payload otherwise.
|
||||||
|
func UploadHRDLog(ctx context.Context, client *http.Client, callsign, code, adifRecord string) (UploadResult, error) {
|
||||||
|
callsign = strings.ToUpper(strings.TrimSpace(callsign))
|
||||||
|
code = strings.TrimSpace(code)
|
||||||
|
if callsign == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("hrdlog: station callsign not set")
|
||||||
|
}
|
||||||
|
if code == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("hrdlog: upload code not set")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(adifRecord) == "" {
|
||||||
|
return UploadResult{}, fmt.Errorf("hrdlog: empty adif record")
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := hrdlogPost(ctx, client, callsign, code, adifRecord)
|
||||||
|
if err != nil {
|
||||||
|
return UploadResult{OK: false, Message: body}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
b := strings.ToLower(body)
|
||||||
|
switch {
|
||||||
|
case strings.Contains(b, "<insert>1"):
|
||||||
|
return UploadResult{OK: true, Message: "uploaded"}, nil
|
||||||
|
case strings.Contains(b, "<insert>0"):
|
||||||
|
return UploadResult{OK: true, Message: "already in logbook"}, nil
|
||||||
|
}
|
||||||
|
reason := authErrHRDLog(body)
|
||||||
|
if reason == "" {
|
||||||
|
reason = body
|
||||||
|
if reason == "" {
|
||||||
|
reason = "upload rejected"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return UploadResult{OK: false, Message: reason}, fmt.Errorf("hrdlog: upload failed: %s", reason)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: HRDLog's NewEntry.aspx inserts ONLY the first record of a multi-record
|
||||||
|
// ADIFData, so there is no batch upload — callers must POST one record per
|
||||||
|
// request (see UploadHRDLog). The bulk uploader in app.go does exactly that.
|
||||||
|
|
||||||
|
// TestHRDLog validates the configured HRDLog credentials with a REAL request:
|
||||||
|
// it posts an empty ADIF so nothing is inserted, then checks for HRDLog's auth
|
||||||
|
// errors. A wrong upload code comes back as "Invalid token", a wrong callsign
|
||||||
|
// as "Unknown user"; anything else means the credentials were accepted (HRDLog
|
||||||
|
// simply had no QSO to add).
|
||||||
|
func TestHRDLog(ctx context.Context, client *http.Client, cfg ServiceConfig) (string, error) {
|
||||||
|
callsign := strings.ToUpper(strings.TrimSpace(cfg.Callsign))
|
||||||
|
code := strings.TrimSpace(cfg.Code)
|
||||||
|
if callsign == "" {
|
||||||
|
return "", fmt.Errorf("hrdlog: station callsign not set")
|
||||||
|
}
|
||||||
|
if code == "" {
|
||||||
|
return "", fmt.Errorf("hrdlog: upload code not set")
|
||||||
|
}
|
||||||
|
body, err := hrdlogPost(ctx, client, callsign, code, "")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if reason := authErrHRDLog(body); reason != "" {
|
||||||
|
return "", fmt.Errorf("hrdlog: %s", reason)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
|
||||||
|
}
|
||||||
@@ -21,8 +21,11 @@ const lotwReportURL = "https://lotw.arrl.org/lotwuser/lotwreport.adi"
|
|||||||
// DownloadLoTWConfirmations fetches confirmed QSOs from LoTW as ADIF text.
|
// DownloadLoTWConfirmations fetches confirmed QSOs from LoTW as ADIF text.
|
||||||
// Uses the LoTW *website* login (Username/Password), not the TQSL cert. When
|
// Uses the LoTW *website* login (Username/Password), not the TQSL cert. When
|
||||||
// since is non-empty (YYYY-MM-DD) only confirmations received since then are
|
// since is non-empty (YYYY-MM-DD) only confirmations received since then are
|
||||||
// returned — used for incremental "Last download" updates.
|
// returned — used for incremental "Last download" updates. When ownCall is
|
||||||
func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg ServiceConfig, since string) (string, error) {
|
// non-empty, only confirmations for that station callsign are returned (an
|
||||||
|
// LoTW account holds every call you operate — F4BPO, F4BPO/P, TM2Q — so this
|
||||||
|
// scopes the pull to the active profile's call).
|
||||||
|
func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg ServiceConfig, since, ownCall string) (string, error) {
|
||||||
user := strings.TrimSpace(cfg.Username)
|
user := strings.TrimSpace(cfg.Username)
|
||||||
if user == "" || cfg.Password == "" {
|
if user == "" || cfg.Password == "" {
|
||||||
return "", fmt.Errorf("lotw: website login (username/password) not set")
|
return "", fmt.Errorf("lotw: website login (username/password) not set")
|
||||||
@@ -33,6 +36,9 @@ func DownloadLoTWConfirmations(ctx context.Context, client *http.Client, cfg Ser
|
|||||||
q.Set("qso_query", "1")
|
q.Set("qso_query", "1")
|
||||||
q.Set("qso_qsl", "yes") // only QSLed (confirmed) records
|
q.Set("qso_qsl", "yes") // only QSLed (confirmed) records
|
||||||
q.Set("qso_qsldetail", "yes") // include QSL_RCVD / QSLRDATE detail
|
q.Set("qso_qsldetail", "yes") // include QSL_RCVD / QSLRDATE detail
|
||||||
|
if c := strings.TrimSpace(ownCall); c != "" {
|
||||||
|
q.Set("qso_owncall", c) // restrict to this station callsign
|
||||||
|
}
|
||||||
if s := strings.TrimSpace(since); s != "" {
|
if s := strings.TrimSpace(since); s != "" {
|
||||||
q.Set("qso_qslsince", s)
|
q.Set("qso_qslsince", s)
|
||||||
}
|
}
|
||||||
|
|||||||
+114
-39
@@ -33,6 +33,11 @@ func sameBaseCall(a, b string) bool {
|
|||||||
return baseCall(a) == baseCall(b)
|
return baseCall(a) == baseCall(b)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SameBaseCall is the exported form of sameBaseCall, so the host app can apply
|
||||||
|
// the same "same operator?" rule when filtering an on-close upload batch by the
|
||||||
|
// active logbook's callsign.
|
||||||
|
func SameBaseCall(a, b string) bool { return sameBaseCall(a, b) }
|
||||||
|
|
||||||
// Deps are the host-app callbacks the Manager needs. Keeping them as
|
// Deps are the host-app callbacks the Manager needs. Keeping them as
|
||||||
// function fields decouples extsvc from the qso/adif/settings packages and
|
// function fields decouples extsvc from the qso/adif/settings packages and
|
||||||
// keeps the upload-scheduling logic testable.
|
// keeps the upload-scheduling logic testable.
|
||||||
@@ -62,6 +67,13 @@ type Deps struct {
|
|||||||
// option would otherwise silently relabel it). "" → no station call known.
|
// option would otherwise silently relabel it). "" → no station call known.
|
||||||
StationCallOf func(id int64) string
|
StationCallOf func(id int64) string
|
||||||
|
|
||||||
|
// CloseUploadIDs returns the QSO ids to upload for a service when the app
|
||||||
|
// closes — scanning the WHOLE logbook, not just this session: LoTW returns
|
||||||
|
// rows whose lotw_sent matches the configured status set; QRZ/Club Log
|
||||||
|
// return anything not yet "Y". This is what makes an imported ADIF (old
|
||||||
|
// QSOs still marked unsent) upload on close. nil → nothing to do.
|
||||||
|
CloseUploadIDs func(svc Service) []int64
|
||||||
|
|
||||||
// Logf is an optional diagnostic logger.
|
// Logf is an optional diagnostic logger.
|
||||||
Logf func(format string, args ...any)
|
Logf func(format string, args ...any)
|
||||||
}
|
}
|
||||||
@@ -72,10 +84,9 @@ type Deps struct {
|
|||||||
type Manager struct {
|
type Manager struct {
|
||||||
deps Deps
|
deps Deps
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
cfg ExternalServices
|
cfg ExternalServices
|
||||||
rnd *rand.Rand
|
rnd *rand.Rand
|
||||||
pending map[Service][]int64 // QSO ids queued for ModeOnClose upload
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewManager(deps Deps) *Manager {
|
func NewManager(deps Deps) *Manager {
|
||||||
@@ -86,8 +97,7 @@ func NewManager(deps Deps) *Manager {
|
|||||||
deps: deps,
|
deps: deps,
|
||||||
// Seeded from the clock; the delay only needs to be unpredictable
|
// Seeded from the clock; the delay only needs to be unpredictable
|
||||||
// enough to spread bursts, not cryptographically random.
|
// enough to spread bursts, not cryptographically random.
|
||||||
rnd: rand.New(rand.NewSource(time.Now().UnixNano())),
|
rnd: rand.New(rand.NewSource(time.Now().UnixNano())),
|
||||||
pending: map[Service][]int64{},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,6 +113,10 @@ func (m *Manager) SetConfig(cfg ExternalServices) {
|
|||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
defer m.mu.Unlock()
|
defer m.mu.Unlock()
|
||||||
cfg.QRZ = cfg.QRZ.normalised()
|
cfg.QRZ = cfg.QRZ.normalised()
|
||||||
|
cfg.Clublog = cfg.Clublog.normalised()
|
||||||
|
cfg.LoTW = cfg.LoTW.normalised()
|
||||||
|
cfg.HRDLog = cfg.HRDLog.normalised()
|
||||||
|
cfg.EQSL = cfg.EQSL.normalised()
|
||||||
m.cfg = cfg
|
m.cfg = cfg
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,17 +153,23 @@ func (m *Manager) OnQSOLogged(id int64) {
|
|||||||
if lt := cfg.LoTW; lt.AutoUpload && lt.TQSLPath != "" && lt.StationLocation != "" {
|
if lt := cfg.LoTW; lt.AutoUpload && lt.TQSLPath != "" && lt.StationLocation != "" {
|
||||||
m.route(ServiceLoTW, id, lt)
|
m.route(ServiceLoTW, id, lt)
|
||||||
}
|
}
|
||||||
|
// HRDLog — needs the station callsign + the account upload code.
|
||||||
|
if h := cfg.HRDLog; h.AutoUpload && h.Callsign != "" && h.Code != "" {
|
||||||
|
m.route(ServiceHRDLog, id, h)
|
||||||
|
}
|
||||||
|
// eQSL — needs the account username (callsign) + password.
|
||||||
|
if e := cfg.EQSL; e.AutoUpload && e.Username != "" && e.Password != "" {
|
||||||
|
m.route(ServiceEQSL, id, e)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// route sends a logged QSO down the configured timing path: queue it for the
|
// route sends a logged QSO down the configured timing path: queue it for the
|
||||||
// app-close batch, or schedule an immediate / delayed upload.
|
// app-close batch, or schedule an immediate / delayed upload.
|
||||||
func (m *Manager) route(svc Service, id int64, cfg ServiceConfig) {
|
func (m *Manager) route(svc Service, id int64, cfg ServiceConfig) {
|
||||||
if cfg.UploadMode == ModeOnClose {
|
if cfg.UploadMode == ModeOnClose {
|
||||||
m.mu.Lock()
|
// Nothing to queue: on-close upload sweeps the whole logbook from the
|
||||||
m.pending[svc] = append(m.pending[svc], id)
|
// database at shutdown (see FlushOnClose), so this QSO is picked up by
|
||||||
n := len(m.pending[svc])
|
// its sent-status then — no in-memory tracking needed.
|
||||||
m.mu.Unlock()
|
|
||||||
m.logf("extsvc: %s queued QSO %d for on-close upload (%d pending)", svc, id, n)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
m.scheduleUpload(svc, id, cfg)
|
m.scheduleUpload(svc, id, cfg)
|
||||||
@@ -166,47 +186,82 @@ func (m *Manager) scheduleUpload(svc Service, id int64, cfg ServiceConfig) {
|
|||||||
go m.upload(svc, id, cfg)
|
go m.upload(svc, id, cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
// PendingCount returns how many QSOs are queued for on-close upload across
|
// onCloseServices returns the services configured for on-close auto-upload,
|
||||||
// all services. The shutdown sequence uses it to decide whether to show the
|
// with the minimum credentials to actually run.
|
||||||
// upload step.
|
func (m *Manager) onCloseServices() []Service {
|
||||||
func (m *Manager) PendingCount() int {
|
cfg := m.Config()
|
||||||
m.mu.Lock()
|
var out []Service
|
||||||
defer m.mu.Unlock()
|
if q := cfg.QRZ; q.AutoUpload && q.UploadMode == ModeOnClose && q.APIKey != "" {
|
||||||
|
out = append(out, ServiceQRZ)
|
||||||
|
}
|
||||||
|
if c := cfg.Clublog; c.AutoUpload && c.UploadMode == ModeOnClose && c.Email != "" && c.Password != "" {
|
||||||
|
out = append(out, ServiceClublog)
|
||||||
|
}
|
||||||
|
if l := cfg.LoTW; l.AutoUpload && l.UploadMode == ModeOnClose && l.TQSLPath != "" && l.StationLocation != "" {
|
||||||
|
out = append(out, ServiceLoTW)
|
||||||
|
}
|
||||||
|
if h := cfg.HRDLog; h.AutoUpload && h.UploadMode == ModeOnClose && h.Callsign != "" && h.Code != "" {
|
||||||
|
out = append(out, ServiceHRDLog)
|
||||||
|
}
|
||||||
|
if e := cfg.EQSL; e.AutoUpload && e.UploadMode == ModeOnClose && e.Username != "" && e.Password != "" {
|
||||||
|
out = append(out, ServiceEQSL)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// CloseUploadCount returns how many QSOs across the whole logbook would be
|
||||||
|
// uploaded at app close (sum over every on-close service). The shutdown
|
||||||
|
// sequence uses it to decide whether to show the upload step and its label.
|
||||||
|
func (m *Manager) CloseUploadCount() int {
|
||||||
|
if m.deps.CloseUploadIDs == nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
n := 0
|
n := 0
|
||||||
for _, ids := range m.pending {
|
for _, svc := range m.onCloseServices() {
|
||||||
n += len(ids)
|
n += len(m.deps.CloseUploadIDs(svc))
|
||||||
}
|
}
|
||||||
return n
|
return n
|
||||||
}
|
}
|
||||||
|
|
||||||
// FlushOnClose uploads every queued QSO. Called from the shutdown sequence.
|
// FlushOnClose uploads every QSO due for an on-close push, scanning the whole
|
||||||
// QRZ/Club Log go one-by-one (fast HTTP); LoTW is signed and uploaded as a
|
// logbook (not just this session). Called from the shutdown sequence. QRZ/Club
|
||||||
// single TQSL batch. Returns the number of QSOs uploaded successfully.
|
// Log go one-by-one (fast HTTP); LoTW is signed and uploaded as a single TQSL
|
||||||
|
// batch. Returns the number of QSOs uploaded successfully.
|
||||||
func (m *Manager) FlushOnClose() int {
|
func (m *Manager) FlushOnClose() int {
|
||||||
m.mu.Lock()
|
if m.deps.CloseUploadIDs == nil {
|
||||||
pending := m.pending
|
return 0
|
||||||
m.pending = map[Service][]int64{}
|
}
|
||||||
cfg := m.cfg
|
cfg := m.Config()
|
||||||
m.mu.Unlock()
|
|
||||||
|
|
||||||
uploaded := 0
|
uploaded := 0
|
||||||
for svc, ids := range pending {
|
for _, svc := range m.onCloseServices() {
|
||||||
|
ids := m.deps.CloseUploadIDs(svc)
|
||||||
if len(ids) == 0 {
|
if len(ids) == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
switch svc {
|
switch svc {
|
||||||
case ServiceLoTW:
|
case ServiceLoTW:
|
||||||
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
|
uploaded += m.flushLoTWBatch(ids, cfg.LoTW)
|
||||||
default:
|
case ServiceQRZ:
|
||||||
var sc ServiceConfig
|
|
||||||
switch svc {
|
|
||||||
case ServiceQRZ:
|
|
||||||
sc = cfg.QRZ
|
|
||||||
case ServiceClublog:
|
|
||||||
sc = cfg.Clublog
|
|
||||||
}
|
|
||||||
for _, id := range ids {
|
for _, id := range ids {
|
||||||
if m.upload(svc, id, sc) {
|
if m.upload(svc, id, cfg.QRZ) {
|
||||||
|
uploaded++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case ServiceClublog:
|
||||||
|
for _, id := range ids {
|
||||||
|
if m.upload(svc, id, cfg.Clublog) {
|
||||||
|
uploaded++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case ServiceHRDLog:
|
||||||
|
for _, id := range ids {
|
||||||
|
if m.upload(svc, id, cfg.HRDLog) {
|
||||||
|
uploaded++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case ServiceEQSL:
|
||||||
|
for _, id := range ids {
|
||||||
|
if m.upload(svc, id, cfg.EQSL) {
|
||||||
uploaded++
|
uploaded++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -276,8 +331,10 @@ func (m *Manager) upload(svc Service, id int64, cfg ServiceConfig) bool {
|
|||||||
switch svc {
|
switch svc {
|
||||||
case ServiceQRZ, ServiceLoTW:
|
case ServiceQRZ, ServiceLoTW:
|
||||||
owner = cfg.ForceStationCallsign
|
owner = cfg.ForceStationCallsign
|
||||||
case ServiceClublog:
|
case ServiceClublog, ServiceHRDLog:
|
||||||
owner = cfg.Callsign
|
owner = cfg.Callsign
|
||||||
|
case ServiceEQSL:
|
||||||
|
owner = cfg.Username
|
||||||
}
|
}
|
||||||
if owner != "" && m.deps.StationCallOf != nil {
|
if owner != "" && m.deps.StationCallOf != nil {
|
||||||
qcall := m.deps.StationCallOf(id)
|
qcall := m.deps.StationCallOf(id)
|
||||||
@@ -324,6 +381,24 @@ func (m *Manager) upload(svc Service, id int64, cfg ServiceConfig) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
res, err = UploadLoTW(ctx, cfg, "", record)
|
res, err = UploadLoTW(ctx, cfg, "", record)
|
||||||
|
case ServiceHRDLog:
|
||||||
|
// HRDLog takes the station callsign as a separate param, so the ADIF
|
||||||
|
// keeps the QSO's own station call (no override), like Club Log.
|
||||||
|
record, ok := m.deps.BuildADIF(id, "")
|
||||||
|
if !ok {
|
||||||
|
m.logf("extsvc: %s upload of QSO %d skipped (no record)", svc, id)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
res, err = UploadHRDLog(ctx, m.deps.Client, cfg.Callsign, cfg.Code, record)
|
||||||
|
case ServiceEQSL:
|
||||||
|
// eQSL keeps the QSO's own station call; the account is identified by
|
||||||
|
// the Username + Password, with an optional QTH nickname.
|
||||||
|
record, ok := m.deps.BuildADIF(id, "")
|
||||||
|
if !ok {
|
||||||
|
m.logf("extsvc: %s upload of QSO %d skipped (no record)", svc, id)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
res, err = UploadEQSL(ctx, m.deps.Client, cfg.Username, cfg.Password, cfg.QTHNickname, record)
|
||||||
default:
|
default:
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ import (
|
|||||||
// subscription used elsewhere for callsign data — they're different keys.
|
// subscription used elsewhere for callsign data — they're different keys.
|
||||||
const qrzAPIURL = "https://logbook.qrz.com/api"
|
const qrzAPIURL = "https://logbook.qrz.com/api"
|
||||||
|
|
||||||
|
// LogSink receives diagnostics such as raw QRZ responses. Set to applog.Printf
|
||||||
|
// at startup; defaults to a no-op so the package is usable without wiring.
|
||||||
|
var LogSink = func(string, ...any) {}
|
||||||
|
|
||||||
// UploadQRZ pushes one ADIF record to the QRZ.com logbook identified by
|
// UploadQRZ pushes one ADIF record to the QRZ.com logbook identified by
|
||||||
// apiKey. It returns OK when the QSO is inserted or already present
|
// apiKey. It returns OK when the QSO is inserted or already present
|
||||||
// (QRZ reports a duplicate as a FAIL with a "duplicate" reason, which we
|
// (QRZ reports a duplicate as a FAIL with a "duplicate" reason, which we
|
||||||
@@ -67,6 +71,7 @@ func UploadQRZ(ctx context.Context, client *http.Client, apiKey, adifRecord stri
|
|||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return UploadResult{}, fmt.Errorf("qrz: http %d: %s", resp.StatusCode, strings.TrimSpace(string(body)))
|
return UploadResult{}, fmt.Errorf("qrz: http %d: %s", resp.StatusCode, strings.TrimSpace(string(body)))
|
||||||
}
|
}
|
||||||
|
LogSink("qrz: INSERT raw response: %s", strings.TrimSpace(string(body)))
|
||||||
|
|
||||||
return parseQRZResponse(string(body))
|
return parseQRZResponse(string(body))
|
||||||
}
|
}
|
||||||
@@ -171,6 +176,7 @@ func TestQRZ(ctx context.Context, client *http.Client, apiKey string) (string, e
|
|||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
|
body, _ := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
|
||||||
|
LogSink("qrz: STATUS raw response: %s", strings.TrimSpace(string(body)))
|
||||||
vals, err := url.ParseQuery(strings.TrimSpace(string(body)))
|
vals, err := url.ParseQuery(strings.TrimSpace(string(body)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("qrz: bad response: %w", err)
|
return "", fmt.Errorf("qrz: bad response: %w", err)
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Direction is "inbound" (we listen) or "outbound" (we emit).
|
// Direction is "inbound" (we listen) or "outbound" (we emit).
|
||||||
@@ -112,10 +114,10 @@ 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 = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
|
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, c.ID)
|
mc, c.MulticastGroup, c.DestinationIP, en, c.SortOrder, db.NowISO(), c.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("update udp: %w", err)
|
return fmt.Errorf("update udp: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
+21
-14
@@ -12,6 +12,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrNotFound is returned by providers when a callsign is unknown.
|
// ErrNotFound is returned by providers when a callsign is unknown.
|
||||||
@@ -357,24 +359,29 @@ func (c *Cache) Get(ctx context.Context, callsign string) (Result, bool) {
|
|||||||
return r, true
|
return r, true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Put upserts a lookup result.
|
// Put upserts a lookup result. fetched_at is generated in Go (NowISO) so the
|
||||||
|
// INSERT is backend-agnostic; the conflict tail is dialect-specific.
|
||||||
func (c *Cache) Put(ctx context.Context, r Result) error {
|
func (c *Cache) Put(ctx context.Context, r Result) error {
|
||||||
_, err := c.db.ExecContext(ctx, `
|
updateCols := []string{
|
||||||
|
"name", "qth", "address", "state", "cnty",
|
||||||
|
"country", "grid", "lat", "lon",
|
||||||
|
"dxcc", "cqz", "ituz", "cont", "email", "qsl_via", "image_url",
|
||||||
|
"source", "fetched_at",
|
||||||
|
}
|
||||||
|
// The lookup cache always lives in the local SQLite database, so SQLite
|
||||||
|
// upsert syntax is used unconditionally.
|
||||||
|
sets := make([]string, len(updateCols))
|
||||||
|
for i, c := range updateCols {
|
||||||
|
sets[i] = c + " = excluded." + c
|
||||||
|
}
|
||||||
|
q := `
|
||||||
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)
|
source, fetched_at)
|
||||||
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,
|
VALUES(?,?,?,?,?,?, ?,?,?,?, ?,?,?,?,?,?,?, ?,?)
|
||||||
strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
|
ON CONFLICT(callsign) DO UPDATE SET ` + strings.Join(sets, ", ")
|
||||||
ON CONFLICT(callsign) DO UPDATE SET
|
_, err := c.db.ExecContext(ctx, q,
|
||||||
name = excluded.name, qth = excluded.qth, address = excluded.address,
|
|
||||||
state = excluded.state, cnty = excluded.cnty,
|
|
||||||
country = excluded.country, grid = excluded.grid,
|
|
||||||
lat = excluded.lat, lon = excluded.lon,
|
|
||||||
dxcc = excluded.dxcc, cqz = excluded.cqz, ituz = excluded.ituz,
|
|
||||||
cont = excluded.cont, email = excluded.email, qsl_via = excluded.qsl_via,
|
|
||||||
image_url = excluded.image_url,
|
|
||||||
source = excluded.source, fetched_at = excluded.fetched_at`,
|
|
||||||
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
r.Callsign, nullable(r.Name), nullable(r.QTH), nullable(r.Address),
|
||||||
nullable(r.State), nullable(r.County),
|
nullable(r.State), nullable(r.County),
|
||||||
nullable(r.Country), nullable(r.Grid),
|
nullable(r.Country), nullable(r.Grid),
|
||||||
@@ -382,7 +389,7 @@ func (c *Cache) Put(ctx context.Context, r Result) error {
|
|||||||
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
nullableInt(r.DXCC), nullableInt(r.CQZ), nullableInt(r.ITUZ),
|
||||||
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
nullable(r.Continent), nullable(r.Email), nullable(r.QSLVia),
|
||||||
nullable(r.ImageURL),
|
nullable(r.ImageURL),
|
||||||
r.Source,
|
r.Source, db.NowISO(),
|
||||||
)
|
)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,234 @@
|
|||||||
|
// Package netctl persists "NET" definitions and their station rosters for the
|
||||||
|
// NET Control feature (managing a directed net / round-table on a frequency).
|
||||||
|
//
|
||||||
|
// A NET is a named net (e.g. "French QSO", "QSO des Brasses") with a roster of
|
||||||
|
// stations that habitually check in. The roster grows over time as you add new
|
||||||
|
// callsigns. Storage is a single JSON file in the data dir — global/shared
|
||||||
|
// across all logbooks (a net like "French QSO" is reused whatever logbook is
|
||||||
|
// open). The QSOs themselves are logged into the active logbook by the caller;
|
||||||
|
// this package only owns the net definitions + rosters, not the live session.
|
||||||
|
package netctl
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Station is one roster entry: a station registered in a net.
|
||||||
|
type Station struct {
|
||||||
|
Callsign string `json:"callsign"`
|
||||||
|
Name string `json:"name,omitempty"`
|
||||||
|
QTH string `json:"qth,omitempty"`
|
||||||
|
Country string `json:"country,omitempty"`
|
||||||
|
DXCC int `json:"dxcc,omitempty"`
|
||||||
|
ITU int `json:"itu,omitempty"`
|
||||||
|
CQ int `json:"cq,omitempty"`
|
||||||
|
Groups string `json:"groups,omitempty"`
|
||||||
|
SIG string `json:"sig,omitempty"`
|
||||||
|
SIGInfo string `json:"sig_info,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Net is a named net with default report values and a station roster.
|
||||||
|
type Net struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
DefaultRSTSent string `json:"default_rst_sent,omitempty"`
|
||||||
|
DefaultRSTRcvd string `json:"default_rst_rcvd,omitempty"`
|
||||||
|
DefaultComment string `json:"default_comment,omitempty"`
|
||||||
|
Stations []Station `json:"stations,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Store is the persistent collection of nets, backed by a JSON file.
|
||||||
|
type Store struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
path string
|
||||||
|
nets []Net
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open loads the store from path (creating an empty one if the file is absent).
|
||||||
|
func Open(path string) (*Store, error) {
|
||||||
|
s := &Store{path: path}
|
||||||
|
b, err := os.ReadFile(path)
|
||||||
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(b) > 0 {
|
||||||
|
if err := json.Unmarshal(b, &s.nets); err != nil {
|
||||||
|
// Corrupt file: start empty rather than failing the whole app.
|
||||||
|
s.nets = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// save writes the current state to disk. Caller must hold s.mu.
|
||||||
|
func (s *Store) save() error {
|
||||||
|
b, err := json.MarshalIndent(s.nets, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tmp := s.path + ".tmp"
|
||||||
|
if err := os.WriteFile(tmp, b, 0o644); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return os.Rename(tmp, s.path)
|
||||||
|
}
|
||||||
|
|
||||||
|
func newID() string { return strconv.FormatInt(time.Now().UnixNano(), 36) }
|
||||||
|
|
||||||
|
// List returns a copy of all nets (with rosters), ordered by name.
|
||||||
|
func (s *Store) List() []Net {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
out := make([]Net, len(s.nets))
|
||||||
|
copy(out, s.nets)
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
return strings.ToLower(out[i].Name) < strings.ToLower(out[j].Name)
|
||||||
|
})
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// find returns the index of the net with id, or -1. Caller must hold s.mu.
|
||||||
|
func (s *Store) find(id string) int {
|
||||||
|
for i := range s.nets {
|
||||||
|
if s.nets[i].ID == id {
|
||||||
|
return i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create adds a new net with default reports of 59/59 and returns it.
|
||||||
|
func (s *Store) Create(name string) (Net, error) {
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
if name == "" {
|
||||||
|
return Net{}, fmt.Errorf("net name required")
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
for i := range s.nets {
|
||||||
|
if strings.EqualFold(s.nets[i].Name, name) {
|
||||||
|
return Net{}, fmt.Errorf("a net named %q already exists", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
n := Net{ID: newID(), Name: name, DefaultRSTSent: "59", DefaultRSTRcvd: "59"}
|
||||||
|
s.nets = append(s.nets, n)
|
||||||
|
return n, s.save()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Rename changes a net's name.
|
||||||
|
func (s *Store) Rename(id, name string) error {
|
||||||
|
name = strings.TrimSpace(name)
|
||||||
|
if name == "" {
|
||||||
|
return fmt.Errorf("net name required")
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return fmt.Errorf("net not found")
|
||||||
|
}
|
||||||
|
s.nets[i].Name = name
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetDefaults updates the per-net default report/comment values.
|
||||||
|
func (s *Store) SetDefaults(id, rstSent, rstRcvd, comment string) error {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return fmt.Errorf("net not found")
|
||||||
|
}
|
||||||
|
s.nets[i].DefaultRSTSent = rstSent
|
||||||
|
s.nets[i].DefaultRSTRcvd = rstRcvd
|
||||||
|
s.nets[i].DefaultComment = comment
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete removes a net and its roster.
|
||||||
|
func (s *Store) Delete(id string) error {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return fmt.Errorf("net not found")
|
||||||
|
}
|
||||||
|
s.nets = append(s.nets[:i], s.nets[i+1:]...)
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get returns a copy of one net by id.
|
||||||
|
func (s *Store) Get(id string) (Net, bool) {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return Net{}, false
|
||||||
|
}
|
||||||
|
return s.nets[i], true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Roster returns a net's stations, sorted by callsign.
|
||||||
|
func (s *Store) Roster(id string) ([]Station, error) {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return nil, fmt.Errorf("net not found")
|
||||||
|
}
|
||||||
|
out := make([]Station, len(s.nets[i].Stations))
|
||||||
|
copy(out, s.nets[i].Stations)
|
||||||
|
sort.Slice(out, func(a, b int) bool { return out[a].Callsign < out[b].Callsign })
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// RosterUpsert adds st to the net's roster, or updates it if the callsign is
|
||||||
|
// already present (matched case-insensitively; the callsign is stored upper).
|
||||||
|
func (s *Store) RosterUpsert(id string, st Station) error {
|
||||||
|
st.Callsign = strings.ToUpper(strings.TrimSpace(st.Callsign))
|
||||||
|
if st.Callsign == "" {
|
||||||
|
return fmt.Errorf("callsign required")
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return fmt.Errorf("net not found")
|
||||||
|
}
|
||||||
|
for j := range s.nets[i].Stations {
|
||||||
|
if strings.EqualFold(s.nets[i].Stations[j].Callsign, st.Callsign) {
|
||||||
|
s.nets[i].Stations[j] = st
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s.nets[i].Stations = append(s.nets[i].Stations, st)
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
|
||||||
|
// RosterRemove deletes a callsign from a net's roster.
|
||||||
|
func (s *Store) RosterRemove(id, callsign string) error {
|
||||||
|
callsign = strings.ToUpper(strings.TrimSpace(callsign))
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
i := s.find(id)
|
||||||
|
if i < 0 {
|
||||||
|
return fmt.Errorf("net not found")
|
||||||
|
}
|
||||||
|
for j := range s.nets[i].Stations {
|
||||||
|
if strings.EqualFold(s.nets[i].Stations[j].Callsign, callsign) {
|
||||||
|
s.nets[i].Stations = append(s.nets[i].Stations[:j], s.nets[i].Stations[j+1:]...)
|
||||||
|
return s.save()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil // not present → nothing to do
|
||||||
|
}
|
||||||
@@ -8,6 +8,8 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Station is a radio / TRX line. The display Name is also what gets
|
// Station is a radio / TRX line. The display Name is also what gets
|
||||||
@@ -56,6 +58,59 @@ type Repo struct{ db *sql.DB }
|
|||||||
|
|
||||||
func NewRepo(db *sql.DB) *Repo { return &Repo{db: db} }
|
func NewRepo(db *sql.DB) *Repo { return &Repo{db: db} }
|
||||||
|
|
||||||
|
// CopyProfile duplicates the entire stations→antennas→bands tree from one
|
||||||
|
// profile to another (used when a profile is duplicated). New ids are assigned;
|
||||||
|
// the band defaults and ordering are preserved.
|
||||||
|
func (r *Repo) CopyProfile(ctx context.Context, srcProfileID, dstProfileID int64) error {
|
||||||
|
tree, err := r.ListTree(ctx, srcProfileID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
tx, err := r.db.BeginTx(ctx, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer tx.Rollback()
|
||||||
|
now := db.NowISO()
|
||||||
|
for _, st := range tree {
|
||||||
|
var pwr any
|
||||||
|
if st.TXPower != nil {
|
||||||
|
pwr = *st.TXPower
|
||||||
|
}
|
||||||
|
res, err := tx.ExecContext(ctx,
|
||||||
|
`INSERT INTO operating_stations(profile_id, name, tx_pwr, sort_order, created_at, updated_at)
|
||||||
|
VALUES(?,?,?,?,?,?)`, dstProfileID, st.Name, pwr, st.SortOrder, now, now)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("copy station: %w", err)
|
||||||
|
}
|
||||||
|
newStationID, _ := res.LastInsertId()
|
||||||
|
for _, ant := range st.Antennas {
|
||||||
|
ares, err := tx.ExecContext(ctx,
|
||||||
|
`INSERT INTO operating_antennas(station_id, name, sort_order, created_at, updated_at)
|
||||||
|
VALUES(?,?,?,?,?)`, newStationID, ant.Name, ant.SortOrder, now, now)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("copy antenna: %w", err)
|
||||||
|
}
|
||||||
|
newAntID, _ := ares.LastInsertId()
|
||||||
|
for _, b := range ant.Bands {
|
||||||
|
if _, err := tx.ExecContext(ctx,
|
||||||
|
`INSERT INTO operating_antenna_bands(antenna_id, band, is_default) VALUES(?,?,?)`,
|
||||||
|
newAntID, b.Band, boolToInt(b.IsDefault)); err != nil {
|
||||||
|
return fmt.Errorf("copy band: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return tx.Commit()
|
||||||
|
}
|
||||||
|
|
||||||
|
func boolToInt(b bool) int {
|
||||||
|
if b {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
// ListTree returns every station for the profile with its nested antennas
|
// ListTree returns every station for the profile with its nested antennas
|
||||||
// and bands. One round-trip per level — three queries total regardless of
|
// and bands. One round-trip per level — three queries total regardless of
|
||||||
// tree size, so the Settings panel stays snappy on big setups.
|
// tree size, so the Settings panel stays snappy on big setups.
|
||||||
@@ -190,8 +245,8 @@ func (r *Repo) SaveStation(ctx context.Context, s *Station) error {
|
|||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE operating_stations
|
`UPDATE operating_stations
|
||||||
SET name = ?, tx_pwr = ?, sort_order = ?,
|
SET name = ?, tx_pwr = ?, sort_order = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
|
updated_at = ?
|
||||||
WHERE id = ?`, s.Name, pwr, s.SortOrder, s.ID)
|
WHERE id = ?`, s.Name, pwr, s.SortOrder, db.NowISO(), s.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("update station: %w", err)
|
return fmt.Errorf("update station: %w", err)
|
||||||
}
|
}
|
||||||
@@ -230,8 +285,8 @@ func (r *Repo) SaveAntenna(ctx context.Context, a *Antenna) error {
|
|||||||
if _, err := tx.ExecContext(ctx,
|
if _, err := tx.ExecContext(ctx,
|
||||||
`UPDATE operating_antennas
|
`UPDATE operating_antennas
|
||||||
SET name = ?, sort_order = ?,
|
SET name = ?, sort_order = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ','now')
|
updated_at = ?
|
||||||
WHERE id = ?`, a.Name, a.SortOrder, a.ID); err != nil {
|
WHERE id = ?`, a.Name, a.SortOrder, db.NowISO(), a.ID); err != nil {
|
||||||
return fmt.Errorf("update antenna: %w", err)
|
return fmt.Errorf("update antenna: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,239 @@
|
|||||||
|
// Package powergenius drives a 4O3A PowerGenius XL amplifier over its TCP text
|
||||||
|
// API (same "Genius Series" line protocol as the Antenna Genius). OpsLog reads
|
||||||
|
// the amp's operate state via the FlexRadio amplifier object, but the fan mode
|
||||||
|
// is a PGXL-only setting only reachable on the amp's own control port — hence
|
||||||
|
// this small direct client. Commands are "C<id>|<cmd>\n"; replies are
|
||||||
|
// "R<id>|0|<k=v …>" and asynchronous "S0|<k=v …>".
|
||||||
|
package powergenius
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
defaultPort = 9008
|
||||||
|
dialTimeout = 5 * time.Second
|
||||||
|
ioTimeout = 3 * time.Second
|
||||||
|
pollEvery = 1500 * time.Millisecond
|
||||||
|
reconnectDelay = 2 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
// Status is the snapshot the UI renders (only the bits OpsLog needs).
|
||||||
|
type Status struct {
|
||||||
|
Connected bool `json:"connected"`
|
||||||
|
Host string `json:"host,omitempty"`
|
||||||
|
LastError string `json:"last_error,omitempty"`
|
||||||
|
State string `json:"state,omitempty"` // IDLE / TRANSMIT_A …
|
||||||
|
FanMode string `json:"fan_mode,omitempty"` // STANDARD / CONTEST / BROADCAST
|
||||||
|
Temperature float64 `json:"temperature"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type Client struct {
|
||||||
|
host string
|
||||||
|
port int
|
||||||
|
|
||||||
|
mu sync.Mutex // serialises command send/recv on the connection
|
||||||
|
conn net.Conn
|
||||||
|
reader *bufio.Reader
|
||||||
|
|
||||||
|
statusMu sync.RWMutex
|
||||||
|
status Status
|
||||||
|
// Optimistic fan mode kept until the amp's status poll confirms it (or it
|
||||||
|
// ages out) — otherwise a stale poll right after a change reverts the UI.
|
||||||
|
fanPending string
|
||||||
|
fanPendingAt time.Time
|
||||||
|
|
||||||
|
cmdID atomic.Int64
|
||||||
|
stop chan struct{}
|
||||||
|
running bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(host string, port int) *Client {
|
||||||
|
if port <= 0 || port > 65535 {
|
||||||
|
port = defaultPort
|
||||||
|
}
|
||||||
|
return &Client{host: host, port: port, stop: make(chan struct{}), status: Status{Host: host}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Start() error {
|
||||||
|
c.running = true
|
||||||
|
go c.pollLoop()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) Stop() {
|
||||||
|
if !c.running {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.running = false
|
||||||
|
close(c.stop)
|
||||||
|
c.mu.Lock()
|
||||||
|
if c.conn != nil {
|
||||||
|
c.conn.Close()
|
||||||
|
c.conn = nil
|
||||||
|
c.reader = nil
|
||||||
|
}
|
||||||
|
c.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) GetStatus() Status {
|
||||||
|
c.statusMu.RLock()
|
||||||
|
defer c.statusMu.RUnlock()
|
||||||
|
return c.status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) setStatus(fn func(*Status)) {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
fn(&c.status)
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetFanMode sets the amplifier fan mode (STANDARD | CONTEST | BROADCAST).
|
||||||
|
func (c *Client) SetFanMode(mode string) error {
|
||||||
|
m := strings.ToUpper(strings.TrimSpace(mode))
|
||||||
|
switch m {
|
||||||
|
case "STANDARD", "CONTEST", "BROADCAST":
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("powergenius: invalid fan mode %q", mode)
|
||||||
|
}
|
||||||
|
if _, err := c.command("setup fanmode=" + m); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.FanMode = m // optimistic
|
||||||
|
c.fanPending, c.fanPendingAt = m, time.Now()
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetOperate puts the amp in OPERATE (1) or STANDBY (0).
|
||||||
|
func (c *Client) SetOperate(on bool) error {
|
||||||
|
v := "0"
|
||||||
|
if on {
|
||||||
|
v = "1"
|
||||||
|
}
|
||||||
|
_, err := c.command("operate=" + v)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) pollLoop() {
|
||||||
|
t := time.NewTicker(pollEvery)
|
||||||
|
defer t.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-c.stop:
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
if err := c.ensureConnected(); err != nil {
|
||||||
|
c.setStatus(func(s *Status) { s.Connected = false; s.LastError = "dial: " + err.Error() })
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := c.command("status"); err != nil {
|
||||||
|
c.dropConn()
|
||||||
|
c.setStatus(func(s *Status) { s.Connected = false; s.LastError = err.Error() })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) ensureConnected() error {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
if c.conn != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
conn, err := net.DialTimeout("tcp", net.JoinHostPort(c.host, strconv.Itoa(c.port)), dialTimeout)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
c.conn = conn
|
||||||
|
c.reader = bufio.NewReader(conn)
|
||||||
|
// Discard the version banner the device sends on connect.
|
||||||
|
_ = conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||||
|
_, _ = c.reader.ReadString('\n')
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) dropConn() {
|
||||||
|
c.mu.Lock()
|
||||||
|
if c.conn != nil {
|
||||||
|
c.conn.Close()
|
||||||
|
c.conn = nil
|
||||||
|
c.reader = nil
|
||||||
|
}
|
||||||
|
c.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// command sends "C<id>|<cmd>\n" and parses the single-line reply into status.
|
||||||
|
func (c *Client) command(cmd string) (string, error) {
|
||||||
|
c.mu.Lock()
|
||||||
|
defer c.mu.Unlock()
|
||||||
|
if c.conn == nil || c.reader == nil {
|
||||||
|
return "", fmt.Errorf("powergenius: not connected")
|
||||||
|
}
|
||||||
|
id := c.cmdID.Add(1)
|
||||||
|
_ = c.conn.SetWriteDeadline(time.Now().Add(ioTimeout))
|
||||||
|
if _, err := fmt.Fprintf(c.conn, "C%d|%s\n", id, cmd); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
_ = c.conn.SetReadDeadline(time.Now().Add(ioTimeout))
|
||||||
|
line, err := c.reader.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
c.parse(line)
|
||||||
|
return line, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse handles "R<id>|0|<k=v …>" and "S0|<k=v …>" status lines.
|
||||||
|
func (c *Client) parse(resp string) {
|
||||||
|
var data string
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(resp, "R"):
|
||||||
|
p := strings.SplitN(resp, "|", 3)
|
||||||
|
if len(p) < 3 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data = p[2]
|
||||||
|
case strings.HasPrefix(resp, "S"):
|
||||||
|
p := strings.SplitN(resp, "|", 2)
|
||||||
|
if len(p) < 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data = p[1]
|
||||||
|
default:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.status.Connected = true
|
||||||
|
c.status.LastError = ""
|
||||||
|
for _, pair := range strings.Fields(data) {
|
||||||
|
kv := strings.SplitN(pair, "=", 2)
|
||||||
|
if len(kv) != 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
switch kv[0] {
|
||||||
|
case "state":
|
||||||
|
c.status.State = kv[1]
|
||||||
|
case "fanmode":
|
||||||
|
dev := strings.ToUpper(kv[1])
|
||||||
|
// Honour a recent optimistic change until the amp confirms it.
|
||||||
|
if c.fanPending != "" && time.Since(c.fanPendingAt) < 3*time.Second && dev != c.fanPending {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
c.fanPending = ""
|
||||||
|
c.status.FanMode = dev
|
||||||
|
case "temp":
|
||||||
|
c.status.Temperature, _ = strconv.ParseFloat(kv[1], 64)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
@@ -11,10 +11,23 @@ package profile
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ProfileDB is a profile's logbook database target. Backend "" or "sqlite" =
|
||||||
|
// the local SQLite file; "mysql" = the shared MySQL server described by the
|
||||||
|
// rest. Switching the active profile switches the live logbook to this.
|
||||||
|
type ProfileDB struct {
|
||||||
|
Backend string `json:"backend"`
|
||||||
|
Host string `json:"host"`
|
||||||
|
Port int `json:"port"`
|
||||||
|
User string `json:"user"`
|
||||||
|
Password string `json:"password"`
|
||||||
|
Database string `json:"database"`
|
||||||
|
}
|
||||||
|
|
||||||
// Profile is one operating configuration. A user typically keeps a few:
|
// Profile is one operating configuration. A user typically keeps a few:
|
||||||
// "Home", "Portable", "SOTA Pic du Midi", "/MM cruise"…
|
// "Home", "Portable", "SOTA Pic du Midi", "/MM cruise"…
|
||||||
type Profile struct {
|
type Profile struct {
|
||||||
@@ -43,6 +56,7 @@ type Profile struct {
|
|||||||
TxPower *float64 `json:"tx_pwr,omitempty"`
|
TxPower *float64 `json:"tx_pwr,omitempty"`
|
||||||
IsActive bool `json:"is_active"`
|
IsActive bool `json:"is_active"`
|
||||||
SortOrder int `json:"sort_order"`
|
SortOrder int `json:"sort_order"`
|
||||||
|
DB ProfileDB `json:"db"` // per-profile logbook target (empty backend = local SQLite)
|
||||||
CreatedAt time.Time `json:"created_at"`
|
CreatedAt time.Time `json:"created_at"`
|
||||||
UpdatedAt time.Time `json:"updated_at"`
|
UpdatedAt time.Time `json:"updated_at"`
|
||||||
}
|
}
|
||||||
@@ -56,7 +70,7 @@ func NewRepo(db *sql.DB) *Repo { return &Repo{db: db} }
|
|||||||
const selectCols = `id, name, callsign, operator, op_name, owner_callsign, my_grid, my_country, my_state, my_cnty,
|
const selectCols = `id, name, callsign, operator, op_name, owner_callsign, my_grid, my_country, my_state, my_cnty,
|
||||||
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref,
|
my_street, my_city, my_postal_code, my_sota_ref, my_pota_ref,
|
||||||
my_rig, my_antenna, my_dxcc, my_cqz, my_ituz, my_lat, my_lon, tx_pwr,
|
my_rig, my_antenna, my_dxcc, my_cqz, my_ituz, my_lat, my_lon, tx_pwr,
|
||||||
is_active, sort_order, created_at, updated_at`
|
is_active, sort_order, db_config, created_at, updated_at`
|
||||||
|
|
||||||
// List returns every profile, active first then by sort_order/id.
|
// List returns every profile, active first then by sort_order/id.
|
||||||
func (r *Repo) List(ctx context.Context) ([]Profile, error) {
|
func (r *Repo) List(ctx context.Context) ([]Profile, error) {
|
||||||
@@ -136,6 +150,20 @@ func (r *Repo) Save(ctx context.Context, p *Profile) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetDB updates only a profile's logbook database target, leaving the rest of
|
||||||
|
// the profile untouched (the general Save deliberately doesn't write db_config).
|
||||||
|
func (r *Repo) SetDB(ctx context.Context, id int64, cfg ProfileDB) error {
|
||||||
|
b, err := json.Marshal(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
now := time.Now().UTC().Format("2006-01-02T15:04:05.000Z")
|
||||||
|
_, err = r.db.ExecContext(ctx,
|
||||||
|
`UPDATE station_profiles SET db_config = ?, updated_at = ? WHERE id = ?`,
|
||||||
|
string(b), now, id)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// SetActive atomically switches the active profile. Clears the flag on all
|
// SetActive atomically switches the active profile. Clears the flag on all
|
||||||
// rows first to keep the "only one active" invariant from the schema doc.
|
// rows first to keep the "only one active" invariant from the schema doc.
|
||||||
func (r *Repo) SetActive(ctx context.Context, id int64) error {
|
func (r *Repo) SetActive(ctx context.Context, id int64) error {
|
||||||
@@ -202,6 +230,7 @@ func (r *Repo) Duplicate(ctx context.Context, srcID int64, newName string) (Prof
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return Profile{}, err
|
return Profile{}, err
|
||||||
}
|
}
|
||||||
|
dbCfg := src.DB // Save deliberately doesn't write db_config — copy it after.
|
||||||
src.ID = 0
|
src.ID = 0
|
||||||
src.Name = newName
|
src.Name = newName
|
||||||
src.IsActive = false
|
src.IsActive = false
|
||||||
@@ -209,6 +238,12 @@ func (r *Repo) Duplicate(ctx context.Context, srcID int64, newName string) (Prof
|
|||||||
if err := r.Save(ctx, &src); err != nil {
|
if err := r.Save(ctx, &src); err != nil {
|
||||||
return Profile{}, err
|
return Profile{}, err
|
||||||
}
|
}
|
||||||
|
if dbCfg.Backend != "" {
|
||||||
|
if err := r.SetDB(ctx, src.ID, dbCfg); err != nil {
|
||||||
|
return Profile{}, err
|
||||||
|
}
|
||||||
|
src.DB = dbCfg
|
||||||
|
}
|
||||||
return src, nil
|
return src, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -227,15 +262,19 @@ func scan(row scannable) (Profile, error) {
|
|||||||
myDXCC, myCQZ, myITUZ sql.NullInt64
|
myDXCC, myCQZ, myITUZ sql.NullInt64
|
||||||
myLat, myLon, txPwr sql.NullFloat64
|
myLat, myLon, txPwr sql.NullFloat64
|
||||||
isActive, sortOrder int
|
isActive, sortOrder int
|
||||||
|
dbConfig sql.NullString
|
||||||
createdAt, updatedAt string
|
createdAt, updatedAt string
|
||||||
)
|
)
|
||||||
err := row.Scan(&p.ID, &p.Name, &callsign, &operator, &opName, &ownerCall, &myGrid, &myCountry, &myState, &myCnty,
|
err := row.Scan(&p.ID, &p.Name, &callsign, &operator, &opName, &ownerCall, &myGrid, &myCountry, &myState, &myCnty,
|
||||||
&myStreet, &myCity, &myPostal, &mySOTA, &myPOTA,
|
&myStreet, &myCity, &myPostal, &mySOTA, &myPOTA,
|
||||||
&myRig, &myAntenna, &myDXCC, &myCQZ, &myITUZ, &myLat, &myLon, &txPwr,
|
&myRig, &myAntenna, &myDXCC, &myCQZ, &myITUZ, &myLat, &myLon, &txPwr,
|
||||||
&isActive, &sortOrder, &createdAt, &updatedAt)
|
&isActive, &sortOrder, &dbConfig, &createdAt, &updatedAt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return p, err
|
return p, err
|
||||||
}
|
}
|
||||||
|
if s := dbConfig.String; s != "" {
|
||||||
|
_ = json.Unmarshal([]byte(s), &p.DB)
|
||||||
|
}
|
||||||
p.Callsign = callsign.String
|
p.Callsign = callsign.String
|
||||||
p.Operator = operator.String
|
p.Operator = operator.String
|
||||||
p.OpName = opName.String
|
p.OpName = opName.String
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ func (HeuristicEngine) Propose(photos []PhotoAnalysis, profile ProfileInfo) ([]T
|
|||||||
cool: sorted[0].Warmth < 0.02,
|
cool: sorted[0].Warmth < 0.02,
|
||||||
}
|
}
|
||||||
if len(sorted) > 1 {
|
if len(sorted) > 1 {
|
||||||
plan.inserts = sorted[1:min(len(sorted), 3)] // hero + up to 2 inserts
|
plan.inserts = sorted[1:min(len(sorted), 5)] // hero + up to 4 inserts
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only side-column inserts (or none): a bottom strip collides with the QSO
|
// Only side-column inserts (or none): a bottom strip collides with the QSO
|
||||||
@@ -671,9 +671,19 @@ func placeInserts(inserts []PhotoAnalysis, hero PhotoAnalysis, archetype string)
|
|||||||
return els, pxRect{x: margin, y: cardH - 380, w: cardW - 2*margin, h: 380 - margin}
|
return els, pxRect{x: margin, y: cardH - 380, w: cardW - 2*margin, h: 380 - margin}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Side column: pick the calmer half of the hero photo.
|
// Side column: pick the calmer half of the hero photo. The insert width
|
||||||
n := min(len(inserts), 3)
|
// shrinks as needed so up to 4 framed photos stack down the side.
|
||||||
w, gap, margin := 400.0, 20.0, 70.0
|
n := min(len(inserts), 4)
|
||||||
|
gap, margin := 20.0, 70.0
|
||||||
|
availH := float64(cardH) - 2*margin - float64(n-1)*gap
|
||||||
|
var arSum float64
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
arSum += float64(inserts[i].H) / float64(inserts[i].W)
|
||||||
|
}
|
||||||
|
w := 400.0
|
||||||
|
if arSum > 0 {
|
||||||
|
w = clamp(availH/arSum, 240, 400) // fit all n vertically, within sane bounds
|
||||||
|
}
|
||||||
left := halfDetail(hero, true) < halfDetail(hero, false)
|
left := halfDetail(hero, true) < halfDetail(hero, false)
|
||||||
x := cardW - w - margin
|
x := cardW - w - margin
|
||||||
if left {
|
if left {
|
||||||
|
|||||||
@@ -106,6 +106,8 @@ type FxParams struct {
|
|||||||
Grunge *float64 `json:"grunge,omitempty"`
|
Grunge *float64 `json:"grunge,omitempty"`
|
||||||
Bevel *float64 `json:"bevel,omitempty"`
|
Bevel *float64 `json:"bevel,omitempty"`
|
||||||
Seed *float64 `json:"seed,omitempty"`
|
Seed *float64 `json:"seed,omitempty"`
|
||||||
|
Dark string `json:"dark,omitempty"` // dark inter-letter edge (per colour palette)
|
||||||
|
Outer string `json:"outer,omitempty"` // silver/rim colour (glossy)
|
||||||
}
|
}
|
||||||
|
|
||||||
// setKeys lists the JSON names of the params that are actually set, for
|
// setKeys lists the JSON names of the params that are actually set, for
|
||||||
|
|||||||
+440
-41
@@ -7,9 +7,12 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"regexp"
|
||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// MergeNonZero copies every non-zero field of src onto dst. Zero-value src
|
// MergeNonZero copies every non-zero field of src onto dst. Zero-value src
|
||||||
@@ -255,6 +258,19 @@ var columnCount = countColumns(columnList)
|
|||||||
// insertPlaceholders returns "?,?,?,..." matching columnCount.
|
// insertPlaceholders returns "?,?,?,..." matching columnCount.
|
||||||
var insertPlaceholders = buildInsertPlaceholders()
|
var insertPlaceholders = buildInsertPlaceholders()
|
||||||
|
|
||||||
|
// insertCols/insertVals append created_at + updated_at so they're set from Go
|
||||||
|
// (NowISO) on every backend — MySQL has no strftime default, and binding the
|
||||||
|
// timestamp keeps a single backend-agnostic INSERT. insertArgs pairs with them.
|
||||||
|
const insertCols = columnList + `, created_at, updated_at`
|
||||||
|
|
||||||
|
var insertVals = insertPlaceholders + ",?,?"
|
||||||
|
|
||||||
|
// insertArgs returns the column values plus the two timestamps for an INSERT.
|
||||||
|
func (q *QSO) insertArgs() []any {
|
||||||
|
now := db.NowISO()
|
||||||
|
return append(q.args(), now, now)
|
||||||
|
}
|
||||||
|
|
||||||
func countColumns(s string) int {
|
func countColumns(s string) int {
|
||||||
n := 1
|
n := 1
|
||||||
for i := 0; i < len(s); i++ {
|
for i := 0; i < len(s); i++ {
|
||||||
@@ -349,34 +365,30 @@ func (r *Repo) Add(ctx context.Context, q QSO) (int64, error) {
|
|||||||
q.QSODate = time.Now().UTC()
|
q.QSODate = time.Now().UTC()
|
||||||
}
|
}
|
||||||
res, err := r.db.ExecContext(ctx,
|
res, err := r.db.ExecContext(ctx,
|
||||||
`INSERT INTO qso (`+columnList+`) VALUES (`+insertPlaceholders+`)`,
|
`INSERT INTO qso (`+insertCols+`) VALUES (`+insertVals+`)`,
|
||||||
q.args()...)
|
q.insertArgs()...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, fmt.Errorf("insert qso: %w", err)
|
return 0, fmt.Errorf("insert qso: %w", err)
|
||||||
}
|
}
|
||||||
return res.LastInsertId()
|
return res.LastInsertId()
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddBatch inserts many QSOs inside a single transaction using a prepared
|
// batchInsertRows is how many QSOs go into one multi-row INSERT on MySQL. Each
|
||||||
// statement. Empty-callsign records are skipped. Returns rows inserted.
|
// row carries ~135 columns, so 200 rows ≈ 27k bound parameters — well under
|
||||||
|
// MySQL's 65535-placeholder limit and a modest packet — while cutting network
|
||||||
|
// round-trips ~200× versus one INSERT per row (critical for a remote server).
|
||||||
|
const batchInsertRows = 200
|
||||||
|
|
||||||
|
// AddBatch inserts many QSOs inside a single transaction. Empty-callsign records
|
||||||
|
// are skipped. On MySQL it uses chunked multi-row INSERTs so a 27k-record import
|
||||||
|
// over a remote link takes seconds, not many minutes; on local SQLite a prepared
|
||||||
|
// statement per row is already fast.
|
||||||
func (r *Repo) AddBatch(ctx context.Context, qsos []QSO) (int64, error) {
|
func (r *Repo) AddBatch(ctx context.Context, qsos []QSO) (int64, error) {
|
||||||
if len(qsos) == 0 {
|
if len(qsos) == 0 {
|
||||||
return 0, nil
|
return 0, nil
|
||||||
}
|
}
|
||||||
tx, err := r.db.BeginTx(ctx, nil)
|
// Normalise and drop empty-callsign records up front.
|
||||||
if err != nil {
|
rows := make([]QSO, 0, len(qsos))
|
||||||
return 0, fmt.Errorf("begin tx: %w", err)
|
|
||||||
}
|
|
||||||
defer tx.Rollback()
|
|
||||||
|
|
||||||
stmt, err := tx.PrepareContext(ctx,
|
|
||||||
`INSERT INTO qso (`+columnList+`) VALUES (`+insertPlaceholders+`)`)
|
|
||||||
if err != nil {
|
|
||||||
return 0, fmt.Errorf("prepare batch insert: %w", err)
|
|
||||||
}
|
|
||||||
defer stmt.Close()
|
|
||||||
|
|
||||||
var inserted int64
|
|
||||||
for _, q := range qsos {
|
for _, q := range qsos {
|
||||||
q.Callsign = strings.ToUpper(strings.TrimSpace(q.Callsign))
|
q.Callsign = strings.ToUpper(strings.TrimSpace(q.Callsign))
|
||||||
if q.Callsign == "" {
|
if q.Callsign == "" {
|
||||||
@@ -385,10 +397,57 @@ func (r *Repo) AddBatch(ctx context.Context, qsos []QSO) (int64, error) {
|
|||||||
if q.QSODate.IsZero() {
|
if q.QSODate.IsZero() {
|
||||||
q.QSODate = time.Now().UTC()
|
q.QSODate = time.Now().UTC()
|
||||||
}
|
}
|
||||||
if _, err := stmt.ExecContext(ctx, q.args()...); err != nil {
|
rows = append(rows, q)
|
||||||
return inserted, fmt.Errorf("insert qso %q: %w", q.Callsign, err)
|
}
|
||||||
|
if len(rows) == 0 {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
tx, err := r.db.BeginTx(ctx, nil)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("begin tx: %w", err)
|
||||||
|
}
|
||||||
|
defer tx.Rollback()
|
||||||
|
|
||||||
|
var inserted int64
|
||||||
|
if db.IsMySQL() {
|
||||||
|
rowPlaceholder := "(" + insertVals + ")"
|
||||||
|
for start := 0; start < len(rows); start += batchInsertRows {
|
||||||
|
end := start + batchInsertRows
|
||||||
|
if end > len(rows) {
|
||||||
|
end = len(rows)
|
||||||
|
}
|
||||||
|
chunk := rows[start:end]
|
||||||
|
var sb strings.Builder
|
||||||
|
sb.WriteString("INSERT INTO qso (")
|
||||||
|
sb.WriteString(insertCols)
|
||||||
|
sb.WriteString(") VALUES ")
|
||||||
|
args := make([]any, 0, len(chunk)*(columnCount+2))
|
||||||
|
for j := range chunk {
|
||||||
|
if j > 0 {
|
||||||
|
sb.WriteByte(',')
|
||||||
|
}
|
||||||
|
sb.WriteString(rowPlaceholder)
|
||||||
|
args = append(args, chunk[j].insertArgs()...)
|
||||||
|
}
|
||||||
|
if _, err := tx.ExecContext(ctx, sb.String(), args...); err != nil {
|
||||||
|
return inserted, fmt.Errorf("batch insert: %w", err)
|
||||||
|
}
|
||||||
|
inserted += int64(len(chunk))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
stmt, err := tx.PrepareContext(ctx,
|
||||||
|
`INSERT INTO qso (`+insertCols+`) VALUES (`+insertVals+`)`)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("prepare batch insert: %w", err)
|
||||||
|
}
|
||||||
|
defer stmt.Close()
|
||||||
|
for i := range rows {
|
||||||
|
if _, err := stmt.ExecContext(ctx, rows[i].insertArgs()...); err != nil {
|
||||||
|
return inserted, fmt.Errorf("insert qso %q: %w", rows[i].Callsign, err)
|
||||||
|
}
|
||||||
|
inserted++
|
||||||
}
|
}
|
||||||
inserted++
|
|
||||||
}
|
}
|
||||||
if err := tx.Commit(); err != nil {
|
if err := tx.Commit(); err != nil {
|
||||||
return 0, fmt.Errorf("commit batch: %w", err)
|
return 0, fmt.Errorf("commit batch: %w", err)
|
||||||
@@ -396,6 +455,19 @@ func (r *Repo) AddBatch(ctx context.Context, qsos []QSO) (int64, error) {
|
|||||||
return inserted, nil
|
return inserted, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Revision returns a cheap fingerprint of the logbook — row count and the
|
||||||
|
// highest id — so a client can poll for changes made by OTHER instances on a
|
||||||
|
// shared MySQL logbook and refresh when it differs. Inserts bump the max id;
|
||||||
|
// deletes change the count.
|
||||||
|
func (r *Repo) Revision(ctx context.Context) (string, error) {
|
||||||
|
var count, maxID int64
|
||||||
|
if err := r.db.QueryRowContext(ctx,
|
||||||
|
`SELECT COUNT(*), COALESCE(MAX(id), 0) FROM qso`).Scan(&count, &maxID); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%d:%d", count, maxID), nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetByID fetches a single QSO by primary key.
|
// GetByID fetches a single QSO by primary key.
|
||||||
func (r *Repo) GetByID(ctx context.Context, id int64) (QSO, error) {
|
func (r *Repo) GetByID(ctx context.Context, id int64) (QSO, error) {
|
||||||
row := r.db.QueryRowContext(ctx,
|
row := r.db.QueryRowContext(ctx,
|
||||||
@@ -420,10 +492,36 @@ var uploadStatusCols = map[string]bool{
|
|||||||
"lotw_sent": true,
|
"lotw_sent": true,
|
||||||
"qrzcom_qso_upload_status": true,
|
"qrzcom_qso_upload_status": true,
|
||||||
"clublog_qso_upload_status": true,
|
"clublog_qso_upload_status": true,
|
||||||
|
"hrdlog_qso_upload_status": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListForUpload returns QSOs whose per-service sent-status column equals
|
// ListForUpload returns QSOs whose per-service sent-status column equals
|
||||||
// value ("" matches blank/NULL). Used by the QSL Manager's "Select required".
|
// value ("" matches blank/NULL). Used by the QSL Manager's "Select required".
|
||||||
|
// ListForUploadFull is like ListForUpload but returns FULL QSO rows so the UI
|
||||||
|
// can show the same rich, column-pickable table as Recent QSOs. column is an
|
||||||
|
// upload-status column (validated); value is the status to match ("" = not yet
|
||||||
|
// uploaded).
|
||||||
|
func (r *Repo) ListForUploadFull(ctx context.Context, column, value string) ([]QSO, error) {
|
||||||
|
if !uploadStatusCols[column] {
|
||||||
|
return nil, fmt.Errorf("invalid upload column %q", column)
|
||||||
|
}
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT `+selectCols+` FROM qso WHERE COALESCE(`+column+`,'') = ? ORDER BY qso_date DESC, id DESC`, value)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("list for upload: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
out := make([]QSO, 0, 64)
|
||||||
|
for rows.Next() {
|
||||||
|
q, err := scanQSO(rows)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, q)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
func (r *Repo) ListForUpload(ctx context.Context, column, value string) ([]UploadRow, error) {
|
func (r *Repo) ListForUpload(ctx context.Context, column, value string) ([]UploadRow, error) {
|
||||||
if !uploadStatusCols[column] {
|
if !uploadStatusCols[column] {
|
||||||
return nil, fmt.Errorf("invalid upload column %q", column)
|
return nil, fmt.Errorf("invalid upload column %q", column)
|
||||||
@@ -448,6 +546,56 @@ func (r *Repo) ListForUpload(ctx context.Context, column, value string) ([]Uploa
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UploadCandidate is a QSO eligible for an on-close upload: its id plus its
|
||||||
|
// STATION_CALLSIGN, so the caller can keep only the rows that belong to the
|
||||||
|
// active logbook's callsign (a mixed-call DB — F4BPO, F4BPO/P, TM2Q — must not
|
||||||
|
// all be signed under one cert).
|
||||||
|
type UploadCandidate struct {
|
||||||
|
ID int64
|
||||||
|
StationCallsign string
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListUploadCandidates returns QSOs eligible for an on-close upload to a
|
||||||
|
// service, scanning the whole logbook. For LoTW (column "lotw_sent"), statuses
|
||||||
|
// is the set of sent-status values to treat as "to send" (e.g. N, R); rows
|
||||||
|
// already "Y" are excluded. For QRZ/Club Log, statuses is ignored and anything
|
||||||
|
// whose upload status isn't yet "Y" qualifies.
|
||||||
|
func (r *Repo) ListUploadCandidates(ctx context.Context, column string, statuses []string) ([]UploadCandidate, error) {
|
||||||
|
if !uploadStatusCols[column] {
|
||||||
|
return nil, fmt.Errorf("invalid upload column %q", column)
|
||||||
|
}
|
||||||
|
var where string
|
||||||
|
var args []any
|
||||||
|
if column == "lotw_sent" {
|
||||||
|
if len(statuses) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
ph := make([]string, len(statuses))
|
||||||
|
for i, s := range statuses {
|
||||||
|
ph[i] = "?"
|
||||||
|
args = append(args, strings.ToUpper(strings.TrimSpace(s)))
|
||||||
|
}
|
||||||
|
where = "UPPER(COALESCE(lotw_sent,'')) IN (" + strings.Join(ph, ",") + ")"
|
||||||
|
} else {
|
||||||
|
where = "UPPER(COALESCE(" + column + ",'')) <> 'Y'"
|
||||||
|
}
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT id, COALESCE(station_callsign,'') FROM qso WHERE `+where+` ORDER BY qso_date`, args...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("list upload candidates: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []UploadCandidate
|
||||||
|
for rows.Next() {
|
||||||
|
var c UploadCandidate
|
||||||
|
if err := rows.Scan(&c.ID, &c.StationCallsign); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, c)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// MarkQRZUploaded stamps QRZCOM_QSO_UPLOAD_STATUS=Y and the upload date on
|
// MarkQRZUploaded stamps QRZCOM_QSO_UPLOAD_STATUS=Y and the upload date on
|
||||||
// a QSO after a successful push to the QRZ.com logbook. date is an ADIF
|
// a QSO after a successful push to the QRZ.com logbook. date is an ADIF
|
||||||
// YYYYMMDD string. Only the two QRZ columns are touched — no full-row
|
// YYYYMMDD string. Only the two QRZ columns are touched — no full-row
|
||||||
@@ -455,8 +603,8 @@ func (r *Repo) ListForUpload(ctx context.Context, column, value string) ([]Uploa
|
|||||||
func (r *Repo) MarkQRZUploaded(ctx context.Context, id int64, date string) error {
|
func (r *Repo) MarkQRZUploaded(ctx context.Context, id int64, date string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET qrzcom_qso_upload_status = 'Y', qrzcom_qso_upload_date = ?,
|
`UPDATE qso SET qrzcom_qso_upload_status = 'Y', qrzcom_qso_upload_date = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
updated_at = ? WHERE id = ?`,
|
||||||
date, id)
|
date, db.NowISO(), id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("mark qrz uploaded %d: %w", id, err)
|
return fmt.Errorf("mark qrz uploaded %d: %w", id, err)
|
||||||
}
|
}
|
||||||
@@ -468,40 +616,146 @@ func (r *Repo) MarkQRZUploaded(ctx context.Context, id int64, date string) error
|
|||||||
func (r *Repo) MarkClublogUploaded(ctx context.Context, id int64, date string) error {
|
func (r *Repo) MarkClublogUploaded(ctx context.Context, id int64, date string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET clublog_qso_upload_status = 'Y', clublog_qso_upload_date = ?,
|
`UPDATE qso SET clublog_qso_upload_status = 'Y', clublog_qso_upload_date = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
updated_at = ? WHERE id = ?`,
|
||||||
date, id)
|
date, db.NowISO(), id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("mark clublog uploaded %d: %w", id, err)
|
return fmt.Errorf("mark clublog uploaded %d: %w", id, err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MarkHRDLogUploaded stamps HRDLOG_QSO_UPLOAD_STATUS=Y and the upload date
|
||||||
|
// after a successful HRDLog.net push. date is an ADIF YYYYMMDD string.
|
||||||
|
func (r *Repo) MarkHRDLogUploaded(ctx context.Context, id int64, date string) error {
|
||||||
|
_, err := r.db.ExecContext(ctx,
|
||||||
|
`UPDATE qso SET hrdlog_qso_upload_status = 'Y', hrdlog_qso_upload_date = ?,
|
||||||
|
updated_at = ? WHERE id = ?`,
|
||||||
|
date, db.NowISO(), id)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("mark hrdlog uploaded %d: %w", id, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// MarkLoTWUploaded stamps LOTW_QSL_SENT=Y and the sent date after a
|
// MarkLoTWUploaded stamps LOTW_QSL_SENT=Y and the sent date after a
|
||||||
// successful TQSL upload. date is an ADIF YYYYMMDD string.
|
// successful TQSL upload. date is an ADIF YYYYMMDD string.
|
||||||
func (r *Repo) MarkLoTWUploaded(ctx context.Context, id int64, date string) error {
|
func (r *Repo) MarkLoTWUploaded(ctx context.Context, id int64, date string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET lotw_sent = 'Y', lotw_sent_date = ?,
|
`UPDATE qso SET lotw_sent = 'Y', lotw_sent_date = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
updated_at = ? WHERE id = ?`,
|
||||||
date, id)
|
date, db.NowISO(), id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("mark lotw uploaded %d: %w", id, err)
|
return fmt.Errorf("mark lotw uploaded %d: %w", id, err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MarkUploadedBatch sets <statusCol>='Y' and <dateCol>=date on EVERY id in one
|
||||||
|
// UPDATE — used by bulk upload (Club Log / HRDLog) so a 25k-QSO run isn't one
|
||||||
|
// round-trip per QSO on a remote MySQL. statusCol/dateCol come from a fixed
|
||||||
|
// whitelist (not user input), so the column interpolation is safe.
|
||||||
|
func (r *Repo) MarkUploadedBatch(ctx context.Context, statusCol, dateCol, date string, ids []int64) error {
|
||||||
|
if len(ids) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
ph := strings.TrimSuffix(strings.Repeat("?,", len(ids)), ",")
|
||||||
|
args := make([]any, 0, len(ids)+2)
|
||||||
|
args = append(args, date, db.NowISO())
|
||||||
|
for _, id := range ids {
|
||||||
|
args = append(args, id)
|
||||||
|
}
|
||||||
|
_, err := r.db.ExecContext(ctx,
|
||||||
|
`UPDATE qso SET `+statusCol+` = 'Y', `+dateCol+` = ?, updated_at = ? WHERE id IN (`+ph+`)`,
|
||||||
|
args...)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("mark uploaded batch (%d): %w", len(ids), err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// MarkEQSLSent stamps EQSL_QSL_SENT=Y and the sent date after a successful
|
// MarkEQSLSent stamps EQSL_QSL_SENT=Y and the sent date after a successful
|
||||||
// eQSL e-mail. date is an ADIF YYYYMMDD string.
|
// eQSL e-mail. date is an ADIF YYYYMMDD string.
|
||||||
func (r *Repo) MarkEQSLSent(ctx context.Context, id int64, date string) error {
|
func (r *Repo) MarkEQSLSent(ctx context.Context, id int64, date string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET eqsl_sent = 'Y', eqsl_sent_date = ?,
|
`UPDATE qso SET eqsl_sent = 'Y', eqsl_sent_date = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
updated_at = ? WHERE id = ?`,
|
||||||
date, id)
|
date, db.NowISO(), id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("mark eqsl sent %d: %w", id, err)
|
return fmt.Errorf("mark eqsl sent %d: %w", id, err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// bulkEditableCols whitelists the columns BulkSetField may write. Limited to
|
||||||
|
// TEXT fields where setting one value across many QSOs is meaningful: the
|
||||||
|
// per-service QSL/upload status fields, plus "my station"/operator fields that
|
||||||
|
// are naturally constant across a run (grid, antenna, rig, address, …). It
|
||||||
|
// deliberately excludes per-QSO fields (callsign, band, mode, date, RST, the
|
||||||
|
// contacted station's details) and numeric columns (power, zones, lat/lon),
|
||||||
|
// which would be corrupted or meaningless if bulk-set to a single value.
|
||||||
|
var bulkEditableCols = map[string]bool{
|
||||||
|
// QSL / upload status
|
||||||
|
"lotw_sent": true,
|
||||||
|
"lotw_rcvd": true,
|
||||||
|
"eqsl_sent": true,
|
||||||
|
"eqsl_rcvd": true,
|
||||||
|
"qsl_sent": true,
|
||||||
|
"qsl_rcvd": true,
|
||||||
|
"qsl_via": true,
|
||||||
|
"qrzcom_qso_upload_status": true,
|
||||||
|
"clublog_qso_upload_status": true,
|
||||||
|
"hrdlog_qso_upload_status": true,
|
||||||
|
// My station / operator
|
||||||
|
"station_callsign": true,
|
||||||
|
"operator": true,
|
||||||
|
"my_grid": true,
|
||||||
|
"my_country": true,
|
||||||
|
"my_state": true,
|
||||||
|
"my_cnty": true,
|
||||||
|
"my_iota": true,
|
||||||
|
"my_sota_ref": true,
|
||||||
|
"my_pota_ref": true,
|
||||||
|
"my_wwff_ref": true,
|
||||||
|
"my_street": true,
|
||||||
|
"my_city": true,
|
||||||
|
"my_postal_code": true,
|
||||||
|
"my_rig": true,
|
||||||
|
"my_antenna": true,
|
||||||
|
"my_sig": true,
|
||||||
|
"my_sig_info": true,
|
||||||
|
// Misc text
|
||||||
|
"comment": true,
|
||||||
|
"notes": true,
|
||||||
|
"rig": true,
|
||||||
|
"ant": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
// BulkSetField sets one whitelisted column to value on every listed QSO in a
|
||||||
|
// single statement. value "" clears the field. Returns rows affected.
|
||||||
|
func (r *Repo) BulkSetField(ctx context.Context, ids []int64, column, value string) (int64, error) {
|
||||||
|
if !bulkEditableCols[column] {
|
||||||
|
return 0, fmt.Errorf("field %q is not bulk-editable", column)
|
||||||
|
}
|
||||||
|
if len(ids) == 0 {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
ph := make([]string, len(ids))
|
||||||
|
args := make([]any, 0, len(ids)+2)
|
||||||
|
args = append(args, value, db.NowISO())
|
||||||
|
for i, id := range ids {
|
||||||
|
ph[i] = "?"
|
||||||
|
args = append(args, id)
|
||||||
|
}
|
||||||
|
res, err := r.db.ExecContext(ctx,
|
||||||
|
`UPDATE qso SET `+column+` = ?, updated_at = ? WHERE id IN (`+strings.Join(ph, ",")+`)`,
|
||||||
|
args...)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("bulk set %s: %w", column, err)
|
||||||
|
}
|
||||||
|
n, _ := res.RowsAffected()
|
||||||
|
return n, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Update overwrites all editable fields of an existing QSO. updated_at is bumped.
|
// Update overwrites all editable fields of an existing QSO. updated_at is bumped.
|
||||||
func (r *Repo) Update(ctx context.Context, q QSO) error {
|
func (r *Repo) Update(ctx context.Context, q QSO) error {
|
||||||
if q.ID == 0 {
|
if q.ID == 0 {
|
||||||
@@ -515,9 +769,9 @@ func (r *Repo) Update(ctx context.Context, q QSO) error {
|
|||||||
q.QSODate = time.Now().UTC()
|
q.QSODate = time.Now().UTC()
|
||||||
}
|
}
|
||||||
setClause := buildUpdateSetClause()
|
setClause := buildUpdateSetClause()
|
||||||
args := append(q.args(), q.ID)
|
args := append(q.args(), db.NowISO(), q.ID)
|
||||||
res, err := r.db.ExecContext(ctx,
|
res, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET `+setClause+`, updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
`UPDATE qso SET `+setClause+`, updated_at = ? WHERE id = ?`,
|
||||||
args...)
|
args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("update qso %d: %w", q.ID, err)
|
return fmt.Errorf("update qso %d: %w", q.ID, err)
|
||||||
@@ -580,6 +834,25 @@ func (r *Repo) DeleteAll(ctx context.Context) (int64, error) {
|
|||||||
return n, nil
|
return n, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeleteMany removes several QSOs in one statement. Returns the number deleted.
|
||||||
|
func (r *Repo) DeleteMany(ctx context.Context, ids []int64) (int64, error) {
|
||||||
|
if len(ids) == 0 {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
ph := make([]string, len(ids))
|
||||||
|
args := make([]any, len(ids))
|
||||||
|
for i, id := range ids {
|
||||||
|
ph[i] = "?"
|
||||||
|
args[i] = id
|
||||||
|
}
|
||||||
|
res, err := r.db.ExecContext(ctx, `DELETE FROM qso WHERE id IN (`+strings.Join(ph, ",")+`)`, args...)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("delete qsos: %w", err)
|
||||||
|
}
|
||||||
|
n, _ := res.RowsAffected()
|
||||||
|
return n, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Delete removes a QSO by id.
|
// Delete removes a QSO by id.
|
||||||
func (r *Repo) Delete(ctx context.Context, id int64) error {
|
func (r *Repo) Delete(ctx context.Context, id int64) error {
|
||||||
res, err := r.db.ExecContext(ctx, `DELETE FROM qso WHERE id = ?`, id)
|
res, err := r.db.ExecContext(ctx, `DELETE FROM qso WHERE id = ?`, id)
|
||||||
@@ -675,16 +948,26 @@ var filterableColumns = map[string]bool{
|
|||||||
"name": true, "qth": true, "address": true, "email": true,
|
"name": true, "qth": true, "address": true, "email": true,
|
||||||
"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, "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,
|
||||||
"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, "clublog_qso_upload_status": true,
|
"qrzcom_qso_upload_status": true, "clublog_qso_upload_status": true, "hrdlog_qso_upload_status": true,
|
||||||
"contest_id": true, "srx": true, "stx": true,
|
"contest_id": true, "srx": true, "stx": true,
|
||||||
"prop_mode": true, "sat_name": true,
|
"prop_mode": true, "sat_name": true,
|
||||||
"station_callsign": true, "operator": true, "my_grid": true, "my_country": true,
|
"station_callsign": true, "operator": true, "my_grid": true, "my_country": true,
|
||||||
|
"my_state": true, "my_cnty": true, "my_iota": true, "my_sota_ref": true, "my_pota_ref": true,
|
||||||
|
"my_wwff_ref": true, "my_street": true, "my_city": true, "my_postal_code": true,
|
||||||
|
"my_rig": true, "my_antenna": true, "my_sig": true, "my_sig_info": true,
|
||||||
"tx_pwr": true, "comment": true, "notes": true,
|
"tx_pwr": true, "comment": true, "notes": true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// dateColumns are stored as full ISO timestamps; a filter on a bare YYYY-MM-DD
|
||||||
|
// value compares on the date part (see conditionSQL) so day filters are exact.
|
||||||
|
var dateColumns = map[string]bool{"qso_date": true, "qso_date_off": true}
|
||||||
|
|
||||||
|
// bareDateRe matches a plain calendar date with no time component.
|
||||||
|
var bareDateRe = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
|
||||||
|
|
||||||
// filterableExtras whitelists virtual filter fields stored inside extras_json
|
// filterableExtras whitelists virtual filter fields stored inside extras_json
|
||||||
// (valid ADIF fields we don't promote to columns). The value is the uppercase
|
// (valid ADIF fields we don't promote to columns). The value is the uppercase
|
||||||
// ADIF/Extras key; the SQL expression uses json_extract.
|
// ADIF/Extras key; the SQL expression uses json_extract.
|
||||||
@@ -714,6 +997,11 @@ func columnExpr(field string) (string, bool) {
|
|||||||
return f, true
|
return f, true
|
||||||
}
|
}
|
||||||
if key, ok := filterableExtras[f]; ok {
|
if key, ok := filterableExtras[f]; ok {
|
||||||
|
if db.IsMySQL() {
|
||||||
|
// JSON_EXTRACT errors on an invalid/empty document, so guard with
|
||||||
|
// NULLIF; JSON_UNQUOTE strips the quotes MySQL adds around strings.
|
||||||
|
return "JSON_UNQUOTE(JSON_EXTRACT(NULLIF(extras_json,''), '$." + key + "'))", true
|
||||||
|
}
|
||||||
return "json_extract(extras_json, '$." + key + "')", true
|
return "json_extract(extras_json, '$." + key + "')", true
|
||||||
}
|
}
|
||||||
return "", false
|
return "", false
|
||||||
@@ -726,6 +1014,14 @@ func conditionSQL(c Condition) (string, []any, error) {
|
|||||||
return "", nil, fmt.Errorf("unknown filter field %q", c.Field)
|
return "", nil, fmt.Errorf("unknown filter field %q", c.Field)
|
||||||
}
|
}
|
||||||
v := c.Value
|
v := c.Value
|
||||||
|
// Date columns hold full ISO timestamps ("2020-01-01T12:34:56.000Z"). When
|
||||||
|
// the user filters on a bare calendar date, compare only the date part so
|
||||||
|
// "= 2020-01-01" matches that whole day and "<= 2020-12-31" includes it
|
||||||
|
// (a raw string compare would otherwise drop times on the boundary day).
|
||||||
|
if dateColumns[strings.ToLower(strings.TrimSpace(c.Field))] && bareDateRe.MatchString(strings.TrimSpace(v)) {
|
||||||
|
col = "substr(" + col + ",1,10)"
|
||||||
|
v = strings.TrimSpace(v)
|
||||||
|
}
|
||||||
switch c.Op {
|
switch c.Op {
|
||||||
case "eq":
|
case "eq":
|
||||||
return col + " = ?", []any{v}, nil
|
return col + " = ?", []any{v}, nil
|
||||||
@@ -1245,13 +1541,114 @@ func (r *Repo) IterateAll(ctx context.Context, fn func(QSO) error) error {
|
|||||||
return rows.Err()
|
return rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// awardCols is the column set the award engine can read — every field reachable
|
||||||
|
// from refField/inScope/confirmed in internal/award plus enrichQSOForAwards:
|
||||||
|
// the reference fields (dxcc, zones, continent, country, state, grid/vucc, iota,
|
||||||
|
// sota, pota, wwff via extras_json, and the free-text fields name/qth/address/
|
||||||
|
// comment/notes a custom award may key on), band/mode/qso_date for scoping,
|
||||||
|
// freq_hz for band recovery, and the qsl/lotw/eqsl rcvd confirmation flags.
|
||||||
|
// This drops ~125 unused columns so award computation over a remote MySQL
|
||||||
|
// backend ships a fraction of each row instead of the whole record.
|
||||||
|
//
|
||||||
|
// IMPORTANT: when a new award references a QSO field not listed here, add the
|
||||||
|
// column to this list AND populate it in scanAwardQSO below, or that award will
|
||||||
|
// silently see an empty value during stats/computation.
|
||||||
|
const awardCols = `id, callsign, qso_date, band, freq_hz, mode, ` +
|
||||||
|
`grid, vucc_grids, country, state, cont, cqz, ituz, dxcc, iota, sota_ref, pota_ref, ` +
|
||||||
|
`name, qth, address, comment, notes, ` +
|
||||||
|
`qsl_rcvd, lotw_rcvd, eqsl_rcvd, extras_json`
|
||||||
|
|
||||||
|
// IterateForAwards streams a lightweight projection of every QSO — only the
|
||||||
|
// fields award computation reads (see awardCols). All other QSO fields are left
|
||||||
|
// zero. Use IterateAll when the full record is needed. Ordered by date/id like
|
||||||
|
// IterateAll for deterministic results.
|
||||||
|
func (r *Repo) IterateForAwards(ctx context.Context, fn func(QSO) error) error {
|
||||||
|
rows, err := r.db.QueryContext(ctx,
|
||||||
|
`SELECT `+awardCols+` FROM qso ORDER BY qso_date ASC, id ASC`)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("query qso (awards): %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
for rows.Next() {
|
||||||
|
q, err := scanAwardQSO(rows)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := fn(q); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// scanAwardQSO reads one row produced by awardCols into a QSO, populating only
|
||||||
|
// the award-relevant fields. Column order MUST match awardCols.
|
||||||
|
func scanAwardQSO(s scanner) (QSO, error) {
|
||||||
|
var q QSO
|
||||||
|
var (
|
||||||
|
qsoDateStr string
|
||||||
|
freqHz sql.NullInt64
|
||||||
|
grid, vucc, country, state sql.NullString
|
||||||
|
cont, iotaRef, sota, pota sql.NullString
|
||||||
|
dxcc, cqz, ituz sql.NullInt64
|
||||||
|
name, qth, address sql.NullString
|
||||||
|
comment, notes sql.NullString
|
||||||
|
qslRcvd, lotwRcvd, eqslRcvd sql.NullString
|
||||||
|
extrasJSON sql.NullString
|
||||||
|
)
|
||||||
|
if err := s.Scan(
|
||||||
|
&q.ID, &q.Callsign, &qsoDateStr, &q.Band, &freqHz, &q.Mode,
|
||||||
|
&grid, &vucc, &country, &state, &cont, &cqz, &ituz, &dxcc, &iotaRef, &sota, &pota,
|
||||||
|
&name, &qth, &address, &comment, ¬es,
|
||||||
|
&qslRcvd, &lotwRcvd, &eqslRcvd, &extrasJSON,
|
||||||
|
); err != nil {
|
||||||
|
return QSO{}, fmt.Errorf("scan qso (awards): %w", err)
|
||||||
|
}
|
||||||
|
q.QSODate = parseTimeLoose(qsoDateStr)
|
||||||
|
if freqHz.Valid {
|
||||||
|
v := freqHz.Int64
|
||||||
|
q.FreqHz = &v
|
||||||
|
}
|
||||||
|
q.Grid = grid.String
|
||||||
|
q.VUCCGrids = vucc.String
|
||||||
|
q.Country = country.String
|
||||||
|
q.State = state.String
|
||||||
|
q.Continent = cont.String
|
||||||
|
if cqz.Valid {
|
||||||
|
v := int(cqz.Int64)
|
||||||
|
q.CQZ = &v
|
||||||
|
}
|
||||||
|
if ituz.Valid {
|
||||||
|
v := int(ituz.Int64)
|
||||||
|
q.ITUZ = &v
|
||||||
|
}
|
||||||
|
if dxcc.Valid {
|
||||||
|
v := int(dxcc.Int64)
|
||||||
|
q.DXCC = &v
|
||||||
|
}
|
||||||
|
q.IOTA = iotaRef.String
|
||||||
|
q.SOTARef = sota.String
|
||||||
|
q.POTARef = pota.String
|
||||||
|
q.Name = name.String
|
||||||
|
q.QTH = qth.String
|
||||||
|
q.Address = address.String
|
||||||
|
q.Comment = comment.String
|
||||||
|
q.Notes = notes.String
|
||||||
|
q.QSLRcvd = qslRcvd.String
|
||||||
|
q.LOTWRcvd = lotwRcvd.String
|
||||||
|
q.EQSLRcvd = eqslRcvd.String
|
||||||
|
q.Extras = decodeExtras(extrasJSON.String)
|
||||||
|
return q, nil
|
||||||
|
}
|
||||||
|
|
||||||
// EntitySlot bundles every (band, mode) tuple ever worked for a given
|
// EntitySlot bundles every (band, mode) tuple ever worked for a given
|
||||||
// DXCC entity name. Used by the cluster spot colouring code to decide
|
// DXCC entity name. Used by the cluster spot colouring code to decide
|
||||||
// NEW / NEW SLOT / WORKED in constant time after one batched query.
|
// NEW / NEW SLOT / WORKED in constant time after one batched query.
|
||||||
type EntitySlot struct {
|
type EntitySlot struct {
|
||||||
Country string
|
Country string
|
||||||
Bands map[string]struct{} // bands worked, any mode
|
Bands map[string]struct{} // bands worked, any mode
|
||||||
Slots map[string]map[string]struct{} // band → modes worked
|
Modes map[string]struct{} // modes worked, any band
|
||||||
|
Slots map[string]map[string]struct{} // band → modes worked
|
||||||
}
|
}
|
||||||
|
|
||||||
// EntitySlotMap returns slot data for every QSO, grouped by DXCC entity NUMBER.
|
// EntitySlotMap returns slot data for every QSO, grouped by DXCC entity NUMBER.
|
||||||
@@ -1296,11 +1693,13 @@ func (r *Repo) EntitySlotMap(ctx context.Context, keyFor func(call string, store
|
|||||||
e = &EntitySlot{
|
e = &EntitySlot{
|
||||||
Country: country,
|
Country: country,
|
||||||
Bands: make(map[string]struct{}),
|
Bands: make(map[string]struct{}),
|
||||||
|
Modes: make(map[string]struct{}),
|
||||||
Slots: make(map[string]map[string]struct{}),
|
Slots: make(map[string]map[string]struct{}),
|
||||||
}
|
}
|
||||||
out[key] = e
|
out[key] = e
|
||||||
}
|
}
|
||||||
e.Bands[band] = struct{}{}
|
e.Bands[band] = struct{}{}
|
||||||
|
e.Modes[mode] = struct{}{}
|
||||||
bandSlots, ok := e.Slots[band]
|
bandSlots, ok := e.Slots[band]
|
||||||
if !ok {
|
if !ok {
|
||||||
bandSlots = make(map[string]struct{})
|
bandSlots = make(map[string]struct{})
|
||||||
@@ -1348,7 +1747,7 @@ func (r *Repo) Count(ctx context.Context) (int64, error) {
|
|||||||
// far cheaper than N exists-queries during the import loop.
|
// far cheaper than N exists-queries during the import loop.
|
||||||
func (r *Repo) ExistingDedupeKeys(ctx context.Context) (map[string]struct{}, error) {
|
func (r *Repo) ExistingDedupeKeys(ctx context.Context) (map[string]struct{}, error) {
|
||||||
rows, err := r.db.QueryContext(ctx, `
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
SELECT callsign, strftime('%Y-%m-%dT%H:%M', qso_date), band, mode
|
SELECT callsign, substr(qso_date, 1, 16), band, mode
|
||||||
FROM qso`)
|
FROM qso`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -1376,7 +1775,7 @@ func DedupeKey(callsign, qsoDateMinute, band, mode string) string {
|
|||||||
// confirmations back to local QSOs.
|
// confirmations back to local QSOs.
|
||||||
func (r *Repo) DedupeKeyIDs(ctx context.Context) (map[string]int64, error) {
|
func (r *Repo) DedupeKeyIDs(ctx context.Context) (map[string]int64, error) {
|
||||||
rows, err := r.db.QueryContext(ctx, `
|
rows, err := r.db.QueryContext(ctx, `
|
||||||
SELECT id, callsign, strftime('%Y-%m-%dT%H:%M', qso_date), band, mode
|
SELECT id, callsign, substr(qso_date, 1, 16), band, mode
|
||||||
FROM qso`)
|
FROM qso`)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -1463,8 +1862,8 @@ func (r *Repo) ConfirmedSlots(ctx context.Context, cols []string) (ConfirmedSets
|
|||||||
func (r *Repo) MarkQRZConfirmed(ctx context.Context, id int64, date string) error {
|
func (r *Repo) MarkQRZConfirmed(ctx context.Context, id int64, date string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET qrzcom_qso_download_status = 'Y', qrzcom_qso_download_date = ?,
|
`UPDATE qso SET qrzcom_qso_download_status = 'Y', qrzcom_qso_download_date = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
updated_at = ? WHERE id = ?`,
|
||||||
date, id)
|
date, db.NowISO(), id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("mark qrz confirmed %d: %w", id, err)
|
return fmt.Errorf("mark qrz confirmed %d: %w", id, err)
|
||||||
}
|
}
|
||||||
@@ -1476,8 +1875,8 @@ func (r *Repo) MarkQRZConfirmed(ctx context.Context, id int64, date string) erro
|
|||||||
func (r *Repo) MarkLoTWConfirmed(ctx context.Context, id int64, date string) error {
|
func (r *Repo) MarkLoTWConfirmed(ctx context.Context, id int64, date string) error {
|
||||||
_, err := r.db.ExecContext(ctx,
|
_, err := r.db.ExecContext(ctx,
|
||||||
`UPDATE qso SET lotw_rcvd = 'Y', lotw_rcvd_date = ?,
|
`UPDATE qso SET lotw_rcvd = 'Y', lotw_rcvd_date = ?,
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now') WHERE id = ?`,
|
updated_at = ? WHERE id = ?`,
|
||||||
date, id)
|
date, db.NowISO(), id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("mark lotw confirmed %d: %w", id, err)
|
return fmt.Errorf("mark lotw confirmed %d: %w", id, err)
|
||||||
}
|
}
|
||||||
|
|||||||
+183
-41
@@ -11,8 +11,10 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"hamlog/internal/db"
|
||||||
"hamlog/internal/secret"
|
"hamlog/internal/secret"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -27,10 +29,111 @@ type Store struct {
|
|||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
cipher Cipher // non-nil when secrets are unlocked
|
cipher Cipher // non-nil when secrets are unlocked
|
||||||
sensitive func(key string) bool // which keys are encrypted at rest
|
sensitive func(key string) bool // which keys are encrypted at rest
|
||||||
|
|
||||||
|
// prefix scopes every key to the active profile (e.g. "p3."), so each
|
||||||
|
// station profile keeps its own complete set of settings. Empty = unscoped
|
||||||
|
// (used briefly at startup before the active profile is known).
|
||||||
|
prefix string
|
||||||
|
|
||||||
|
// cache holds every setting's RAW (as-stored) value, loaded once. Reads are
|
||||||
|
// served from memory so the Preferences dialog (dozens of keys) doesn't pay
|
||||||
|
// a network round-trip per key against a remote MySQL. Decryption still
|
||||||
|
// happens on read, so a later Unlock takes effect without reloading.
|
||||||
|
cache map[string]string
|
||||||
|
cached bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewStore(db *sql.DB) *Store { return &Store{db: db} }
|
func NewStore(db *sql.DB) *Store { return &Store{db: db} }
|
||||||
|
|
||||||
|
// CopyProfile duplicates every setting from one profile to another (used when
|
||||||
|
// a profile is duplicated), preserving raw/encrypted values verbatim.
|
||||||
|
func (s *Store) CopyProfile(ctx context.Context, srcID, dstID int64) error {
|
||||||
|
if err := s.ensureCache(ctx); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
srcPrefix := fmt.Sprintf("p%d.", srcID)
|
||||||
|
dstPrefix := fmt.Sprintf("p%d.", dstID)
|
||||||
|
s.mu.RLock()
|
||||||
|
pairs := make(map[string]string)
|
||||||
|
for k, v := range s.cache {
|
||||||
|
if strings.HasPrefix(k, srcPrefix) {
|
||||||
|
pairs[dstPrefix+strings.TrimPrefix(k, srcPrefix)] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s.mu.RUnlock()
|
||||||
|
q := "INSERT INTO settings(`key`, value, updated_at) VALUES(?, ?, ?) " +
|
||||||
|
"ON CONFLICT(`key`) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at"
|
||||||
|
for fullKey, val := range pairs {
|
||||||
|
if _, err := s.db.ExecContext(ctx, q, fullKey, val, db.NowISO()); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
s.cachePut(fullKey, val)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetProfile scopes all subsequent reads/writes to the given profile id, so
|
||||||
|
// each profile has its own settings. Called at startup and whenever the active
|
||||||
|
// profile changes.
|
||||||
|
func (s *Store) SetProfile(id int64) {
|
||||||
|
s.mu.Lock()
|
||||||
|
s.prefix = fmt.Sprintf("p%d.", id)
|
||||||
|
s.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// profileKey returns the storage key for the active profile.
|
||||||
|
func (s *Store) profileKey(key string) string {
|
||||||
|
s.mu.RLock()
|
||||||
|
p := s.prefix
|
||||||
|
s.mu.RUnlock()
|
||||||
|
return p + key
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensureCache lazily loads all settings into memory on first read. A concurrent
|
||||||
|
// double-load is harmless (the result is identical), so it's done without a
|
||||||
|
// long-held lock.
|
||||||
|
func (s *Store) ensureCache(ctx context.Context) error {
|
||||||
|
s.mu.RLock()
|
||||||
|
ok := s.cached
|
||||||
|
s.mu.RUnlock()
|
||||||
|
if ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
rows, err := s.db.QueryContext(ctx, "SELECT `key`, value FROM settings")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
m := make(map[string]string, 256)
|
||||||
|
for rows.Next() {
|
||||||
|
var k, v string
|
||||||
|
if err := rows.Scan(&k, &v); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
m[k] = v
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
s.mu.Lock()
|
||||||
|
if !s.cached {
|
||||||
|
s.cache = m
|
||||||
|
s.cached = true
|
||||||
|
}
|
||||||
|
s.mu.Unlock()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// cachePut updates the in-memory copy after a write so reads stay coherent.
|
||||||
|
func (s *Store) cachePut(key, raw string) {
|
||||||
|
s.mu.Lock()
|
||||||
|
if s.cache == nil {
|
||||||
|
s.cache = map[string]string{}
|
||||||
|
}
|
||||||
|
s.cache[key] = raw
|
||||||
|
s.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
// SetSensitivePredicate registers which keys hold secrets. Set once at startup.
|
// SetSensitivePredicate registers which keys hold secrets. Set once at startup.
|
||||||
func (s *Store) SetSensitivePredicate(fn func(key string) bool) {
|
func (s *Store) SetSensitivePredicate(fn func(key string) bool) {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
@@ -101,39 +204,38 @@ func (s *Store) encodeWrite(key, val string) string {
|
|||||||
|
|
||||||
// Get returns the value for key, or "" if not set.
|
// Get returns the value for key, or "" if not set.
|
||||||
func (s *Store) Get(ctx context.Context, key string) (string, error) {
|
func (s *Store) Get(ctx context.Context, key string) (string, error) {
|
||||||
var v string
|
raw, err := s.GetRaw(ctx, key)
|
||||||
err := s.db.QueryRowContext(ctx, `SELECT value FROM settings WHERE key = ?`, key).Scan(&v)
|
|
||||||
if err == sql.ErrNoRows {
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
return s.decodeRead(key, v), nil
|
return s.decodeRead(key, raw), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRaw returns the stored value WITHOUT decryption — used by the passphrase
|
// GetRaw returns the stored value WITHOUT decryption — used by the passphrase
|
||||||
// migration which must read/re-write the raw ciphertext or plaintext.
|
// migration which must read/re-write the raw ciphertext or plaintext.
|
||||||
func (s *Store) GetRaw(ctx context.Context, key string) (string, error) {
|
func (s *Store) GetRaw(ctx context.Context, key string) (string, error) {
|
||||||
var v string
|
if err := s.ensureCache(ctx); err != nil {
|
||||||
err := s.db.QueryRowContext(ctx, `SELECT value FROM settings WHERE key = ?`, key).Scan(&v)
|
return "", err
|
||||||
if err == sql.ErrNoRows {
|
|
||||||
return "", nil
|
|
||||||
}
|
}
|
||||||
return v, err
|
full := s.profileKey(key)
|
||||||
|
s.mu.RLock()
|
||||||
|
v := s.cache[full] // "" when absent
|
||||||
|
s.mu.RUnlock()
|
||||||
|
return v, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetRaw stores a value verbatim (no encryption) — used by the migration.
|
// SetRaw stores a value verbatim (no encryption) — used by the migration.
|
||||||
|
// The settings table always lives in the local SQLite database (config is
|
||||||
|
// per-operator, never on the shared MySQL logbook), so SQLite syntax is used
|
||||||
|
// unconditionally. The backticks around `key` are accepted by SQLite too.
|
||||||
func (s *Store) SetRaw(ctx context.Context, key, value string) error {
|
func (s *Store) SetRaw(ctx context.Context, key, value string) error {
|
||||||
_, err := s.db.ExecContext(ctx, `
|
full := s.profileKey(key)
|
||||||
INSERT INTO settings(key, value) VALUES(?, ?)
|
q := "INSERT INTO settings(`key`, value, updated_at) VALUES(?, ?, ?) " +
|
||||||
ON CONFLICT(key) DO UPDATE SET
|
"ON CONFLICT(`key`) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at"
|
||||||
value = excluded.value,
|
if _, err := s.db.ExecContext(ctx, q, full, value, db.NowISO()); err != nil {
|
||||||
updated_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')`,
|
|
||||||
key, value)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("set %s: %w", key, err)
|
return fmt.Errorf("set %s: %w", key, err)
|
||||||
}
|
}
|
||||||
|
s.cachePut(full, value)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,33 +244,73 @@ func (s *Store) Set(ctx context.Context, key, value string) error {
|
|||||||
return s.SetRaw(ctx, key, s.encodeWrite(key, value))
|
return s.SetRaw(ctx, key, s.encodeWrite(key, value))
|
||||||
}
|
}
|
||||||
|
|
||||||
// All returns every stored setting (sensitive values decrypted when unlocked).
|
// GetGlobal reads a value stored WITHOUT the profile prefix — for settings that
|
||||||
func (s *Store) All(ctx context.Context) (map[string]string, error) {
|
// are shared across every profile (e.g. award definitions, which are the
|
||||||
rows, err := s.db.QueryContext(ctx, `SELECT key, value FROM settings`)
|
// operator's own work and shouldn't be re-created per profile). Sensitive
|
||||||
if err != nil {
|
// decryption still applies.
|
||||||
return nil, err
|
func (s *Store) GetGlobal(ctx context.Context, key string) (string, error) {
|
||||||
|
if err := s.ensureCache(ctx); err != nil {
|
||||||
|
return "", err
|
||||||
}
|
}
|
||||||
defer rows.Close()
|
s.mu.RLock()
|
||||||
out := map[string]string{}
|
v := s.cache[key]
|
||||||
for rows.Next() {
|
s.mu.RUnlock()
|
||||||
var k, v string
|
return s.decodeRead(key, v), nil
|
||||||
if err := rows.Scan(&k, &v); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out[k] = s.decodeRead(k, v)
|
|
||||||
}
|
|
||||||
return out, rows.Err()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMany fetches several keys in a single round-trip.
|
// SetGlobal upserts a value WITHOUT the profile prefix (shared across profiles).
|
||||||
func (s *Store) GetMany(ctx context.Context, keys ...string) (map[string]string, error) {
|
func (s *Store) SetGlobal(ctx context.Context, key, value string) error {
|
||||||
out := make(map[string]string, len(keys))
|
value = s.encodeWrite(key, value)
|
||||||
for _, k := range keys {
|
q := "INSERT INTO settings(`key`, value, updated_at) VALUES(?, ?, ?) " +
|
||||||
v, err := s.Get(ctx, k)
|
"ON CONFLICT(`key`) DO UPDATE SET value = excluded.value, updated_at = excluded.updated_at"
|
||||||
if err != nil {
|
if _, err := s.db.ExecContext(ctx, q, key, value, db.NowISO()); err != nil {
|
||||||
return nil, err
|
return fmt.Errorf("set global %s: %w", key, err)
|
||||||
|
}
|
||||||
|
s.cachePut(key, value)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// All returns every stored setting (sensitive values decrypted when unlocked).
|
||||||
|
func (s *Store) All(ctx context.Context) (map[string]string, error) {
|
||||||
|
if err := s.ensureCache(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
prefix := s.profileKey("")
|
||||||
|
s.mu.RLock()
|
||||||
|
raw := make(map[string]string, len(s.cache))
|
||||||
|
for k, v := range s.cache {
|
||||||
|
if strings.HasPrefix(k, prefix) {
|
||||||
|
raw[strings.TrimPrefix(k, prefix)] = v
|
||||||
}
|
}
|
||||||
out[k] = v
|
}
|
||||||
|
s.mu.RUnlock()
|
||||||
|
out := make(map[string]string, len(raw))
|
||||||
|
for k, v := range raw {
|
||||||
|
out[k] = s.decodeRead(k, v)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetMany fetches several keys, all served from the in-memory cache (one DB
|
||||||
|
// round-trip total, on first access). Every requested key is present in the
|
||||||
|
// result (absent settings map to "").
|
||||||
|
func (s *Store) GetMany(ctx context.Context, keys ...string) (map[string]string, error) {
|
||||||
|
out := make(map[string]string, len(keys))
|
||||||
|
if len(keys) == 0 {
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
if err := s.ensureCache(ctx); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
prefix := s.profileKey("")
|
||||||
|
s.mu.RLock()
|
||||||
|
raw := make([]string, len(keys))
|
||||||
|
for i, k := range keys {
|
||||||
|
raw[i] = s.cache[prefix+k]
|
||||||
|
}
|
||||||
|
s.mu.RUnlock()
|
||||||
|
for i, k := range keys {
|
||||||
|
out[k] = s.decodeRead(k, raw[i])
|
||||||
}
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ package ultrabeam
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
@@ -12,6 +13,17 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Connection tuning. Remote operation (the antenna controller reached over the
|
||||||
|
// internet, not the LAN) sees real latency and jitter, so the read timeout is
|
||||||
|
// generous and a few transient timeouts are tolerated before the link is torn
|
||||||
|
// down — otherwise a single slow reply dropped the whole connection and the
|
||||||
|
// client churned reconnect/disconnect.
|
||||||
|
const (
|
||||||
|
ubReadTimeout = 4 * time.Second // was 1s — too tight for a remote link
|
||||||
|
ubKeepAlive = 15 * time.Second // OS-level TCP keepalive
|
||||||
|
ubMaxPollTimeout = 3 // consecutive read timeouts tolerated before reconnecting
|
||||||
|
)
|
||||||
|
|
||||||
// Protocol constants
|
// Protocol constants
|
||||||
const (
|
const (
|
||||||
STX byte = 0xF5 // 245 decimal
|
STX byte = 0xF5 // 245 decimal
|
||||||
@@ -56,6 +68,13 @@ type Client struct {
|
|||||||
running bool
|
running bool
|
||||||
seqNum byte
|
seqNum byte
|
||||||
seqMu sync.Mutex
|
seqMu sync.Mutex
|
||||||
|
|
||||||
|
// Optimistic pattern direction kept until the antenna's status poll reports
|
||||||
|
// it (or it ages out) — the motors take a second or two, and a stale poll in
|
||||||
|
// between would otherwise snap the UI back to the old direction.
|
||||||
|
pendingDir int
|
||||||
|
pendingDirAt time.Time
|
||||||
|
pendingDirSet bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type Status struct {
|
type Status struct {
|
||||||
@@ -110,6 +129,7 @@ func (c *Client) pollLoop() {
|
|||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
pollCount := 0
|
pollCount := 0
|
||||||
|
pollFails := 0 // consecutive failed status polls (transient timeouts tolerated)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
@@ -120,7 +140,8 @@ func (c *Client) pollLoop() {
|
|||||||
c.connMu.Lock()
|
c.connMu.Lock()
|
||||||
if c.conn == nil {
|
if c.conn == nil {
|
||||||
log.Printf("Ultrabeam: Not connected, attempting connection...")
|
log.Printf("Ultrabeam: Not connected, attempting connection...")
|
||||||
conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%d", c.host, c.port), 5*time.Second)
|
dialer := net.Dialer{Timeout: 5 * time.Second, KeepAlive: ubKeepAlive}
|
||||||
|
conn, err := dialer.Dial("tcp", net.JoinHostPort(c.host, fmt.Sprintf("%d", c.port)))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Ultrabeam: Connection failed: %v", err)
|
log.Printf("Ultrabeam: Connection failed: %v", err)
|
||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
@@ -133,6 +154,7 @@ func (c *Client) pollLoop() {
|
|||||||
}
|
}
|
||||||
c.conn = conn
|
c.conn = conn
|
||||||
c.reader = bufio.NewReader(c.conn)
|
c.reader = bufio.NewReader(c.conn)
|
||||||
|
pollFails = 0
|
||||||
log.Printf("Ultrabeam: Connected to %s:%d", c.host, c.port)
|
log.Printf("Ultrabeam: Connected to %s:%d", c.host, c.port)
|
||||||
}
|
}
|
||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
@@ -140,8 +162,17 @@ func (c *Client) pollLoop() {
|
|||||||
// Query status
|
// Query status
|
||||||
status, err := c.queryStatus()
|
status, err := c.queryStatus()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Ultrabeam: Failed to query status: %v", err)
|
// A single slow/lost reply over a remote link is normal — keep
|
||||||
// Close connection and retry
|
// the connection (and the last status) for a few tries before
|
||||||
|
// tearing it down, so we don't churn reconnect/disconnect.
|
||||||
|
var ne net.Error
|
||||||
|
transient := errors.As(err, &ne) && ne.Timeout()
|
||||||
|
pollFails++
|
||||||
|
if transient && pollFails < ubMaxPollTimeout {
|
||||||
|
log.Printf("Ultrabeam: status timeout (%d/%d), keeping link: %v", pollFails, ubMaxPollTimeout, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
log.Printf("Ultrabeam: Failed to query status, reconnecting: %v", err)
|
||||||
c.connMu.Lock()
|
c.connMu.Lock()
|
||||||
if c.conn != nil {
|
if c.conn != nil {
|
||||||
c.conn.Close()
|
c.conn.Close()
|
||||||
@@ -156,6 +187,7 @@ func (c *Client) pollLoop() {
|
|||||||
c.statusMu.Unlock()
|
c.statusMu.Unlock()
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
pollFails = 0
|
||||||
|
|
||||||
// Mark as connected
|
// Mark as connected
|
||||||
status.Connected = true
|
status.Connected = true
|
||||||
@@ -174,6 +206,14 @@ func (c *Client) pollLoop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
c.statusMu.Lock()
|
c.statusMu.Lock()
|
||||||
|
// Keep a just-commanded direction until the antenna reports it.
|
||||||
|
if c.pendingDirSet {
|
||||||
|
if time.Since(c.pendingDirAt) > 4*time.Second || status.Direction == c.pendingDir {
|
||||||
|
c.pendingDirSet = false
|
||||||
|
} else {
|
||||||
|
status.Direction = c.pendingDir
|
||||||
|
}
|
||||||
|
}
|
||||||
c.lastStatus = status
|
c.lastStatus = status
|
||||||
c.statusMu.Unlock()
|
c.statusMu.Unlock()
|
||||||
|
|
||||||
@@ -318,8 +358,8 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
|||||||
return nil, fmt.Errorf("failed to write: %w", err)
|
return nil, fmt.Errorf("failed to write: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read reply with timeout
|
// Read reply with timeout (generous — tolerates remote-link latency).
|
||||||
c.conn.SetReadDeadline(time.Now().Add(1 * time.Second)) // Reduced from 2s to 1s
|
c.conn.SetReadDeadline(time.Now().Add(ubReadTimeout))
|
||||||
|
|
||||||
// Read until we get a complete packet
|
// Read until we get a complete packet
|
||||||
var buffer []byte
|
var buffer []byte
|
||||||
@@ -424,6 +464,14 @@ func (c *Client) SetFrequency(freqKhz int, direction int) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_, err := c.sendCommand(CMD_FREQ, data)
|
_, err := c.sendCommand(CMD_FREQ, data)
|
||||||
|
if err == nil {
|
||||||
|
c.statusMu.Lock()
|
||||||
|
c.pendingDir, c.pendingDirAt, c.pendingDirSet = direction, time.Now(), true
|
||||||
|
if c.lastStatus != nil {
|
||||||
|
c.lastStatus.Direction = direction // reflect immediately
|
||||||
|
}
|
||||||
|
c.statusMu.Unlock()
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user