Compare commits

..
34 Commits
Author SHA1 Message Date
rouggy 2bf98a9801 chore: release v0.24.0 2026-08-09 13:01:59 +02:00
rouggy 80dac64b56 feat(theme): four themes with an actual hue — Indigo, Ocean, Plum, Nordic
The seven existing themes are warm beige, cool grey, sage grey, slate, warm
dark, graphite and black — every one neutral, six of the seven accented orange.
Picking a theme changed the shade of grey and little else.

These colour the SURFACES, not just the accent, and each takes a different
primary so the picker tells them apart at a glance: violet on deep indigo, cyan
on deep teal, magenta on aubergine, indigo on a crisp cool white.

The semantic colours stay recognisable as themselves. A logger is read for
hours and "red means a problem" cannot become a decorative choice, so the hue
budget went on the surfaces and the primary. Where a theme's primary would have
collided with a meaning, the MEANING kept its identity and the ornament moved:
Ocean's info is blue rather than cyan, Plum's danger is red rather than rose,
and the matrix entity ramp shifts to cyan under Indigo and teal under Nordic so
a "confirmed" cell never reads as a button.

Everything else follows for free: the grids resolve var(--…) at runtime, so
they re-skin with no re-render. The three shared registrations that do NOT
follow automatically are done — the chart palette (light vs dark ramp) and the
date-picker icon inversion, which is keyed on an explicit list of dark themes.
2026-08-09 10:06:05 +02:00
rouggy 79427ccd18 fix(awards): apply the reference Prefix where it can actually help
Prefix exists so a field holding a bare value counts for an award whose codes
carry a letter: a French operator writes "74" in STATE, DDFM's codes are "D74".
Def's own doc says exactly that. But searchOne applied the prefix AFTER looking
the token up in the reference list — after the step that had just failed — so
the bare form matched nothing and the prefix decorated an empty result. The only
way through was a regex, in a mode where the operator had chosen "code" and
explicitly not "pattern".

The token lookup now tries the prefixed form when the bare one is not a known
reference. The list stays the authority: an unknown number still matches
nothing, so the prefix completes references rather than inventing them.

Second bug in the same pass: the blanket prefix also hit codes that came
straight OUT of the list, so a field already holding "D74" produced "DD74" as
soon as a prefix was configured — for both the token lookup and the
description matcher. Branches that yield whole codes are now excluded from it;
the ones that yield a raw capture (regex, whole-field split) still get it.
2026-08-09 09:43:27 +02:00
rouggy 4352b9aec5 fix(udp): read WSJT-X packets that arrive through a relay
A forwarder (W&P, seen in the field in front of MSHV) prepends the origin as
plain text before re-broadcasting:

    "127.0.0.1:2237|" + <the original, untouched WSJT-X packet>

That puts the magic 15 bytes in, so every datagram failed on "bad magic
0x3132372e" — those four bytes being ASCII "127." — and an operator running
MSHV behind the relay saw no decodes, no callsigns and no auto-logged QSOs.

No new service type: what follows the header IS a WSJT-X packet, so the parser
and everything downstream apply unchanged, and a separate type would duplicate
decode, status and logged-ADIF handling to strip 15 bytes. ParseWSJT skips the
header instead, which also covers any other relay that wraps traffic this way.

The match is deliberately narrow — the magic must fall within the first 64
bytes AND every byte before it must be printable ASCII. A corrupt or truncated
packet that merely contains those four bytes somewhere is not resurrected into
a QSO; it fails exactly as it did before.

Test data is the real captured datagram, header included.
2026-08-09 08:06:21 +02:00
rouggy a0f7f2abf0 feat(udp): show the packet behind a parse error, and stop repeating it
"WSJT parse error: bad magic 0x3132372e" named neither the sender nor the
payload, so there was nothing to act on — even though those four bytes are
ASCII "127.", i.e. some program broadcasting an address on a port expecting
WSJT-X binary.

The line now carries the remote address, the size, a printable preview and a
hex dump of the first 96 bytes. Text senders are readable at a glance; a
genuinely binary payload still shows its bytes.

And it stops after five. The reported case wrote that line about 150 times a
second: a permanently misconfigured port would fill the 10 MB rotating log with
one repeated sentence and bury every other piece of evidence — the log's whole
purpose. The fifth line names the two things worth checking, the sender and the
service type.

N1MM's parse error goes through the same path; it had no packet detail either.
2026-08-09 07:59:51 +02:00
rouggy 40f5960c76 feat(awards): implement the QRZ.com and Custom confirmation sources
The award editor offered five confirmation sources and Def's own doc comment
named five, but confirmed() had cases for three. "qrzcom" and "custom" fell
through the switch, so ticking either marked nothing as confirmed — the exact
failure the GrantCodes comment in this struct warns about: a checkbox that does
nothing is worse than no checkbox, because it is trusted.

QRZ.com reads qrzcom_qso_download_status, not the upload one: uploading a QSO
is us telling QRZ about it, which confirms nothing.

Custom names a field. Rather than a checkbox per external source, the Def gains
ConfirmField + ConfirmValue: any QSO field or ADIF extras key, and optionally
the comma-separated values that count. That one shape covers the three cases
asked for — the OpsLog card marker (APP_OPSLOG_QSL_RCVD), an arbitrary ADIF
tag, and a tag stamped by an imported club list — because all three end up as a
field on the QSO.

An empty ConfirmValue means any non-empty content confirms: the OpsLog marker
stores the date the card arrived, not a Y/N flag. A custom source naming NO
field confirms nothing, deliberately — the opposite default would silently mark
a whole logbook confirmed.
2026-08-09 02:11:24 +02:00
rouggy 59135d55ab fix(window): don't save the geometry of a minimised window
Windows parks a minimised window at -32000,-32000 with a stub size and reports
it as not-maximised, so closing OpsLog from the taskbar while minimised stored
exactly that. Seen in a log: "window: saving -32000,-32000 237x39
maximised=false".

The restore side already rejects both the impossible corner and the
below-minimum size, so nothing opened off-screen — but it fell back to the
default placement, and the operator silently lost the size, the position and the
maximised state they had set.

saveWindowState now keeps what was already stored when the window is minimised.
Two tests for that: the Wails flag, and the -32000 corner, because a window that
is mid-close can sit at that corner with the flag already cleared. A poisoned
window.json repairs itself on the next close of an on-screen window.
2026-08-09 01:47:45 +02:00
rouggy 44cf5954fd fix(qsl): print "TNX QSL" rather than "TNX" on the card
The stamp answers "PSE QSL", so it reads as its counterpart or not at all: a
bare "TNX" next to a QSL message says thanks for something unnamed.

Changed at the source of the {qso.pse_tnx} token, so every card picks it up
with no template edit. The live indicator in the QSO editor and the hint beside
it follow.
2026-08-09 01:39:50 +02:00
rouggy f1b7a7e477 fix(qsl): put the OpsLog card in the Manage Confirmation picker too
The previous commit added its row to the status table but left the picker
listing only the column-backed channels, so the one channel you could actually
tick was the one you could not select.

Selecting it swaps the left panel for an OpsLog editor instead of the generic
sent/received/date grid, which has no fields to bind to here: Sent is shown
read-only (OpsLog stamps it when the card goes out), Received is the tick, and
the PSE QSL / TNX indicator sits next to them since that stamp is what the flag
is for.
2026-08-09 01:23:52 +02:00
rouggy 19ae00124f feat(qsl): show the OpsLog card with the other confirmations
The OpsLog QSL marker sat under QSL Msg in "Contact's details", nowhere near
the channel it belongs to, while the QSL Info tab listed every other
confirmation — QSL, LoTW, eQSL, QRZ.com, Club Log, HRDLog — with a Sent and a
Received column.

It now has its own row in that table and the "QSL received" tick moved to the
same tab, keeping the PSE QSL / TNX indicator that is the reason the flag
exists at all: received prints TNX on the card, otherwise PSE QSL.

Written by hand rather than added to CONFIRMATIONS: that table maps QSO
columns, and this channel is backed by ADIF extras (APP_OPSLOG_QSL_RCVD, plus
the older APP_OPSLOG_QSL_CARD_SENT for the sent side). Sent stays read-only —
OpsLog stamps it when a card actually goes out, and a hand tick would record
something that never happened.
2026-08-08 23:28:26 +02:00
rouggy 642ed358c2 feat(worked): fold portable callsigns into the worked-before history
Typing RK3DWA found nothing while RK3DWA/3 found 21 QSOs, so a station's
history was only visible if you happened to type the exact form it had been
logged under — and an operator who worked it as /0, /P or /MM saw none of it.
The other RDA tools and Log4OM fold these together; this does too.

The predicate strips the suffix from what was typed and matches "call = base OR
call LIKE base/%", so it works from either end: the base call finds the portable
QSOs and a portable call finds the plain ones. Deliberately not a bare prefix
LIKE 'RK3DWA%', which would also match RK3DWAB — a different station. The '/' is
what makes it the same operator.

Settings -> General to turn it off. Default ON, hence the inverted storage: an
existing install has no key, and reading that as OFF would leave everyone with
the behaviour we were asked to change.

Contest dupe checking is untouched — it runs through ContestDupe, a separate
binding, and stays an exact match as a contest requires.
2026-08-08 23:24:23 +02:00
rouggy 1d8cd25205 chore: release v0.23.9 2026-08-08 20:44:32 +02:00
rouggy 1f55cfe9fa feat(cluster): self-spot on the master node while logging
Settings -> DX Cluster: a toggle and an interval. When it is on, logging a QSO
announces the station on the master cluster — the QSO's own station callsign as
the DX, on the frequency the contact was made on — so callers find the run
without waiting for someone else to spot it. The node fills the DE field from
the login, so the spotter is us too: a self-spot.

It fires on the FIRST QSO of a frequency and then at most once per interval.
Both halves matter: announcing every QSO would flood the node and get the
station filtered out, while a pure timer would stay silent for minutes after a
band change. A drift of up to 500 Hz still counts as the same run, so nudging
the VFO mid-pileup does not re-announce.

Five minutes is the floor, clamped in SaveSelfSpotSettings as well as in the
input: the limit protects the node from us, so it must not depend on the
frontend. The interval input keeps raw text and clamps on blur — clamping per
keystroke rewrote "10" to "5" as soon as the "1" landed.

Wired into both log paths (manual entry and UDP auto-log) on the async side, so
a cluster that is slow or down never holds up logging. A send failure restores
the previous throttle state, so the next QSO retries instead of sitting out an
interval that produced no spot.
2026-08-08 20:34:10 +02:00
rouggy 90c6458af0 fix(rigctld): never leave the rig keyed when the client goes away
The Kenwood/Elecraft backend deliberately suspends its wire poll while PTT is
held — a K3 answers "?;" to IF; during transmit, and treating that as a fault
used to drop the whole CAT link. The consequence was that nothing watched the
transmitter: a client that crashed, was closed, or simply had its socket shut
under it left the rig on air.

And shutting the socket is routine. reloadCATShare tears the sharing server
down and rebuilds it on every settings save, so a Save while WSJT-X held PTT
was enough. A K3 operator's log shows exactly that: "TX;" at 17:53:09, no "RX;"
ever, the poll silent, and the rig still keyed 29 s later when the CAT link
happened to be rebuilt.

The server now drops PTT when a connection ends and when Stop() is called.
Stop() runs before reloadCAT restarts the backend, so the unkey still reaches
the radio. An atomic Swap keeps it once-only across the two paths.
2026-08-08 20:19:00 +02:00
rouggy 18f44a5aa3 fix(cat): read MD6 back as DATA on an Elecraft, not RTTY
MD6 is FSK on a Kenwood and DATA on a K3/K4. kenwoodModeToADIF decoded the
digit unconditionally as RTTY, so OpsLog contradicted the mode it had just
set: SetMode writes MD6 for a digital mode on an Elecraft, then ReadState
parsed the IF frame back as RTTY.

A K3 running FT8 therefore showed RTTY in the status bar, logged its QSOs on
RTTY, and — through the shared CAT server — told WSJT-X/JTDX the rig sat in
RTTY while they had just asked for a data mode. Found in a K3 operator's log:
every cat:state line read mode=RTTY on 21.074 FT8, two lines after OpsLog's
own "MD6;".

The digit now resolves to the configured digital mode whenever MD6 means DATA
on this rig — the Elecraft backend, and the "DATA A - MD6" data-mode option
that exists for it. A plain Kenwood still reads MD6 as RTTY.
2026-08-08 20:13:45 +02:00
rouggy 4d13cf7d15 feat(entry): normalise Name/QTH/Comment/Note case, upper-case the Recent QSOs search
One station reaches the log SHOUTED by QRZ, lower-cased by a hurried
operator and in whatever case an imported ADIF carried, so the same name
appears three ways across a log. Name and QTH are now title-cased word by
word; Comment and Note only get a capital first letter, because the rest
routinely holds callsigns and modes ("TNX QSO F5ABC, FT8 59") that
lower-casing would destroy.

Normalised on blur, never per keystroke — rewriting the value mid-word
fights the typist (the controlled-input trap in CLAUDE.md). Applied in
both entry layouts and in the QSO editor, since leaving the editor alone
would just reintroduce the mess on the first correction.

The Recent QSOs box only ever searches callsigns, so it upper-cases as
you type and carries an inline clear button.
2026-08-08 17:37:09 +02:00
rouggy 366d9df634 fix(grid): keep the award columns' position in the saved layout
Award columns were filtered out of the persisted column state entirely,
so applyColumnState({applyOrder:true}) had nowhere to put them and AG
Grid appended what the state does not mention. A column the operator
dragged to sit AFTER an award column therefore jumped back in front of
it on every reload.

Only the `hide` property is dropped now. Visibility stays owned by the
awardShown code-set — that is what stopped shown award columns from
vanishing on an awardCols rebuild — while the position survives the
round-trip.
2026-08-08 17:36:48 +02:00
rouggy f4b7c9dcf8 fix(settings): restore the settings-database buttons and unstack the backup options
The Settings -> Database panel had lost every action on the settings
database except "Open folder", which launches Windows Explorer — where a
.db cannot be selected at all, so double-clicking it only asks which
program should open it. The handlers were still there, just no longer
rendered; New / Open existing / Save a copy / Rename / Reset are back,
along with the restart banner (the DB pointer is only read at startup).

The backup block put the rotation field and three checkboxes on one flex
row inside max-w-xl. That fitted until "keep every backup" arrived with
its two-line hint, after which every label wrapped into an unreadable
sliver. The options are stacked now, and keep-all sits under the option
it depends on.
2026-08-08 17:36:31 +02:00
rouggy 48c448e6f3 chore(bindings): regenerate the Wails TS bindings
Stale since the 0.23.9 work: SetOpsLogQSLReceived, the backup keep_all
flag, the award PRIMARY search prefix and the default QSL message were
all missing from the generated bindings.
2026-08-08 17:35:53 +02:00
rouggy 9c757e5175 feat(cat): distinct Elecraft K3/K4 backend in the rig list
The Elecraft handling was buried in the Kenwood "data mode" option, so users
couldn't find it. Add "Elecraft K3/K4" as its own entry in the CAT backend
selector. It reuses the Kenwood-dialect transport and the Kenwood USB/network
settings (the K3 emulates the Kenwood command set — a separate transport would be
a near-total duplicate), with an `elecraft` flag on the client that forces
digital modes to DATA A (MD6+DT0) — no data-mode dropdown needed. RigState still
reports Backend "kenwood" so the CW-over-CAT keyer capability keeps working.
2026-08-08 14:15:55 +02:00
rouggy 626edca8ba feat(cat): Elecraft K3/K4 DATA A — send MD6 + DT0 on data mode (from the stale branch)
Integrates the fix/jtdx-kenwood-tx work onto main: the Kenwood/Elecraft backend's
"data" data-mode path now sends MD6 then DT0 so a K3/K4 lands in DATA A — the
audio sub-mode FT8 uses. MD6 alone could leave the rig in an FSK/PSK sub-mode
where it keyed but the rear sound-card audio never modulated ("transmits but
nothing comes out"). The data-mode option is relabelled "DATA A — MD6+DT0
(Elecraft K3/K4)". A shared Kenwood/Elecraft backend is kept (the K3 emulates the
Kenwood dialect); the Elecraft specifics live behind the data-mode seam rather
than a 7000-line duplicate backend.
2026-08-07 16:37:55 +02:00
rouggy b202d98ae5 fix(awards): add a Prefix field to the primary QSOFIELDS search
Only OrRule had a Prefix ("prepended to each found reference", e.g. postal 74 →
D74); the primary search passed "" for prefix, so an award whose references are
D01/D02… couldn't prepend the D on its main rule — only on OR fallbacks. Add
Def.Prefix, pass it into the primary run(), and expose a Prefix input next to the
primary Leading/Trailing fields in the award editor.
2026-08-07 14:23:41 +02:00
rouggy 949cc17ed1 feat(backup): "keep every backup" option — timestamped files per exit
Sub-option of "back up on every exit": when on, backup.Run/RunADIF stamp the
filename with the time (opslog-YYYY-MM-DD-HHMMSS.db) so each run is a distinct
file instead of overwriting the day's snapshot. Rotation still trims to the
newest N (raise Rotation for a longer history). Threaded as a `unique` flag
through runConfiguredBackup/backupLogADIF from BackupSettings.KeepAll
(keyBackupKeepAll); UI sub-checkbox shown only when EveryExit is on.
2026-08-07 12:28:52 +02:00
rouggy e9feeffdc3 fix(udp): forward WSJT/JTDX/MSHV-logged QSOs to the outbound ADIF integrations
autoLogFromUDP (the inbound WSJT-X/JTDX/MSHV log path) inserted the QSO but,
unlike the manual LogQSO path, never called a.udp.EmitLoggedADIF — so a QSO
received from MSHV was not re-emitted to the outbound ADIF listeners (Log4OM,
N1MM, GridTracker…). Emit it in the same async goroutine. A pathological
self-loop is broken by the existing ±2-min dedup, which returns before the emit.
2026-08-07 10:56:49 +02:00
rouggy 7d7d1042c0 feat(qsl): OpsLog QSL received marker + PSE/TNX card stamp + default QSL message
Received flag: new APP_OPSLOG_QSL_RCVD extra, toggled on the QSO edit window
next to QSL Message (immediate targeted write via SetOpsLogQSLReceived so it sets
AND clears reliably), plus a live PSE QSL / TNX indicator and a Recent-QSOs
column mirroring the sent one.

PSE/TNX card stamp: automatic — received → TNX, otherwise PSE QSL — exposed as
the {qso.pse_tnx} token (added to qslVars, so preview and send agree) and placed
in the default QSO-box footer; it can be moved to its own element in the designer.

Default QSL message: new qsl.default_message (QSLEmailTemplates.DefaultMessage),
edited under Settings → E-mail → QSL card e-mail. qslVars falls back to it when
the QSO's own QSLMSG is empty, so a per-QSO message always wins. Single choke
point covers both live preview and send.
2026-08-07 10:36:57 +02:00
rouggy 9cbfd39da0 ui(cluster): drop the value-looking placeholders in My rig/antenna/satellite
'Flex 8600', 'UB640', 'AO-91', 'U/V' read as real values, so an empty field
looked already filled. Removed so an empty field is visibly empty.
2026-08-07 09:53:01 +02:00
rouggy 5338ad0b29 feat(backup): option to back up on every exit, not just once a day
New BackupSettings.EveryExit (keyBackupEveryExit) with a Settings → Backup
checkbox. When on, the three shutdown-backup gates (plannedShutdownSteps,
runBackupForShutdown, maybeShutdownBackup) bypass the HasBackupToday /
HasADIFBackupToday "already done today" check and always run, so a second
session's QSOs are captured instead of skipped until the next day. The dated
backup file for today is refreshed (overwritten) each exit; prior days are still
kept by rotation.
2026-08-07 09:46:23 +02:00
rouggy 970127cc16 changelog: open empty 0.23.9 block 2026-08-07 00:17:42 +02:00
rouggy 3704dbdd99 chore: release v0.23.8 2026-08-07 00:16:56 +02:00
rouggy 3cdf16b501 perf(cluster): throttle the grid refreshCells to 200ms (coalesce RBN status bursts)
spotStatus updates ~20x/second under an RBN firehose; firing a full refreshCells
on each was pure churn on a slow PC. Coalesce into one refresh per 200ms. Keeps
the NEW/WORKED badge colours and the 'represents nothing' dimming — the dimming
itself is a trivial pure read now that the worked-index scan is cached, so it's
no longer a cost worth removing.
2026-08-07 00:13:23 +02:00
rouggy 9a72afd467 perf(cluster): cache the worked-index and bound the spot-status cache (RBN firehose)
A user on a slow PC with RBN saw OpsLog at 94% CPU and 8.5 GB RAM (Logger32: 3%
/ 34 MB on the same feeds). Two runaway costs under the spot firehose:

- ClusterSpotStatuses re-scanned the ENTIRE logbook (5-6 full-table maps) on
  every 50 ms spot batch — ~20×/second — its "one scan regardless of batch" doc
  was untrue. On a big log that's millions of row-scans/second → the pegged CPU.
  Now cached in clusterStatusCache (an immutable snapshot), rebuilt only when the
  logbook changes (noteWorked on a single log, invalidateAwardStats on bulk), so
  it's one scan per logged QSO instead of per batch.

- The frontend spotStatus map had no cap: one entry per call|band|mode ever seen,
  and RBN produces thousands of unique calls/hour → unbounded growth to GBs, plus
  a full {...prev} copy 20×/second. Now pruned back to the live (SPOTS_CAP=1000)
  spots once it drifts past 2×, with a cheap same-reference bail-out otherwise.
2026-08-07 00:08:24 +02:00
rouggy e2bfe73bdb fix(backup): back up the contacts (logbook), not just the settings db
Since the logbook was split into its own SQLite file, backup.Run was still
snapshotting a.db (the settings/config database) — so the scheduled and manual
backups silently stopped including the QSOs. The operator was backing up config
and thinking it was their log.

