Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d8cd25205 | ||
|
|
1f55cfe9fa | ||
|
|
90c6458af0 | ||
|
|
18f44a5aa3 | ||
|
|
4d13cf7d15 | ||
|
|
366d9df634 | ||
|
|
f4b7c9dcf8 | ||
|
|
48c448e6f3 | ||
|
|
9c757e5175 | ||
|
|
626edca8ba | ||
|
|
b202d98ae5 | ||
|
|
949cc17ed1 | ||
|
|
e9feeffdc3 | ||
|
|
7d7d1042c0 | ||
|
|
9cbfd39da0 | ||
|
|
5338ad0b29 | ||
|
|
970127cc16 | ||
|
|
3704dbdd99 | ||
|
|
3cdf16b501 | ||
|
|
9a72afd467 | ||
|
|
e2bfe73bdb | ||
|
|
6e2e2cc3aa | ||
|
|
75d11a4069 |
@@ -287,15 +287,19 @@ const (
|
||||
keyWKCWLine = "winkeyer.cw_key_line" // serial engine: "dtr" (CW) / "rts" (PTT) or swapped
|
||||
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
|
||||
|
||||
keyBackupEnabled = "backup.enabled"
|
||||
keyBackupFolder = "backup.folder"
|
||||
keyBackupRotation = "backup.rotation"
|
||||
keyBackupZip = "backup.zip"
|
||||
keyBackupLast = "backup.last_at"
|
||||
keyBackupEnabled = "backup.enabled"
|
||||
keyBackupFolder = "backup.folder"
|
||||
keyBackupRotation = "backup.rotation"
|
||||
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"
|
||||
|
||||
keyQSLDefaultQSLSent = "qsl.qsl_sent"
|
||||
keyQSLDefaultQSLRcvd = "qsl.qsl_rcvd"
|
||||
@@ -569,8 +573,21 @@ type App struct {
|
||||
// wcbm is an in-memory "CALL|BAND|MODE" worked-index so the alert engine never
|
||||
// queries the DB per cluster spot (an FT8 firehose would swamp a remote MySQL).
|
||||
// Loaded once, appended to on each log, rebuilt after bulk changes.
|
||||
wcbm map[string]struct{}
|
||||
wcbmMu sync.RWMutex
|
||||
wcbm map[string]struct{}
|
||||
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
|
||||
uls *uls.Store // US callsign→county/grid (offline FCC ULS), lazily opened
|
||||
awardRefs *awardref.Repo
|
||||
@@ -644,6 +661,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
|
||||
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
|
||||
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)
|
||||
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
|
||||
@@ -1066,6 +1084,7 @@ func (a *App) startup(ctx context.Context) {
|
||||
applog.Printf("startup: logbook open failed (%v) — falling back to SQLite logbook", lerr)
|
||||
a.dbBackendErr = strings.TrimPrefix(lerr.Error(), "")
|
||||
logbookConn, backend = conn, "sqlite"
|
||||
a.logDbPath = "" // fell back to the settings db as the logbook — backup snapshots a.db
|
||||
}
|
||||
a.dbBackend = backend
|
||||
// db.Dialect describes the LOGBOOK backend — the only place SQL actually
|
||||
@@ -1440,7 +1459,8 @@ func (a *App) plannedShutdownSteps() []shutdownStep {
|
||||
if folder == "" {
|
||||
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"})
|
||||
}
|
||||
}
|
||||
@@ -1520,17 +1540,12 @@ func (a *App) runBackupForShutdown() error {
|
||||
if mysql {
|
||||
done = backup.HasADIFBackupToday(folder)
|
||||
}
|
||||
if done {
|
||||
if done && !s.EveryExit { // "every exit" backs up regardless of a prior backup today
|
||||
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
|
||||
}
|
||||
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))
|
||||
}
|
||||
|
||||
@@ -2053,6 +2068,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
a.logDbPath = "" // MySQL: no local file to snapshot (the log is exported to ADIF instead)
|
||||
return c, "mysql", nil
|
||||
}
|
||||
// SQLite logbook FILE, separate from the settings/config database. A profile
|
||||
@@ -2066,6 +2082,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
||||
lp = a.logbookPath
|
||||
}
|
||||
if lp == "" {
|
||||
a.logDbPath = "" // settings db serves as the logbook (split failed) — backup snapshots a.db
|
||||
return a.db, "sqlite", nil
|
||||
}
|
||||
// Resolve against THIS install before opening. Without it, a profile carried
|
||||
@@ -2081,6 +2098,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
||||
if err != nil {
|
||||
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
|
||||
}
|
||||
|
||||
@@ -2597,6 +2615,7 @@ func (a *App) AddQSO(q qso.QSO) (id int64, err error) {
|
||||
a.extsvc.OnQSOLogged(id)
|
||||
}
|
||||
a.maybeAutoSendEQSL(qc)
|
||||
a.maybeSelfSpot(qc)
|
||||
if a.udp != nil {
|
||||
a.udp.EmitLoggedADIF(adif.SingleRecordADIF(qc))
|
||||
}
|
||||
@@ -4254,6 +4273,11 @@ func (a *App) invalidateAwardStats() {
|
||||
a.awardSnap = nil
|
||||
a.awardSnapRev = ""
|
||||
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
|
||||
// worked-index so alert "needed" checks stay accurate. Async: never block the
|
||||
// mutation, and it's a single lightweight query.
|
||||
@@ -7775,6 +7799,11 @@ func (a *App) noteWorked(call, band, mode string) {
|
||||
}
|
||||
a.wcbm[wcbmKey(call, band, mode)] = struct{}{}
|
||||
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,
|
||||
@@ -11563,6 +11592,13 @@ func (a *App) LogUDPLoggedADIF(adifText string) (int64, error) {
|
||||
a.extsvc.OnQSOLogged(id)
|
||||
}
|
||||
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 {
|
||||
wruntime.EventsEmit(a.ctx, "qso:logged", id) // refresh again so award_refs show
|
||||
}
|
||||
@@ -11757,6 +11793,8 @@ type BackupSettings struct {
|
||||
Folder string `json:"folder"`
|
||||
Rotation int `json:"rotation"`
|
||||
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"`
|
||||
DefaultFolder string `json:"default_folder"` // computed, read-only — shown as a hint
|
||||
}
|
||||
@@ -11771,7 +11809,7 @@ func (a *App) GetBackupSettings() (BackupSettings, error) {
|
||||
return out, nil
|
||||
}
|
||||
m, err := a.settings.GetMany(a.ctx,
|
||||
keyBackupEnabled, keyBackupFolder, keyBackupRotation, keyBackupZip, keyBackupLast)
|
||||
keyBackupEnabled, keyBackupFolder, keyBackupRotation, keyBackupZip, keyBackupEveryExit, keyBackupKeepAll, keyBackupLast)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
@@ -11781,6 +11819,8 @@ func (a *App) GetBackupSettings() (BackupSettings, error) {
|
||||
out.Rotation = n
|
||||
}
|
||||
out.Zip = m[keyBackupZip] == "1"
|
||||
out.EveryExit = m[keyBackupEveryExit] == "1"
|
||||
out.KeepAll = m[keyBackupKeepAll] == "1"
|
||||
out.LastBackupAt = m[keyBackupLast]
|
||||
return out, nil
|
||||
}
|
||||
@@ -11803,10 +11843,12 @@ func (a *App) SaveBackupSettings(s BackupSettings) error {
|
||||
doZip = "1"
|
||||
}
|
||||
for k, v := range map[string]string{
|
||||
keyBackupEnabled: enabled,
|
||||
keyBackupFolder: strings.TrimSpace(s.Folder),
|
||||
keyBackupRotation: strconv.Itoa(s.Rotation),
|
||||
keyBackupZip: doZip,
|
||||
keyBackupEnabled: enabled,
|
||||
keyBackupFolder: strings.TrimSpace(s.Folder),
|
||||
keyBackupRotation: strconv.Itoa(s.Rotation),
|
||||
keyBackupZip: doZip,
|
||||
keyBackupEveryExit: boolStr(s.EveryExit),
|
||||
keyBackupKeepAll: boolStr(s.KeepAll),
|
||||
} {
|
||||
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
||||
return err
|
||||
@@ -11815,6 +11857,33 @@ func (a *App) SaveBackupSettings(s BackupSettings) error {
|
||||
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.
|
||||
// Returns the destination path of the file that was written.
|
||||
func (a *App) RunBackupNow() (string, error) {
|
||||
@@ -11826,20 +11895,10 @@ func (a *App) RunBackupNow() (string, error) {
|
||||
if folder == "" {
|
||||
folder = s.DefaultFolder
|
||||
}
|
||||
// Always snapshot the local SQLite (config + any pre-MySQL local QSOs).
|
||||
path, err := backup.Run(a.ctx, a.db, a.dbPath, folder, s.Rotation, s.Zip)
|
||||
path, err := a.runConfiguredBackup(folder, s.Rotation, s.Zip, s.KeepAll)
|
||||
if err != nil {
|
||||
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))
|
||||
return path, nil
|
||||
}
|
||||
@@ -11847,11 +11906,11 @@ func (a *App) RunBackupNow() (string, error) {
|
||||
// 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
|
||||
// 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 {
|
||||
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}
|
||||
_, e := ex.ExportFile(a.ctx, p)
|
||||
return e
|
||||
@@ -11882,19 +11941,13 @@ func (a *App) maybeShutdownBackup() {
|
||||
if mysql {
|
||||
done = backup.HasADIFBackupToday(folder)
|
||||
}
|
||||
if done {
|
||||
if done && !s.EveryExit { // "every exit" backs up regardless of a prior backup today
|
||||
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)
|
||||
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))
|
||||
}
|
||||
|
||||
@@ -13096,6 +13149,21 @@ func (a *App) reloadCAT() {
|
||||
kw.SetDataMode(s.KenwoodDataMode)
|
||||
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":
|
||||
// Native Icom CI-V over the radio's USB serial port (local control).
|
||||
// Same civ protocol the network backend reuses for remote.
|
||||
@@ -15931,6 +15999,128 @@ func (a *App) GetClusterAutoConnect() (bool, error) {
|
||||
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.
|
||||
func (a *App) ConnectClusterServer(id int64) error {
|
||||
if a.cluster == nil {
|
||||
@@ -16075,18 +16265,46 @@ type SpotStatus struct {
|
||||
Pfx string `json:"pfx,omitempty"`
|
||||
}
|
||||
|
||||
// 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). One cty.dat lookup + one DB scan, regardless of batch size.
|
||||
//
|
||||
// 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))
|
||||
// clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
|
||||
// spots against. Rebuilding them per spot batch re-scanned the entire logbook
|
||||
// ~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
|
||||
// that already holds the pointer keeps reading valid (stale-by-one-log) data
|
||||
// while a newer snapshot is being built. See clusterStatusMaps.
|
||||
type clusterStatusCache struct {
|
||||
entities map[int]*qso.EntitySlot
|
||||
workedCalls map[string]struct{}
|
||||
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 {
|
||||
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
|
||||
// its stored DXCC if present (the authoritative value set at log time, incl.
|
||||
@@ -16109,43 +16327,58 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
||||
}
|
||||
return 0
|
||||
}
|
||||
// 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.
|
||||
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
|
||||
}
|
||||
c.entities, _ = a.qso.EntitySlotMap(a.ctx, keyFor, c.normMode)
|
||||
// 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
|
||||
// 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
|
||||
// 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.
|
||||
sameSlot := a.clusterWorkedSameSlot()
|
||||
var workedCallSlots map[string]struct{}
|
||||
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
|
||||
// lookup) and worked POTA parks. Both built once per batch.
|
||||
workedCounties, _ := a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey)
|
||||
workedPOTA, _ := a.qso.WorkedPOTARefs(a.ctx)
|
||||
// lookup) and worked POTA parks.
|
||||
c.workedCounties, _ = a.qso.WorkedCountyKeys(a.ctx, award.USCountyKey)
|
||||
c.workedPOTA, _ = a.qso.WorkedPOTARefs(a.ctx)
|
||||
// Worked WPX prefixes, derived from the callsigns we already loaded — no
|
||||
// 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
|
||||
// in step with the WPX award, which does the same thing.
|
||||
workedPfx := make(map[string]struct{}, len(workedCalls))
|
||||
for c := range workedCalls {
|
||||
if p := award.WPXPrefix(c); p != "" {
|
||||
workedPfx[p] = struct{}{}
|
||||
c.workedPfx = make(map[string]struct{}, len(c.workedCalls))
|
||||
for call := range c.workedCalls {
|
||||
if p := award.WPXPrefix(call); p != "" {
|
||||
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 {
|
||||
out[i] = SpotStatus{
|
||||
Call: q.Call,
|
||||
|
||||
+58
-8
@@ -31,13 +31,20 @@ import (
|
||||
const (
|
||||
keyQSLEmailSubject = "qsl.email_subject"
|
||||
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
|
||||
// own QSL card. Deliberately NOT eqsl_sent (that's eQSL.cc's, kept independent).
|
||||
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" (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 (
|
||||
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}"
|
||||
@@ -453,11 +460,37 @@ func (a *App) SendEQSL(qsoID int64, templateID int64, jpegB64 string) error {
|
||||
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 {
|
||||
Subject string `json:"subject"`
|
||||
Body string `json:"body"`
|
||||
AutoSend bool `json:"auto_send"`
|
||||
Subject string `json:"subject"`
|
||||
Body string `json:"body"`
|
||||
AutoSend bool `json:"auto_send"`
|
||||
DefaultMessage string `json:"default_message"`
|
||||
}
|
||||
|
||||
// QSLGetEmailTemplates returns the eQSL e-mail templates (with defaults).
|
||||
@@ -466,7 +499,7 @@ func (a *App) QSLGetEmailTemplates() (QSLEmailTemplates, error) {
|
||||
if a.settings == 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 {
|
||||
return out, err
|
||||
}
|
||||
@@ -477,6 +510,7 @@ func (a *App) QSLGetEmailTemplates() (QSLEmailTemplates, error) {
|
||||
out.Body = b
|
||||
}
|
||||
out.AutoSend = m[keyQSLAutoSend] == "1"
|
||||
out.DefaultMessage = m[keyQSLDefaultMsg]
|
||||
return out, nil
|
||||
}
|
||||
|
||||
@@ -495,7 +529,10 @@ func (a *App) QSLSaveEmailTemplates(t QSLEmailTemplates) error {
|
||||
if t.AutoSend {
|
||||
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
|
||||
@@ -634,6 +671,18 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
|
||||
}
|
||||
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"
|
||||
}
|
||||
vars := map[string]string{
|
||||
"profile.callsign": info.Callsign,
|
||||
"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.submode": q.Submode,
|
||||
"qso.rst_sent": q.RSTSent,
|
||||
"qso.qsl_msg": q.QSLMsg,
|
||||
"qso.qsl_msg": msg,
|
||||
"qso.pse_tnx": pseTnx,
|
||||
"qso.name": q.Name,
|
||||
}
|
||||
vars["qso.my_rig"], vars["qso.my_antenna"] = a.qslRigAntenna(q)
|
||||
|
||||
@@ -1,4 +1,56 @@
|
||||
[
|
||||
{
|
||||
"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",
|
||||
"date": "",
|
||||
|
||||
+49
-12
@@ -103,6 +103,7 @@ import { WinkeyerPanel, type WKStatus, type WKMacro } from '@/components/Winkeye
|
||||
import { RotorCompass } from '@/components/RotorCompass';
|
||||
import { writeUiPref } from '@/lib/uiPref';
|
||||
import { formatDateTimeUTC } from '@/lib/dateFormat';
|
||||
import { titleCase, sentenceCase } from '@/lib/textCase';
|
||||
import { setGridPrefsProfile, flushGridPrefs } from '@/lib/gridPrefs';
|
||||
import { DvkPanel, type DVKMsg, type DVKStat } from '@/components/DvkPanel';
|
||||
|
||||
@@ -1504,6 +1505,22 @@ export default function App() {
|
||||
// a stale closure.
|
||||
const spotsRef = useRef(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
|
||||
// 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
|
||||
@@ -4206,7 +4223,8 @@ export default function App() {
|
||||
);
|
||||
const nameBlock = (
|
||||
<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>
|
||||
);
|
||||
// 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>
|
||||
<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>
|
||||
);
|
||||
const gridBlock = (
|
||||
@@ -4371,7 +4390,7 @@ export default function App() {
|
||||
);
|
||||
const commentSm = (
|
||||
<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>
|
||||
);
|
||||
// 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.
|
||||
const commentLine = (
|
||||
<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>
|
||||
);
|
||||
const noteLine = (
|
||||
<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>
|
||||
);
|
||||
const logButtons = (
|
||||
@@ -5589,7 +5608,8 @@ export default function App() {
|
||||
it to its own line instead, which stays readable. */}
|
||||
<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>
|
||||
<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>
|
||||
{qthBlock}
|
||||
{gridBlock}
|
||||
@@ -6029,12 +6049,29 @@ export default function App() {
|
||||
|
||||
<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">
|
||||
<Input
|
||||
className="flex-1"
|
||||
placeholder="Search callsign…"
|
||||
value={filterCallsign}
|
||||
onChange={(e) => setFilterCallsign(e.target.value)}
|
||||
/>
|
||||
{/* 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
|
||||
className="w-full pr-8 font-mono"
|
||||
placeholder="Search callsign…"
|
||||
value={filterCallsign}
|
||||
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()}>
|
||||
<RefreshCw className="size-3.5" /> Refresh
|
||||
</Button>
|
||||
|
||||
@@ -34,7 +34,7 @@ export type AwardDef = {
|
||||
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
|
||||
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[];
|
||||
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;
|
||||
@@ -556,9 +556,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]" 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>
|
||||
<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.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>
|
||||
|
||||
{/* Fallback searches: tried in order, only while nothing
|
||||
|
||||
@@ -424,15 +424,22 @@ export function ClusterGrid({ rows, spotStatus, onSpotClick }: Props) {
|
||||
const context = useMemo(() => ({ spotStatus }), [spotStatus]);
|
||||
|
||||
// Spot statuses arrive asynchronously (~after the rows render). The Call/Band/
|
||||
// Mode cellStyles depend on them but their cell VALUE doesn't change, so ag-grid
|
||||
// won't re-render those cells on its own — force a refresh so e.g. a worked call
|
||||
// turns blue once its status loads.
|
||||
// Mode cellStyles and the dimmed "represents nothing" class depend on them but
|
||||
// the cell VALUE doesn't change, so ag-grid won't re-render on its own — force a
|
||||
// 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(() => {
|
||||
// Light refresh so status-dependent styling — the Call/Band/Mode colours AND
|
||||
// the dimmed "represents nothing" class (cellClassRules above) — re-applies
|
||||
// once a status lands, WITHOUT redrawing whole rows (which pegged the CPU).
|
||||
gridRef.current?.api?.refreshCells({ force: true });
|
||||
if (refreshPending.current !== undefined) return; // a refresh is already queued
|
||||
refreshPending.current = window.setTimeout(() => {
|
||||
refreshPending.current = undefined;
|
||||
gridRef.current?.api?.refreshCells({ force: true });
|
||||
}, 200);
|
||||
}, [spotStatus]);
|
||||
useEffect(() => () => { if (refreshPending.current !== undefined) window.clearTimeout(refreshPending.current); }, []);
|
||||
|
||||
// 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.
|
||||
|
||||
@@ -465,18 +465,18 @@ export function DetailsPanel({ callsign, prefix, operatorGrid, remoteGrid, qth,
|
||||
</Select>
|
||||
</Field>
|
||||
<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 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>
|
||||
{satelliteMode && (
|
||||
<>
|
||||
<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 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>
|
||||
</>
|
||||
)}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useMemo, useRef, useState } from '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 { AwardRefSelector } from '@/components/AwardRefSelector';
|
||||
import { AdifExtrasEditor } from '@/components/AdifExtrasEditor';
|
||||
@@ -22,6 +22,7 @@ import { Combobox } from '@/components/ui/combobox';
|
||||
import { cn } from '@/lib/utils';
|
||||
import { flagURL } from '@/lib/flags';
|
||||
import { useI18n } from '@/lib/i18n';
|
||||
import { titleCase, sentenceCase } from '@/lib/textCase';
|
||||
import type { QSOForm } from '@/types';
|
||||
|
||||
type QSO = QSOForm;
|
||||
@@ -428,6 +429,22 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
[draft.extras],
|
||||
);
|
||||
|
||||
// OpsLog QSL "received" marker (ADIF extra). Drives the card's PSE/TNX stamp:
|
||||
// received → TNX (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();
|
||||
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 (
|
||||
<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">
|
||||
@@ -498,7 +515,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
<div className="grid grid-cols-2 gap-x-6 gap-y-2.5">
|
||||
{/* ── Left column ── */}
|
||||
<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">
|
||||
<Label className="w-20 shrink-0">{t('qedit.band')}</Label>
|
||||
<Select value={draft.band || ''} onValueChange={(v) => set('band', v)}>
|
||||
@@ -564,8 +582,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 w-24"><Label>PFX</Label><Input readOnly value={pfxOf(draft.callsign ?? '')} className="font-mono bg-muted/40" /></div>
|
||||
</div>
|
||||
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)} /></div>
|
||||
<div><Label>{t('qedit.note')}</Label><Textarea rows={3} value={draft.notes ?? ''} onChange={(e) => set('notes', e.target.value)} /></div>
|
||||
<div><Label>{t('qedit.comment')}</Label><Input value={draft.comment ?? ''} onChange={(e) => set('comment', e.target.value)}
|
||||
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>
|
||||
</TabsContent>
|
||||
@@ -586,7 +606,8 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</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>
|
||||
{/* Right column */}
|
||||
@@ -596,7 +617,19 @@ 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>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><Label>{t('qedit.qslMsg')}</Label><Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} /></div>
|
||||
<div>
|
||||
<Label>{t('qedit.qslMsg')}</Label>
|
||||
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
||||
<div className="mt-1 flex items-center gap-2">
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={qslReceived} onCheckedChange={(c) => toggleQslReceived(!!c)} />
|
||||
{t('qedit.qslReceived')}
|
||||
</label>
|
||||
<span className="text-[11px] font-mono px-1.5 py-0.5 rounded bg-muted text-muted-foreground" title={t('qedit.pseTnxHint')}>
|
||||
{qslReceived ? 'TNX' : 'PSE QSL'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -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) },
|
||||
// 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 },
|
||||
// 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.
|
||||
{ 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);
|
||||
|
||||
// Award columns are governed SOLELY by the awardShown code-set, never by AG
|
||||
// Grid's saved column state. Stripping them here (on both save and restore)
|
||||
// stops a stale saved state from re-hiding a shown award column on every
|
||||
// awardCols rebuild — the desync that made award columns vanish mid-session.
|
||||
const stripAwardCols = (st: any[] | null | undefined): any[] =>
|
||||
(st ?? []).filter((s) => !String(s?.colId ?? '').startsWith('award_'));
|
||||
// Award-column VISIBILITY is governed SOLELY by the awardShown code-set, never
|
||||
// by AG Grid's saved column state: dropping `hide` here (on both save and
|
||||
// restore) stops a stale saved state from re-hiding a shown award column on
|
||||
// every awardCols rebuild — the desync that made award columns vanish
|
||||
// mid-session.
|
||||
//
|
||||
// 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) {
|
||||
const { t } = useI18n();
|
||||
@@ -468,12 +480,12 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
function onGridReady(e: GridReadyEvent) {
|
||||
onGridApi?.(e.api);
|
||||
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
|
||||
// (fresh machine / after a reinstall), then re-seed the cache.
|
||||
loadRemote(colStateKey).then((remote) => {
|
||||
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);
|
||||
}
|
||||
});
|
||||
@@ -497,7 +509,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
if (restoringRef.current) return; // ignore the events fired by a column rebuild
|
||||
const state = gridRef.current?.api?.getColumnState();
|
||||
if (!state) return;
|
||||
saveState(colStateKey, stripAwardCols(state));
|
||||
saveState(colStateKey, sanitizeAwardCols(state));
|
||||
// Award columns are stripped above, so persist their widths on the side.
|
||||
let changed = false;
|
||||
for (const s of state) {
|
||||
@@ -525,7 +537,7 @@ export function RecentQSOsGrid({ rows, myGrid, selectAllSignal, selectRowSignal,
|
||||
useEffect(() => {
|
||||
const api = gridRef.current?.api;
|
||||
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.
|
||||
const t = window.setTimeout(() => { restoringRef.current = false; }, 0);
|
||||
return () => window.clearTimeout(t);
|
||||
|
||||
@@ -26,7 +26,7 @@ import {
|
||||
AudioStartMonitor, AudioStopMonitor, AudioMonitorActive,
|
||||
AudioStartTX, AudioStopTX, AudioTXActive,
|
||||
ListClusterServers, SaveClusterServer, DeleteClusterServer,
|
||||
GetClusterAutoConnect, SetClusterAutoConnect,
|
||||
GetClusterAutoConnect, SetClusterAutoConnect, GetSelfSpotSettings, SaveSelfSpotSettings,
|
||||
ConnectClusterServer, DisconnectClusterServer,
|
||||
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus,
|
||||
GetBackupSettings, SaveBackupSettings, RunBackupNow, PickBackupFolder,
|
||||
@@ -1373,8 +1373,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
const [emailMsg, setEmailMsg] = useState('');
|
||||
const setEmailField = (patch: Partial<EmailCfg>) => setEmailCfg((s) => ({ ...s, ...patch }));
|
||||
// eQSL card e-mail (subject/body templates + auto-send on log).
|
||||
type EQSLCfg = { subject: string; body: string; auto_send: boolean };
|
||||
const [eqslCfg, setEqslCfg] = useState<EQSLCfg>({ subject: '', body: '', auto_send: false });
|
||||
type EQSLCfg = { subject: string; body: string; auto_send: boolean; default_message: string };
|
||||
const [eqslCfg, setEqslCfg] = useState<EQSLCfg>({ subject: '', body: '', auto_send: false, default_message: '' });
|
||||
const setEqslField = (patch: Partial<EQSLCfg>) => setEqslCfg((s) => ({ ...s, ...patch }));
|
||||
// ClubLog Country File (cty.xml) exception status.
|
||||
type ClubInfo = { enabled: boolean; loaded: boolean; date: string; count: number };
|
||||
@@ -1524,19 +1524,28 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
|
||||
const [clusterServers, setClusterServers] = useState<ClusterServer[]>([]);
|
||||
const [clusterAutoConnect, setClusterAutoConnectState] = useState(false);
|
||||
// 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 [editingServer, setEditingServer] = useState<ClusterServer | null>(null);
|
||||
|
||||
async function reloadClusterServers() {
|
||||
try {
|
||||
const [list, ac, st] = await Promise.all([
|
||||
const [list, ac, st, ss] = await Promise.all([
|
||||
ListClusterServers(),
|
||||
GetClusterAutoConnect(),
|
||||
GetClusterStatus(),
|
||||
GetSelfSpotSettings(),
|
||||
]);
|
||||
setClusterServers((list ?? []) as ClusterServer[]);
|
||||
setClusterAutoConnectState(ac);
|
||||
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)); }
|
||||
}
|
||||
|
||||
@@ -1849,6 +1858,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
await SaveQSLDefaults(qslDefaults as any);
|
||||
await SaveExternalServices(extSvc as any);
|
||||
await SetClusterAutoConnect(clusterAutoConnect);
|
||||
await SaveSelfSpotSettings(selfSpot as any);
|
||||
|
||||
setMsg('Settings saved.');
|
||||
onSaved();
|
||||
@@ -2527,6 +2537,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<SelectItem value="flex">{t('cat.optFlex')}</SelectItem>
|
||||
<SelectItem value="yaesu">{t('cat.optYaesu')}</SelectItem>
|
||||
<SelectItem value="kenwood">{t('cat.optKenwood')}</SelectItem>
|
||||
<SelectItem value="elecraft">{t('cat.optElecraft')}</SelectItem>
|
||||
<SelectItem value="xiegu">{t('cat.optXiegu')}</SelectItem>
|
||||
<SelectItem value="icom">{t('cat.optIcom')}</SelectItem>
|
||||
<SelectItem value="icom-net">{t('cat.optIcomNet')}</SelectItem>
|
||||
@@ -2688,7 +2699,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
{t('cat.civTrace')}
|
||||
</label> </div>
|
||||
)}
|
||||
{catCfg.backend === 'kenwood' && (
|
||||
{(catCfg.backend === 'kenwood' || catCfg.backend === 'elecraft') && (
|
||||
<>
|
||||
<div className="space-y-1">
|
||||
<Label>{t('cat.kenwoodPort')}</Label>
|
||||
@@ -2725,16 +2736,21 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</label>
|
||||
<span className="text-xs text-muted-foreground">{t('cat.lowerLinesHint')}</span>
|
||||
</div>
|
||||
<div className="space-y-1">
|
||||
<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))}>
|
||||
<SelectTrigger className="h-8"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="usb">{t('cat.kwDataUsb')}</SelectItem>
|
||||
<SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem>
|
||||
<SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select> </div>
|
||||
{catCfg.backend === 'kenwood' ? (
|
||||
<div className="space-y-1">
|
||||
<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))}>
|
||||
<SelectTrigger className="h-8"><SelectValue /></SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="usb">{t('cat.kwDataUsb')}</SelectItem>
|
||||
<SelectItem value="data">{t('cat.kwDataMd6')}</SelectItem>
|
||||
<SelectItem value="keep">{t('cat.kwDataKeep')}</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
</div>
|
||||
) : (
|
||||
<span className="text-xs text-muted-foreground">{t('cat.elecraftHint')}</span>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
{catCfg.backend === 'icom' && (
|
||||
@@ -4108,6 +4124,39 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
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>
|
||||
</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>
|
||||
|
||||
{editingServer && (
|
||||
@@ -4305,7 +4354,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
title={t('sec.backup')}
|
||||
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">
|
||||
<Checkbox
|
||||
checked={!!backupCfg.enabled}
|
||||
@@ -4346,28 +4395,53 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex items-end gap-3">
|
||||
<div className="space-y-1.5">
|
||||
<Label className="text-xs text-muted-foreground">{t('bk.rotation')}</Label>
|
||||
<Input
|
||||
type="number"
|
||||
min={1}
|
||||
max={365}
|
||||
className="w-24 font-mono text-xs"
|
||||
value={backupCfg.rotation || 5}
|
||||
onChange={(e) => {
|
||||
const n = Number(e.target.value);
|
||||
if (Number.isFinite(n) && n > 0) setBackupCfg((b) => ({ ...b, rotation: Math.floor(n) }));
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<label className="flex items-center gap-2 text-sm cursor-pointer pb-2">
|
||||
<div className="space-y-1.5">
|
||||
<Label className="text-xs text-muted-foreground">{t('bk.rotation')}</Label>
|
||||
<Input
|
||||
type="number"
|
||||
min={1}
|
||||
max={365}
|
||||
className="w-24 font-mono text-xs"
|
||||
value={backupCfg.rotation || 5}
|
||||
onChange={(e) => {
|
||||
const n = Number(e.target.value);
|
||||
if (Number.isFinite(n) && n > 0) setBackupCfg((b) => ({ ...b, rotation: Math.floor(n) }));
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* 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
|
||||
checked={!!backupCfg.zip}
|
||||
onCheckedChange={(c) => setBackupCfg((b) => ({ ...b, zip: !!c }))}
|
||||
/>
|
||||
<span>{t('bk.zip')}</span>
|
||||
</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 className="border-t border-border/60 pt-3 flex items-center gap-3">
|
||||
@@ -5179,8 +5253,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</div>
|
||||
<p className="text-[11px] text-muted-foreground">{t('db.appDbHint')}</p>
|
||||
<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>
|
||||
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
|
||||
</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>
|
||||
|
||||
{/* Logbook (QSOs) — this profile: default SQLite file, a dedicated file, or MySQL. */}
|
||||
@@ -5802,6 +5891,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<span className="text-[11px] text-muted-foreground">{emailMsg}</span>
|
||||
</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">
|
||||
<Label className="text-sm font-semibold">{t('em.qslCardEmail')}</Label>
|
||||
<div className="text-[11px] text-muted-foreground">
|
||||
@@ -5818,6 +5918,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
<div className="text-[11px] text-muted-foreground">
|
||||
{t('em.autoSendHint')}
|
||||
</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>
|
||||
</>
|
||||
|
||||
+16
-12
File diff suppressed because one or more lines are too long
@@ -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());
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.23.7';
|
||||
export const APP_VERSION = '0.23.9';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+6
@@ -481,6 +481,8 @@ export function GetScpStatus():Promise<main.ScpStatus>;
|
||||
|
||||
export function GetSecretStatus():Promise<main.SecretStatus>;
|
||||
|
||||
export function GetSelfSpotSettings():Promise<main.SelfSpotSettings>;
|
||||
|
||||
export function GetSlotStats():Promise<qso.SlotStats>;
|
||||
|
||||
export function GetSolarData():Promise<solar.Data>;
|
||||
@@ -895,6 +897,8 @@ export function SaveRelayAuto(arg1:main.RelayAutoConfig):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 SaveStationSettings(arg1:main.StationSettings):Promise<void>;
|
||||
@@ -949,6 +953,8 @@ export function SetDVKLabel(arg1:number,arg2:string):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 SetScpEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
@@ -910,6 +910,10 @@ export function GetSecretStatus() {
|
||||
return window['go']['main']['App']['GetSecretStatus']();
|
||||
}
|
||||
|
||||
export function GetSelfSpotSettings() {
|
||||
return window['go']['main']['App']['GetSelfSpotSettings']();
|
||||
}
|
||||
|
||||
export function GetSlotStats() {
|
||||
return window['go']['main']['App']['GetSlotStats']();
|
||||
}
|
||||
@@ -1738,6 +1742,10 @@ export function SaveRotators(arg1) {
|
||||
return window['go']['main']['App']['SaveRotators'](arg1);
|
||||
}
|
||||
|
||||
export function SaveSelfSpotSettings(arg1) {
|
||||
return window['go']['main']['App']['SaveSelfSpotSettings'](arg1);
|
||||
}
|
||||
|
||||
export function SaveStationDevices(arg1) {
|
||||
return window['go']['main']['App']['SaveStationDevices'](arg1);
|
||||
}
|
||||
@@ -1846,6 +1854,10 @@ export function 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) {
|
||||
return window['go']['main']['App']['SetPassphrase'](arg1);
|
||||
}
|
||||
|
||||
@@ -315,6 +315,7 @@ export namespace award {
|
||||
pattern: string;
|
||||
leading_str?: string;
|
||||
trailing_str?: string;
|
||||
prefix?: string;
|
||||
dynamic?: boolean;
|
||||
one_ref_per_qso?: boolean;
|
||||
or_rules?: OrRule[];
|
||||
@@ -356,6 +357,7 @@ export namespace award {
|
||||
this.pattern = source["pattern"];
|
||||
this.leading_str = source["leading_str"];
|
||||
this.trailing_str = source["trailing_str"];
|
||||
this.prefix = source["prefix"];
|
||||
this.dynamic = source["dynamic"];
|
||||
this.one_ref_per_qso = source["one_ref_per_qso"];
|
||||
this.or_rules = this.convertValues(source["or_rules"], OrRule);
|
||||
@@ -1894,6 +1896,8 @@ export namespace main {
|
||||
folder: string;
|
||||
rotation: number;
|
||||
zip: boolean;
|
||||
every_exit: boolean;
|
||||
keep_all: boolean;
|
||||
last_backup_at: string;
|
||||
default_folder: string;
|
||||
|
||||
@@ -1907,6 +1911,8 @@ export namespace main {
|
||||
this.folder = source["folder"];
|
||||
this.rotation = source["rotation"];
|
||||
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.default_folder = source["default_folder"];
|
||||
}
|
||||
@@ -2635,6 +2641,7 @@ export namespace main {
|
||||
subject: string;
|
||||
body: string;
|
||||
auto_send: boolean;
|
||||
default_message: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
return new QSLEmailTemplates(source);
|
||||
@@ -2645,6 +2652,7 @@ export namespace main {
|
||||
this.subject = source["subject"];
|
||||
this.body = source["body"];
|
||||
this.auto_send = source["auto_send"];
|
||||
this.default_message = source["default_message"];
|
||||
}
|
||||
}
|
||||
export class QSLFontInfo {
|
||||
@@ -2906,6 +2914,20 @@ export namespace main {
|
||||
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 {
|
||||
call: string;
|
||||
band: string;
|
||||
|
||||
@@ -74,6 +74,7 @@ type Def struct {
|
||||
Pattern string `json:"pattern"` // award-level Go regexp; group 1 = reference
|
||||
LeadingStr string `json:"leading_str,omitempty"` // strip this prefix before matching
|
||||
TrailingStr string `json:"trailing_str,omitempty"` // strip this suffix before matching
|
||||
Prefix string `json:"prefix,omitempty"` // prepended to each found reference (e.g. captured "01" + "D" → "D01"), same as OrRule.Prefix
|
||||
Dynamic bool `json:"dynamic,omitempty"` // references not predefined (any value counts)
|
||||
// OneRefPerQSO refuses an AMBIGUOUS match rather than guessing.
|
||||
//
|
||||
@@ -960,7 +961,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
|
||||
// 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.
|
||||
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 {
|
||||
r := &d.OrRules[i]
|
||||
label := fmt.Sprintf("OR %d", i+1)
|
||||
|
||||
+21
-15
@@ -23,10 +23,10 @@ import (
|
||||
// every time we add a field).
|
||||
type Settings struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Folder string `json:"folder"` // empty → DefaultFolder
|
||||
Rotation int `json:"rotation"` // how many backups to keep; 0/neg = 5
|
||||
Zip bool `json:"zip"` // compress with deflate
|
||||
LastBackupAt string `json:"last_backup_at"`// RFC3339; empty if never
|
||||
Folder string `json:"folder"` // empty → DefaultFolder
|
||||
Rotation int `json:"rotation"` // how many backups to keep; 0/neg = 5
|
||||
Zip bool `json:"zip"` // compress with deflate
|
||||
LastBackupAt string `json:"last_backup_at"` // RFC3339; empty if never
|
||||
}
|
||||
|
||||
// DefaultFolder returns the folder used when Settings.Folder is empty.
|
||||
@@ -44,7 +44,7 @@ func DefaultFolder(dataDir string) string {
|
||||
// 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",
|
||||
// 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 {
|
||||
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 == "" {
|
||||
return "", fmt.Errorf("backup folder not set")
|
||||
}
|
||||
if prefix == "" {
|
||||
prefix = "opslog"
|
||||
}
|
||||
if err := os.MkdirAll(folder, 0o755); err != nil {
|
||||
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")
|
||||
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
|
||||
// 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.
|
||||
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
|
||||
// ADIF export is a portable, re-importable backup of the actual contacts.
|
||||
// writeADIF must write the full ADIF to the path it's handed.
|
||||
func RunADIF(folder string, rotation int, doZip bool, writeADIF func(path string) error) (string, error) {
|
||||
func RunADIF(folder string, rotation int, doZip bool, unique bool, writeADIF func(path string) error) (string, error) {
|
||||
if rotation <= 0 {
|
||||
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 {
|
||||
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")
|
||||
_ = os.Remove(tmp)
|
||||
if err := writeADIF(tmp); err != nil {
|
||||
@@ -203,12 +215,6 @@ func copyZipped(src, dst, innerName string) error {
|
||||
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
|
||||
// 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
|
||||
|
||||
+50
-3
@@ -62,6 +62,10 @@ type Kenwood struct {
|
||||
// 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.
|
||||
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
|
||||
port serial.Port
|
||||
@@ -287,7 +291,10 @@ func (k *Kenwood) ReadState() (RigState, error) {
|
||||
s := RigState{Connected: true, Backend: "kenwood"}
|
||||
k.curVFO = 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
|
||||
|
||||
// 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
|
||||
// MD6 (K3/K4 DATA), or fall through to the default USB from kenwoodModeDigit.
|
||||
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 {
|
||||
case "keep":
|
||||
return nil // leave whatever data mode the operator set on the rig
|
||||
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)
|
||||
@@ -413,6 +439,14 @@ func (k *Kenwood) SetDataMode(m string) {
|
||||
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,
|
||||
// PSK, JT…) rather than a voice/CW/RTTY mode the rig sets natively.
|
||||
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
|
||||
// it is on USB — so the operator's configured digital mode is used, exactly as
|
||||
// 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 {
|
||||
case '1':
|
||||
return "LSB"
|
||||
@@ -641,6 +679,15 @@ func kenwoodModeToADIF(d byte, digital string) string {
|
||||
case '5':
|
||||
return "AM"
|
||||
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 ""
|
||||
|
||||
@@ -141,8 +141,23 @@ func TestKenwoodModeToADIF(t *testing.T) {
|
||||
{'0', ""}, // unknown → say nothing rather than guess
|
||||
}
|
||||
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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -734,7 +734,10 @@ func placeQSOBox(profile ProfileInfo, zone pxRect, occupied []pxRect) QSOBox {
|
||||
BG: "#ffffff", BGOpacity: 0.88, Radius: 12,
|
||||
Title: "Confirming QSO with {qso.callsign}",
|
||||
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
|
||||
if zone.y+zone.h/2 > cardH/2 {
|
||||
|
||||
@@ -118,7 +118,32 @@ func (s *Server) Start() error {
|
||||
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() {
|
||||
// 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.closed = true
|
||||
ln := s.ln
|
||||
@@ -146,6 +171,8 @@ func (s *Server) serve(c net.Conn) {
|
||||
delete(s.conns, c)
|
||||
s.mu.Unlock()
|
||||
_ = 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())
|
||||
r := bufio.NewReader(c)
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// 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) {
|
||||
for _, c := range []struct{ adif, hamlib string }{
|
||||
{"SSB", "USB"}, {"LSB", "LSB"}, {"CW", "CW"}, {"RTTY", "RTTY"},
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.23.7"
|
||||
appVersion = "0.23.9"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
Reference in New Issue
Block a user