Track the resolved logbook file path (a.logDbPath, set in connectLogbook) and
route the backup through a new runConfiguredBackup: the CONTACTS become the
primary "opslog-*" backup (the logbook file on SQLite, an ADIF export on MySQL),
and the settings/config db is snapshotted separately as "opslogcfg-*" so nothing
is lost. backup.Run takes a name prefix; the two sets rotate independently.
2026-08-06 23:22:04 +02:00
rouggy 6e2e2cc3aa changelog: move the recording-email editor to 0.23.8 (0.23.7 is released) 2026-08-06 19:11:10 +02:00
rouggy 75d11a4069 feat(email): editable subject/body for the QSO recording e-mail
The recording e-mail's subject and body round-tripped through EmailSettings and
the backend (keyEmailSubject/keyEmailBody) but had no UI editor — only the QSL
card e-mail did, so the recording mail was stuck on the default text. Add the
same subject/body editor to the E-mail panel, above the QSL block, sharing the
{CALL}/{DATE}/{BAND}/{MODE}/{MYCALL} template variables.
2026-08-06 18:14:24 +02:00
35 changed files with 2013 additions and 237 deletions
+361 -66
View File
@@ -288,13 +288,23 @@ const (
keyWKCWInvert = "winkeyer.cw_invert" // serial engine: invert line polarity (active-LOW) keyWKCWInvert = "winkeyer.cw_invert" // serial engine: invert line polarity (active-LOW)
keyClusterAutoConnect = "cluster.auto_connect" // open every enabled server at app start keyClusterAutoConnect = "cluster.auto_connect" // open every enabled server at app start
keyClusterSelfSpot = "cluster.self_spot" // "1" → announce ourselves on the cluster as we log
keyClusterSelfSpotMin = "cluster.self_spot_minutes" // shortest gap between two self-spots
keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on
// Worked-before: fold an operator's portable forms (X, X/3, X/P) together.
// Stored inverted — "0" means OFF — so the feature is ON for an existing
// install that has never seen the key, which is the behaviour operators asked
// for. See GetWorkedCallVariants.
keyWorkedCallVariants = "worked.call_variants"
keyBackupEnabled = "backup.enabled" keyBackupEnabled = "backup.enabled"
keyBackupFolder = "backup.folder" keyBackupFolder = "backup.folder"
keyBackupRotation = "backup.rotation" keyBackupRotation = "backup.rotation"
keyBackupZip = "backup.zip" keyBackupZip = "backup.zip"
keyBackupEveryExit = "backup.every_exit" // "1" → back up on every quit, not just once/day
keyBackupKeepAll = "backup.keep_all" // "1" → each backup is a distinct time-stamped file (no same-day overwrite)
keyBackupLast = "backup.last_at" keyBackupLast = "backup.last_at"
keyQSLDefaultQSLSent = "qsl.qsl_sent" keyQSLDefaultQSLSent = "qsl.qsl_sent"
@@ -571,6 +581,19 @@ type App struct {
// Loaded once, appended to on each log, rebuilt after bulk changes. // Loaded once, appended to on each log, rebuilt after bulk changes.
wcbm map[string]struct{} wcbm map[string]struct{}
wcbmMu sync.RWMutex wcbmMu sync.RWMutex
// clusterStatusIdx caches the whole-logbook maps ClusterSpotStatuses colours
// spots against (worked entities/calls/counties/POTA/prefixes). Building them
// per spot batch re-scanned the entire logbook ~20×/second under an RBN
// firehose — the dominant CPU cost on a large log. Built lazily, treated as an
// immutable snapshot, and dropped on any logbook change (invalidateAwardStats)
// or when a setting that shapes the maps flips.
clusterStatusIdx *clusterStatusCache
clusterStatusMu sync.Mutex
// Self-spot throttle: when and on what frequency we last announced ourselves.
// Held in memory only — a restart legitimately re-announces the station.
selfSpotMu sync.Mutex
selfSpotAt time.Time
selfSpotHz int64
pota *pota.Cache pota *pota.Cache
uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened
awardRefs *awardref.Repo awardRefs *awardref.Repo
@@ -644,6 +667,7 @@ type App struct {
settingsScoped atomic.Bool // true once a.settings is scoped to the active profile — GetUIPref/SetUIPref (per-profile) must wait for it, else an early call reads the wrong scope and e.g. resets the theme settingsScoped atomic.Bool // true once a.settings is scoped to the active profile — GetUIPref/SetUIPref (per-profile) must wait for it, else an early call reads the wrong scope and e.g. resets the theme
dbPath string // settings/config database file (settings + profiles); may be a user-chosen location dbPath string // settings/config database file (settings + profiles); may be a user-chosen location
logbookPath string // default SQLite logbook file (QSOs), next to the settings db — used when a profile doesn't point elsewhere logbookPath string // default SQLite logbook file (QSOs), next to the settings db — used when a profile doesn't point elsewhere
logDbPath string // resolved SQLite file actually backing logDb ("" on MySQL, or when the settings db serves as the logbook) — the file the backup snapshots
logDb *sql.DB // QSO logbook connection — MySQL, a per-profile SQLite file, or the default logbook.db (never the settings db, except on fallback) logDb *sql.DB // QSO logbook connection — MySQL, a per-profile SQLite file, or the default logbook.db (never the settings db, except on fallback)
dbBackend string // "sqlite" | "mysql" — the logbook backend actually opened at startup dbBackend string // "sqlite" | "mysql" — the logbook backend actually opened at startup
dbBackendErr string // non-empty when a configured MySQL backend failed and we fell back to SQLite dbBackendErr string // non-empty when a configured MySQL backend failed and we fell back to SQLite
@@ -1066,6 +1090,7 @@ func (a *App) startup(ctx context.Context) {
applog.Printf("startup: logbook open failed (%v) — falling back to SQLite logbook", lerr) applog.Printf("startup: logbook open failed (%v) — falling back to SQLite logbook", lerr)
a.dbBackendErr = strings.TrimPrefix(lerr.Error(), "") a.dbBackendErr = strings.TrimPrefix(lerr.Error(), "")
logbookConn, backend = conn, "sqlite" logbookConn, backend = conn, "sqlite"
a.logDbPath = "" // fell back to the settings db as the logbook — backup snapshots a.db
} }
a.dbBackend = backend a.dbBackend = backend
// db.Dialect describes the LOGBOOK backend — the only place SQL actually // db.Dialect describes the LOGBOOK backend — the only place SQL actually
@@ -1440,7 +1465,8 @@ func (a *App) plannedShutdownSteps() []shutdownStep {
if folder == "" { if folder == "" {
folder = s.DefaultFolder folder = s.DefaultFolder
} }
if !backup.HasBackupToday(folder) { // "Back up on every exit" bypasses the once-a-day gate.
if s.EveryExit || !backup.HasBackupToday(folder) {
out = append(out, shutdownStep{ID: "backup", Label: "Backing up database", Status: "pending"}) out = append(out, shutdownStep{ID: "backup", Label: "Backing up database", Status: "pending"})
} }
} }
@@ -1520,17 +1546,12 @@ func (a *App) runBackupForShutdown() error {
if mysql { if mysql {
done = backup.HasADIFBackupToday(folder) done = backup.HasADIFBackupToday(folder)
} }
if done { if done && !s.EveryExit { // "every exit" backs up regardless of a prior backup today
return nil return nil
} }
if _, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip); err != nil { if _, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip, s.KeepAll); err != nil {
return err return err
} }
if mysql {
if _, err := a.backupLogADIF(folder, s.Rotation, s.Zip); err != nil {
return err
}
}
return a.settings.Set(a.ctx, keyBackupLast, time.Now().UTC().Format(time.RFC3339)) return a.settings.Set(a.ctx, keyBackupLast, time.Now().UTC().Format(time.RFC3339))
} }
@@ -1779,6 +1800,24 @@ func writeWindowState(dataDir string, w windowState) {
} }
} }
// windowIsMinimised reports whether the window is currently minimised.
//
// Two tests rather than one: Wails answers the question directly, and the
// -32000 corner is Windows' own marker for a minimised window — a window that
// is mid-close or hidden can report that corner while the flag has already been
// cleared, and either way the geometry is not worth storing.
func (a *App) windowIsMinimised() bool {
if a.ctx == nil {
return false
}
if wruntime.WindowIsMinimised(a.ctx) {
return true
}
x, y := wruntime.WindowGetPosition(a.ctx)
const minimisedCorner = -32000
return x <= minimisedCorner || y <= minimisedCorner
}
// saveWindowState captures the current geometry. Called as the window closes. // saveWindowState captures the current geometry. Called as the window closes.
// While in compact mode the window is pinned to a tiny fixed size, so we keep the // While in compact mode the window is pinned to a tiny fixed size, so we keep the
// previously-saved normal geometry rather than overwrite it with 1240×158 — only // previously-saved normal geometry rather than overwrite it with 1240×158 — only
@@ -1788,6 +1827,18 @@ func (a *App) saveWindowState() {
return return
} }
prev, _ := readWindowState(a.dataDir) prev, _ := readWindowState(a.dataDir)
// A MINIMISED window has no usable geometry: Windows parks it at -32000,-32000
// with a stub size, and reports it as not-maximised. Closing OpsLog from the
// taskbar while minimised captured exactly that — "saving -32000,-32000 237x39
// maximised=false" — and window.json then held a position no monitor covers and
// a size below the minimum. The restore side rejects both and falls back to the
// default placement, so the operator silently lost the size, the position AND
// the maximised state they had. Keep what was already stored instead.
if a.windowIsMinimised() {
applog.Printf("window: minimised at close — keeping the stored geometry %d,%d %dx%d maximised=%v",
prev.X, prev.Y, prev.Width, prev.Height, prev.Maximised)
return
}
max := wruntime.WindowIsMaximised(a.ctx) max := wruntime.WindowIsMaximised(a.ctx)
ws := prev ws := prev
ws.Maximised = max ws.Maximised = max
@@ -2053,6 +2104,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
a.logDbPath = "" // MySQL: no local file to snapshot (the log is exported to ADIF instead)
return c, "mysql", nil return c, "mysql", nil
} }
// SQLite logbook FILE, separate from the settings/config database. A profile // SQLite logbook FILE, separate from the settings/config database. A profile
@@ -2066,6 +2118,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
lp = a.logbookPath lp = a.logbookPath
} }
if lp == "" { if lp == "" {
a.logDbPath = "" // settings db serves as the logbook (split failed) — backup snapshots a.db
return a.db, "sqlite", nil return a.db, "sqlite", nil
} }
// Resolve against THIS install before opening. Without it, a profile carried // Resolve against THIS install before opening. Without it, a profile carried
@@ -2081,6 +2134,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
if err != nil { if err != nil {
return nil, "", fmt.Errorf("open logbook %s: %w", lp, err) return nil, "", fmt.Errorf("open logbook %s: %w", lp, err)
} }
a.logDbPath = lp // the SQLite file the backup snapshots for the contacts
return c, "sqlite", nil return c, "sqlite", nil
} }
@@ -2597,6 +2651,7 @@ func (a *App) AddQSO(q qso.QSO) (id int64, err error) {
a.extsvc.OnQSOLogged(id) a.extsvc.OnQSOLogged(id)
} }
a.maybeAutoSendEQSL(qc) a.maybeAutoSendEQSL(qc)
a.maybeSelfSpot(qc)
if a.udp != nil { if a.udp != nil {
a.udp.EmitLoggedADIF(adif.SingleRecordADIF(qc)) a.udp.EmitLoggedADIF(adif.SingleRecordADIF(qc))
} }
@@ -4198,8 +4253,8 @@ func (a *App) GetAwardStats(code string) (AwardStatsResult, error) {
continue continue
} }
bi, hasBand := bandIdx[strings.ToLower(strings.TrimSpace(q.Band))] bi, hasBand := bandIdx[strings.ToLower(strings.TrimSpace(q.Band))]
isConf := award.Confirmed(q, def.Confirm) isConf := award.Confirmed(q, *def, def.Confirm)
isVal := award.Confirmed(q, def.Validate) isVal := award.Confirmed(q, *def, def.Validate)
cat := strings.ToUpper(award.EmissionOf(q.Mode)) cat := strings.ToUpper(award.EmissionOf(q.Mode))
record := func(c string) { record := func(c string) {
@@ -4254,6 +4309,11 @@ func (a *App) invalidateAwardStats() {
a.awardSnap = nil a.awardSnap = nil
a.awardSnapRev = "" a.awardSnapRev = ""
a.awardSnapMu.Unlock() a.awardSnapMu.Unlock()
// Drop the cluster worked-index snapshot too, so the Cluster tab's NEW/WORKED
// colouring reflects the change on the next spot batch (it rebuilds lazily).
a.clusterStatusMu.Lock()
a.clusterStatusIdx = nil
a.clusterStatusMu.Unlock()
// Bulk QSO changes (import, delete, bulk edit) also land here — refresh the // Bulk QSO changes (import, delete, bulk edit) also land here — refresh the
// worked-index so alert "needed" checks stay accurate. Async: never block the // worked-index so alert "needed" checks stay accurate. Async: never block the
// mutation, and it's a single lightweight query. // mutation, and it's a single lightweight query.
@@ -6067,6 +6127,31 @@ func (a *App) bulkSetFrequency(ids []int64, value string) (int64, error) {
return n, nil return n, nil
} }
// GetWorkedCallVariants reports whether "worked before" folds an operator's
// portable forms together (RK3DWA ↔ RK3DWA/3 ↔ RK3DWA/P).
//
// Defaults to ON, hence the inverted storage: an install that predates the
// setting has no key at all, and reading that as OFF would leave every existing
// operator with the old narrow behaviour they asked us to change.
func (a *App) GetWorkedCallVariants() (bool, error) {
if a.settings == nil {
return true, fmt.Errorf("db not initialized")
}
v, err := a.settings.Get(a.ctx, keyWorkedCallVariants)
if err != nil {
return true, err
}
return v != "0", nil
}
// SetWorkedCallVariants persists the toggle.
func (a *App) SetWorkedCallVariants(on bool) error {
if a.settings == nil {
return fmt.Errorf("db not initialized")
}
return a.settings.Set(a.ctx, keyWorkedCallVariants, boolStr(on))
}
// WorkedBefore returns prior contacts with the given callsign at both // WorkedBefore returns prior contacts with the given callsign at both
// call and DXCC granularity. Pass dxccHint=0 when unknown — the function // call and DXCC granularity. Pass dxccHint=0 when unknown — the function
// will infer it from past QSOs with the same call when possible. // will infer it from past QSOs with the same call when possible.
@@ -6083,7 +6168,8 @@ func (a *App) WorkedBefore(callsign string, dxccHint int) (qso.WorkedBefore, err
dxccHint = dxcc.EntityDXCC(m.Entity.Name) dxccHint = dxcc.EntityDXCC(m.Entity.Name)
} }
} }
wb, err := a.qso.WorkedBefore(a.ctx, callsign, dxccHint) variants, _ := a.GetWorkedCallVariants()
wb, err := a.qso.WorkedBefore(a.ctx, callsign, dxccHint, variants)
// Attach the ClubLog Most Wanted rank for this entity (opt-in) so the entry // Attach the ClubLog Most Wanted rank for this entity (opt-in) so the entry
// matrix can show it next to the country name. // matrix can show it next to the country name.
if err == nil && wb.DXCC > 0 && a.clublogMW != nil && a.clublogMostWantedEnabled() { if err == nil && wb.DXCC > 0 && a.clublogMW != nil && a.clublogMostWantedEnabled() {
@@ -7775,6 +7861,11 @@ func (a *App) noteWorked(call, band, mode string) {
} }
a.wcbm[wcbmKey(call, band, mode)] = struct{}{} a.wcbm[wcbmKey(call, band, mode)] = struct{}{}
a.wcbmMu.Unlock() a.wcbmMu.Unlock()
// The cluster worked-index snapshot is now stale (this call/slot just became
// worked) — drop it so the next spot batch recolours with the new QSO.
a.clusterStatusMu.Lock()
a.clusterStatusIdx = nil
a.clusterStatusMu.Unlock()
} }
// isWorkedBandMode reports whether this exact call+band+mode is in the log, // isWorkedBandMode reports whether this exact call+band+mode is in the log,
@@ -11563,6 +11654,13 @@ func (a *App) LogUDPLoggedADIF(adifText string) (int64, error) {
a.extsvc.OnQSOLogged(id) a.extsvc.OnQSOLogged(id)
} }
a.maybeAutoSendEQSL(qc) a.maybeAutoSendEQSL(qc)
a.maybeSelfSpot(qc)
// Forward to the outbound UDP integrations, exactly like the manual log
// path — otherwise a QSO logged FROM WSJT-X/JTDX/MSHV was never re-emitted
// to the outbound ADIF listeners (Log4OM, N1MM, gridtracker…).
if a.udp != nil {
a.udp.EmitLoggedADIF(adif.SingleRecordADIF(qc))
}
if a.ctx != nil { if a.ctx != nil {
wruntime.EventsEmit(a.ctx, "qso:logged", id) // refresh again so award_refs show wruntime.EventsEmit(a.ctx, "qso:logged", id) // refresh again so award_refs show
} }
@@ -11757,6 +11855,8 @@ type BackupSettings struct {
Folder string `json:"folder"` Folder string `json:"folder"`
Rotation int `json:"rotation"` Rotation int `json:"rotation"`
Zip bool `json:"zip"` Zip bool `json:"zip"`
EveryExit bool `json:"every_exit"` // back up on every quit, not just the first of the day
KeepAll bool `json:"keep_all"` // time-stamped file per backup instead of one-per-day (kept up to Rotation)
LastBackupAt string `json:"last_backup_at"` LastBackupAt string `json:"last_backup_at"`
DefaultFolder string `json:"default_folder"` // computed, read-only — shown as a hint DefaultFolder string `json:"default_folder"` // computed, read-only — shown as a hint
} }
@@ -11771,7 +11871,7 @@ func (a *App) GetBackupSettings() (BackupSettings, error) {
return out, nil return out, nil
} }
m, err := a.settings.GetMany(a.ctx, m, err := a.settings.GetMany(a.ctx,
keyBackupEnabled, keyBackupFolder, keyBackupRotation, keyBackupZip, keyBackupLast) keyBackupEnabled, keyBackupFolder, keyBackupRotation, keyBackupZip, keyBackupEveryExit, keyBackupKeepAll, keyBackupLast)
if err != nil { if err != nil {
return out, err return out, err
} }
@@ -11781,6 +11881,8 @@ func (a *App) GetBackupSettings() (BackupSettings, error) {
out.Rotation = n out.Rotation = n
} }
out.Zip = m[keyBackupZip] == "1" out.Zip = m[keyBackupZip] == "1"
out.EveryExit = m[keyBackupEveryExit] == "1"
out.KeepAll = m[keyBackupKeepAll] == "1"
out.LastBackupAt = m[keyBackupLast] out.LastBackupAt = m[keyBackupLast]
return out, nil return out, nil
} }
@@ -11807,6 +11909,8 @@ func (a *App) SaveBackupSettings(s BackupSettings) error {
keyBackupFolder: strings.TrimSpace(s.Folder), keyBackupFolder: strings.TrimSpace(s.Folder),
keyBackupRotation: strconv.Itoa(s.Rotation), keyBackupRotation: strconv.Itoa(s.Rotation),
keyBackupZip: doZip, keyBackupZip: doZip,
keyBackupEveryExit: boolStr(s.EveryExit),
keyBackupKeepAll: boolStr(s.KeepAll),
} { } {
if err := a.settings.Set(a.ctx, k, v); err != nil { if err := a.settings.Set(a.ctx, k, v); err != nil {
return err return err
@@ -11815,6 +11919,33 @@ func (a *App) SaveBackupSettings(s BackupSettings) error {
return nil return nil
} }
// runConfiguredBackup writes the backup set to folder: the CONTACTS as the
// primary "opslog-*" backup, plus a separate "opslogcfg-*" snapshot of the
// settings/config db, so neither is lost. The contacts are what the user means
// by "the log": on SQLite they live in the split-out logbook file (a.logDbPath),
// NOT the settings db — the old code snapshotted a.db and so silently stopped
// backing up the QSOs once the logbook was split out. On MySQL the contacts
// aren't in a local file, so they're exported to ADIF instead. Returns the path
// of the contacts backup.
func (a *App) runConfiguredBackup(folder string, rotation int, zip, unique bool) (string, error) {
// Config snapshot (profiles, hardware, awards). Best-effort — a config-backup
// failure must never stop the contacts from being protected.
if _, err := backup.Run(a.ctx, a.db, a.dbPath, folder, rotation, zip, "opslogcfg", unique); err != nil {
applog.Printf("backup: config snapshot failed: %v", err)
}
if a.dbBackend == "mysql" {
// The live log is on MySQL; VACUUM INTO can't reach it — export to ADIF.
return a.backupLogADIF(folder, rotation, zip, unique)
}
// SQLite: snapshot the logbook file that holds the contacts. Fall back to the
// settings db only when it doubles as the logbook (rare split-failure case).
conn, path := a.logDb, a.logDbPath
if conn == nil || path == "" {
conn, path = a.db, a.dbPath
}
return backup.Run(a.ctx, conn, path, folder, rotation, zip, "opslog", unique)
}
// RunBackupNow forces an immediate backup using the persisted settings. // RunBackupNow forces an immediate backup using the persisted settings.
// Returns the destination path of the file that was written. // Returns the destination path of the file that was written.
func (a *App) RunBackupNow() (string, error) { func (a *App) RunBackupNow() (string, error) {
@@ -11826,20 +11957,10 @@ func (a *App) RunBackupNow() (string, error) {
if folder == "" { if folder == "" {
folder = s.DefaultFolder folder = s.DefaultFolder
} }
// Always snapshot the local SQLite (config + any pre-MySQL local QSOs). path, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip, s.KeepAll)
path, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip)
if err != nil { if err != nil {
return path, err return path, err
} }
// On MySQL the live QSO log isn't in the local DB — export it to ADIF so the
// contacts are actually protected. The ADIF path is the one we surface.
if a.dbBackend == "mysql" {
adiPath, aerr := a.backupLogADIF(folder, s.Rotation, s.Zip)
if aerr != nil {
return adiPath, aerr
}
path = adiPath
}
a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339)) a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339))
return path, nil return path, nil
} }
@@ -11847,11 +11968,11 @@ func (a *App) RunBackupNow() (string, error) {
// backupLogADIF writes a rotating ADIF export of the (MySQL) logbook into the // backupLogADIF writes a rotating ADIF export of the (MySQL) logbook into the
// backup folder. The full set of ADIF + app fields is included so the backup is // backup folder. The full set of ADIF + app fields is included so the backup is
// a complete, re-importable copy of the log. // a complete, re-importable copy of the log.
func (a *App) backupLogADIF(folder string, rotation int, zip bool) (string, error) { func (a *App) backupLogADIF(folder string, rotation int, zip, unique bool) (string, error) {
if a.qso == nil { if a.qso == nil {
return "", fmt.Errorf("logbook not initialized") return "", fmt.Errorf("logbook not initialized")
} }
return backup.RunADIF(folder, rotation, zip, func(p string) error { return backup.RunADIF(folder, rotation, zip, unique, func(p string) error {
ex := &adif.Exporter{Repo: a.qso, AppName: "OpsLog", AppVersion: "0.1", IncludeAppFields: true} ex := &adif.Exporter{Repo: a.qso, AppName: "OpsLog", AppVersion: "0.1", IncludeAppFields: true}
_, e := ex.ExportFile(a.ctx, p) _, e := ex.ExportFile(a.ctx, p)
return e return e
@@ -11882,19 +12003,13 @@ func (a *App) maybeShutdownBackup() {
if mysql { if mysql {
done = backup.HasADIFBackupToday(folder) done = backup.HasADIFBackupToday(folder)
} }
if done { if done && !s.EveryExit { // "every exit" backs up regardless of a prior backup today
return return
} }
if _, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip); err != nil { if _, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip, s.KeepAll); err != nil {
fmt.Println("OpsLog: shutdown backup failed:", err) fmt.Println("OpsLog: shutdown backup failed:", err)
return return
} }
if mysql {
if _, err := a.backupLogADIF(folder, s.Rotation, s.Zip); err != nil {
fmt.Println("OpsLog: shutdown ADIF log backup failed:", err)
return
}
}
a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339)) a.setSetting(keyBackupLast, time.Now().UTC().Format(time.RFC3339))
} }
@@ -13096,6 +13211,21 @@ func (a *App) reloadCAT() {
kw.SetDataMode(s.KenwoodDataMode) kw.SetDataMode(s.KenwoodDataMode)
a.cat.Start(kw) a.cat.Start(kw)
} }
case "elecraft":
// Elecraft K3/K4: the Kenwood-dialect client with the Elecraft specifics on
// (digital modes → DATA A via MD6+DT0). Reuses the Kenwood port/baud/host
// settings — the K3 emulates the Kenwood command set, so a separate transport
// would be a near-total duplicate.
if h := strings.TrimSpace(s.KenwoodHost); h != "" {
kw := cat.NewKenwoodTCP(h, s.DigitalDefault)
kw.SetElecraft(true)
a.cat.Start(kw)
} else {
kw := cat.NewKenwood(s.KenwoodPort, s.KenwoodBaud, s.DigitalDefault)
kw.SetLowerLines(s.KenwoodLowLines)
kw.SetElecraft(true)
a.cat.Start(kw)
}
case "icom": case "icom":
// Native Icom CI-V over the radio's USB serial port (local control). // Native Icom CI-V over the radio's USB serial port (local control).
// Same civ protocol the network backend reuses for remote. // Same civ protocol the network backend reuses for remote.
@@ -15931,6 +16061,128 @@ func (a *App) GetClusterAutoConnect() (bool, error) {
return a.clusterAutoConnect() return a.clusterAutoConnect()
} }
// ── Self-spot ─────────────────────────────────────────────────────────────
// selfSpotMinMinutes is the shortest gap OpsLog will announce itself at.
//
// A self-spot is traffic every user of the node sees, so the floor is a
// courtesy rule, not a preference: at one spot per QSO a run would flood the
// cluster within minutes and get the station filtered out — which is worse for
// the operator than not spotting at all. Five minutes is the interval the
// DX-cluster etiquette guides give.
const selfSpotMinMinutes = 5
// selfSpotSameRunHz is how far the frequency may drift and still count as the
// same run. A run creeps a few hundred Hz as the operator nudges the VFO, and
// re-announcing on every nudge is exactly the flood the gap exists to prevent.
// Move further than this and it IS a new frequency, which is announced at once.
const selfSpotSameRunHz = 500
// SelfSpotSettings configures announcing the station on the DX cluster as it
// logs, so callers can find it without anyone else having to spot it.
type SelfSpotSettings struct {
Enabled bool `json:"enabled"`
Minutes int `json:"minutes"` // shortest gap between two self-spots
}
// GetSelfSpotSettings reads the self-spot configuration.
func (a *App) GetSelfSpotSettings() (SelfSpotSettings, error) {
out := SelfSpotSettings{Minutes: selfSpotMinMinutes}
if a.settings == nil {
return out, fmt.Errorf("db not initialized")
}
m, err := a.settings.GetMany(a.ctx, keyClusterSelfSpot, keyClusterSelfSpotMin)
if err != nil {
return out, err
}
out.Enabled = m[keyClusterSelfSpot] == "1"
if n, _ := strconv.Atoi(m[keyClusterSelfSpotMin]); n >= selfSpotMinMinutes {
out.Minutes = n
}
return out, nil
}
// SaveSelfSpotSettings persists it. The minimum gap is clamped here as well as
// in the UI: the floor protects the node from us, so it must not depend on a
// frontend that could be bypassed or carry a stale value.
func (a *App) SaveSelfSpotSettings(s SelfSpotSettings) error {
if a.settings == nil {
return fmt.Errorf("db not initialized")
}
if s.Minutes < selfSpotMinMinutes {
s.Minutes = selfSpotMinMinutes
}
if err := a.settings.Set(a.ctx, keyClusterSelfSpot, boolStr(s.Enabled)); err != nil {
return err
}
return a.settings.Set(a.ctx, keyClusterSelfSpotMin, strconv.Itoa(s.Minutes))
}
// maybeSelfSpot announces the station on the master cluster after a QSO, so a
// run is findable without waiting for someone else to spot it.
//
// The DX call and the spotter are both us: the node fills the "DE" from the
// login, and the QSO's own station callsign is the DX — which is the right
// source, not the profile, because that is the call the contact was made under.
//
// Fires on the FIRST QSO of a frequency, then at most once per configured gap.
// Called from both log paths (manual entry and UDP auto-log), off the critical
// path — a cluster that is slow or down must never hold up logging.
func (a *App) maybeSelfSpot(q qso.QSO) {
cfg, err := a.GetSelfSpotSettings()
if err != nil || !cfg.Enabled {
return
}
call := strings.ToUpper(strings.TrimSpace(q.StationCallsign))
if call == "" {
return
}
// The QSO's frequency, not the rig's: by the time this runs the operator may
// already have tuned away, and a spot has to say where the contact happened.
var hz int64
if q.FreqHz != nil {
hz = *q.FreqHz
}
if hz <= 0 && a.cat != nil {
hz = a.cat.State().FreqHz // no frequency on the QSO (paper-style entry) — fall back to CAT
}
if hz <= 0 {
return
}
a.selfSpotMu.Lock()
sameRun := a.selfSpotHz != 0 && absInt64(hz-a.selfSpotHz) <= selfSpotSameRunHz
if sameRun && time.Since(a.selfSpotAt) < time.Duration(cfg.Minutes)*time.Minute {
a.selfSpotMu.Unlock()
return
}
prevAt, prevHz := a.selfSpotAt, a.selfSpotHz
// Claim the slot BEFORE sending: the two log paths can run concurrently and
// would otherwise both pass the check and spot twice.
a.selfSpotAt, a.selfSpotHz = time.Now(), hz
a.selfSpotMu.Unlock()
khz := math.Round(float64(hz)/100) / 10 // 0.1 kHz — the resolution a cluster keeps
if err := a.SendClusterSpot(call, khz, strings.ToUpper(strings.TrimSpace(q.Mode))); err != nil {
// Not sent (no enabled server, node not connected). Restore the previous
// state so the NEXT QSO tries again, instead of sitting out a gap that
// never produced a spot.
a.selfSpotMu.Lock()
a.selfSpotAt, a.selfSpotHz = prevAt, prevHz
a.selfSpotMu.Unlock()
applog.Printf("cluster: self-spot %s on %.1f kHz failed: %v", call, khz, err)
return
}
applog.Printf("cluster: self-spot %s on %.1f kHz sent", call, khz)
}
func absInt64(n int64) int64 {
if n < 0 {
return -n
}
return n
}
// ConnectClusterServer opens a session for one specific saved server. // ConnectClusterServer opens a session for one specific saved server.
func (a *App) ConnectClusterServer(id int64) error { func (a *App) ConnectClusterServer(id int64) error {
if a.cluster == nil { if a.cluster == nil {
@@ -16075,18 +16327,46 @@ type SpotStatus struct {
Pfx string `json:"pfx,omitempty"` Pfx string `json:"pfx,omitempty"`
} }
// ClusterSpotStatuses takes a batch of spots and returns slot status for // clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
// each. Used by the Cluster tab to color rows (NEW / NEW BAND / NEW SLOT // spots against. Rebuilding them per spot batch re-scanned the entire logbook
// / WORKED). One cty.dat lookup + one DB scan, regardless of batch size. // ~20×/second under an RBN firehose — the dominant CPU cost on a large log. This
// // is an immutable snapshot: once built its maps are never mutated, so a batch
// Mode handling: when the caller passes an empty Mode (cluster comment // that already holds the pointer keeps reading valid (stale-by-one-log) data
// was ambiguous and the frontend couldn't infer) we degrade gracefully // while a newer snapshot is being built. See clusterStatusMaps.
// to band-only — saying "worked" rather than wrongly flagging "new-slot" type clusterStatusCache struct {
// just because we don't know the mode. entities map[int]*qso.EntitySlot
func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus { workedCalls map[string]struct{}
out := make([]SpotStatus, len(spots)) workedCallSlots map[string]struct{} // nil unless the "same slot" option is on
workedCounties map[string]struct{}
workedPOTA map[string]struct{}
workedPfx map[string]struct{}
normMode func(string) string // nil unless digital-mode grouping is on
groupDigital bool // settings the maps were built under —
sameSlot bool // a change rebuilds the snapshot
}
// clusterStatusMaps returns the cached worked-index snapshot, building it once
// per logbook change (invalidated by invalidateAwardStats) or when a setting
// that shapes the maps flips. This turns the per-batch full-logbook scans into
// one scan per logged QSO — the fix for the RBN-firehose CPU pegging.
func (a *App) clusterStatusMaps() *clusterStatusCache {
groupDigital := a.groupDigitalSlots()
sameSlot := a.clusterWorkedSameSlot()
a.clusterStatusMu.Lock()
defer a.clusterStatusMu.Unlock()
if c := a.clusterStatusIdx; c != nil && c.groupDigital == groupDigital && c.sameSlot == sameSlot {
return c
}
c := &clusterStatusCache{groupDigital: groupDigital, sameSlot: sameSlot}
if a.qso == nil { if a.qso == nil {
return out a.clusterStatusIdx = c
return c
}
// Optional digital-mode grouping (Settings → General): with it on, FT8/FT4/
// RTTY… all count as ONE "DIG" mode, so an FT4 spot on a band where FT8 was
// worked shows "worked", not "new-slot" — DXCC-style mode classes.
if groupDigital {
c.normMode = qso.GroupDigitalMode
} }
// Compare by DXCC entity NUMBER, not name. For each logged QSO the key is // Compare by DXCC entity NUMBER, not name. For each logged QSO the key is
// its stored DXCC if present (the authoritative value set at log time, incl. // its stored DXCC if present (the authoritative value set at log time, incl.
@@ -16109,43 +16389,58 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
} }
return 0 return 0
} }
// Optional digital-mode grouping (Settings → General): with it on, FT8/FT4/ c.entities, _ = a.qso.EntitySlotMap(a.ctx, keyFor, c.normMode)
// RTTY… all count as ONE "DIG" mode, so an FT4 spot on a band where FT8 was
// worked shows "worked", not "new-slot" — DXCC-style mode classes.
var normMode func(string) string
if a.groupDigitalSlots() {
normMode = qso.GroupDigitalMode
}
entities, err := a.qso.EntitySlotMap(a.ctx, keyFor, normMode)
if err != nil {
return out
}
// Per-call worked set — separate from the entity check so we can flag // Per-call worked set — separate from the entity check so we can flag
// "I've already QSO'd this exact station" even when the band/mode // "I've already QSO'd this exact station" even when the band/mode
// makes the entity check say "new-band" or "new-slot". // makes the entity check say "new-band" or "new-slot".
workedCalls, _ := a.qso.WorkedCallsigns(a.ctx) c.workedCalls, _ = a.qso.WorkedCallsigns(a.ctx)
// "Already worked only on the same slot" option (Settings → DX Cluster): the // "Already worked only on the same slot" option (Settings → DX Cluster): the
// WORKED-call flag then needs the SAME band and mode (digital-grouped through // WORKED-call flag then needs the SAME band and mode (digital-grouped through
// the same normMode when that option is on) rather than the call anywhere. // the same normMode when that option is on) rather than the call anywhere.
sameSlot := a.clusterWorkedSameSlot()
var workedCallSlots map[string]struct{}
if sameSlot { if sameSlot {
workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, normMode) c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
} }
// Orthogonal dimensions: worked US counties (for the ULS callsign→county // Orthogonal dimensions: worked US counties (for the ULS callsign→county
// lookup) and worked POTA parks. Both built once per batch. // lookup) and worked POTA parks.
workedCounties, _ := a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey) c.workedCounties, _ = a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey)
workedPOTA, _ := a.qso.WorkedPOTARefs(a.ctx) c.workedPOTA, _ = a.qso.WorkedPOTARefs(a.ctx)
// Worked WPX prefixes, derived from the callsigns we already loaded — no // Worked WPX prefixes, derived from the callsigns we already loaded — no
// extra query. Derived rather than read from the stored PFX column: that // extra query. Derived rather than read from the stored PFX column: that
// column is only filled when an import supplied it, and deriving keeps this // column is only filled when an import supplied it, and deriving keeps this
// in step with the WPX award, which does the same thing. // in step with the WPX award, which does the same thing.
workedPfx := make(map[string]struct{}, len(workedCalls)) c.workedPfx = make(map[string]struct{}, len(c.workedCalls))
for c := range workedCalls { for call := range c.workedCalls {
if p := award.WPXPrefix(c); p != "" { if p := award.WPXPrefix(call); p != "" {
workedPfx[p] = struct{}{} c.workedPfx[p] = struct{}{}
} }
} }
a.clusterStatusIdx = c
return c
}
// ClusterSpotStatuses takes a batch of spots and returns slot status for
// each. Used by the Cluster tab to color rows (NEW / NEW BAND / NEW SLOT
// / WORKED). Reads the cached worked-index snapshot (clusterStatusMaps) so a
// spot batch never re-scans the logbook — critical under an RBN firehose.
//
// Mode handling: when the caller passes an empty Mode (cluster comment
// was ambiguous and the frontend couldn't infer) we degrade gracefully
// to band-only — saying "worked" rather than wrongly flagging "new-slot"
// just because we don't know the mode.
func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
out := make([]SpotStatus, len(spots))
if a.qso == nil {
return out
}
idx := a.clusterStatusMaps()
entities := idx.entities
workedCalls := idx.workedCalls
workedCallSlots := idx.workedCallSlots
workedCounties := idx.workedCounties
workedPOTA := idx.workedPOTA
workedPfx := idx.workedPfx
normMode := idx.normMode
sameSlot := idx.sameSlot
for i, q := range spots { for i, q := range spots {
out[i] = SpotStatus{ out[i] = SpotStatus{
Call: q.Call, Call: q.Call,
+54 -4
View File
@@ -32,12 +32,19 @@ const (
keyQSLEmailSubject = "qsl.email_subject" keyQSLEmailSubject = "qsl.email_subject"
keyQSLEmailBody = "qsl.email_body" keyQSLEmailBody = "qsl.email_body"
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
keyQSLDefaultMsg = "qsl.default_message" // fallback QSL message printed on the card when the QSO's own QSLMSG is empty
) )
// appQSLCardSentField is the ADIF APP_ field stamping when OpsLog e-mailed its // 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). // own QSL card. Deliberately NOT eqsl_sent (that's eQSL.cc's, kept independent).
const appQSLCardSentField = "APP_OPSLOG_QSL_SENT" const appQSLCardSentField = "APP_OPSLOG_QSL_SENT"
// appQSLCardRcvdField marks that a QSL was RECEIVED for this QSO (set by the
// operator, e.g. when a card arrives by e-mail). It drives the PSE/TNX stamp on
// the card: received → "TNX QSL" (thanks for your card), not received → "PSE QSL"
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
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}"
@@ -453,11 +460,37 @@ func (a *App) SendEQSL(qsoID int64, templateID int64, jpegB64 string) error {
return nil return nil
} }
// QSLEmailTemplates is the eQSL e-mail subject/body plus the auto-send toggle. // qslDefaultMessage returns the operator's default QSL message (Settings), used
// on the card when a QSO has no QSLMSG of its own.
func (a *App) qslDefaultMessage() string {
if a.settings == nil {
return ""
}
s, _ := a.settings.Get(a.ctx, keyQSLDefaultMsg)
return s
}
// SetOpsLogQSLReceived marks (or clears) that a QSL was received for a QSO. This
// flips the card's PSE/TNX stamp. Stored as a timestamp in the QSO extras (a
// single-key UPDATE, like the sent marker) so it survives concurrent uploads.
func (a *App) SetOpsLogQSLReceived(qsoID int64, on bool) error {
if a.qso == nil {
return fmt.Errorf("db not initialized")
}
v := ""
if on {
v = time.Now().UTC().Format(time.RFC3339)
}
return a.qso.SetExtra(a.ctx, qsoID, appQSLCardRcvdField, v)
}
// QSLEmailTemplates is the eQSL e-mail subject/body, the auto-send toggle, and
// the default QSL message printed on the card when a QSO has none of its own.
type QSLEmailTemplates struct { type QSLEmailTemplates struct {
Subject string `json:"subject"` Subject string `json:"subject"`
Body string `json:"body"` Body string `json:"body"`
AutoSend bool `json:"auto_send"` AutoSend bool `json:"auto_send"`
DefaultMessage string `json:"default_message"`
} }
// QSLGetEmailTemplates returns the eQSL e-mail templates (with defaults). // QSLGetEmailTemplates returns the eQSL e-mail templates (with defaults).
@@ -466,7 +499,7 @@ func (a *App) QSLGetEmailTemplates() (QSLEmailTemplates, error) {
if a.settings == nil { if a.settings == nil {
return out, nil return out, nil
} }
m, err := a.settings.GetMany(a.ctx, keyQSLEmailSubject, keyQSLEmailBody, keyQSLAutoSend) m, err := a.settings.GetMany(a.ctx, keyQSLEmailSubject, keyQSLEmailBody, keyQSLAutoSend, keyQSLDefaultMsg)
if err != nil { if err != nil {
return out, err return out, err
} }
@@ -477,6 +510,7 @@ func (a *App) QSLGetEmailTemplates() (QSLEmailTemplates, error) {
out.Body = b out.Body = b
} }
out.AutoSend = m[keyQSLAutoSend] == "1" out.AutoSend = m[keyQSLAutoSend] == "1"
out.DefaultMessage = m[keyQSLDefaultMsg]
return out, nil return out, nil
} }
@@ -495,7 +529,10 @@ func (a *App) QSLSaveEmailTemplates(t QSLEmailTemplates) error {
if t.AutoSend { if t.AutoSend {
v = "1" v = "1"
} }
return a.settings.Set(a.ctx, keyQSLAutoSend, v) if err := a.settings.Set(a.ctx, keyQSLAutoSend, v); err != nil {
return err
}
return a.settings.Set(a.ctx, keyQSLDefaultMsg, t.DefaultMessage)
} }
// maybeAutoSendEQSL fires an eQSL render+send for a freshly-logged QSO when the // maybeAutoSendEQSL fires an eQSL render+send for a freshly-logged QSO when the
@@ -634,6 +671,18 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
} }
return strconv.Itoa(z) return strconv.Itoa(z)
} }
// The QSL message on the card: the QSO's own QSLMSG wins; when it's empty the
// operator's default message (Settings) is used instead.
msg := q.QSLMsg
if strings.TrimSpace(msg) == "" {
msg = a.qslDefaultMessage()
}
// PSE/TNX stamp, chosen automatically by whether a QSL was received for this
// QSO (appQSLCardRcvdField): received → thank them, otherwise ask for a card.
pseTnx := "PSE QSL"
if q.Extras != nil && strings.TrimSpace(q.Extras[appQSLCardRcvdField]) != "" {
pseTnx = "TNX QSL"
}
vars := map[string]string{ vars := map[string]string{
"profile.callsign": info.Callsign, "profile.callsign": info.Callsign,
"profile.operator_name": info.Operator, "profile.operator_name": info.Operator,
@@ -650,7 +699,8 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
"qso.mode": q.Mode, "qso.mode": q.Mode,
"qso.submode": q.Submode, "qso.submode": q.Submode,
"qso.rst_sent": q.RSTSent, "qso.rst_sent": q.RSTSent,
"qso.qsl_msg": q.QSLMsg, "qso.qsl_msg": msg,
"qso.pse_tnx": pseTnx,
"qso.name": q.Name, "qso.name": q.Name,
} }
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q) vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
+78
View File
@@ -1,4 +1,82 @@
[ [
{
"version": "0.24.0",
"date": "",
"en": [
"Worked before: an operator's portable callsigns now count as the same station. Typing RK3DWA finds the RK3DWA/3, /P and /MM contacts too, and the other way round — before, the history only appeared if you typed the exact form. Can be turned off in Settings → General; contest dupe checking is unaffected and stays exact.",
"QSO editor: the OpsLog card now appears with the other confirmations. It has its own Sent / Received row in the QSL Info table, next to QSL, LoTW, eQSL and the rest, and the \"QSL received\" tick moved there from Contact's details — with its PSE QSL / TNX indicator, which is unchanged. Sent stays read-only: OpsLog stamps it when the card actually goes out.",
"QSL card: the {qso.pse_tnx} stamp now prints \"TNX QSL\" instead of just \"TNX\", to read as the counterpart of \"PSE QSL\".",
"Four new themes, with real colour this time: Indigo (deep blue-violet, electric accent), Ocean (deep teal, cyan), Plum (aubergine, magenta) and Nordic light (crisp cool white, indigo). The seven existing ones were all neutral — beige, slate, graphite, black — with an orange accent, so picking a theme only ever changed the shade of grey. Each new one colours the surfaces, not just the accent, and takes its own primary. The status colours stay exactly where they were: red still means a problem.",
"Awards: the Prefix now completes a reference the operator typed without it. A station that puts just \"74\" in State counts for DDFM (codes D01…D95) with match-by \"code\" and Prefix \"D\" — before, that found nothing and the only way through was to write a regex, in a mode where you had chosen \"code\" and not \"pattern\". The prefix was applied after the reference lookup, that is, after the step that had already failed. A field that already holds the whole code is no longer prefixed twice either (\"D74\" used to become \"DD74\" as soon as a prefix was set).",
"UDP: WSJT-X traffic arriving through a relay is read again. A forwarder such as W&P prepends the origin as text — \"127.0.0.1:2237|\" — in front of the packet it re-broadcasts, which pushed the WSJT-X signature 15 bytes in and made every datagram fail. That header is now skipped, so MSHV / WSJT-X / JTDX behind a relay work on the ordinary \"WSJT-X / JTDX / MSHV\" service: no new setting, nothing to reconfigure.",
"UDP: an unreadable packet now says who sent it and what it contained — the sender's address, the size, a text preview and a hex dump — instead of just a magic number. And it stops after five: a port receiving the wrong traffic was writing that line a hundred times a second, filling the log and burying everything else. A closing line points at the two things to check, the sender and the service type.",
"Awards: the QRZ.com and Custom confirmation sources actually work now. Both were offered in the award editor but neither was implemented, so ticking one marked no QSO as confirmed — silently. QRZ.com reads the download status (them confirming back, not our upload). Custom reads any QSO field or ADIF tag you name, with an optional list of values that count: point it at APP_OPSLOG_QSL_RCVD for a card received through OpsLog, or at a tag stamped by a club list you imported. Leave the value empty and any non-empty content confirms. A Custom source naming no field confirms nothing.",
"Window: closing OpsLog while it is minimised no longer loses its size and position. Windows parks a minimised window at -32000,-32000 with a stub size, and that was what got saved — so the next launch found geometry no screen could hold, discarded it, and reopened at the default place. The stored geometry is now kept instead; it repairs itself the first time you close a window that is on screen."
],
"fr": [
"Déjà contacté : les indicatifs portables d'un opérateur comptent désormais comme la même station. Taper RK3DWA retrouve aussi les QSO en RK3DWA/3, /P et /MM, et inversement — avant, l'historique n'apparaissait que si tu tapais la forme exacte. Désactivable dans Réglages → Général ; le contrôle de doublon en concours n'est pas touché et reste strict.",
"Éditeur de QSO : la carte OpsLog rejoint les autres confirmations. Elle a sa propre ligne Envoyée / Reçue dans le tableau de l'onglet QSL Info, à côté de QSL, LoTW, eQSL et les autres, et la case « QSL reçue » y a été déplacée depuis Détails du contact — avec son indicateur PSE QSL / TNX, inchangé. « Envoyée » reste en lecture seule : OpsLog l'inscrit quand la carte part réellement.",
"Carte QSL : le tampon {qso.pse_tnx} imprime désormais « TNX QSL » et non plus « TNX » seul, pour répondre à « PSE QSL ».",
"Quatre nouveaux thèmes, avec de la vraie couleur cette fois : Indigo (bleu-violet profond, accent électrique), Océan (turquoise profond, cyan), Prune (aubergine, magenta) et Clair nordique (blanc froid net, indigo). Les sept existants étaient tous neutres — beige, ardoise, graphite, noir — avec un accent orange : choisir un thème ne changeait que la nuance de gris. Les nouveaux colorent les surfaces, pas seulement l'accent, et ont chacun leur couleur principale. Les couleurs de statut ne bougent pas : le rouge veut toujours dire un problème.",
"Diplômes : le Préfixe complète désormais une référence saisie sans lui. Une station qui met simplement « 74 » dans State compte pour le DDFM (codes D01…D95) avec correspondance « code » et Préfixe « D » — avant, cela ne trouvait rien et le seul recours était d'écrire une regex, dans un mode où tu avais justement choisi « code » et pas « pattern ». Le préfixe était appliqué après la recherche de la référence, c'est-à-dire après l'étape qui venait d'échouer. Un champ contenant déjà le code complet n'est plus préfixé deux fois non plus (« D74 » devenait « DD74 » dès qu'un préfixe était réglé).",
"UDP : le trafic WSJT-X qui arrive via un relais est de nouveau lu. Un réexpéditeur comme W&P place l'origine en texte — « 127.0.0.1:2237| » — devant le paquet qu'il rediffuse, ce qui décalait la signature WSJT-X de 15 octets et faisait échouer chaque datagramme. Cet en-tête est désormais ignoré : MSHV / WSJT-X / JTDX derrière un relais fonctionnent avec le service « WSJT-X / JTDX / MSHV » habituel, sans nouveau réglage ni reconfiguration.",
"UDP : un paquet illisible indique désormais qui l'a envoyé et ce qu'il contenait — adresse de l'émetteur, taille, aperçu en texte et vidage hexadécimal — au lieu d'un simple nombre magique. Et il s'arrête après cinq : un port recevant le mauvais trafic écrivait cette ligne cent fois par seconde, saturant le journal et enterrant tout le reste. Une ligne finale rappelle les deux choses à vérifier, l'émetteur et le type de service.",
"Diplômes : les sources de confirmation QRZ.com et Custom fonctionnent enfin. Les deux étaient proposées dans l'éditeur de diplômes sans être implémentées : cocher l'une ou l'autre ne confirmait aucun QSO, en silence. QRZ.com lit le statut de téléchargement (leur confirmation en retour, pas notre envoi). Custom lit n'importe quel champ de QSO ou balise ADIF que tu désignes, avec une liste facultative de valeurs qui comptent : pointe-la sur APP_OPSLOG_QSL_RCVD pour une carte reçue via OpsLog, ou sur une balise inscrite à l'import d'une liste de club. Laisse la valeur vide et tout contenu non vide confirme. Une source Custom sans champ ne confirme rien.",
"Fenêtre : fermer OpsLog alors qu'il est réduit ne fait plus perdre sa taille et sa position. Windows range une fenêtre réduite en -32000,-32000 avec une taille factice, et c'est cela qui était enregistré — au lancement suivant, OpsLog trouvait une géométrie qu'aucun écran ne peut contenir, la rejetait et rouvrait à l'emplacement par défaut. La géométrie déjà enregistrée est désormais conservée ; cela se répare tout seul à la première fermeture d'une fenêtre visible à l'écran."
]
},
{
"version": "0.23.9",
"date": "",
"en": [
"Backup: new \"Back up on every exit\" option (Settings → Backup). With it on, OpsLog backs up the database each time you quit instead of only the first time of the day — so a second session's QSOs are always captured.",
"Cluster details (My station): removed the example placeholders in My rig / My antenna (and the satellite name/mode) — they looked like real values, so an empty field read as already filled.",
"QSL: new \"OpsLog QSL received\" marker on the QSO edit window (next to QSL Message), with a live PSE QSL / TNX indicator. When a QSL was received the card prints TNX (thanks), otherwise PSE QSL (please send one) — automatic. The stamp uses the {qso.pse_tnx} token (in the default card footer; placeable anywhere in the designer). A \"QSL received\" column was added to Recent QSOs.",
"QSL: a default QSL message (Settings → E-mail, under the QSL card e-mail) now prints on the card when a QSO has no QSL Message of its own — a QSO's own QSL Message always takes precedence.",
"UDP outbound: a QSO logged from WSJT-X / JTDX / MSHV (via the inbound UDP listener) is now forwarded to the outbound ADIF integrations too — previously only QSOs typed directly into OpsLog were re-emitted.",
"Backup: with \"back up on every exit\", a new \"Keep every backup\" sub-option writes a distinct time-stamped file per exit (opslog-YYYY-MM-DD-HHMMSS.db) instead of overwriting the day's file. Rotation still keeps the newest N — raise it for more history.",
"Awards editor: the PRIMARY QSOFIELDS search now has a Prefix field too (prepended to each found reference, e.g. captured 01 → D01) — previously only the OR fallback searches could add a prefix, so a DOK-style award couldn't match on its main rule.",
"CAT: new Elecraft K3/K4 backend in the rig list. Select it (it reuses the Kenwood USB/network settings) and digital modes automatically use DATA A (MD6+DT0) — the sub-mode FT8 audio needs, so the K3 no longer keys the transmitter without modulating.",
"Settings database: the New / Open existing / Save a copy / Rename / Reset buttons are back (Settings → Database). Only \"Open folder\" was left, which opens Windows Explorer — where a .db can't be selected, it just asks which program should open it. Picking a database now uses a proper file dialog and offers a one-click restart.",
"Recent QSOs: a column dragged to sit AFTER an award column now stays there. Award columns were left out of the saved layout, so on reload they were pushed to the far right and jumped back in front of the column you had placed after them.",
"Entry form and QSO editor: Name and QTH are capitalised word by word (\"JEAN-PIERRE\" → \"Jean-Pierre\"), Comment and Note get a capital first letter. Applied when you leave the field, so typing is never interrupted; the rest of a comment is left alone, since it usually holds callsigns and modes.",
"Recent QSOs: the search box only ever takes callsigns, so it now upper-cases as you type and carries a small clear button.",
"CAT Elecraft K3/K4: the rig's mode is read back correctly. MD6 is DATA on a K3 but FSK on a Kenwood, and OpsLog decoded it as RTTY — so a K3 running FT8 showed RTTY, logged its QSOs as RTTY, and told WSJT-X/JTDX over the shared CAT link that the rig was in RTTY while they had asked for a data mode. Applies to the Elecraft K3/K4 backend and to the \"DATA A — MD6\" option; a plain Kenwood still reads MD6 as RTTY.",
"CAT sharing: the transmitter is dropped when the program keying it goes away. If WSJT-X/JTDX crashed, was closed, or simply had its connection cut — which is what saving the settings does, since the sharing server is rebuilt — the rig stayed on air with nobody watching: the Kenwood/Elecraft link stops polling while PTT is held, so nothing noticed. A K3 was seen transmitting for 29 seconds.",
"DX cluster: new \"Self-spot while I log\" option (Settings → DX Cluster). When you log a QSO, OpsLog announces YOU on the master cluster — your station callsign as the DX, on the frequency you just worked — so callers find you without waiting for someone else to spot you. It fires on the first QSO of a frequency, then no more often than the interval you set; five minutes is the minimum, since a self-spot is traffic every user of the node sees."
],
"fr": [
"Sauvegarde : nouvelle option \"Sauvegarder à chaque fermeture\" (Réglages → Sauvegarde). Activée, OpsLog sauvegarde la base à chaque fois que tu quittes au lieu d'une seule fois par jour — les QSO d'une seconde session sont ainsi toujours pris.",
"Détails cluster (Ma station) : suppression des exemples en filigrane dans Mon rig / Mon antenne (et nom/mode satellite) — ils ressemblaient à de vraies valeurs, faisant croire qu'un champ vide était déjà rempli.",
"QSL : nouveau marqueur \"QSL OpsLog reçue\" dans la fenêtre d'édition du QSO (à côté du Message QSL), avec un indicateur PSE QSL / TNX en direct. Si une QSL a été reçue, la carte imprime TNX (merci), sinon PSE QSL (envoie-moi une carte) — automatique. Le tampon utilise le token {qso.pse_tnx} (dans le pied de carte par défaut ; plaçable où tu veux dans le designer). Une colonne \"QSL reçue\" a été ajoutée aux QSO récents.",
"QSL : un message QSL par défaut (Réglages → E-mail, sous l'e-mail de carte QSL) s'imprime désormais sur la carte quand un QSO n'a pas son propre Message QSL — le Message QSL du QSO l'emporte toujours.",
"UDP sortant : un QSO enregistré depuis WSJT-X / JTDX / MSHV (via l'écouteur UDP entrant) est désormais aussi transmis aux intégrations ADIF sortantes — avant, seuls les QSO saisis directement dans OpsLog étaient réémis.",
"Sauvegarde : avec \"sauvegarder à chaque fermeture\", une nouvelle sous-option \"Garder chaque sauvegarde\" écrit un fichier horodaté distinct par fermeture (opslog-AAAA-MM-JJ-HHMMSS.db) au lieu d'écraser le fichier du jour. La rotation garde les N plus récents — augmente-la pour plus d'historique.",
"Éditeur de diplômes : la recherche PRINCIPALE QSOFIELDS a aussi un champ Préfixe (ajouté devant chaque référence trouvée, ex. 01 capturé → D01) — avant, seules les recherches OR de repli pouvaient ajouter un préfixe, empêchant un diplôme type DOK de matcher sur sa règle principale.",
"CAT : nouveau backend Elecraft K3/K4 dans la liste des rigs. Sélectionne-le (il réutilise les réglages USB/réseau Kenwood) et les modes numériques passent automatiquement en DATA A (MD6+DT0) — le sous-mode dont l'audio FT8 a besoin, donc le K3 ne passe plus en émission sans moduler.",
"Base de réglages : les boutons Nouvelle base / Ouvrir existante / Enregistrer une copie / Renommer / Réinitialiser sont de retour (Réglages → Base de données). Il ne restait que \"Ouvrir le dossier\", qui lance l'Explorateur Windows — où un .db n'est pas sélectionnable, il demande juste avec quel logiciel l'ouvrir. Choisir une base passe désormais par un vrai sélecteur de fichier, avec redémarrage en un clic.",
"QSO récents : une colonne déplacée APRÈS une colonne de diplôme y reste. Les colonnes de diplômes étaient exclues de la disposition enregistrée, donc au rechargement elles étaient repoussées tout à droite et repassaient devant la colonne que tu avais placée après elles.",
"Saisie et éditeur de QSO : Name et QTH sont capitalisés mot par mot (« JEAN-PIERRE » → « Jean-Pierre »), Comment et Note prennent une majuscule en première lettre. Appliqué quand tu quittes le champ, donc la frappe n'est jamais perturbée ; la suite d'un commentaire est laissée telle quelle, puisqu'elle contient souvent des indicatifs et des modes.",
"QSO récents : le champ de recherche ne prend que des indicatifs — il passe donc en majuscules à la frappe et reçoit un petit bouton d'effacement.",
"CAT Elecraft K3/K4 : le mode de la radio est relu correctement. MD6 vaut DATA sur un K3 mais FSK sur un Kenwood, et OpsLog le décodait en RTTY — un K3 en FT8 affichait donc RTTY, enregistrait ses QSO en RTTY, et annonçait RTTY à WSJT-X/JTDX via le partage CAT alors qu'ils avaient demandé un mode data. Vaut pour le backend Elecraft K3/K4 et pour l'option « DATA A — MD6 » ; un Kenwood classique lit toujours MD6 comme RTTY.",
"Partage CAT : l'émission est coupée quand le logiciel qui la commandait disparaît. Si WSJT-X/JTDX plantait, était fermé, ou voyait simplement sa connexion coupée — ce que fait un enregistrement des réglages, puisque le serveur de partage est reconstruit — la radio restait en émission sans surveillance : la liaison Kenwood/Elecraft cesse d'interroger le poste tant que le PTT est tenu, donc rien ne s'en apercevait. Un K3 a été vu en émission pendant 29 secondes.",
"Cluster DX : nouvelle option « M'auto-spotter quand j'enregistre » (Réglages → DX Cluster). À chaque QSO enregistré, OpsLog t'annonce sur le cluster maître — ton indicatif de station en DX, sur la fréquence que tu viens de travailler — pour qu'on te trouve sans attendre que quelqu'un te spotte. Déclenché au premier QSO d'une fréquence, puis pas plus souvent que l'intervalle choisi ; cinq minutes est le minimum, un auto-spot étant du trafic que voient tous les utilisateurs du nœud."
]
},
{
"version": "0.23.8",
"date": "",
"en": [
"E-mail: the QSO recording e-mail (subject and body) is now editable in Settings → E-mail, like the QSL card e-mail — with the {CALL} {DATE} {BAND} {MODE} {MYCALL} variables.",
"Backup fix: the backup now saves your CONTACTS (the logbook), not just the settings. Once the logbook was split into its own file, the backup kept snapshotting the settings database and silently missed the QSOs. It now writes the log to opslog-*.db and the configuration separately to opslogcfg-*.db (MySQL logs still export to ADIF).",
"Performance: much lower CPU and memory on a busy cluster (RBN and other high-volume feeds). The Cluster tab was re-scanning the entire logbook for every batch of spots (~20×/second) and its spot-status cache grew without limit — on a firehose that could climb to gigabytes of RAM and peg a CPU. The worked-index is now cached (rebuilt only when you log a QSO) and the status cache is bounded to the spots actually shown."
],
"fr": [
"E-mail : le texte de l'e-mail d'enregistrement QSO (objet et corps) est désormais modifiable dans Réglages → E-mail, comme l'e-mail de carte QSL — avec les variables {CALL} {DATE} {BAND} {MODE} {MYCALL}.",
"Correction sauvegarde : la sauvegarde enregistre désormais tes CONTACTS (le journal), et plus seulement les réglages. Depuis que le journal a été séparé dans son propre fichier, la sauvegarde continuait à copier la base des réglages et oubliait les QSO. Elle écrit maintenant le log dans opslog-*.db et la configuration à part dans opslogcfg-*.db (les logs MySQL restent exportés en ADIF).",
"Performances : CPU et mémoire nettement réduits sur un cluster chargé (RBN et autres flux à fort volume). L'onglet Cluster rescannait tout le journal à chaque lot de spots (~20×/seconde) et son cache de statuts grossissait sans limite — sur un flux intense cela pouvait atteindre des gigaoctets de RAM et saturer un cœur. L'index des contacts est désormais mis en cache (reconstruit seulement quand tu logues un QSO) et le cache de statuts est borné aux spots réellement affichés."
]
},
{ {
"version": "0.23.7", "version": "0.23.7",
"date": "", "date": "",
+45 -8
View File
@@ -103,6 +103,7 @@ import { WinkeyerPanel, type WKStatus, type WKMacro } from '@/components/Winkeye
import { RotorCompass } from '@/components/RotorCompass'; import { RotorCompass } from '@/components/RotorCompass';
import { writeUiPref } from '@/lib/uiPref'; import { writeUiPref } from '@/lib/uiPref';
import { formatDateTimeUTC } from '@/lib/dateFormat'; import { formatDateTimeUTC } from '@/lib/dateFormat';
import { titleCase, sentenceCase } from '@/lib/textCase';
import { setGridPrefsProfile, flushGridPrefs } from '@/lib/gridPrefs'; import { setGridPrefsProfile, flushGridPrefs } from '@/lib/gridPrefs';
import { DvkPanel, type DVKMsg, type DVKStat } from '@/components/DvkPanel'; import { DvkPanel, type DVKMsg, type DVKStat } from '@/components/DvkPanel';
@@ -1504,6 +1505,22 @@ export default function App() {
// a stale closure. // a stale closure.
const spotsRef = useRef(spots); const spotsRef = useRef(spots);
useEffect(() => { spotsRef.current = spots; }, [spots]); useEffect(() => { spotsRef.current = spots; }, [spots]);
// Bound the status cache. Keyed per call|band|mode, it otherwise kept an entry
// for every station ever seen — under an RBN firehose (thousands of unique
// calls/hour) that grew without limit to gigabytes. Prune it back to the live
// (SPOTS_CAP-limited) spots once it drifts well past them. The size check bails
// cheaply the rest of the time (returning the same reference, so no dependent
// memo re-runs); an evicted spot is just re-resolved if it reappears.
useEffect(() => {
setSpotStatus((prev) => {
const keys = Object.keys(prev);
if (keys.length <= SPOTS_CAP * 2) return prev;
const live = new Set(spots.map((x) => spotStatusKey(x.dx_call, x.band ?? '', x.comment ?? '', x.freq_hz)));
const pruned: typeof prev = {};
for (const k of keys) if (live.has(k)) pruned[k] = prev[k];
return pruned;
});
}, [spots]);
// Re-fetch the status of every SHOWN spot and OVERWRITE the cache (merge, never // Re-fetch the status of every SHOWN spot and OVERWRITE the cache (merge, never
// clear). Overwriting keeps the other NEW badges on screen until their fresh // clear). Overwriting keeps the other NEW badges on screen until their fresh
// value lands, instead of blanking the whole grid and letting the badges pop // value lands, instead of blanking the whole grid and letting the badges pop
@@ -4206,7 +4223,8 @@ export default function App() {
); );
const nameBlock = ( const nameBlock = (
<div className="flex flex-col flex-1 min-w-[110px]"><Label className="mb-1 h-3.5">{t('field.name')}</Label> <div className="flex flex-col flex-1 min-w-[110px]"><Label className="mb-1 h-3.5">{t('field.name')}</Label>
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }} /> <Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
onBlur={() => setName(titleCase)} />
</div> </div>
); );
// In contest mode QTH is replaced by the sent (read-only, auto) and received // In contest mode QTH is replaced by the sent (read-only, auto) and received
@@ -4226,7 +4244,8 @@ export default function App() {
</> </>
) : ( ) : (
<div className="flex flex-col flex-1 min-w-[80px]"><Label className="mb-1 h-3.5">{t('field.qth')}</Label> <div className="flex flex-col flex-1 min-w-[80px]"><Label className="mb-1 h-3.5">{t('field.qth')}</Label>
<Input value={qth} onChange={(e) => { setQth(e.target.value); markEdited('qth'); }} /> <Input value={qth} onChange={(e) => { setQth(e.target.value); markEdited('qth'); }}
onBlur={() => setQth(titleCase)} />
</div> </div>
); );
const gridBlock = ( const gridBlock = (
@@ -4371,7 +4390,7 @@ export default function App() {
); );
const commentSm = ( const commentSm = (
<div className="flex flex-col w-40"><Label className="mb-1 h-3.5">{t('field.comment')}</Label> <div className="flex flex-col w-40"><Label className="mb-1 h-3.5">{t('field.comment')}</Label>
<Input value={comment} onChange={(e) => setComment(e.target.value)} /> <Input value={comment} onChange={(e) => setComment(e.target.value)} onBlur={() => setComment(sentenceCase)} />
</div> </div>
); );
// Inline-label variants (label to the LEFT of the control, Log4OM-style) — // Inline-label variants (label to the LEFT of the control, Log4OM-style) —
@@ -4487,12 +4506,12 @@ export default function App() {
// column). No flex-1 so they stay one row tall. // column). No flex-1 so they stay one row tall.
const commentLine = ( const commentLine = (
<div className="flex flex-col"><Label className="mb-1 h-3.5">{t('field.comment')}</Label> <div className="flex flex-col"><Label className="mb-1 h-3.5">{t('field.comment')}</Label>
<Input value={comment} onChange={(e) => setComment(e.target.value)} /> <Input value={comment} onChange={(e) => setComment(e.target.value)} onBlur={() => setComment(sentenceCase)} />
</div> </div>
); );
const noteLine = ( const noteLine = (
<div className="flex flex-col"><Label className="mb-1 h-3.5">{t('field.note')}</Label> <div className="flex flex-col"><Label className="mb-1 h-3.5">{t('field.note')}</Label>
<Input value={note} onChange={(e) => setNote(e.target.value)} /> <Input value={note} onChange={(e) => setNote(e.target.value)} onBlur={() => setNote(sentenceCase)} />
</div> </div>
); );
const logButtons = ( const logButtons = (
@@ -5589,7 +5608,8 @@ export default function App() {
it to its own line instead, which stays readable. */} it to its own line instead, which stays readable. */}
<div className="flex gap-4 items-end flex-wrap"> <div className="flex gap-4 items-end flex-wrap">
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label> <div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }} /> <Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
onBlur={() => setName(titleCase)} />
</div> </div>
{qthBlock} {qthBlock}
{gridBlock} {gridBlock}
@@ -6029,12 +6049,29 @@ export default function App() {
<TabsContent value="recent" className="mt-0 flex flex-col min-h-0 flex-1"> <TabsContent value="recent" className="mt-0 flex flex-col min-h-0 flex-1">
<div className="flex gap-2 p-2.5 border-b border-border/60"> <div className="flex gap-2 p-2.5 border-b border-border/60">
{/* Callsign-only search: forced upper-case (a call is never
lower-case, and the operator shouldn't have to hold shift)
with an inline clear so wiping the filter is one click
instead of a select-all + delete. */}
<div className="relative flex-1">
<Input <Input
className="flex-1" className="w-full pr-8 font-mono"
placeholder="Search callsign…" placeholder="Search callsign…"
value={filterCallsign} value={filterCallsign}
onChange={(e) => setFilterCallsign(e.target.value)} onChange={(e) => setFilterCallsign(e.target.value.toUpperCase())}
/> />
{filterCallsign && (
<button
type="button"
aria-label={t('btn.clear')}
title={t('btn.clear')}
className="absolute right-1.5 top-1/2 -translate-y-1/2 inline-flex items-center justify-center size-5 rounded text-muted-foreground hover:text-foreground hover:bg-foreground/10"
onClick={() => setFilterCallsign('')}
>
<X className="size-3.5" />
</button>
)}
</div>
<Button variant="outline" size="sm" onClick={() => refresh()}> <Button variant="outline" size="sm" onClick={() => refresh()}>
<RefreshCw className="size-3.5" /> Refresh <RefreshCw className="size-3.5" /> Refresh
</Button> </Button>
+30 -2
View File
@@ -34,10 +34,13 @@ 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;
ref_display?: string; // grid column shows: ref | name | both ref_display?: string; // grid column shows: ref | name | both
type?: string; field: string; match_by?: string; exact_match?: boolean; one_ref_per_qso?: boolean; pattern: string; type?: string; field: string; match_by?: string; exact_match?: boolean; one_ref_per_qso?: boolean; pattern: string;
leading_str?: string; trailing_str?: string; dynamic?: boolean; leading_str?: string; trailing_str?: string; prefix?: string; dynamic?: boolean;
or_rules?: AwardOrRule[]; 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;
// The "custom" confirmation source: the field it reads and, optionally, the
// value(s) that count. Empty value = any non-empty value confirms.
confirm_field?: string; confirm_value?: string;
total: number; builtin?: boolean; version?: number; total: number; builtin?: boolean; version?: number;
}; };
@@ -556,9 +559,10 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
<label className="flex items-center gap-2 text-xs cursor-pointer pl-[128px]"><Checkbox checked={!!cur.exact_match} onCheckedChange={(c) => patch({ exact_match: !!c })} /> {t('awed.exactMatch')}</label> <label className="flex items-center gap-2 text-xs cursor-pointer pl-[128px]"><Checkbox checked={!!cur.exact_match} onCheckedChange={(c) => patch({ exact_match: !!c })} /> {t('awed.exactMatch')}</label>
<label className="flex items-center gap-2 text-xs cursor-pointer pl-[128px]" title={t('awed.oneRefHint')}><Checkbox checked={!!cur.one_ref_per_qso} onCheckedChange={(c) => patch({ one_ref_per_qso: !!c })} /> {t('awed.oneRef')}</label> <label className="flex items-center gap-2 text-xs cursor-pointer pl-[128px]" title={t('awed.oneRefHint')}><Checkbox checked={!!cur.one_ref_per_qso} onCheckedChange={(c) => patch({ one_ref_per_qso: !!c })} /> {t('awed.oneRef')}</label>
<Field2 label={t('awed.patternRegex')}><Input className="h-8 font-mono text-xs" value={cur.pattern} onChange={(e) => patch({ pattern: e.target.value })} placeholder={t('awed.patternPlaceholder')} /></Field2> <Field2 label={t('awed.patternRegex')}><Input className="h-8 font-mono text-xs" value={cur.pattern} onChange={(e) => patch({ pattern: e.target.value })} placeholder={t('awed.patternPlaceholder')} /></Field2>
<div className="grid grid-cols-2 gap-3"> <div className="grid grid-cols-3 gap-3">
<Field2 label={t('awed.leadingString')}><Input className="h-8 font-mono text-xs" value={cur.leading_str ?? ''} onChange={(e) => patch({ leading_str: e.target.value })} /></Field2> <Field2 label={t('awed.leadingString')}><Input className="h-8 font-mono text-xs" value={cur.leading_str ?? ''} onChange={(e) => patch({ leading_str: e.target.value })} /></Field2>
<Field2 label={t('awed.trailingString')}><Input className="h-8 font-mono text-xs" value={cur.trailing_str ?? ''} onChange={(e) => patch({ trailing_str: e.target.value })} /></Field2> <Field2 label={t('awed.trailingString')}><Input className="h-8 font-mono text-xs" value={cur.trailing_str ?? ''} onChange={(e) => patch({ trailing_str: e.target.value })} /></Field2>
<Field2 label={t('awed.prefix')}><Input className="h-8 font-mono text-xs" value={cur.prefix ?? ''} onChange={(e) => patch({ prefix: e.target.value })} placeholder={t('awed.prefixPlaceholder')} title={t('awed.prefixTitle')} /></Field2>
</div> </div>
{/* Fallback searches: tried in order, only while nothing {/* Fallback searches: tried in order, only while nothing
@@ -621,6 +625,30 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
))} ))}
</div> </div>
</div> </div>
{/* "Custom" is only meaningful once it names a field, so the
inputs appear as soon as it is ticked in either column —
and a custom source with no field confirms nothing. */}
{((cur.confirm ?? []).includes('custom') || (cur.validate ?? []).includes('custom')) && (
<div className="space-y-2 border-t border-border/60 pt-3">
<Label className="text-xs font-semibold">{t('awed.customLabel')}</Label>
<div className="grid grid-cols-2 gap-3">
<div className="space-y-1">
<Label className="text-[11px] text-muted-foreground">{t('awed.customField')}</Label>
<Input className="h-8 font-mono text-xs" placeholder="APP_OPSLOG_QSL_RCVD"
value={(cur as any).confirm_field ?? ''}
onChange={(e) => patch({ confirm_field: e.target.value.trim().toUpperCase() } as any)} />
</div>
<div className="space-y-1">
<Label className="text-[11px] text-muted-foreground">{t('awed.customValue')}</Label>
<Input className="h-8 font-mono text-xs" placeholder="Y,V"
value={(cur as any).confirm_value ?? ''}
onChange={(e) => patch({ confirm_value: e.target.value } as any)} />
</div>
</div>
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('awed.customHint')}</p>
</div>
)}
{/* "Grant codes" and "export credit_granted" used to live here. No {/* "Grant codes" and "export credit_granted" used to live here. No
ADIF export has ever written CREDIT_GRANTED, so both controls ADIF export has ever written CREDIT_GRANTED, so both controls
did nothing at all. The stored values are kept (see award.Def); did nothing at all. The stored values are kept (see award.Def);
+13 -6
View File
@@ -424,15 +424,22 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
const context = useMemo(() => ({ spotStatus }), [spotStatus]); const context = useMemo(() => ({ spotStatus }), [spotStatus]);
// Spot statuses arrive asynchronously (~after the rows render). The Call/Band/ // 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 // Mode cellStyles and the dimmed "represents nothing" class depend on them but
// won't re-render those cells on its own — force a refresh so e.g. a worked call // the cell VALUE doesn't change, so ag-grid won't re-render on its own — force a
// turns blue once its status loads. // refresh so e.g. a worked call turns blue once its status loads.
//
// THROTTLED: under an RBN firehose spotStatus updates ~20×/second, and firing a
// full refreshCells that often is pure churn on a slow PC. Coalesce the bursts
// into one refresh every 200 ms (still imperceptible) instead of one per update.
const refreshPending = useRef<number | undefined>(undefined);
useEffect(() => { useEffect(() => {
// Light refresh so status-dependent styling — the Call/Band/Mode colours AND if (refreshPending.current !== undefined) return; // a refresh is already queued
// the dimmed "represents nothing" class (cellClassRules above) — re-applies refreshPending.current = window.setTimeout(() => {
// once a status lands, WITHOUT redrawing whole rows (which pegged the CPU). refreshPending.current = undefined;
gridRef.current?.api?.refreshCells({ force: true }); gridRef.current?.api?.refreshCells({ force: true });
}, 200);
}, [spotStatus]); }, [spotStatus]);
useEffect(() => () => { if (refreshPending.current !== undefined) window.clearTimeout(refreshPending.current); }, []);
// Restore AFTER the profile scope is known — this grid has no key= remount to // Restore AFTER the profile scope is known — this grid has no key= remount to
// save it from reading the wrong (unscoped) cache key at first paint. // save it from reading the wrong (unscoped) cache key at first paint.
+4 -4
View File
@@ -465,18 +465,18 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
</Select> </Select>
</Field> </Field>
<Field label={t('detp.rig')} span={3}> <Field label={t('detp.rig')} span={3}>
<Input value={details.my_rig} placeholder="Flex 8600" onChange={(e) => onChange({ my_rig: e.target.value })} /> <Input value={details.my_rig} onChange={(e) => onChange({ my_rig: e.target.value })} />
</Field> </Field>
<Field label={t('detp.antenna')} span={3}> <Field label={t('detp.antenna')} span={3}>
<Input value={details.my_antenna} placeholder="UB640" onChange={(e) => onChange({ my_antenna: e.target.value })} /> <Input value={details.my_antenna} onChange={(e) => onChange({ my_antenna: e.target.value })} />
</Field> </Field>
{satelliteMode && ( {satelliteMode && (
<> <>
<Field label={t('detp.satName')} span={3}> <Field label={t('detp.satName')} span={3}>
<Input value={details.sat_name} placeholder="AO-91" onChange={(e) => onChange({ sat_name: e.target.value })} /> <Input value={details.sat_name} onChange={(e) => onChange({ sat_name: e.target.value })} />
</Field> </Field>
<Field label={t('detp.satelliteMode')} span={3}> <Field label={t('detp.satelliteMode')} span={3}>
<Input value={details.sat_mode} placeholder="U/V" onChange={(e) => onChange({ sat_mode: e.target.value })} /> <Input value={details.sat_mode} onChange={(e) => onChange({ sat_mode: e.target.value })} />
</Field> </Field>
</> </>
)} )}
+98 -7
View File
@@ -1,6 +1,6 @@
import { useEffect, useMemo, useRef, useState } from 'react'; import { useEffect, useMemo, useRef, useState } from 'react';
import { Trash2, Search, Loader2, CalendarDays } from 'lucide-react'; import { Trash2, Search, Loader2, CalendarDays } from 'lucide-react';
import { LookupCallsign, LookupCallsignFresh, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings, OpenExternalURL } from '../../wailsjs/go/main/App'; import { LookupCallsign, LookupCallsignFresh, DXCCForCountry, GetAwardDefs, ComputeQSOAwardRefs, GetListsSettings, OpenExternalURL, SetOpsLogQSLReceived } from '../../wailsjs/go/main/App';
import { rstOptions, type RSTLists } from '@/lib/rst'; import { rstOptions, type RSTLists } from '@/lib/rst';
import { AwardRefSelector } from '@/components/AwardRefSelector'; import { AwardRefSelector } from '@/components/AwardRefSelector';
import { AdifExtrasEditor } from '@/components/AdifExtrasEditor'; import { AdifExtrasEditor } from '@/components/AdifExtrasEditor';
@@ -22,6 +22,7 @@ import { Combobox } from '@/components/ui/combobox';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
import { flagURL } from '@/lib/flags'; import { flagURL } from '@/lib/flags';
import { useI18n } from '@/lib/i18n'; import { useI18n } from '@/lib/i18n';
import { titleCase, sentenceCase } from '@/lib/textCase';
import type { QSOForm } from '@/types'; import type { QSOForm } from '@/types';
type QSO = QSOForm; type QSO = QSOForm;
@@ -72,6 +73,11 @@ const CONF_LABEL_KEYS: Record<string, string> = {
QSL: 'qedit.confQslPaper', QSL: 'qedit.confQslPaper',
}; };
// OpsLog's own card. Kept out of CONFIRMATIONS on purpose — that list maps QSO
// columns and this channel is backed by ADIF extras — but it still belongs in
// the channel picker and the status table alongside the rest.
const OPSLOG_CONF = 'OPSLOG';
// Colour-coded status cell for the confirmation grid. // Colour-coded status cell for the confirmation grid.
function StatusCell({ value }: { value?: string }) { function StatusCell({ value }: { value?: string }) {
const { t } = useI18n(); const { t } = useI18n();
@@ -428,6 +434,26 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
[draft.extras], [draft.extras],
); );
// OpsLog QSL "received" marker (ADIF extra). Drives the card's PSE/TNX stamp:
// received → TNX QSL (thanks for your card), otherwise PSE QSL (please send one).
// Saved with the normal Save via draft.extras.
const OPSLOG_QSL_RCVD = 'APP_OPSLOG_QSL_RCVD';
const qslReceived = !!String(draft.extras?.[OPSLOG_QSL_RCVD] ?? '').trim();
// Sent side, for the confirmations table. Two key names because the marker was
// renamed once and old QSOs still carry the first one — same test the Recent
// QSOs "OpsLog QSL" column makes.
const opslogQslSent = !!(draft.extras?.['APP_OPSLOG_QSL_SENT'] || draft.extras?.['APP_OPSLOG_QSL_CARD_SENT']);
const toggleQslReceived = (on: boolean) => {
// Reflect immediately in the draft (for the PSE/TNX indicator)…
const next = { ...(draft.extras ?? {}) };
if (on) next[OPSLOG_QSL_RCVD] = new Date().toISOString();
else delete next[OPSLOG_QSL_RCVD];
set('extras', next as any);
// …and persist right away with a targeted write that reliably sets OR clears
// the key (the modal's extras-merge on Save wouldn't clear a removed key).
if ((draft as any).id) SetOpsLogQSLReceived((draft as any).id, on).catch(() => {});
};
return ( return (
<Dialog open onOpenChange={(o) => { if (!o) onClose(); }}> <Dialog open onOpenChange={(o) => { if (!o) onClose(); }}>
<DialogContent className="max-w-5xl max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0"> <DialogContent className="max-w-5xl max-h-[92vh] grid grid-rows-[auto_1fr_auto] gap-0 p-0">
@@ -498,7 +524,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<div className="grid grid-cols-2 gap-x-6 gap-y-2.5"> <div className="grid grid-cols-2 gap-x-6 gap-y-2.5">
{/* ── Left column ── */} {/* ── Left column ── */}
<div className="flex flex-col gap-2.5"> <div className="flex flex-col gap-2.5">
<div><Label>{t('qedit.name')}</Label><Input value={draft.name ?? ''} onChange={(e) => set('name', e.target.value)} /></div> <div><Label>{t('qedit.name')}</Label><Input value={draft.name ?? ''} onChange={(e) => set('name', e.target.value)}
onBlur={() => set('name', titleCase(draft.name ?? '') as any)} /></div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Label className="w-20 shrink-0">{t('qedit.band')}</Label> <Label className="w-20 shrink-0">{t('qedit.band')}</Label>
<Select value={draft.band || ''} onValueChange={(v) => set('band', v)}> <Select value={draft.band || ''} onValueChange={(v) => set('band', v)}>
@@ -564,8 +591,10 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div> <div className="flex flex-col flex-1"><Label>{t('qedit.grid')}</Label><Input value={draft.grid ?? ''} onChange={(e) => set('grid', e.target.value)} className="font-mono uppercase" /></div>
<div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div> <div className="flex flex-col w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
</div> </div>
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)} /></div> <div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
<div><Label>{t('qedit.note')}</Label><Textarea rows={3} value={draft.notes ?? ''} onChange={(e) => set('notes', e.target.value)} /></div> onBlur={() => set('comment', sentenceCase(draft.comment ?? '') as any)} /></div>
<div><Label>{t('qedit.note')}</Label><Textarea rows={3} value={draft.notes ?? ''} onChange={(e) => set('notes', e.target.value)}
onBlur={() => set('notes', sentenceCase(draft.notes ?? '') as any)} /></div>
</div> </div>
</div> </div>
</TabsContent> </TabsContent>
@@ -586,7 +615,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
</SelectContent> </SelectContent>
</Select> </Select>
</div> </div>
<div><Label>QTH</Label><Input value={draft.qth ?? ''} onChange={(e) => set('qth', e.target.value)} /></div> <div><Label>QTH</Label><Input value={draft.qth ?? ''} onChange={(e) => set('qth', e.target.value)}
onBlur={() => set('qth', titleCase(draft.qth ?? '') as any)} /></div>
<div><Label>{t('qedit.address')}</Label><Textarea rows={4} value={draft.address ?? ''} onChange={(e) => set('address', e.target.value)} /></div> <div><Label>{t('qedit.address')}</Label><Textarea rows={4} value={draft.address ?? ''} onChange={(e) => set('address', e.target.value)} /></div>
</div> </div>
{/* Right column */} {/* Right column */}
@@ -596,7 +626,13 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<div className="flex flex-col flex-1"><Label>Lat</Label><Input type="number" step="0.000001" value={draft.lat ?? ''} onChange={(e) => set('lat', numOrUndef(e.target.value) as any)} className="font-mono" /></div> <div className="flex flex-col flex-1"><Label>Lat</Label><Input type="number" step="0.000001" value={draft.lat ?? ''} onChange={(e) => set('lat', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
<div className="flex flex-col flex-1"><Label>Lon</Label><Input type="number" step="0.000001" value={draft.lon ?? ''} onChange={(e) => set('lon', numOrUndef(e.target.value) as any)} className="font-mono" /></div> <div className="flex flex-col flex-1"><Label>Lon</Label><Input type="number" step="0.000001" value={draft.lon ?? ''} onChange={(e) => set('lon', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
</div> </div>
<div><Label>{t('qedit.qslMsg')}</Label><Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} /></div> {/* The OpsLog QSL marker used to sit here, under QSL Msg. It
belongs with the other confirmation channels — see the QSL
Info tab. */}
<div>
<Label>{t('qedit.qslMsg')}</Label>
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
</div>
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div> <div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
</div> </div>
</div> </div>
@@ -644,9 +680,51 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<Label>{t('qedit.manageConf')}</Label> <Label>{t('qedit.manageConf')}</Label>
<Select value={confSel} onValueChange={setConfSel}> <Select value={confSel} onValueChange={setConfSel}>
<SelectTrigger><SelectValue /></SelectTrigger> <SelectTrigger><SelectValue /></SelectTrigger>
<SelectContent>{CONFIRMATIONS.map((c) => <SelectItem key={c.key} value={c.key}>{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</SelectItem>)}</SelectContent> <SelectContent>
{CONFIRMATIONS.map((c) => <SelectItem key={c.key} value={c.key}>{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</SelectItem>)}
{/* Listed here but NOT in CONFIRMATIONS: that table maps
QSO columns, and this channel lives in the ADIF
extras. It gets its own editor below rather than the
generic sent/received/date grid, which has no field
to bind to. */}
<SelectItem value={OPSLOG_CONF}>{t('qedit.confOpsLog')}</SelectItem>
</SelectContent>
</Select> </Select>
</div> </div>
{confSel === OPSLOG_CONF ? (
/* OpsLog's own card. "Sent" is stamped when the card
actually goes out, so it is shown, not offered: ticking
it by hand would record something that never happened.
"Received" drives the PSE/TNX stamp printed on the card,
which is the whole reason the flag exists — hence the
live indicator next to it. It writes immediately rather
than on Save, because clearing an extras key would not
survive the merge Save does. */
<div className="space-y-3">
<div className="grid grid-cols-2 gap-3">
<div>
<Label>{t('qedit.sent')}</Label>
<Input disabled value={opslogQslSent ? t('qedit.qslYes') : t('qedit.qslNo')} />
</div>
<div>
<Label>{t('qedit.received')}</Label>
<label className="flex h-9 items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={qslReceived} onCheckedChange={(c) => toggleQslReceived(!!c)} />
{t('qedit.qslReceived')}
</label>
</div>
</div>
<div className="flex items-center gap-2">
<span className="text-[11px] font-mono px-1.5 py-0.5 rounded bg-muted text-muted-foreground">
{qslReceived ? 'TNX QSL' : 'PSE QSL'}
</span>
<span className="text-[11px] text-muted-foreground">{t('qedit.pseTnxHint')}</span>
</div>
<p className="text-[11px] text-muted-foreground">{t('qedit.opslogSentHint')}</p>
</div>
) : (
<>
<div className="grid grid-cols-2 gap-3"> <div className="grid grid-cols-2 gap-3">
<div><Label>{t('qedit.sent')}</Label><QslSelect value={val(def.sent)} onChange={(v) => put(def.sent, v)} /></div> <div><Label>{t('qedit.sent')}</Label><QslSelect value={val(def.sent)} onChange={(v) => put(def.sent, v)} /></div>
<div><Label>{t('qedit.received')}</Label> <div><Label>{t('qedit.received')}</Label>
@@ -663,6 +741,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<p className="text-[11px] text-muted-foreground"> <p className="text-[11px] text-muted-foreground">
{t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>. {t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>.
</p> </p>
</>
)}
</div> </div>
{/* Right: live status grid for every channel. {/* Right: live status grid for every channel.
@@ -687,6 +767,17 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
<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>
</tr> </tr>
))} ))}
{/* OpsLog's own card, read from the ADIF extras rather
than a QSO column — hence a hand-written row instead
of a CONFIRMATIONS entry. "Sent" is stamped by OpsLog
when the card actually goes out, so it stays
read-only here: an operator ticking it by hand would
be recording something that never happened. */}
<tr className="text-xs">
<td className="font-medium pr-3 py-0.5 whitespace-nowrap">{t('qedit.confOpsLog')}</td>
<td className="w-24"><StatusCell value={opslogQslSent ? 'Y' : 'N'} /></td>
<td className="w-24"><StatusCell value={qslReceived ? 'Y' : 'N'} /></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
+22 -10
View File
@@ -195,6 +195,8 @@ export const makeColCatalog = (t: TFn, myGrid?: string): ColEntry[] => [
{ group: 'eQSL', label: t('rqg.c.eqsl_rcvd_date'), colId: 'eqsl_rcvd_date', headerName: t('rqg.h.eqsl_rcvd_date'), field: 'eqsl_rcvd_date' as any, width: 120, valueFormatter: (p) => fmtDateOnly(p.value) }, { group: 'eQSL', label: t('rqg.c.eqsl_rcvd_date'), colId: 'eqsl_rcvd_date', headerName: t('rqg.h.eqsl_rcvd_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. // App-specific: when OpsLog e-mailed its own QSL card. Distinct from eQSL.cc.
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_sent'), colId: 'opslog_qsl_card_sent', headerName: t('rqg.c.opslog_qsl_card_sent'), width: 100, cellClass: qslStatusCellClass, 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 }, { group: 'QSL', label: t('rqg.c.opslog_qsl_card_sent'), colId: 'opslog_qsl_card_sent', headerName: t('rqg.c.opslog_qsl_card_sent'), width: 100, cellClass: qslStatusCellClass, 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: operator marked a QSL as RECEIVED for this QSO (drives PSE/TNX).
{ group: 'QSL', label: t('rqg.c.opslog_qsl_card_rcvd'), colId: 'opslog_qsl_card_rcvd', headerName: t('rqg.c.opslog_qsl_card_rcvd'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_QSL_RCVD'] ? 'Y' : 'N'; }, defaultVisible: false },
// App-specific: when the QSO's audio recording was e-mailed to the station. // App-specific: when the QSO's audio recording was e-mailed to the station.
{ group: 'QSL', label: t('rqg.c.opslog_recording_sent'), colId: 'opslog_recording_sent', headerName: t('rqg.h.opslog_recording_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false }, { group: 'QSL', label: t('rqg.c.opslog_recording_sent'), colId: 'opslog_recording_sent', headerName: t('rqg.h.opslog_recording_sent'), width: 100, cellClass: qslStatusCellClass, valueGetter: (p) => { const e = (p.data as any)?.extras ?? {}; return e['APP_OPSLOG_RECORDING_SENT'] ? 'Y' : 'N'; }, defaultVisible: false },
@@ -280,12 +282,22 @@ const GRP_KEYS: Record<string, string> = {
}; };
export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g); export const groupLabel = (t: TFn, g: string): string => t(GRP_KEYS[g] ?? g);
// Award columns are governed SOLELY by the awardShown code-set, never by AG // Award-column VISIBILITY is governed SOLELY by the awardShown code-set, never
// Grid's saved column state. Stripping them here (on both save and restore) // by AG Grid's saved column state: dropping `hide` here (on both save and
// stops a stale saved state from re-hiding a shown award column on every // restore) stops a stale saved state from re-hiding a shown award column on
// awardCols rebuild — the desync that made award columns vanish mid-session. // every awardCols rebuild — the desync that made award columns vanish
const stripAwardCols = (st: any[] | null | undefined): any[] => // mid-session.
(st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_')); //
// Their POSITION, however, has to stay in the state. Filtering the entries out
// entirely left applyColumnState({applyOrder:true}) with no place for them, and
// AG Grid appends what the state doesn't mention — so a column the operator
// dragged to sit AFTER an award column jumped back in front of it on reload.
const sanitizeAwardCols = (st: any[] | null | undefined): any[] =>
(st ?? []).map((s) => {
if (!String(s?.colId ?? '').startsWith('award_')) return s;
const { hide: _hide, ...rest } = s as any;
return rest;
});
export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) { export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal, rowDragCall, passOrder, onGridApi, storageKey, onRowDoubleClicked, onRowClicked, onRowSelected, onRowSelectedQso, onUpdateFromCty, onUpdateFromQRZ, onUpdateFromClublog, onSendTo, onSendRecording, onSendEQSL, onBulkEdit, onExportSelected, onExportSelectedFields, onExportFiltered, onExportCabrilloSelected, onExportCabrilloFiltered, onDelete, onFilteredCountChange, awardCols }: Props) {
const { t } = useI18n(); const { t } = useI18n();
@@ -468,12 +480,12 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
function onGridReady(e: GridReadyEvent) { function onGridReady(e: GridReadyEvent) {
onGridApi?.(e.api); onGridApi?.(e.api);
const local = loadLocal(colStateKey); const local = loadLocal(colStateKey);
if (local) e.api.applyColumnState({ state: sanitizeState(stripAwardCols(local)) as ColumnState[], applyOrder: true }); if (local) e.api.applyColumnState({ state: sanitizeState(sanitizeAwardCols(local)) as ColumnState[], applyOrder: true });
// Fall back to the portable DB copy when the local cache is empty // Fall back to the portable DB copy when the local cache is empty
// (fresh machine / after a reinstall), then re-seed the cache. // (fresh machine / after a reinstall), then re-seed the cache.
loadRemote(colStateKey).then((remote) => { loadRemote(colStateKey).then((remote) => {
if (remote && !local) { if (remote && !local) {
e.api.applyColumnState({ state: sanitizeState(stripAwardCols(remote)) as ColumnState[], applyOrder: true }); e.api.applyColumnState({ state: sanitizeState(sanitizeAwardCols(remote)) as ColumnState[], applyOrder: true });
seedLocal(colStateKey, remote); seedLocal(colStateKey, remote);
} }
}); });
@@ -497,7 +509,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
if (restoringRef.current) return; // ignore the events fired by a column rebuild 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) return; if (!state) return;
saveState(colStateKey, stripAwardCols(state)); saveState(colStateKey, sanitizeAwardCols(state));
// Award columns are stripped above, so persist their widths on the side. // Award columns are stripped above, so persist their widths on the side.
let changed = false; let changed = false;
for (const s of state) { for (const s of state) {
@@ -525,7 +537,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
useEffect(() => { useEffect(() => {
const api = gridRef.current?.api; const api = gridRef.current?.api;
const local = loadLocal(colStateKey); const local = loadLocal(colStateKey);
if (api && local) api.applyColumnState({ state: sanitizeState(stripAwardCols(local)) as ColumnState[], applyOrder: true }); if (api && local) api.applyColumnState({ state: sanitizeState(sanitizeAwardCols(local)) as ColumnState[], applyOrder: true });
// Re-enable saving once AG Grid has settled the column events from the rebuild. // Re-enable saving once AG Grid has settled the column events from the rebuild.
const t = window.setTimeout(() => { restoringRef.current = false; }, 0); const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
return () => window.clearTimeout(t); return () => window.clearTimeout(t);
+130 -9
View File
@@ -26,7 +26,8 @@ import {
AudioStartMonitor, AudioStopMonitor, AudioMonitorActive, AudioStartMonitor, AudioStopMonitor, AudioMonitorActive,
AudioStartTX, AudioStopTX, AudioTXActive, AudioStartTX, AudioStopTX, AudioTXActive,
ListClusterServers, SaveClusterServer, DeleteClusterServer, ListClusterServers, SaveClusterServer, DeleteClusterServer,
GetClusterAutoConnect, SetClusterAutoConnect, GetClusterAutoConnect, SetClusterAutoConnect, GetSelfSpotSettings, SaveSelfSpotSettings,
GetWorkedCallVariants, SetWorkedCallVariants,
ConnectClusterServer, DisconnectClusterServer, ConnectClusterServer, DisconnectClusterServer,
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus, ConnectAllClusters, DisconnectAllClusters, GetClusterStatus,
GetBackupSettings, SaveBackupSettings, RunBackupNow, PickBackupFolder, GetBackupSettings, SaveBackupSettings, RunBackupNow, PickBackupFolder,
@@ -402,9 +403,13 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' }, 'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' }, 'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' }, 'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' }, 'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' }, 'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
'dark-graphite': { bg: '#16181d', card: '#1f232b', accent: '#f97316' }, 'dark-graphite': { bg: '#16181d', card: '#1f232b', accent: '#f97316' },
'dark-indigo': { bg: '#0e0f1f', card: '#181a30', accent: '#7c6cff' },
'dark-teal': { bg: '#061c21', card: '#0d2c33', accent: '#22d3ee' },
'dark-plum': { bg: '#180f1e', card: '#251830', accent: '#f472b6' },
'high-contrast': { bg: '#000000', card: '#0d0d0d', accent: '#ff7a1a' }, 'high-contrast': { bg: '#000000', card: '#0d0d0d', accent: '#ff7a1a' },
}; };
@@ -1373,8 +1378,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const [emailMsg, setEmailMsg] = useState(''); const [emailMsg, setEmailMsg] = useState('');
const setEmailField = (patch: Partial<EmailCfg>) => setEmailCfg((s) => ({ ...s, ...patch })); const setEmailField = (patch: Partial<EmailCfg>) => setEmailCfg((s) => ({ ...s, ...patch }));
// eQSL card e-mail (subject/body templates + auto-send on log). // eQSL card e-mail (subject/body templates + auto-send on log).
type EQSLCfg = { subject: string; body: string; auto_send: boolean }; type EQSLCfg = { subject: string; body: string; auto_send: boolean; default_message: string };
const [eqslCfg, setEqslCfg] = useState<EQSLCfg>({ subject: '', body: '', auto_send: false }); const [eqslCfg, setEqslCfg] = useState<EQSLCfg>({ subject: '', body: '', auto_send: false, default_message: '' });
const setEqslField = (patch: Partial<EQSLCfg>) => setEqslCfg((s) => ({ ...s, ...patch })); const setEqslField = (patch: Partial<EQSLCfg>) => setEqslCfg((s) => ({ ...s, ...patch }));
// ClubLog Country File (cty.xml) exception status. // ClubLog Country File (cty.xml) exception status.
type ClubInfo = { enabled: boolean; loaded: boolean; date: string; count: number }; type ClubInfo = { enabled: boolean; loaded: boolean; date: string; count: number };
@@ -1524,19 +1529,30 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
const [clusterServers, setClusterServers] = useState<ClusterServer[]>([]); const [clusterServers, setClusterServers] = useState<ClusterServer[]>([]);
const [clusterAutoConnect, setClusterAutoConnectState] = useState(false); const [clusterAutoConnect, setClusterAutoConnectState] = useState(false);
// Defaults to true so the checkbox matches the backend before the read lands.
const [workedVariants, setWorkedVariants] = useState(true);
// Self-spot. SELF_SPOT_MIN_MIN mirrors the backend floor — the input clamps on
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
// the "1" landed and the field would fight the operator.
const SELF_SPOT_MIN_MIN = 5;
const [selfSpot, setSelfSpot] = useState({ enabled: false, minutes: SELF_SPOT_MIN_MIN });
const [selfSpotText, setSelfSpotText] = useState(String(SELF_SPOT_MIN_MIN));
const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]); const [clusterStatuses, setClusterStatuses] = useState<ClusterServerStatus[]>([]);
const [editingServer, setEditingServer] = useState<ClusterServer | null>(null); const [editingServer, setEditingServer] = useState<ClusterServer | null>(null);
async function reloadClusterServers() { async function reloadClusterServers() {
try { try {
const [list, ac, st] = await Promise.all([ const [list, ac, st, ss] = await Promise.all([
ListClusterServers(), ListClusterServers(),
GetClusterAutoConnect(), GetClusterAutoConnect(),
GetClusterStatus(), GetClusterStatus(),
GetSelfSpotSettings(),
]); ]);
setClusterServers((list ?? []) as ClusterServer[]); setClusterServers((list ?? []) as ClusterServer[]);
setClusterAutoConnectState(ac); setClusterAutoConnectState(ac);
setClusterStatuses((st ?? []) as ClusterServerStatus[]); setClusterStatuses((st ?? []) as ClusterServerStatus[]);
setSelfSpot(ss as any);
setSelfSpotText(String((ss as any).minutes ?? SELF_SPOT_MIN_MIN));
} catch (e: any) { setErr(String(e?.message ?? e)); } } catch (e: any) { setErr(String(e?.message ?? e)); }
} }
@@ -1623,6 +1639,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
try { setAudioCfg(await GetAudioSettings() as any); } catch {} try { setAudioCfg(await GetAudioSettings() as any); } catch {}
try { setEmailCfg(await GetEmailSettings() as any); } catch {} try { setEmailCfg(await GetEmailSettings() as any); } catch {}
try { setEqslCfg(await QSLGetEmailTemplates() as any); } catch {} try { setEqslCfg(await QSLGetEmailTemplates() as any); } catch {}
try { setWorkedVariants(await GetWorkedCallVariants()); } catch {}
reloadAudioDevices(); reloadAudioDevices();
reloadDvk(); reloadDvk();
} catch (e: any) { } catch (e: any) {
@@ -1849,6 +1866,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
await SaveQSLDefaults(qslDefaults as any); await SaveQSLDefaults(qslDefaults as any);
await SaveExternalServices(extSvc as any); await SaveExternalServices(extSvc as any);
await SetClusterAutoConnect(clusterAutoConnect); await SetClusterAutoConnect(clusterAutoConnect);
await SaveSelfSpotSettings(selfSpot as any);
setMsg('Settings saved.'); setMsg('Settings saved.');
onSaved(); onSaved();
@@ -2527,6 +2545,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<SelectItem value="flex">{t('cat.optFlex')}</SelectItem> <SelectItem value="flex">{t('cat.optFlex')}</SelectItem>
<SelectItem value="yaesu">{t('cat.optYaesu')}</SelectItem> <SelectItem value="yaesu">{t('cat.optYaesu')}</SelectItem>
<SelectItem value="kenwood">{t('cat.optKenwood')}</SelectItem> <SelectItem value="kenwood">{t('cat.optKenwood')}</SelectItem>
<SelectItem value="elecraft">{t('cat.optElecraft')}</SelectItem>
<SelectItem value="xiegu">{t('cat.optXiegu')}</SelectItem> <SelectItem value="xiegu">{t('cat.optXiegu')}</SelectItem>
<SelectItem value="icom">{t('cat.optIcom')}</SelectItem> <SelectItem value="icom">{t('cat.optIcom')}</SelectItem>
<SelectItem value="icom-net">{t('cat.optIcomNet')}</SelectItem> <SelectItem value="icom-net">{t('cat.optIcomNet')}</SelectItem>
@@ -2688,7 +2707,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
{t('cat.civTrace')} {t('cat.civTrace')}
</label> </div> </label> </div>
)} )}
{catCfg.backend === 'kenwood' && ( {(catCfg.backend === 'kenwood' || catCfg.backend === 'elecraft') && (
<> <>
<div className="space-y-1"> <div className="space-y-1">
<Label>{t('cat.kenwoodPort')}</Label> <Label>{t('cat.kenwoodPort')}</Label>
@@ -2725,6 +2744,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</label> </label>
<span className="text-xs text-muted-foreground">{t('cat.lowerLinesHint')}</span> <span className="text-xs text-muted-foreground">{t('cat.lowerLinesHint')}</span>
</div> </div>
{catCfg.backend === 'kenwood' ? (
<div className="space-y-1"> <div className="space-y-1">
<Label>{t('cat.kwDataMode')}</Label> <Label>{t('cat.kwDataMode')}</Label>
<Select value={(catCfg as any).kenwood_data_mode || 'usb'} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_data_mode: v } as any))}> <Select value={(catCfg as any).kenwood_data_mode || 'usb'} onValueChange={(v) => setCatCfg((s) => ({ ...s, kenwood_data_mode: v } as any))}>
@@ -2734,7 +2754,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem> <SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem>
<SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem> <SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem>
</SelectContent> </SelectContent>
</Select> </div> </Select>
</div>
) : (
<span className="text-xs text-muted-foreground">{t('cat.elecraftHint')}</span>
)}
</> </>
)} )}
{catCfg.backend === 'icom' && ( {catCfg.backend === 'icom' && (
@@ -4108,6 +4132,39 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} /> onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span> <span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
</label> </label>
{/* Self-spot. The interval only shows once it's on an interval for
something switched off is just a question the operator can't act on. */}
<div className="border-t border-border/60 pt-3 space-y-2">
<div className="flex items-center gap-3 flex-wrap">
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={selfSpot.enabled}
onCheckedChange={(c) => setSelfSpot((s) => ({ ...s, enabled: !!c }))} />
{t('clu.selfSpot')}
</label>
{selfSpot.enabled && (
<div className="flex items-center gap-2 text-sm">
<span className="text-muted-foreground">{t('clu.selfSpotEvery')}</span>
<Input
type="number"
min={SELF_SPOT_MIN_MIN}
max={240}
className="w-20 h-8 font-mono text-xs"
value={selfSpotText}
onChange={(e) => setSelfSpotText(e.target.value)}
onBlur={() => {
const n = Math.floor(Number(selfSpotText));
const v = Number.isFinite(n) && n > SELF_SPOT_MIN_MIN ? Math.min(n, 240) : SELF_SPOT_MIN_MIN;
setSelfSpotText(String(v));
setSelfSpot((s) => ({ ...s, minutes: v }));
}}
/>
<span className="text-muted-foreground">{t('clu.selfSpotMinutes')}</span>
</div>
)}
</div>
<p className="text-xs text-muted-foreground leading-relaxed">{t('clu.selfSpotHint')}</p>
</div>
</div> </div>
{editingServer && ( {editingServer && (
@@ -4305,7 +4362,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
title={t('sec.backup')} title={t('sec.backup')}
hint={mysqlCfg.enabled ? t('bk.hintMysql') : t('bk.hint')} hint={mysqlCfg.enabled ? t('bk.hintMysql') : t('bk.hint')}
/> />
<div className="space-y-4 max-w-xl"> <div className="space-y-5 max-w-2xl">
<label className="flex items-center gap-2 text-sm cursor-pointer"> <label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox <Checkbox
checked={!!backupCfg.enabled} checked={!!backupCfg.enabled}
@@ -4346,7 +4403,6 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div> </div>
</div> </div>
<div className="flex items-end gap-3">
<div className="space-y-1.5"> <div className="space-y-1.5">
<Label className="text-xs text-muted-foreground">{t('bk.rotation')}</Label> <Label className="text-xs text-muted-foreground">{t('bk.rotation')}</Label>
<Input <Input
@@ -4361,13 +4417,39 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
}} }}
/> />
</div> </div>
<label className="flex items-center gap-2 text-sm cursor-pointer pb-2">
{/* Stacked, not one flex row: these labels are full sentences and the
"keep every backup" hint is two lines side by side they wrapped
into unreadable slivers. It also puts keep-all under the option it
depends on rather than beside it. */}
<div className="space-y-2.5">
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox <Checkbox
checked={!!backupCfg.zip} checked={!!backupCfg.zip}
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, zip: !!c }))} onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, zip: !!c }))}
/> />
<span>{t('bk.zip')}</span> <span>{t('bk.zip')}</span>
</label> </label>
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox
checked={!!(backupCfg as any).every_exit}
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, every_exit: !!c } as any))}
/>
<span>{t('bk.everyExit')}</span>
</label>
{!!(backupCfg as any).every_exit && (
<label className="flex items-start gap-2 text-sm cursor-pointer pl-6">
<Checkbox
className="mt-0.5"
checked={!!(backupCfg as any).keep_all}
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, keep_all: !!c } as any))}
/>
<span>
{t('bk.keepAll')}
<span className="block text-xs text-muted-foreground mt-0.5 leading-relaxed">{t('bk.keepAllHint')}</span>
</span>
</label>
)}
</div> </div>
<div className="border-t border-border/60 pt-3 flex items-center gap-3"> <div className="border-t border-border/60 pt-3 flex items-center gap-3">
@@ -5179,8 +5261,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
</div> </div>
<p className="text-[11px] text-muted-foreground">{t('db.appDbHint')}</p> <p className="text-[11px] text-muted-foreground">{t('db.appDbHint')}</p>
<div className="flex flex-wrap gap-2"> <div className="flex flex-wrap gap-2">
<Button variant="outline" size="sm" onClick={createNew}><Plus className="size-3.5" /> {t('db.newDb')}</Button>
<Button variant="outline" size="sm" onClick={openExisting}><Database className="size-3.5" /> {t('db.openExisting')}</Button>
<Button variant="outline" size="sm" onClick={saveCopy}><Copy className="size-3.5" /> {t('db.saveCopy')}</Button>
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
<Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button> <Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
</div> </div>
{/* The DB pointer is only read at startup, so offer the restart inline. */}
{dbMsg && (
<div className="text-[11px] text-success space-y-1 pt-1">
<div>{t('db.savedRestart')} <span className="font-mono break-all">{dbMsg}</span></div>
<Button size="sm" className="h-7" onClick={() => RestartApp().catch((e: any) => setErr(String(e?.message ?? e)))}>
<Power className="size-3.5" /> {t('db.restartNow')}
</Button>
<span className="ml-2 text-muted-foreground">{t('db.restartHint')}</span>
</div>
)}
</div> </div>
{/* Logbook (QSOs) — this profile: default SQLite file, a dedicated file, or MySQL. */} {/* Logbook (QSOs) — this profile: default SQLite file, a dedicated file, or MySQL. */}
@@ -5577,6 +5674,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<Checkbox checked={autofocusWB} onCheckedChange={(c) => { const v = !!c; setAutofocusWB(v); writeUiPref('opslog.autofocusWB', v ? '1' : '0'); }} /> <Checkbox checked={autofocusWB} onCheckedChange={(c) => { const v = !!c; setAutofocusWB(v); writeUiPref('opslog.autofocusWB', v ? '1' : '0'); }} />
{t('gen.autofocusWB')} {t('gen.autofocusWB')}
</label> </label>
{/* Backend setting, not a UI pref: the fold happens in the SQL. Saved
instantly like the rest of this panel. */}
<label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={workedVariants}
onCheckedChange={(c) => { const v = !!c; setWorkedVariants(v); SetWorkedCallVariants(v).catch((e: any) => setErr(String(e?.message ?? e))); }} />
{t('gen.workedVariants')} <span className="text-xs text-muted-foreground">{t('gen.workedVariantsHint')}</span>
</label>
<label className="flex items-center gap-2 text-sm cursor-pointer"> <label className="flex items-center gap-2 text-sm cursor-pointer">
<Checkbox checked={showBeamMap} onCheckedChange={(c) => { const v = !!c; setShowBeamMap(v); writeUiPref('opslog.showBeamOnMap', v ? '1' : '0'); }} /> <Checkbox checked={showBeamMap} onCheckedChange={(c) => { const v = !!c; setShowBeamMap(v); writeUiPref('opslog.showBeamOnMap', v ? '1' : '0'); }} />
{t('gen.showBeam')} {t('gen.showBeam')}
@@ -5802,6 +5906,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<span className="text-[11px] text-muted-foreground">{emailMsg}</span> <span className="text-[11px] text-muted-foreground">{emailMsg}</span>
</div> </div>
<div className="pt-2 mt-2 border-t border-border space-y-2">
<Label className="text-sm font-semibold">{t('em.recEmail')}</Label>
<div className="text-[11px] text-muted-foreground">
{t('em.recVarsHint')} {'{CALL}'} {'{DATE}'} {'{BAND}'} {'{MODE}'} {'{MYCALL}'}.
</div>
<Input className="h-8" placeholder={t('em.subject')} value={emailCfg.subject}
onChange={(e) => setEmailField({ subject: e.target.value })} />
<Textarea rows={3} className="text-sm" placeholder={t('em.body')} value={emailCfg.body}
onChange={(e) => setEmailField({ body: e.target.value })} />
</div>
<div className="pt-2 mt-2 border-t border-border space-y-2"> <div className="pt-2 mt-2 border-t border-border space-y-2">
<Label className="text-sm font-semibold">{t('em.qslCardEmail')}</Label> <Label className="text-sm font-semibold">{t('em.qslCardEmail')}</Label>
<div className="text-[11px] text-muted-foreground"> <div className="text-[11px] text-muted-foreground">
@@ -5818,6 +5933,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
<div className="text-[11px] text-muted-foreground"> <div className="text-[11px] text-muted-foreground">
{t('em.autoSendHint')} {t('em.autoSendHint')}
</div> </div>
<div className="pt-2 space-y-1">
<Label className="text-sm">{t('em.qslDefaultMsg')}</Label>
<Input className="h-8" placeholder={t('em.qslDefaultMsgPh')} value={eqslCfg.default_message ?? ''}
onChange={(e) => setEqslField({ default_message: e.target.value })} />
<div className="text-[11px] text-muted-foreground">{t('em.qslDefaultMsgHint')}</div>
</div>
</div> </div>
</div> </div>
</> </>
File diff suppressed because one or more lines are too long
+28
View File
@@ -0,0 +1,28 @@
// Capitalisation helpers for the free-text QSO fields (Name / QTH / Comment /
// Note).
//
// The same station reaches the log SHOUTED by QRZ, lower-cased by a hurried
// operator, and in whatever case the other logger stored it in an imported
// ADIF — so one callsign ends up as "JEAN", "jean" and "Jean" across a log,
// and sorting or reading a QTH column becomes a mess.
//
// Both helpers are meant to run on BLUR, never per keystroke: rewriting the
// value while the operator is still typing a word fights them mid-word (see
// the controlled-input note in CLAUDE.md).
// titleCase upper-cases the first letter of every word and lower-cases the
// rest. Separators are kept, so "SAINT-JULIEN" → "Saint-Julien" and
// "o'brien" → "O'Brien".
export function titleCase(s: string): string {
return s
.toLowerCase()
.replace(/(^|[\s\-'/.])(\p{L})/gu, (_m, sep: string, ch: string) => sep + ch.toUpperCase());
}
// sentenceCase upper-cases the first letter and leaves everything after it as
// typed. A comment routinely carries callsigns, modes and abbreviations
// ("TNX QSO F5ABC, FT8 59") that lower-casing would quietly destroy — which is
// why this is NOT titleCase.
export function sentenceCase(s: string): string {
return s.replace(/^(\s*)(\p{L})/u, (_m, sp: string, ch: string) => sp + ch.toUpperCase());
}
+8 -3
View File
@@ -6,11 +6,16 @@ import { GetUIPref } from '../../wailsjs/go/main/App';
// CSS variables in style.css key off of. 'auto' follows the OS light/dark // CSS variables in style.css key off of. 'auto' follows the OS light/dark
// preference. The choice is persisted (localStorage + portable UI pref, so it // preference. The choice is persisted (localStorage + portable UI pref, so it
// travels with the data/ folder like the language). // travels with the data/ folder like the language).
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'high-contrast'; export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic'
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
// Selectable, concrete themes (excludes 'auto') in display order. // Selectable, concrete themes (excludes 'auto') in display order: lights first,
// then darks, with high-contrast last — it is an accessibility choice, not a
// taste one, and listing it among the moods buries it.
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [ export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
'light-warm', 'light-cool', 'light-sage', 'dim-slate', 'dark-warm', 'dark-graphite', 'high-contrast', 'light-warm', 'light-cool', 'light-sage', 'light-nordic',
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
'high-contrast',
]; ];
export const LS_KEY = 'opslog.theme'; export const LS_KEY = 'opslog.theme';
+288 -3
View File
@@ -495,6 +495,286 @@
color-scheme: dark; color-scheme: dark;
} }
/* ---- Theme 5: Indigo — deep blue-violet, electric accent ----------------
The first seven themes are all neutral (beige, slate, graphite, black) with an
orange accent, so "another dark theme" only ever meant another grey. These
four carry a real hue in the SURFACES, not just in the accent, and each takes
a different primary — violet, cyan, pink, indigo — so they are told apart at a
glance in the picker.
Every one keeps the same contract: the semantic colours (success / warning /
caution / danger / info) must stay recognisable as themselves. A logger is
read for hours and "red = a problem" cannot become a decorative choice, so the
hue budget is spent on the surfaces and the primary, never on the meanings. */
[data-theme="dark-indigo"] {
--background: #0e0f1f;
--foreground: #e4e5f2;
--card: #181a30;
--card-foreground: #e4e5f2;
--popover: #181a30;
--popover-foreground: #e4e5f2;
--primary: #7c6cff; /* electric violet */
--primary-foreground: #0b0a1a;
--secondary: #222542;
--secondary-foreground: #e4e5f2;
--muted: #1e2038;
--muted-foreground: #9d9fbe;
--accent: #2a2d51;
--accent-foreground: #c7c9ee;
--destructive: #f2555a;
--destructive-foreground: #12030a;
--destructive-muted: #34131c;
--destructive-muted-foreground: #fca5a5;
--border: #2a2d4c;
--input: #2a2d4c;
--ring: #9b8dff;
--success: #34d399;
--success-foreground: #052018;
--success-muted: #0e2f27;
--success-muted-foreground: #6ee7b7;
--success-border: #165241;
--warning: #fbbf24;
--warning-foreground: #221803;
--warning-muted: #33280f;
--warning-muted-foreground: #fcd34d;
--warning-border: #4f3e15;
--caution: #facc15;
--caution-foreground: #221e04;
--caution-muted: #322d0e;
--caution-muted-foreground: #fde047;
--caution-border: #4b4315;
--danger: #fb7185;
--danger-foreground: #250912;
--danger-muted: #37151f;
--danger-muted-foreground: #fda4af;
--danger-border: #562533;
--info: #38bdf8;
--info-foreground: #051d29;
--info-muted: #0b2a3a;
--info-muted-foreground: #7dd3fc;
--info-border: #12475c;
/* The entity ramp moves to CYAN here: violet is the primary, and a violet
"entity confirmed" cell would read as a button. */
--mx-call-conf: #22c55e;
--mx-call-work: #2c7a52;
--mx-dx-conf: #22d3ee;
--mx-dx-work: #1b6b7c;
--mx-none: #2c2f4d;
--scrollbar-thumb: #383c63;
--scrollbar-thumb-hover: #4c5182;
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(228, 229, 242, 0.05);
color-scheme: dark;
}
/* ---- Theme 6: Ocean — deep teal, cyan accent --------------------------- */
[data-theme="dark-teal"] {
--background: #061c21;
--foreground: #dcecee;
--card: #0d2c33;
--card-foreground: #dcecee;
--popover: #0d2c33;
--popover-foreground: #dcecee;
--primary: #22d3ee; /* cyan */
--primary-foreground: #041d24;
--secondary: #143b44;
--secondary-foreground: #dcecee;
--muted: #10333b;
--muted-foreground: #92b4ba;
--accent: #15424c;
--accent-foreground: #a5d8e0;
--destructive: #f2555a;
--destructive-foreground: #12030a;
--destructive-muted: #35161a;
--destructive-muted-foreground: #fca5a5;
--border: #1a4652;
--input: #1a4652;
--ring: #5fe3f5;
--success: #4ade80;
--success-foreground: #04220f;
--success-muted: #0e3020;
--success-muted-foreground: #86efac;
--success-border: #17593a;
--warning: #fbbf24;
--warning-foreground: #221803;
--warning-muted: #33280f;
--warning-muted-foreground: #fcd34d;
--warning-border: #4f3e15;
--caution: #facc15;
--caution-foreground: #221e04;
--caution-muted: #312d0e;
--caution-muted-foreground: #fde047;
--caution-border: #4a4315;
--danger: #fb7185;
--danger-foreground: #250912;
--danger-muted: #38161f;
--danger-muted-foreground: #fda4af;
--danger-border: #572634;
/* Info moves to a BLUE: a cyan "info" would be the primary colour again. */
--info: #7aa2f7;
--info-foreground: #04122e;
--info-muted: #16233f;
--info-muted-foreground: #a9c2fb;
--info-border: #2b3d66;
--mx-call-conf: #4ade80;
--mx-call-work: #2b7a4d;
--mx-dx-conf: #a78bfa;
--mx-dx-work: #5b4a9c;
--mx-none: #1c4550;
--scrollbar-thumb: #235a68;
--scrollbar-thumb-hover: #31788a;
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(220, 236, 238, 0.05);
color-scheme: dark;
}
/* ---- Theme 7: Plum — aubergine, magenta accent ------------------------- */
[data-theme="dark-plum"] {
--background: #180f1e;
--foreground: #eee0f0;
--card: #251830;
--card-foreground: #eee0f0;
--popover: #251830;
--popover-foreground: #eee0f0;
--primary: #f472b6; /* magenta-pink */
--primary-foreground: #250518;
--secondary: #33203f;
--secondary-foreground: #eee0f0;
--muted: #2b1b36;
--muted-foreground: #b39dbd;
--accent: #3b2648;
--accent-foreground: #dcc2e6;
--destructive: #f2555a;
--destructive-foreground: #12030a;
--destructive-muted: #3a1620;
--destructive-muted-foreground: #fca5a5;
--border: #3a2547;
--input: #3a2547;
--ring: #f9a8d4;
--success: #34d399;
--success-foreground: #052018;
--success-muted: #10302a;
--success-muted-foreground: #6ee7b7;
--success-border: #1a5745;
--warning: #fbbf24;
--warning-foreground: #221803;
--warning-muted: #352a12;
--warning-muted-foreground: #fcd34d;
--warning-border: #524019;
--caution: #facc15;
--caution-foreground: #221e04;
--caution-muted: #342e12;
--caution-muted-foreground: #fde047;
--caution-border: #4e4519;
/* Danger goes RED here, not rose: a rose "danger" beside a pink primary is
indistinguishable, and this is the one colour that must never be missed. */
--danger: #f43f3f;
--danger-foreground: #2a0606;
--danger-muted: #3d1418;
--danger-muted-foreground: #fca5a5;
--danger-border: #5c2128;
--info: #38bdf8;
--info-foreground: #051d29;
--info-muted: #0f2b3a;
--info-muted-foreground: #7dd3fc;
--info-border: #16485d;
--mx-call-conf: #22c55e;
--mx-call-work: #2f7d55;
--mx-dx-conf: #60a5fa;
--mx-dx-work: #35538c;
--mx-none: #3a2647;
--scrollbar-thumb: #4a3159;
--scrollbar-thumb-hover: #644176;
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(238, 224, 240, 0.05);
color-scheme: dark;
}
/* ---- Theme 8: Nordic light — crisp cool white, indigo accent ----------- */
[data-theme="light-nordic"] {
--background: #eef1f7;
--foreground: #1b2130;
--card: #ffffff;
--card-foreground: #1b2130;
--popover: #ffffff;
--popover-foreground: #1b2130;
--primary: #4f46e5; /* indigo */
--primary-foreground: #ffffff;
--secondary: #dfe4ee;
--secondary-foreground: #1b2130;
--muted: #e2e7f0;
--muted-foreground: #4a5468;
--accent: #dcdcfb;
--accent-foreground: #312a91;
--destructive: #b91c1c;
--destructive-foreground: #ffffff;
--destructive-muted: #fef2f2;
--destructive-muted-foreground: #b91c1c;
--border: #c9d1e0;
--input: #c9d1e0;
--ring: #6366f1;
--success: #15803d;
--success-foreground: #ffffff;
--success-muted: #dcfce7;
--success-muted-foreground: #14532d;
--success-border: #86efac;
--warning: #b45309;
--warning-foreground: #ffffff;
--warning-muted: #fef3c7;
--warning-muted-foreground: #92400e;
--warning-border: #fcd34d;
--caution: #a16207;
--caution-foreground: #ffffff;
--caution-muted: #fef9c3;
--caution-muted-foreground: #854d0e;
--caution-border: #fde047;
--danger: #dc2626;
--danger-foreground: #ffffff;
--danger-muted: #fee2e2;
--danger-muted-foreground: #991b1b;
--danger-border: #fca5a5;
--info: #0369a1;
--info-foreground: #ffffff;
--info-muted: #e0f2fe;
--info-muted-foreground: #075985;
--info-border: #7dd3fc;
/* Entity ramp shifts to TEAL: indigo is the primary here. */
--mx-call-conf: #15803d;
--mx-call-work: #86efac;
--mx-dx-conf: #0f766e;
--mx-dx-work: #99f6e4;
--mx-none: #dde3ec;
--scrollbar-thumb: #b6c0d2;
--scrollbar-thumb-hover: #93a0b8;
--card-shadow: 0 1px 2px rgba(27, 33, 48, 0.06), 0 0 0 1px rgba(27, 33, 48, 0.03);
color-scheme: light;
}
/* ── Data-viz palette (Statistics dashboard) ──────────────────────────────── /* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
@@ -512,7 +792,8 @@
:root, :root,
[data-theme="light-warm"], [data-theme="light-warm"],
[data-theme="light-cool"], [data-theme="light-cool"],
[data-theme="light-sage"] { [data-theme="light-sage"],
[data-theme="light-nordic"] {
--chart-1: #2a78d6; /* blue — default single-series hue */ --chart-1: #2a78d6; /* blue — default single-series hue */
--chart-2: #1baf7a; /* aqua */ --chart-2: #1baf7a; /* aqua */
--chart-3: #eda100; /* yellow */ --chart-3: #eda100; /* yellow */
@@ -533,7 +814,10 @@
[data-theme="dim-slate"], [data-theme="dim-slate"],
[data-theme="dark-warm"], [data-theme="dark-warm"],
[data-theme="dark-graphite"], [data-theme="dark-graphite"],
[data-theme="high-contrast"] { [data-theme="high-contrast"],
[data-theme="dark-indigo"],
[data-theme="dark-teal"],
[data-theme="dark-plum"] {
--chart-1: #3987e5; --chart-1: #3987e5;
--chart-2: #199e70; --chart-2: #199e70;
--chart-3: #c98500; --chart-3: #c98500;
@@ -681,7 +965,8 @@
help. */ help. */
Every temporal input carries the same glyph, so the rule names them all: Every temporal input carries the same glyph, so the rule names them all:
datetime-local was left out at first and its icon stayed invisible. */ datetime-local was left out at first and its icon stayed invisible. */
:is([data-theme='dim-slate'], [data-theme='dark-warm'], [data-theme='dark-graphite'], [data-theme='high-contrast']) :is([data-theme='dim-slate'], [data-theme='dark-warm'], [data-theme='dark-graphite'], [data-theme='high-contrast'],
[data-theme='dark-indigo'], [data-theme='dark-teal'], [data-theme='dark-plum'])
:is(input[type='date'], input[type='datetime-local'], input[type='time'], input[type='month'], input[type='week'])::-webkit-calendar-picker-indicator { :is(input[type='date'], input[type='datetime-local'], input[type='time'], input[type='month'], input[type='week'])::-webkit-calendar-picker-indicator {
filter: invert(1) brightness(1.8); filter: invert(1) brightness(1.8);
opacity: 0.9; opacity: 0.9;
+1 -1
View File
@@ -1,6 +1,6 @@
// Single source of truth for the app version shown in the UI (header + About). // Single source of truth for the app version shown in the UI (header + About).
// Bump this on a release (the release script updates it alongside telemetry.go). // Bump this on a release (the release script updates it alongside telemetry.go).
export const APP_VERSION = '0.23.7'; export const APP_VERSION = '0.24.0';
// Author / credits, shown in Help -> About. // Author / credits, shown in Help -> About.
export const APP_AUTHOR = 'F4BPO'; export const APP_AUTHOR = 'F4BPO';
+10
View File
@@ -481,6 +481,8 @@ export function GetScpStatus():Promise<main.ScpStatus>;
export function GetSecretStatus():Promise<main.SecretStatus>; export function GetSecretStatus():Promise<main.SecretStatus>;
export function GetSelfSpotSettings():Promise<main.SelfSpotSettings>;
export function GetSlotStats():Promise<qso.SlotStats>; export function GetSlotStats():Promise<qso.SlotStats>;
export function GetSolarData():Promise<solar.Data>; export function GetSolarData():Promise<solar.Data>;
@@ -513,6 +515,8 @@ export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
export function GetWinkeyerStatus():Promise<winkeyer.Status>; export function GetWinkeyerStatus():Promise<winkeyer.Status>;
export function GetWorkedCallVariants():Promise<boolean>;
export function GetYaesuState():Promise<cat.YaesuTXState>; export function GetYaesuState():Promise<cat.YaesuTXState>;
export function HasBuiltinReferences(arg1:string):Promise<boolean>; export function HasBuiltinReferences(arg1:string):Promise<boolean>;
@@ -895,6 +899,8 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):Promise<void>;
export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>; export function SaveRotators(arg1:Array<main.RotatorDevice>):Promise<void>;
export function SaveSelfSpotSettings(arg1:main.SelfSpotSettings):Promise<void>;
export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>; export function SaveStationDevices(arg1:Array<main.StationDevice>):Promise<void>;
export function SaveStationSettings(arg1:main.StationSettings):Promise<void>; export function SaveStationSettings(arg1:main.StationSettings):Promise<void>;
@@ -949,6 +955,8 @@ export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
export function SetKenwoodKeySpeed(arg1:number):Promise<void>; export function SetKenwoodKeySpeed(arg1:number):Promise<void>;
export function SetOpsLogQSLReceived(arg1:number,arg2:boolean):Promise<void>;
export function SetPassphrase(arg1:string):Promise<void>; export function SetPassphrase(arg1:string):Promise<void>;
export function SetScpEnabled(arg1:boolean):Promise<void>; export function SetScpEnabled(arg1:boolean):Promise<void>;
@@ -961,6 +969,8 @@ export function SetUltrabeamDirection(arg1:number):Promise<void>;
export function SetWinkeyerTrace(arg1:boolean):Promise<void>; export function SetWinkeyerTrace(arg1:boolean):Promise<void>;
export function SetWorkedCallVariants(arg1:boolean):Promise<void>;
export function SetYaesuAFGain(arg1:number):Promise<void>; export function SetYaesuAFGain(arg1:number):Promise<void>;
export function SetYaesuAGC(arg1:string):Promise<void>; export function SetYaesuAGC(arg1:string):Promise<void>;
+20
View File
@@ -910,6 +910,10 @@ export function GetSecretStatus() {
return window['go']['main']['App']['GetSecretStatus'](); return window['go']['main']['App']['GetSecretStatus']();
} }
export function GetSelfSpotSettings() {
return window['go']['main']['App']['GetSelfSpotSettings']();
}
export function GetSlotStats() { export function GetSlotStats() {
return window['go']['main']['App']['GetSlotStats'](); return window['go']['main']['App']['GetSlotStats']();
} }
@@ -974,6 +978,10 @@ export function GetWinkeyerStatus() {
return window['go']['main']['App']['GetWinkeyerStatus'](); return window['go']['main']['App']['GetWinkeyerStatus']();
} }
export function GetWorkedCallVariants() {
return window['go']['main']['App']['GetWorkedCallVariants']();
}
export function GetYaesuState() { export function GetYaesuState() {
return window['go']['main']['App']['GetYaesuState'](); return window['go']['main']['App']['GetYaesuState']();
} }
@@ -1738,6 +1746,10 @@ export function SaveRotators(arg1) {
return window['go']['main']['App']['SaveRotators'](arg1); return window['go']['main']['App']['SaveRotators'](arg1);
} }
export function SaveSelfSpotSettings(arg1) {
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
}
export function SaveStationDevices(arg1) { export function SaveStationDevices(arg1) {
return window['go']['main']['App']['SaveStationDevices'](arg1); return window['go']['main']['App']['SaveStationDevices'](arg1);
} }
@@ -1846,6 +1858,10 @@ export function SetKenwoodKeySpeed(arg1) {
return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1); return window['go']['main']['App']['SetKenwoodKeySpeed'](arg1);
} }
export function SetOpsLogQSLReceived(arg1, arg2) {
return window['go']['main']['App']['SetOpsLogQSLReceived'](arg1, arg2);
}
export function SetPassphrase(arg1) { export function SetPassphrase(arg1) {
return window['go']['main']['App']['SetPassphrase'](arg1); return window['go']['main']['App']['SetPassphrase'](arg1);
} }
@@ -1870,6 +1886,10 @@ export function SetWinkeyerTrace(arg1) {
return window['go']['main']['App']['SetWinkeyerTrace'](arg1); return window['go']['main']['App']['SetWinkeyerTrace'](arg1);
} }
export function SetWorkedCallVariants(arg1) {
return window['go']['main']['App']['SetWorkedCallVariants'](arg1);
}
export function SetYaesuAFGain(arg1) { export function SetYaesuAFGain(arg1) {
return window['go']['main']['App']['SetYaesuAFGain'](arg1); return window['go']['main']['App']['SetYaesuAFGain'](arg1);
} }
+26
View File
@@ -315,6 +315,7 @@ export namespace award {
pattern: string; pattern: string;
leading_str?: string; leading_str?: string;
trailing_str?: string; trailing_str?: string;
prefix?: string;
dynamic?: boolean; dynamic?: boolean;
one_ref_per_qso?: boolean; one_ref_per_qso?: boolean;
or_rules?: OrRule[]; or_rules?: OrRule[];
@@ -324,6 +325,8 @@ export namespace award {
emission?: string[]; emission?: string[];
confirm: string[]; confirm: string[];
validate?: string[]; validate?: string[];
confirm_field?: string;
confirm_value?: string;
grant_codes?: string; grant_codes?: string;
export_credit_granted?: boolean; export_credit_granted?: boolean;
total: number; total: number;
@@ -356,6 +359,7 @@ export namespace award {
this.pattern = source["pattern"]; this.pattern = source["pattern"];
this.leading_str = source["leading_str"]; this.leading_str = source["leading_str"];
this.trailing_str = source["trailing_str"]; this.trailing_str = source["trailing_str"];
this.prefix = source["prefix"];
this.dynamic = source["dynamic"]; this.dynamic = source["dynamic"];
this.one_ref_per_qso = source["one_ref_per_qso"]; this.one_ref_per_qso = source["one_ref_per_qso"];
this.or_rules = this.convertValues(source["or_rules"], OrRule); this.or_rules = this.convertValues(source["or_rules"], OrRule);
@@ -365,6 +369,8 @@ export namespace award {
this.emission = source["emission"]; this.emission = source["emission"];
this.confirm = source["confirm"]; this.confirm = source["confirm"];
this.validate = source["validate"]; this.validate = source["validate"];
this.confirm_field = source["confirm_field"];
this.confirm_value = source["confirm_value"];
this.grant_codes = source["grant_codes"]; this.grant_codes = source["grant_codes"];
this.export_credit_granted = source["export_credit_granted"]; this.export_credit_granted = source["export_credit_granted"];
this.total = source["total"]; this.total = source["total"];
@@ -1894,6 +1900,8 @@ export namespace main {
folder: string; folder: string;
rotation: number; rotation: number;
zip: boolean; zip: boolean;
every_exit: boolean;
keep_all: boolean;
last_backup_at: string; last_backup_at: string;
default_folder: string; default_folder: string;
@@ -1907,6 +1915,8 @@ export namespace main {
this.folder = source["folder"]; this.folder = source["folder"];
this.rotation = source["rotation"]; this.rotation = source["rotation"];
this.zip = source["zip"]; this.zip = source["zip"];
this.every_exit = source["every_exit"];
this.keep_all = source["keep_all"];
this.last_backup_at = source["last_backup_at"]; this.last_backup_at = source["last_backup_at"];
this.default_folder = source["default_folder"]; this.default_folder = source["default_folder"];
} }
@@ -2635,6 +2645,7 @@ export namespace main {
subject: string; subject: string;
body: string; body: string;
auto_send: boolean; auto_send: boolean;
default_message: string;
static createFrom(source: any = {}) { static createFrom(source: any = {}) {
return new QSLEmailTemplates(source); return new QSLEmailTemplates(source);
@@ -2645,6 +2656,7 @@ export namespace main {
this.subject = source["subject"]; this.subject = source["subject"];
this.body = source["body"]; this.body = source["body"];
this.auto_send = source["auto_send"]; this.auto_send = source["auto_send"];
this.default_message = source["default_message"];
} }
} }
export class QSLFontInfo { export class QSLFontInfo {
@@ -2906,6 +2918,20 @@ export namespace main {
this.unlocked = source["unlocked"]; this.unlocked = source["unlocked"];
} }
} }
export class SelfSpotSettings {
enabled: boolean;
minutes: number;
static createFrom(source: any = {}) {
return new SelfSpotSettings(source);
}
constructor(source: any = {}) {
if ('string' === typeof source) source = JSON.parse(source);
this.enabled = source["enabled"];
this.minutes = source["minutes"];
}
}
export class SpotQuery { export class SpotQuery {
call: string; call: string;
band: string; band: string;
+95 -7
View File
@@ -74,6 +74,7 @@ type Def struct {
Pattern string `json:"pattern"` // award-level Go regexp; group 1 = reference Pattern string `json:"pattern"` // award-level Go regexp; group 1 = reference
LeadingStr string `json:"leading_str,omitempty"` // strip this prefix before matching LeadingStr string `json:"leading_str,omitempty"` // strip this prefix before matching
TrailingStr string `json:"trailing_str,omitempty"` // strip this suffix before matching TrailingStr string `json:"trailing_str,omitempty"` // strip this suffix before matching
Prefix string `json:"prefix,omitempty"` // prepended to each found reference (e.g. captured "01" + "D" → "D01"), same as OrRule.Prefix
Dynamic bool `json:"dynamic,omitempty"` // references not predefined (any value counts) Dynamic bool `json:"dynamic,omitempty"` // references not predefined (any value counts)
// OneRefPerQSO refuses an AMBIGUOUS match rather than guessing. // OneRefPerQSO refuses an AMBIGUOUS match rather than guessing.
// //
@@ -110,6 +111,18 @@ type Def struct {
// --- Confirmation --- // --- Confirmation ---
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
Validate []string `json:"validate,omitempty"` // validated/granted sources Validate []string `json:"validate,omitempty"` // validated/granted sources
// The "custom" source, for confirmations OpsLog has no dedicated column for:
// ConfirmField names a QSO field or an ADIF extras key, ConfirmValue the
// value(s) that count (comma-separated, case-insensitive).
//
// An EMPTY ConfirmValue means "any non-empty value confirms" — which is what
// the OpsLog card marker needs: APP_OPSLOG_QSL_RCVD stores the timestamp of
// the day the card arrived, not a Y/N flag. The same shape serves a key
// stamped by an outside source (a club's CSV imported into an extras field),
// so one mechanism covers every "confirmed somewhere else" case instead of a
// new checkbox per site.
ConfirmField string `json:"confirm_field,omitempty"`
ConfirmValue string `json:"confirm_value,omitempty"`
// NOT IMPLEMENTED. Kept so the values operators already typed are not lost, but // NOT IMPLEMENTED. Kept so the values operators already typed are not lost, but
// nothing reads them: no ADIF export has ever written CREDIT_GRANTED. Their // nothing reads them: no ADIF export has ever written CREDIT_GRANTED. Their
// controls have been removed from the editor — a checkbox that quietly does // controls have been removed from the editor — a checkbox that quietly does
@@ -522,8 +535,8 @@ func Compute(defs []Def, qsos []qso.QSO, refMetas map[string][]RefMeta, nameOf N
} }
band := strings.ToLower(strings.TrimSpace(q.Band)) band := strings.ToLower(strings.TrimSpace(q.Band))
modeClass := ModeClass(q.Mode) modeClass := ModeClass(q.Mode)
isConf := confirmed(q, d.Confirm) isConf := confirmed(q, d.Confirm, d)
isVal := confirmed(q, d.Validate) isVal := confirmed(q, d.Validate, d)
for _, ref := range refs { for _, ref := range refs {
a := agg[i][ref] a := agg[i][ref]
if a == nil { if a == nil {
@@ -684,8 +697,9 @@ func manualRefs(q *qso.QSO, code string) []string {
} }
// Confirmed reports whether a QSO satisfies any of the given confirmation // Confirmed reports whether a QSO satisfies any of the given confirmation
// sources (lotw|qsl|eqsl). Exported for the statistics view. // sources (lotw|qsl|eqsl|qrzcom|custom). Exported for the statistics view.
func Confirmed(q *qso.QSO, sources []string) bool { return confirmed(q, sources) } // The Def is needed for the "custom" source, which reads the field IT names.
func Confirmed(q *qso.QSO, d Def, sources []string) bool { return confirmed(q, sources, &d) }
// InScope reports whether a QSO falls within an award's scope (DXCC entity, // InScope reports whether a QSO falls within an award's scope (DXCC entity,
// bands, modes, emission, dates) — independent of whether a reference was // bands, modes, emission, dates) — independent of whether a reference was
@@ -779,6 +793,10 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
byDesc := predefined && strings.EqualFold(strings.TrimSpace(matchBy), "description") byDesc := predefined && strings.EqualFold(strings.TrimSpace(matchBy), "description")
var found []string var found []string
// codesAreFinal: this branch produced references straight from the award's
// LIST, so they are already whole codes. The blanket prefix at the end must
// leave them alone — prefixing a code that is already "D74" yields "DD74".
codesAreFinal := false
switch { switch {
case re != nil: case re != nil:
// Award-level regex: capture group 1 (or whole match) for each hit. // Award-level regex: capture group 1 (or whole match) for each hit.
@@ -787,6 +805,7 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
// Match references by their DESCRIPTION/name appearing in the field // Match references by their DESCRIPTION/name appearing in the field
// (e.g. WAJA finds the prefecture name inside the QTH). ExactMatch means // (e.g. WAJA finds the prefecture name inside the QTH). ExactMatch means
// 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.
codesAreFinal = true
up := strings.ToUpper(raw) up := strings.ToUpper(raw)
for _, nc := range rl.names { for _, nc := range rl.names {
if exact { if exact {
@@ -809,9 +828,23 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
// "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.
codesAreFinal = true
for _, tok := range tokenize(raw) { for _, tok := range tokenize(raw) {
if _, ok := rl.byCode[tok]; ok { if _, ok := rl.byCode[tok]; ok {
found = append(found, tok) found = append(found, tok)
continue
}
// The field may carry the reference WITHOUT the award's letter: a French
// operator writes "74" in STATE while the DDFM codes are "D74". Prefix is
// exactly what that case is for, so try the prefixed form HERE — applying
// it after the lookup (as the blanket pass below used to) could never
// help, because the lookup is the step that failed. Without this, the
// only way to match a bare department was to write a regex, in a mode
// where the operator had chosen "code" and not "pattern".
if prefix != "" {
if _, ok := rl.byCode[prefix+tok]; ok {
found = append(found, prefix+tok)
}
} }
} }
for _, code := range rl.withPattern { for _, code := range rl.withPattern {
@@ -825,7 +858,7 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
// counts each reference separately. // counts each reference separately.
found = splitRefs(raw) found = splitRefs(raw)
} }
if prefix != "" { if prefix != "" && !codesAreFinal {
for i := range found { for i := range found {
found[i] = prefix + found[i] found[i] = prefix + found[i]
} }
@@ -960,7 +993,7 @@ func candidatesTrace(d *Def, re *regexp.Regexp, q *qso.QSO, rl refList, hasList
// Testing the raw candidate would call that a hit, skip every fallback, and // Testing the raw candidate would call that a hit, skip every fallback, and
// only then drop it as unlisted — leaving the QSO unmatched even though the // only then drop it as unlisted — leaving the QSO unmatched even though the
// next rule ("find the code inside the QTH") would have found BG. // next rule ("find the code inside the QTH") would have found BG.
found := run("primary", d.Field, d.MatchBy, d.Pattern, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, "") found := run("primary", d.Field, d.MatchBy, d.Pattern, re, d.ExactMatch, d.LeadingStr, d.TrailingStr, d.Prefix)
for i := range d.OrRules { for i := range d.OrRules {
r := &d.OrRules[i] r := &d.OrRules[i]
label := fmt.Sprintf("OR %d", i+1) label := fmt.Sprintf("OR %d", i+1)
@@ -1373,7 +1406,7 @@ func dxccAllowed(dxcc *int, filter []int) bool {
// confirmed reports whether the QSO satisfies any accepted confirmation source. // confirmed reports whether the QSO satisfies any accepted confirmation source.
// ADIF *_QSL_RCVD values Y (confirmed) and V (verified) both count. // ADIF *_QSL_RCVD values Y (confirmed) and V (verified) both count.
func confirmed(q *qso.QSO, sources []string) bool { func confirmed(q *qso.QSO, sources []string, d *Def) bool {
for _, s := range sources { for _, s := range sources {
switch s { switch s {
case "lotw": case "lotw":
@@ -1388,11 +1421,66 @@ func confirmed(q *qso.QSO, sources []string) bool {
if isYes(q.EQSLRcvd) { if isYes(q.EQSLRcvd) {
return true return true
} }
case "qrzcom":
// The DOWNLOAD status, not the upload one: uploading a QSO to QRZ is
// us telling them, not them confirming it back.
if isYes(q.QRZComDownloadStatus) {
return true
}
case "custom":
if customConfirmed(q, d) {
return true
}
} }
} }
return false return false
} }
// customConfirmed answers the operator-defined confirmation source: the field
// named by ConfirmField, optionally required to hold one of ConfirmValue's
// comma-separated values.
//
// A source that names no field confirms NOTHING. That is deliberate: ticking
// "custom" without saying what it means used to mark every QSO as unconfirmed
// anyway, and silently marking them all CONFIRMED instead would be far worse.
func customConfirmed(q *qso.QSO, d *Def) bool {
if d == nil {
return false
}
field := strings.TrimSpace(d.ConfirmField)
if field == "" {
return false
}
got := strings.TrimSpace(customFieldValue(q, field))
if got == "" {
return false
}
want := strings.TrimSpace(d.ConfirmValue)
if want == "" {
return true // any value at all counts — see ConfirmField's doc
}
for _, w := range strings.Split(want, ",") {
if w = strings.TrimSpace(w); w != "" && strings.EqualFold(w, got) {
return true
}
}
return false
}
// customFieldValue resolves the field a custom confirmation names: one of the
// engine's known QSO fields first, then the ADIF extras — which is where the
// OpsLog card marker (APP_OPSLOG_QSL_RCVD) and anything stamped by an outside
// import actually live.
func customFieldValue(q *qso.QSO, field string) string {
if v := strings.TrimSpace(fieldRaw(field, q)); v != "" {
return v
}
if q.Extras == nil {
return ""
}
return q.Extras[strings.ToUpper(strings.TrimSpace(field))]
}
func isYes(v string) bool { func isYes(v string) bool {
switch strings.ToUpper(strings.TrimSpace(v)) { switch strings.ToUpper(strings.TrimSpace(v)) {
case "Y", "V": case "Y", "V":
+5 -2
View File
@@ -20,7 +20,10 @@
"match_by": "description" "match_by": "description"
} }
], ],
"dxcc_filter": null, "dxcc_filter": [
15,
54
],
"valid_bands": [ "valid_bands": [
"160m", "160m",
"60m", "60m",
@@ -43,7 +46,7 @@
], ],
"total": 0, "total": 0,
"builtin": true, "builtin": true,
"version": 1 "version": 2
}, },
"references": [ "references": [
{ {
+66
View File
@@ -0,0 +1,66 @@
package award
import (
"testing"
"hamlog/internal/qso"
)
// Every source the editor offers must actually do something. "qrzcom" and
// "custom" were listed in the UI and in Def's doc comment but had no case in the
// switch, so ticking either marked nothing as confirmed — a checkbox that is
// trusted and silently inert.
func TestConfirmedSources(t *testing.T) {
cases := []struct {
name string
q qso.QSO
d Def
sources []string
want bool
}{
{"lotw", qso.QSO{LOTWRcvd: "Y"}, Def{}, []string{"lotw"}, true},
{"qsl", qso.QSO{QSLRcvd: "Y"}, Def{}, []string{"qsl"}, true},
{"eqsl", qso.QSO{EQSLRcvd: "Y"}, Def{}, []string{"eqsl"}, true},
// QRZ confirms on the DOWNLOAD status. The upload one is us telling QRZ
// about the QSO, which is not a confirmation of anything.
{"qrz download", qso.QSO{QRZComDownloadStatus: "Y"}, Def{}, []string{"qrzcom"}, true},
{"qrz upload only", qso.QSO{QRZComUploadStatus: "Y"}, Def{}, []string{"qrzcom"}, false},
// Custom, no value required: any non-empty value counts. This is the
// OpsLog card case — the marker holds a timestamp, not a flag.
{"custom any value",
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": "2026-08-09T01:00:00Z"}},
Def{ConfirmField: "APP_OPSLOG_QSL_RCVD"}, []string{"custom"}, true},
{"custom field empty",
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": ""}},
Def{ConfirmField: "APP_OPSLOG_QSL_RCVD"}, []string{"custom"}, false},
// Custom with an explicit value list, matched case-insensitively.
{"custom value match",
qso.QSO{Extras: map[string]string{"APP_CLUB_CONF": "v"}},
Def{ConfirmField: "APP_CLUB_CONF", ConfirmValue: "Y,V"}, []string{"custom"}, true},
{"custom value mismatch",
qso.QSO{Extras: map[string]string{"APP_CLUB_CONF": "N"}},
Def{ConfirmField: "APP_CLUB_CONF", ConfirmValue: "Y,V"}, []string{"custom"}, false},
// A custom source naming no field must confirm NOTHING — never everything.
{"custom without a field",
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": "x"}},
Def{}, []string{"custom"}, false},
// Known QSO fields resolve too, not just extras.
{"custom on a known field", qso.QSO{State: "TX"},
Def{ConfirmField: "state", ConfirmValue: "TX"}, []string{"custom"}, true},
// Any source in the list is enough.
{"first source misses, second hits", qso.QSO{EQSLRcvd: "Y"}, Def{},
[]string{"lotw", "eqsl"}, true},
{"no source set", qso.QSO{LOTWRcvd: "Y"}, Def{}, nil, false},
}
for _, c := range cases {
if got := Confirmed(&c.q, c.d, c.sources); got != c.want {
t.Errorf("%s: Confirmed = %v, want %v", c.name, got, c.want)
}
}
}
+81
View File
@@ -0,0 +1,81 @@
package award
import (
"testing"
"hamlog/internal/qso"
)
// ddfmLike is a small stand-in for the French departments award: predefined
// references whose codes carry a letter the operator does not type.
func ddfmLike() []Def {
return []Def{{
Code: "DDFM", Name: "Departments", Type: TypeQSOFields,
Field: "state", MatchBy: "code", Prefix: "D",
}}
}
func ddfmRefs() map[string][]RefMeta {
return map[string][]RefMeta{"DDFM": {
{Code: "D29", Name: "Finistère", Valid: true},
{Code: "D49", Name: "Maine-et-Loire", Valid: true},
{Code: "D74", Name: "Haute-Savoie", Valid: true},
}}
}
func refsOf(t *testing.T, defs []Def, q qso.QSO) []string {
t.Helper()
res := Compute(defs, []qso.QSO{q}, ddfmRefs(), nil)
if len(res) != 1 {
t.Fatalf("want 1 result, got %d", len(res))
}
var out []string
for _, r := range res[0].Refs {
if r.Worked {
out = append(out, r.Ref)
}
}
return out
}
// The reported case: the operator writes just "74" in STATE, the award's codes
// are "D74", match-by is "code" and a Prefix of "D" is set. That found nothing —
// the prefix was applied only AFTER the list lookup, i.e. after the step that
// had already failed — so the only workaround was a regex, in a mode where the
// operator had explicitly chosen "code" rather than "pattern".
func TestPrefixCompletesABareReference(t *testing.T) {
got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "74"})
if len(got) != 1 || got[0] != "D74" {
t.Errorf("bare state 74 with prefix D → %v, want [D74]", got)
}
}
// And a field that ALREADY holds the whole code must not be prefixed twice.
// The blanket pass turned "D74" into "DD74" whenever a prefix was configured.
func TestPrefixDoesNotDoubleUpOnACompleteCode(t *testing.T) {
got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "D74"})
if len(got) != 1 || got[0] != "D74" {
t.Errorf("state D74 with prefix D → %v, want [D74]", got)
}
}
// A token that is neither a code nor a prefixable one stays unmatched: the
// prefix must not invent references.
func TestPrefixDoesNotInventReferences(t *testing.T) {
if got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "99"}); len(got) != 0 {
t.Errorf("unknown department 99 → %v, want none", got)
}
}
// Without a prefix nothing changes: a bare number matches nothing, a full code
// matches itself.
func TestNoPrefixKeepsExactCodeMatching(t *testing.T) {
defs := ddfmLike()
defs[0].Prefix = ""
if got := refsOf(t, defs, qso.QSO{Callsign: "F5AYE", State: "74"}); len(got) != 0 {
t.Errorf("no prefix, state 74 → %v, want none", got)
}
if got := refsOf(t, defs, qso.QSO{Callsign: "F5AYE", State: "D74"}); len(got) != 1 || got[0] != "D74" {
t.Errorf("no prefix, state D74 → %v, want [D74]", got)
}
}
+17 -11
View File
@@ -44,7 +44,7 @@ func DefaultFolder(dataDir string) string {
// statement (no torn-copy window while the app keeps writing), and compacts // statement (no torn-copy window while the app keeps writing), and compacts
// the destination as a bonus. It replaces the old "checkpoint + raw io.Copy", // the destination as a bonus. It replaces the old "checkpoint + raw io.Copy",
// which could capture a half-written page during a concurrent write. // which could capture a half-written page during a concurrent write.
func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation int, doZip bool) (string, error) { func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation int, doZip bool, prefix string, unique bool) (string, error) {
if dbConn == nil { if dbConn == nil {
return "", fmt.Errorf("nil db connection") return "", fmt.Errorf("nil db connection")
} }
@@ -54,12 +54,20 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
if folder == "" { if folder == "" {
return "", fmt.Errorf("backup folder not set") return "", fmt.Errorf("backup folder not set")
} }
if prefix == "" {
prefix = "opslog"
}
if err := os.MkdirAll(folder, 0o755); err != nil { if err := os.MkdirAll(folder, 0o755); err != nil {
return "", fmt.Errorf("create backup folder: %w", err) return "", fmt.Errorf("create backup folder: %w", err)
} }
// One file per DAY by default (same-day runs overwrite). With `unique`, add the
// time so every run is a distinct file — rotation still keeps the newest N.
stamp := time.Now().Format("2006-01-02") stamp := time.Now().Format("2006-01-02")
base := fmt.Sprintf("opslog-%s", stamp) if unique {
stamp = time.Now().Format("2006-01-02-150405")
}
base := fmt.Sprintf("%s-%s", prefix, stamp)
// VACUUM INTO requires a non-existent target → use a temp file, then // VACUUM INTO requires a non-existent target → use a temp file, then
// move/zip it into place. // move/zip it into place.
@@ -92,7 +100,7 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
} }
} }
if err := rotate(folder, rotation); err != nil { if err := rotateMatch(folder, rotation, prefix+"-", ".db", ".db.zip"); err != nil {
// Rotation errors are non-fatal — the backup itself succeeded. // Rotation errors are non-fatal — the backup itself succeeded.
return dstPath, fmt.Errorf("rotate: %w (backup OK at %s)", err, dstPath) return dstPath, fmt.Errorf("rotate: %w (backup OK at %s)", err, dstPath)
} }
@@ -103,7 +111,7 @@ func Run(ctx context.Context, dbConn *sql.DB, dbPath, folder string, rotation in
// log lives on a shared MySQL server, where VACUUM INTO can't snapshot it — an // 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. // ADIF export is a portable, re-importable backup of the actual contacts.
// writeADIF must write the full ADIF to the path it's handed. // 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) { func RunADIF(folder string, rotation int, doZip bool, unique bool, writeADIF func(path string) error) (string, error) {
if rotation <= 0 { if rotation <= 0 {
rotation = 5 rotation = 5
} }
@@ -113,7 +121,11 @@ func RunADIF(folder string, rotation int, doZip bool, writeADIF func(path string
if err := os.MkdirAll(folder, 0o755); err != nil { if err := os.MkdirAll(folder, 0o755); err != nil {
return "", fmt.Errorf("create backup folder: %w", err) return "", fmt.Errorf("create backup folder: %w", err)
} }
base := "opslog-log-" + time.Now().Format("2006-01-02") stamp := time.Now().Format("2006-01-02")
if unique {
stamp = time.Now().Format("2006-01-02-150405")
}
base := "opslog-log-" + stamp
tmp := filepath.Join(folder, base+".adi.tmp") tmp := filepath.Join(folder, base+".adi.tmp")
_ = os.Remove(tmp) _ = os.Remove(tmp)
if err := writeADIF(tmp); err != nil { if err := writeADIF(tmp); err != nil {
@@ -203,12 +215,6 @@ func copyZipped(src, dst, innerName string) error {
return out.Close() return out.Close()
} }
// rotate keeps the most recent `keep` SQLite backups (opslog-*.db /
// opslog-*.db.zip) and deletes the rest.
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 // 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 // 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 // files are touched — never unrelated user files in the same folder. The suffix
+50 -3
View File
@@ -62,6 +62,10 @@ type Kenwood struct {
// leave the rig's current mode untouched (safest for a TS-590SG/TS-990S whose // leave the rig's current mode untouched (safest for a TS-590SG/TS-990S whose
// data mode is a USB modifier the operator sets on the rig). See SetMode. // data mode is a USB modifier the operator sets on the rig). See SetMode.
dataMode string dataMode string
// elecraft marks a K3/K4 (the "Elecraft" backend). It reuses this Kenwood-dialect
// client but, being an Elecraft, always drives digital modes to DATA A (MD6+DT0)
// — the sub-mode FT8 audio needs — instead of going through the dataMode option.
elecraft bool
mu sync.Mutex mu sync.Mutex
port serial.Port port serial.Port
@@ -287,7 +291,10 @@ func (k *Kenwood) ReadState() (RigState, error) {
s := RigState{Connected: true, Backend: "kenwood"} s := RigState{Connected: true, Backend: "kenwood"}
k.curVFO = f.VFO k.curVFO = f.VFO
s.Vfo = f.VFO s.Vfo = f.VFO
s.Mode = kenwoodModeToADIF(f.Mode, k.digital) // Both branches of SetMode that emit MD6 identify a K3/K4: the Elecraft
// backend, and the "MD6" data-mode option that exists for it. Decode the
// read-back the same way, or OpsLog contradicts the mode it just set.
s.Mode = kenwoodModeToADIF(f.Mode, k.digital, k.elecraft || k.dataMode == "data")
s.Rig = k.model s.Rig = k.model
// IF reports the frequency of the VFO in USE (what the operator hears). // IF reports the frequency of the VFO in USE (what the operator hears).
@@ -391,11 +398,30 @@ func (k *Kenwood) SetMode(mode string) error {
// mode digit fits every rig, so the operator picks: keep the rig's mode, use // mode digit fits every rig, so the operator picks: keep the rig's mode, use
// MD6 (K3/K4 DATA), or fall through to the default USB from kenwoodModeDigit. // MD6 (K3/K4 DATA), or fall through to the default USB from kenwoodModeDigit.
if isKenwoodDataMode(mode) { if isKenwoodDataMode(mode) {
// An Elecraft always uses DATA A for a soundcard digital mode — that's what
// the "Elecraft" backend means, so the dataMode option doesn't apply.
if k.elecraft {
if err := k.write("MD6;"); err != nil {
return err
}
return k.write("DT0;")
}
switch k.dataMode { switch k.dataMode {
case "keep": case "keep":
return nil // leave whatever data mode the operator set on the rig return nil // leave whatever data mode the operator set on the rig
case "data": case "data":
return k.write("MD6;") // Elecraft K3/K4 DATA mode // Elecraft K3/K4 DATA mode (MD6) PLUS the DATA-A submode (DT0). MD6 alone
// can leave the rig in an FSK/PSK data submode (from a prior RTTY/PSK
// session), where FT8 keys the transmitter but the rear sound-card audio
// never modulates — "transmits but nothing comes out". DT0 forces DATA A,
// the audio submode FT8 needs. This is the Elecraft path (the option is
// labelled K3/K4); a real K3/K4 answers DT with nothing. A plain Kenwood
// has no DT command and would "?;" it — but that's a misconfiguration
// (pick USB there), and IF is never latched so the link self-recovers.
if err := k.write("MD6;"); err != nil {
return err
}
return k.write("DT0;")
} }
} }
d := kenwoodModeDigit(mode, k.curFreq) d := kenwoodModeDigit(mode, k.curFreq)
@@ -413,6 +439,14 @@ func (k *Kenwood) SetDataMode(m string) {
k.mu.Unlock() k.mu.Unlock()
} }
// SetElecraft marks this client as driving a K3/K4 (the "Elecraft" backend), so
// digital modes always land in DATA A (MD6+DT0). Set before Start.
func (k *Kenwood) SetElecraft(v bool) {
k.mu.Lock()
k.elecraft = v
k.mu.Unlock()
}
// isKenwoodDataMode reports whether a mode name is a soundcard/data mode (FT8, // isKenwoodDataMode reports whether a mode name is a soundcard/data mode (FT8,
// PSK, JT…) rather than a voice/CW/RTTY mode the rig sets natively. // PSK, JT…) rather than a voice/CW/RTTY mode the rig sets natively.
func isKenwoodDataMode(mode string) bool { func isKenwoodDataMode(mode string) bool {
@@ -628,7 +662,11 @@ func kenwoodModeDigit(mode string, hz int64) byte {
// Digital modes are indistinguishable from SSB over CAT — the rig only knows // Digital modes are indistinguishable from SSB over CAT — the rig only knows
// it is on USB — so the operator's configured digital mode is used, exactly as // it is on USB — so the operator's configured digital mode is used, exactly as
// the other backends do. // the other backends do.
func kenwoodModeToADIF(d byte, digital string) string { //
// md6IsData says whether MD6 means DATA on THIS rig — true for an Elecraft
// (the K3/K4 backend, and the "MD6" data-mode option that targets it), false
// for a plain Kenwood. See below.
func kenwoodModeToADIF(d byte, digital string, md6IsData bool) string {
switch d { switch d {
case '1': case '1':
return "LSB" return "LSB"
@@ -641,6 +679,15 @@ func kenwoodModeToADIF(d byte, digital string) string {
case '5': case '5':
return "AM" return "AM"
case '6', '9': case '6', '9':
// One digit, two meanings. On a Kenwood MD6/MD9 is FSK/FSK-R; on an
// Elecraft it is DATA / DATA-REV — and DATA is precisely what SetMode
// puts a K3/K4 into for FT8. Reading it straight back as RTTY meant a K3
// running FT8 reported RTTY: the QSO was logged on the wrong mode, and
// the shared CAT link told WSJT-X/JTDX the rig sat in RTTY while they had
// asked for a data mode.
if md6IsData {
return digital
}
return "RTTY" return "RTTY"
} }
return "" return ""
+16 -1
View File
@@ -141,8 +141,23 @@ func TestKenwoodModeToADIF(t *testing.T) {
{'0', ""}, // unknown → say nothing rather than guess {'0', ""}, // unknown → say nothing rather than guess
} }
for _, c := range cases { for _, c := range cases {
if got := kenwoodModeToADIF(c.d, "FT8"); got != c.want { if got := kenwoodModeToADIF(c.d, "FT8", false); got != c.want {
t.Errorf("kenwoodModeToADIF(%q) = %q, want %q", c.d, got, c.want) t.Errorf("kenwoodModeToADIF(%q) = %q, want %q", c.d, got, c.want)
} }
} }
} }
// On a K3/K4 the same digits mean DATA / DATA-REV, not FSK — and DATA is what
// OpsLog itself sets for FT8. Decoding them as RTTY logged a K3 running FT8 on
// the wrong mode and told the shared-CAT clients the rig was in RTTY.
func TestKenwoodModeToADIFElecraftData(t *testing.T) {
for _, d := range []byte{'6', '9'} {
if got := kenwoodModeToADIF(d, "FT8", true); got != "FT8" {
t.Errorf("kenwoodModeToADIF(%q, elecraft) = %q, want %q", d, got, "FT8")
}
}
// Everything else is unaffected by the Elecraft dialect.
if got := kenwoodModeToADIF('2', "FT8", true); got != "USB" {
t.Errorf("kenwoodModeToADIF('2', elecraft) = %q, want USB", got)
}
}
@@ -0,0 +1,43 @@
package udp
import (
"strings"
"testing"
)
// The diagnostic that matters: a text payload arriving on a WSJT port must be
// READABLE in the log. "bad magic 0x3132372e" alone told the operator nothing —
// those four bytes are ASCII "127.", i.e. some program broadcasting an address
// where WSJT-X binary was expected.
func TestDescribePacketShowsTextAndHex(t *testing.T) {
got := describePacket([]byte("127.0.0.1:4532"))
for _, want := range []string{`14 bytes`, `"127.0.0.1:4532"`, `31 32 37 2e`} {
if !strings.Contains(got, want) {
t.Errorf("describePacket missing %q\ngot: %s", want, got)
}
}
}
// Binary stays inspectable: unprintable bytes become dots in the preview and
// the hex carries the real values.
func TestDescribePacketHandlesBinary(t *testing.T) {
got := describePacket([]byte{0xad, 0xbc, 0xcb, 0xda, 0x00})
if !strings.Contains(got, `"....."`) || !strings.Contains(got, "ad bc cb da 00") {
t.Errorf("binary preview wrong: %s", got)
}
}
// A long datagram is truncated, and says so, rather than dumping a whole packet
// into the log on every line.
func TestDescribePacketTruncates(t *testing.T) {
got := describePacket([]byte(strings.Repeat("A", 300)))
if !strings.Contains(got, "300 bytes") {
t.Errorf("lost the real length: %s", got)
}
if !strings.Contains(got, "…") {
t.Errorf("truncation not marked: %s", got)
}
if strings.Count(got, "41 ") > 96 {
t.Errorf("hex not capped: %s", got)
}
}
@@ -0,0 +1,63 @@
package udp
import (
"bytes"
"testing"
)
// Bytes captured from a real W&P relay in front of MSHV: the origin as text,
// a '|', then the untouched WSJT-X packet. This exact datagram produced
// "bad magic 0x3132372e" — 0x3132372e being ASCII "127.".
var wpDecode = []byte{
// "127.0.0.1:2237|"
0x31, 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x3a, 0x32, 0x32, 0x33, 0x37, 0x7c,
// magic, schema 3, type 2 (Decode), id "MSHV"
0xad, 0xbc, 0xcb, 0xda, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02,
0x00, 0x00, 0x00, 0x04, 0x4d, 0x53, 0x48, 0x56,
0x01, 0x01, 0x4b, 0x31, 0x28, 0x00, 0x00, 0x00, 0x16,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a,
0x00, 0x00, 0x00, 0x03, 0x46, 0x54, 0x38, // "FT8"
0x00, 0x00, 0x00, 0x0e, 0x54, 0x4e, 0x38, 0x47, 0x44, 0x20, 0x39, 0x41, 0x31, 0x4d, 0x4d, 0x20, 0x37, 0x33, // "TN8GD 9A1MM 73"
0x00, 0x00,
}
func TestParseWSJTBehindAForwarder(t *testing.T) {
if _, _, err := ParseWSJT(wpDecode); err != nil {
t.Fatalf("relayed packet still fails: %v", err)
}
// And the header is what was in the way: without it the same bytes parse.
if _, _, err := ParseWSJT(wpDecode[15:]); err != nil {
t.Fatalf("bare packet fails: %v", err)
}
}
func TestStripForwarderHeader(t *testing.T) {
bare := wpDecode[15:]
if got := stripForwarderHeader(bare); !bytes.Equal(got, bare) {
t.Error("a packet with no header must be returned untouched")
}
if got := stripForwarderHeader(wpDecode); !bytes.Equal(got, bare) {
t.Error("the text header was not stripped")
}
// A BINARY prefix is not a forwarder header — refusing it is what stops a
// corrupt packet that merely contains the magic from becoming a QSO.
binPrefix := append([]byte{0x00, 0x01, 0x02}, bare...)
if got := stripForwarderHeader(binPrefix); !bytes.Equal(got, binPrefix) {
t.Error("a non-printable prefix must not be treated as a header")
}
// Beyond the window, the magic is ignored however printable the prefix is.
far := append(bytes.Repeat([]byte("A"), maxFwdHeader+1), bare...)
if got := stripForwarderHeader(far); !bytes.Equal(got, far) {
t.Error("magic past maxFwdHeader must not be trusted")
}
// No magic anywhere, and runt packets, must not panic or invent anything.
for _, junk := range [][]byte{[]byte("127.0.0.1:2237|hello"), {}, {0xad}, {0xad, 0xbc, 0xcb}} {
if got := stripForwarderHeader(junk); !bytes.Equal(got, junk) {
t.Errorf("junk %q was altered", junk)
}
}
}
+68 -2
View File
@@ -94,6 +94,47 @@ type Server struct {
// id is distinct whenever there is more than one. // id is distinct whenever there is more than one.
dialHz map[string]int64 dialHz map[string]int64
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
// badPkts counts datagrams this listener could not parse, so the diagnostic
// dump below stays bounded. A misconfigured port is not a one-off: the
// sender that produced "bad magic 0x3132372e" put out ~150 packets a second,
// which fills the whole rotating log with the same line and buries the
// evidence of anything else.
badPkts int
}
// maxBadPktDumps is how many unparseable datagrams a listener describes in full
// before going quiet. Enough to identify the sender and the payload; few enough
// that a permanently misconfigured port costs a handful of lines, not a log.
const maxBadPktDumps = 5
// describePacket renders a datagram for the log: its size, a printable preview
// and the first bytes in hex.
//
// Both forms, deliberately. "bad magic 0x3132372e" is already readable as ASCII
// "127." to someone who thinks to decode it — and that one fact (the sender is
// emitting text, not WSJT-X binary) is the whole diagnosis. The hex stays for
// the case where the payload really is binary and the preview shows nothing.
func describePacket(pkt []byte) string {
const maxShown = 96
head := pkt
if len(head) > maxShown {
head = head[:maxShown]
}
var text, hex strings.Builder
for _, b := range head {
if b >= 0x20 && b < 0x7f {
text.WriteByte(b)
} else {
text.WriteByte('.')
}
fmt.Fprintf(&hex, "%02x ", b)
}
more := ""
if len(pkt) > maxShown {
more = "…"
}
return fmt.Sprintf("%d bytes | text %q%s | hex %s%s", len(pkt), text.String(), more, strings.TrimSpace(hex.String()), more)
} }
func newServer(cfg Config, out chan<- Event) *Server { func newServer(cfg Config, out chan<- Event) *Server {
@@ -201,13 +242,38 @@ func (s *Server) run() {
} }
} }
// logBadPacket reports a datagram this listener could not parse, with enough of
// it to identify the sender — then falls silent.
//
// The point is the SENDER: an unparseable packet on a WSJT port almost always
// means another program is broadcasting on it, or the service type is wrong for
// what is actually arriving. The remote address names the culprit, and the
// payload preview says what it really is. Neither was logged before, so the
// operator saw only a magic number repeated a few hundred times a second.
func (s *Server) logBadPacket(kind string, remote *net.UDPAddr, pkt []byte, err error) {
s.mu.Lock()
s.badPkts++
n := s.badPkts
s.mu.Unlock()
if n > maxBadPktDumps {
return
}
applog.Printf("udp: [%s] %s parse error from %s: %v — %s\n",
s.cfg.Name, kind, remote, err, describePacket(pkt))
if n == maxBadPktDumps {
applog.Printf("udp: [%s] further unparseable packets on port %d will not be logged — "+
"check that the sender belongs on this port and that the service type matches\n",
s.cfg.Name, s.cfg.Port)
}
}
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) { func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()} ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
switch s.cfg.ServiceType { switch s.cfg.ServiceType {
case ServiceWSJT: case ServiceWSJT:
w, ok, err := ParseWSJT(pkt) w, ok, err := ParseWSJT(pkt)
if err != nil { if err != nil {
applog.Printf("udp: [%s] WSJT parse error: %v\n", s.cfg.Name, err) s.logBadPacket("WSJT", remote, pkt, err)
return return
} }
if !ok { if !ok {
@@ -321,7 +387,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
case ServiceN1MM: case ServiceN1MM:
adifText, ok, err := ParseN1MM(pkt) adifText, ok, err := ParseN1MM(pkt)
if err != nil { if err != nil {
applog.Printf("udp: [%s] N1MM parse error: %v\n", s.cfg.Name, err) s.logBadPacket("N1MM", remote, pkt, err)
return return
} }
if !ok { if !ok {
+49
View File
@@ -56,12 +56,61 @@ type WSJTEvent struct {
IsCQ bool // the decode was a CQ call IsCQ bool // the decode was a CQ call
} }
// maxFwdHeader bounds how far into a packet the WSJT-X magic may sit behind a
// forwarder's header. The one seen in the field ("127.0.0.1:2237|") is 15 bytes;
// 64 leaves room for a longer address without ever scanning a real payload.
const maxFwdHeader = 64
// stripForwarderHeader removes the origin header a UDP relay prepends.
//
// A relay that re-broadcasts WSJT-X traffic has to say where each datagram came
// from, and it does so as plain text in front of the payload:
//
// "127.0.0.1:2237|" + <the original, untouched WSJT-X packet>
//
// The magic then sits 15 bytes in, every packet fails on "bad magic", and an
// operator running MSHV behind such a relay gets nothing at all. There is no
// need for a separate service type: what follows the header IS a WSJT-X packet,
// so the whole parser and everything downstream apply unchanged.
//
// Deliberately narrow. The magic must appear within maxFwdHeader bytes AND
// everything before it must be printable ASCII — a truncated or corrupt packet
// that happens to contain those four bytes somewhere is not resurrected into a
// QSO. Anything else is returned untouched, and still fails as it did.
func stripForwarderHeader(pkt []byte) []byte {
if len(pkt) < 4 {
return pkt
}
if binary.BigEndian.Uint32(pkt) == wsjtMagic {
return pkt // no header — the overwhelmingly common case
}
limit := len(pkt) - 4
if limit > maxFwdHeader {
limit = maxFwdHeader
}
for i := 1; i <= limit; i++ {
if binary.BigEndian.Uint32(pkt[i:]) != wsjtMagic {
continue
}
for _, b := range pkt[:i] {
if b < 0x20 || b >= 0x7f {
return pkt // not a text header — leave it alone
}
}
return pkt[i:]
}
return pkt
}
// ParseWSJT decodes one UDP packet. Returns ok=false for messages we // ParseWSJT decodes one UDP packet. Returns ok=false for messages we
// don't care about (heartbeat, clears, etc.). // don't care about (heartbeat, clears, etc.).
func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) { func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
if len(pkt) < 12 { if len(pkt) < 12 {
return WSJTEvent{}, false, fmt.Errorf("packet too short") return WSJTEvent{}, false, fmt.Errorf("packet too short")
} }
// A relay (W&P and friends) puts its own origin header in front — skip it so
// the packet parses exactly as if it had arrived from WSJT-X directly.
pkt = stripForwarderHeader(pkt)
r := bytes.NewReader(pkt) r := bytes.NewReader(pkt)
var magic, schema, mtype uint32 var magic, schema, mtype uint32
if err := binary.Read(r, binary.BigEndian, &magic); err != nil { if err := binary.Read(r, binary.BigEndian, &magic); err != nil {
+4 -1
View File
@@ -734,7 +734,10 @@ func placeQSOBox(profile ProfileInfo, zone pxRect, occupied []pxRect) QSOBox {
BG: "#ffffff", BGOpacity: 0.88, Radius: 12, BG: "#ffffff", BGOpacity: 0.88, Radius: 12,
Title: "Confirming QSO with {qso.callsign}", Title: "Confirming QSO with {qso.callsign}",
Fields: []string{"qso_date", "time_on", "band", "mode", "rst_sent"}, Fields: []string{"qso_date", "time_on", "band", "mode", "rst_sent"},
Footer: "{qso.qsl_msg}", // PSE/TNX stamp (auto: TNX if a QSL was received, else PSE QSL) leads the
// message. {qso.pse_tnx} is a normal token — it can be moved to its own
// element anywhere on the card in the designer.
Footer: "{qso.pse_tnx} {qso.qsl_msg}",
} }
box.Y = cardH - box.H - 110 box.Y = cardH - box.H - 110
if zone.y+zone.h/2 > cardH/2 { if zone.y+zone.h/2 > cardH/2 {
+34
View File
@@ -0,0 +1,34 @@
package qso
import "testing"
// The predicate behind "Worked before". Exact when folding is off; with it on,
// a station's portable forms are one operator — and the fold has to work from
// either end, because you may type the base call or the portable one.
func TestCallMatch(t *testing.T) {
if pred, args := callMatch("RK3DWA", false); pred != "callsign = ?" || len(args) != 1 || args[0] != "RK3DWA" {
t.Errorf("exact: got %q %v", pred, args)
}
// Typing the base call: match it and everything suffixed off it.
pred, args := callMatch("RK3DWA", true)
if pred != "(callsign = ? OR callsign LIKE ?)" {
t.Errorf("variants predicate = %q", pred)
}
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
t.Errorf("variants args = %v, want [RK3DWA RK3DWA/%%]", args)
}
// Typing a portable form must reach the plain call too — the suffix is
// stripped from the INPUT, not just matched in the column.
_, args = callMatch("RK3DWA/3", true)
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
t.Errorf("portable input args = %v, want [RK3DWA RK3DWA/%%]", args)
}
// A leading slash is not a suffix marker — dropping to "" there would match
// the entire logbook.
if _, args := callMatch("/RK3DWA", true); args[0] != "/RK3DWA" {
t.Errorf("leading slash: args[0] = %v, want the call unchanged", args[0])
}
}
+32 -7
View File
@@ -1585,11 +1585,35 @@ type BandMode struct {
// rendering a recent-contacts mini-list. // rendering a recent-contacts mini-list.
const maxWorkedEntries = 50 const maxWorkedEntries = 50
// callMatch builds the WHERE fragment that selects one station's QSOs.
//
// Exact by default. With variants on, an operator's portable forms count as the
// same station: RK3DWA, RK3DWA/3, RK3DWA/P and RK3DWA/QRP are one person, and
// someone asking "have I worked RK3DWA?" means the person, not the string.
// Typing 21 QSOs' worth of history only when you happen to add "/3" is the
// behaviour this replaces. The suffix is stripped from what was TYPED too, so
// it matches both ways round — RK3DWA/3 also finds the plain RK3DWA contacts.
//
// Deliberately NOT a bare "starts with": LIKE 'RK3DWA%' would also drag in
// RK3DWAB, which is a different station. The '/' is what makes it the same one.
func callMatch(call string, variants bool) (string, []any) {
if !variants {
return "callsign = ?", []any{call}
}
base := call
if i := strings.IndexByte(base, '/'); i > 0 {
base = base[:i]
}
return "(callsign = ? OR callsign LIKE ?)", []any{base, base + "/%"}
}
// WorkedBefore returns aggregated history at both callsign and DXCC level. // WorkedBefore returns aggregated history at both callsign and DXCC level.
// dxccHint lets the caller pass a known DXCC number (e.g. from a fresh QRZ // dxccHint lets the caller pass a known DXCC number (e.g. from a fresh QRZ
// lookup) when the call has never been worked. If 0, the DXCC is inferred // lookup) when the call has never been worked. If 0, the DXCC is inferred
// from the most recent prior QSO with the same callsign. // from the most recent prior QSO with the same callsign.
func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int) (WorkedBefore, error) { //
// matchVariants folds the portable forms of the call together — see callMatch.
func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int, matchVariants bool) (WorkedBefore, error) {
wb := WorkedBefore{ wb := WorkedBefore{
Callsign: upperTrim(callsign), Callsign: upperTrim(callsign),
Bands: []string{}, Bands: []string{},
@@ -1605,17 +1629,18 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
} }
// ---- Per-callsign stats ---- // ---- Per-callsign stats ----
pred, predArgs := callMatch(wb.Callsign, matchVariants)
if err := r.db.QueryRowContext(ctx, if err := r.db.QueryRowContext(ctx,
`SELECT COUNT(*) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&wb.Count); err != nil { `SELECT COUNT(*) FROM qso WHERE `+pred, predArgs...).Scan(&wb.Count); err != nil {
return wb, fmt.Errorf("count worked: %w", err) return wb, fmt.Errorf("count worked: %w", err)
} }
if wb.Count > 0 { if wb.Count > 0 {
// Pull the full QSO records (same columns as the Recent QSOs list) so // Pull the full QSO records (same columns as the Recent QSOs list) so
// the Worked-before grid can offer the same rich column picker. // the Worked-before grid can offer the same rich column picker.
rows, err := r.db.QueryContext(ctx, `SELECT `+selectCols+` rows, err := r.db.QueryContext(ctx, `SELECT `+selectCols+`
FROM qso WHERE callsign = ? FROM qso WHERE `+pred+`
ORDER BY qso_date DESC, id DESC ORDER BY qso_date DESC, id DESC
LIMIT ?`, wb.Callsign, maxWorkedEntries) LIMIT ?`, append(append([]any{}, predArgs...), maxWorkedEntries)...)
if err != nil { if err != nil {
return wb, fmt.Errorf("query worked: %w", err) return wb, fmt.Errorf("query worked: %w", err)
} }
@@ -1648,7 +1673,7 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
if wb.Count > maxWorkedEntries { if wb.Count > maxWorkedEntries {
var firstStr sql.NullString var firstStr sql.NullString
_ = r.db.QueryRowContext(ctx, _ = r.db.QueryRowContext(ctx,
`SELECT MIN(qso_date) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&firstStr) `SELECT MIN(qso_date) FROM qso WHERE `+pred, predArgs...).Scan(&firstStr)
if firstStr.Valid { if firstStr.Valid {
wb.First = parseTimeLoose(firstStr.String) wb.First = parseTimeLoose(firstStr.String)
} }
@@ -1673,8 +1698,8 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
var d sql.NullInt64 var d sql.NullInt64
_ = r.db.QueryRowContext(ctx, ` _ = r.db.QueryRowContext(ctx, `
SELECT dxcc FROM qso SELECT dxcc FROM qso
WHERE callsign = ? AND dxcc IS NOT NULL WHERE `+pred+` AND dxcc IS NOT NULL
ORDER BY qso_date DESC LIMIT 1`, wb.Callsign).Scan(&d) ORDER BY qso_date DESC LIMIT 1`, predArgs...).Scan(&d)
if d.Valid { if d.Valid {
dxcc = int(d.Int64) dxcc = int(d.Int64)
} }
+27
View File
@@ -118,7 +118,32 @@ func (s *Server) Start() error {
return nil return nil
} }
// releasePTT drops the transmitter when whoever was holding it goes away.
//
// Nothing else will. The Kenwood/Elecraft backend deliberately suspends its
// wire poll while PTT is held (a K3 answers "?;" to IF; during transmit), so a
// client that crashes, is killed, or simply has its socket closed under it
// leaves the rig keyed with nobody watching — and closing the socket is exactly
// what Stop() does on every settings save. Seen in the field: a K3 sat in
// transmit for 29 s, until the CAT link happened to be rebuilt.
//
// Swap makes this once-only, so the Stop() path and the per-connection defer it
// triggers can both call it without double-unkeying.
func (s *Server) releasePTT(why string) {
if !s.ptt.Swap(false) {
return
}
s.log("rigctld: %s while the rig was keyed — dropping PTT", why)
if err := s.rig.SetPTT(false); err != nil {
s.log("rigctld: emergency unkey failed: %v", err)
}
}
func (s *Server) Stop() { func (s *Server) Stop() {
// Before anything is torn down: reloadCAT calls us BEFORE it restarts the CAT
// backend, so the rig is still reachable here and an unkey still lands.
s.releasePTT("CAT sharing stopped")
s.mu.Lock() s.mu.Lock()
s.closed = true s.closed = true
ln := s.ln ln := s.ln
@@ -146,6 +171,8 @@ func (s *Server) serve(c net.Conn) {
delete(s.conns, c) delete(s.conns, c)
s.mu.Unlock() s.mu.Unlock()
_ = c.Close() _ = c.Close()
// A client that walks away mid-over must not leave the rig transmitting.
s.releasePTT(fmt.Sprintf("client %s left", c.RemoteAddr()))
}() }()
s.log("rigctld: client connected from %s", c.RemoteAddr()) s.log("rigctld: client connected from %s", c.RemoteAddr())
r := bufio.NewReader(c) r := bufio.NewReader(c)
+61
View File
@@ -7,6 +7,7 @@ import (
"strings" "strings"
"sync" "sync"
"testing" "testing"
"time"
) )
// fakeRig stands in for the CAT manager. // fakeRig stands in for the CAT manager.
@@ -234,6 +235,66 @@ func TestServerOverTCP(t *testing.T) {
} }
} }
// A client that vanishes mid-over must not leave the transmitter keyed. Nothing
// else would notice: the Kenwood/Elecraft backend stops polling while PTT is
// held, so a K3 was seen sitting in transmit for 29 s after WSJT-X's socket was
// closed under it by a settings save.
func TestPTTIsDroppedWhenTheClientDisappears(t *testing.T) {
rig := &fakeRig{freq: 14074000, mode: "FT8"}
s := New(0, rig, nil)
ln, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatalf("listen: %v", err)
}
s.mu.Lock()
s.ln = ln
s.mu.Unlock()
go func() {
for {
c, err := ln.Accept()
if err != nil {
return
}
go s.serve(c)
}
}()
defer s.Stop()
c, err := net.DialTimeout("tcp", ln.Addr().String(), dialTimeout)
if err != nil {
t.Fatalf("dial: %v", err)
}
r := bufio.NewReader(c)
// "T 3" is what WSJT-X sends for PTT_ON_DATA — the form seen in the field.
if _, err := c.Write([]byte("T 3\n")); err != nil {
t.Fatalf("write: %v", err)
}
line, _ := r.ReadString('\n')
if strings.TrimSpace(line) != "RPRT 0" {
t.Fatalf("set_ptt = %q, want RPRT 0", strings.TrimSpace(line))
}
rig.mu.Lock()
keyed := rig.ptt
rig.mu.Unlock()
if !keyed {
t.Fatalf("rig is not keyed after T 3 — the test proves nothing")
}
_ = c.Close()
// The unkey happens on the serve goroutine's defer, so poll briefly.
deadline := time.Now().Add(2 * time.Second)
for time.Now().Before(deadline) {
rig.mu.Lock()
keyed = rig.ptt
rig.mu.Unlock()
if !keyed {
return
}
time.Sleep(10 * time.Millisecond)
}
t.Error("rig still keyed after the client disconnected — the transmitter was left on air")
}
func TestModeMapping(t *testing.T) { func TestModeMapping(t *testing.T) {
for _, c := range []struct{ adif, hamlib string }{ for _, c := range []struct{ adif, hamlib string }{
{"SSB", "USB"}, {"LSB", "LSB"}, {"CW", "CW"}, {"RTTY", "RTTY"}, {"SSB", "USB"}, {"LSB", "LSB"}, {"CW", "CW"}, {"RTTY", "RTTY"},
+1 -1
View File
@@ -21,7 +21,7 @@ import (
const ( const (
// appVersion is stamped on every heartbeat (and could feed the About box). // appVersion is stamped on every heartbeat (and could feed the About box).
appVersion = "0.23.7" appVersion = "0.24.0"
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change // posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
// to https://us.i.posthog.com for a US project. // to https://us.i.posthog.com for a US project.