Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec71dd1661 | ||
|
|
31f9bdfc98 | ||
|
|
57e98139ab | ||
|
|
b10a867125 | ||
|
|
17819ea673 | ||
|
|
a8fac52400 | ||
|
|
2bf98a9801 | ||
|
|
80dac64b56 | ||
|
|
79427ccd18 | ||
|
|
4352b9aec5 | ||
|
|
a0f7f2abf0 | ||
|
|
40f5960c76 | ||
|
|
59135d55ab | ||
|
|
44cf5954fd | ||
|
|
f1b7a7e477 | ||
|
|
19ae00124f | ||
|
|
642ed358c2 |
@@ -11,6 +11,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"runtime"
|
||||||
"runtime/debug"
|
"runtime/debug"
|
||||||
"sort"
|
"sort"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -293,6 +294,12 @@ const (
|
|||||||
|
|
||||||
keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on
|
keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on
|
||||||
|
|
||||||
|
// Worked-before: fold an operator's portable forms (X, X/3, X/P) together.
|
||||||
|
// Stored inverted — "0" means OFF — so the feature is ON for an existing
|
||||||
|
// install that has never seen the key, which is the behaviour operators asked
|
||||||
|
// for. See GetWorkedCallVariants.
|
||||||
|
keyWorkedCallVariants = "worked.call_variants"
|
||||||
|
|
||||||
keyBackupEnabled = "backup.enabled"
|
keyBackupEnabled = "backup.enabled"
|
||||||
keyBackupFolder = "backup.folder"
|
keyBackupFolder = "backup.folder"
|
||||||
keyBackupRotation = "backup.rotation"
|
keyBackupRotation = "backup.rotation"
|
||||||
@@ -682,6 +689,7 @@ type App struct {
|
|||||||
awardSnapMu sync.Mutex // guards the award QSO snapshot
|
awardSnapMu sync.Mutex // guards the award QSO snapshot
|
||||||
awardSnap []qso.QSO // light-scanned + enriched logbook snapshot reused across award computations
|
awardSnap []qso.QSO // light-scanned + enriched logbook snapshot reused across award computations
|
||||||
awardSnapRev string // logbook revision the snapshot was built at ("" = none)
|
awardSnapRev string // logbook revision the snapshot was built at ("" = none)
|
||||||
|
awardSnapUsed time.Time // last read — the snapshot is dropped once it goes cold (see awardSnapshotJanitor)
|
||||||
dataDir string // <exeDir>/data — holds config.json, logs, cty.dat
|
dataDir string // <exeDir>/data — holds config.json, logs, cty.dat
|
||||||
|
|
||||||
// shuttingDown gates beforeClose re-entry: the first user attempt to
|
// shuttingDown gates beforeClose re-entry: the first user attempt to
|
||||||
@@ -1229,6 +1237,7 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
// behind telnet).
|
// behind telnet).
|
||||||
a.clusterEvents = newClusterQueue()
|
a.clusterEvents = newClusterQueue()
|
||||||
go a.clusterEventWorker()
|
go a.clusterEventWorker()
|
||||||
|
go a.awardSnapshotJanitor() // give the award snapshot's memory back once it goes cold
|
||||||
|
|
||||||
a.cluster = cluster.NewManager(
|
a.cluster = cluster.NewManager(
|
||||||
// onSpot / onLine run on the session's socket-read goroutine, so they must
|
// onSpot / onLine run on the session's socket-read goroutine, so they must
|
||||||
@@ -1794,6 +1803,24 @@ func writeWindowState(dataDir string, w windowState) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// windowIsMinimised reports whether the window is currently minimised.
|
||||||
|
//
|
||||||
|
// Two tests rather than one: Wails answers the question directly, and the
|
||||||
|
// -32000 corner is Windows' own marker for a minimised window — a window that
|
||||||
|
// is mid-close or hidden can report that corner while the flag has already been
|
||||||
|
// cleared, and either way the geometry is not worth storing.
|
||||||
|
func (a *App) windowIsMinimised() bool {
|
||||||
|
if a.ctx == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if wruntime.WindowIsMinimised(a.ctx) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
x, y := wruntime.WindowGetPosition(a.ctx)
|
||||||
|
const minimisedCorner = -32000
|
||||||
|
return x <= minimisedCorner || y <= minimisedCorner
|
||||||
|
}
|
||||||
|
|
||||||
// saveWindowState captures the current geometry. Called as the window closes.
|
// saveWindowState captures the current geometry. Called as the window closes.
|
||||||
// While in compact mode the window is pinned to a tiny fixed size, so we keep the
|
// While in compact mode the window is pinned to a tiny fixed size, so we keep the
|
||||||
// previously-saved normal geometry rather than overwrite it with 1240×158 — only
|
// previously-saved normal geometry rather than overwrite it with 1240×158 — only
|
||||||
@@ -1803,6 +1830,18 @@ func (a *App) saveWindowState() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
prev, _ := readWindowState(a.dataDir)
|
prev, _ := readWindowState(a.dataDir)
|
||||||
|
// A MINIMISED window has no usable geometry: Windows parks it at -32000,-32000
|
||||||
|
// with a stub size, and reports it as not-maximised. Closing OpsLog from the
|
||||||
|
// taskbar while minimised captured exactly that — "saving -32000,-32000 237x39
|
||||||
|
// maximised=false" — and window.json then held a position no monitor covers and
|
||||||
|
// a size below the minimum. The restore side rejects both and falls back to the
|
||||||
|
// default placement, so the operator silently lost the size, the position AND
|
||||||
|
// the maximised state they had. Keep what was already stored instead.
|
||||||
|
if a.windowIsMinimised() {
|
||||||
|
applog.Printf("window: minimised at close — keeping the stored geometry %d,%d %dx%d maximised=%v",
|
||||||
|
prev.X, prev.Y, prev.Width, prev.Height, prev.Maximised)
|
||||||
|
return
|
||||||
|
}
|
||||||
max := wruntime.WindowIsMaximised(a.ctx)
|
max := wruntime.WindowIsMaximised(a.ctx)
|
||||||
ws := prev
|
ws := prev
|
||||||
ws.Maximised = max
|
ws.Maximised = max
|
||||||
@@ -4136,6 +4175,7 @@ func (a *App) awardSnapshot() ([]qso.QSO, error) {
|
|||||||
a.awardSnapMu.Lock()
|
a.awardSnapMu.Lock()
|
||||||
if a.awardSnap != nil && a.awardSnapRev == rev {
|
if a.awardSnap != nil && a.awardSnapRev == rev {
|
||||||
qs := a.awardSnap
|
qs := a.awardSnap
|
||||||
|
a.awardSnapUsed = time.Now()
|
||||||
a.awardSnapMu.Unlock()
|
a.awardSnapMu.Unlock()
|
||||||
return qs, nil
|
return qs, nil
|
||||||
}
|
}
|
||||||
@@ -4151,18 +4191,63 @@ func (a *App) awardSnapshot() ([]qso.QSO, error) {
|
|||||||
}); err != nil {
|
}); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
applog.Printf("awardSnapshot: pulled %d qsos from logbook in %v (rev=%s)",
|
// Heap alongside the row count: this snapshot is the single largest thing
|
||||||
len(all), time.Since(t0).Round(time.Millisecond), rev)
|
// OpsLog holds, and "OpsLog is eating memory" reports are unanswerable
|
||||||
|
// without a number. A 132 000-QSO logbook was the case that prompted it.
|
||||||
|
var ms runtime.MemStats
|
||||||
|
runtime.ReadMemStats(&ms)
|
||||||
|
applog.Printf("awardSnapshot: pulled %d qsos from logbook in %v (rev=%s) — go heap now %d MB",
|
||||||
|
len(all), time.Since(t0).Round(time.Millisecond), rev, ms.HeapAlloc/(1024*1024))
|
||||||
|
|
||||||
if revErr == nil {
|
if revErr == nil {
|
||||||
a.awardSnapMu.Lock()
|
a.awardSnapMu.Lock()
|
||||||
a.awardSnap = all
|
a.awardSnap = all
|
||||||
a.awardSnapRev = rev
|
a.awardSnapRev = rev
|
||||||
|
a.awardSnapUsed = time.Now()
|
||||||
a.awardSnapMu.Unlock()
|
a.awardSnapMu.Unlock()
|
||||||
}
|
}
|
||||||
return all, nil
|
return all, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// awardSnapIdleTTL is how long the snapshot survives without a reader.
|
||||||
|
//
|
||||||
|
// Generous on purpose: an operator working through the Awards panel triggers a
|
||||||
|
// computation every few seconds, and re-pulling costs seconds on a big remote
|
||||||
|
// logbook. This is only meant to catch the far commoner case — awards looked at
|
||||||
|
// once, then hours of logging with several hundred megabytes still held.
|
||||||
|
const awardSnapIdleTTL = 15 * time.Minute
|
||||||
|
|
||||||
|
// awardSnapshotJanitor drops the award snapshot once nothing has read it for a
|
||||||
|
// while, and returns the memory to the OS.
|
||||||
|
//
|
||||||
|
// The snapshot is a whole logbook of QSO structs, each carrying a decoded map of
|
||||||
|
// its ADIF extras: ~1.9 KB of struct plus strings and one map allocation per
|
||||||
|
// QSO. At 30 000 QSOs that is tens of megabytes and nobody notices; at 132 000
|
||||||
|
// it is several hundred, held for the rest of the session because the cache had
|
||||||
|
// no expiry — only invalidation when the logbook changed.
|
||||||
|
func (a *App) awardSnapshotJanitor() {
|
||||||
|
for {
|
||||||
|
time.Sleep(time.Minute)
|
||||||
|
a.awardSnapMu.Lock()
|
||||||
|
n := len(a.awardSnap)
|
||||||
|
idle := !a.awardSnapUsed.IsZero() && time.Since(a.awardSnapUsed) > awardSnapIdleTTL
|
||||||
|
if a.awardSnap != nil && idle {
|
||||||
|
a.awardSnap = nil
|
||||||
|
a.awardSnapRev = ""
|
||||||
|
}
|
||||||
|
a.awardSnapMu.Unlock()
|
||||||
|
if n > 0 && idle {
|
||||||
|
// FreeOSMemory, not just GC: Go hands pages back lazily, and the whole
|
||||||
|
// point here is that the operator sees the memory come back.
|
||||||
|
debug.FreeOSMemory()
|
||||||
|
var ms runtime.MemStats
|
||||||
|
runtime.ReadMemStats(&ms)
|
||||||
|
applog.Printf("awardSnapshot: released %d cached qsos after %v idle — go heap now %d MB",
|
||||||
|
n, awardSnapIdleTTL, ms.HeapAlloc/(1024*1024))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// GetAwardStats computes the worked/confirmed/validated reference counts of one
|
// GetAwardStats computes the worked/confirmed/validated reference counts of one
|
||||||
// award, broken down by band and by mode category (All/CW/Digital/Phone).
|
// award, broken down by band and by mode category (All/CW/Digital/Phone).
|
||||||
func (a *App) GetAwardStats(code string) (AwardStatsResult, error) {
|
func (a *App) GetAwardStats(code string) (AwardStatsResult, error) {
|
||||||
@@ -4217,8 +4302,8 @@ func (a *App) GetAwardStats(code string) (AwardStatsResult, error) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
bi, hasBand := bandIdx[strings.ToLower(strings.TrimSpace(q.Band))]
|
bi, hasBand := bandIdx[strings.ToLower(strings.TrimSpace(q.Band))]
|
||||||
isConf := award.Confirmed(q, def.Confirm)
|
isConf := award.Confirmed(q, *def, def.Confirm)
|
||||||
isVal := award.Confirmed(q, def.Validate)
|
isVal := award.Confirmed(q, *def, def.Validate)
|
||||||
cat := strings.ToUpper(award.EmissionOf(q.Mode))
|
cat := strings.ToUpper(award.EmissionOf(q.Mode))
|
||||||
|
|
||||||
record := func(c string) {
|
record := func(c string) {
|
||||||
@@ -6091,6 +6176,31 @@ func (a *App) bulkSetFrequency(ids []int64, value string) (int64, error) {
|
|||||||
return n, nil
|
return n, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetWorkedCallVariants reports whether "worked before" folds an operator's
|
||||||
|
// portable forms together (RK3DWA ↔ RK3DWA/3 ↔ RK3DWA/P).
|
||||||
|
//
|
||||||
|
// Defaults to ON, hence the inverted storage: an install that predates the
|
||||||
|
// setting has no key at all, and reading that as OFF would leave every existing
|
||||||
|
// operator with the old narrow behaviour they asked us to change.
|
||||||
|
func (a *App) GetWorkedCallVariants() (bool, error) {
|
||||||
|
if a.settings == nil {
|
||||||
|
return true, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
v, err := a.settings.Get(a.ctx, keyWorkedCallVariants)
|
||||||
|
if err != nil {
|
||||||
|
return true, err
|
||||||
|
}
|
||||||
|
return v != "0", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetWorkedCallVariants persists the toggle.
|
||||||
|
func (a *App) SetWorkedCallVariants(on bool) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
return a.settings.Set(a.ctx, keyWorkedCallVariants, boolStr(on))
|
||||||
|
}
|
||||||
|
|
||||||
// WorkedBefore returns prior contacts with the given callsign at both
|
// WorkedBefore returns prior contacts with the given callsign at both
|
||||||
// call and DXCC granularity. Pass dxccHint=0 when unknown — the function
|
// call and DXCC granularity. Pass dxccHint=0 when unknown — the function
|
||||||
// will infer it from past QSOs with the same call when possible.
|
// will infer it from past QSOs with the same call when possible.
|
||||||
@@ -6107,7 +6217,8 @@ func (a *App) WorkedBefore(callsign string, dxccHint int) (qso.WorkedBefore, err
|
|||||||
dxccHint = dxcc.EntityDXCC(m.Entity.Name)
|
dxccHint = dxcc.EntityDXCC(m.Entity.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wb, err := a.qso.WorkedBefore(a.ctx, callsign, dxccHint)
|
variants, _ := a.GetWorkedCallVariants()
|
||||||
|
wb, err := a.qso.WorkedBefore(a.ctx, callsign, dxccHint, variants)
|
||||||
// Attach the ClubLog Most Wanted rank for this entity (opt-in) so the entry
|
// Attach the ClubLog Most Wanted rank for this entity (opt-in) so the entry
|
||||||
// matrix can show it next to the country name.
|
// matrix can show it next to the country name.
|
||||||
if err == nil && wb.DXCC > 0 && a.clublogMW != nil && a.clublogMostWantedEnabled() {
|
if err == nil && wb.DXCC > 0 && a.clublogMW != nil && a.clublogMostWantedEnabled() {
|
||||||
|
|||||||
+2
-2
@@ -41,7 +41,7 @@ const appQSLCardSentField = "APP_OPSLOG_QSL_SENT"
|
|||||||
|
|
||||||
// appQSLCardRcvdField marks that a QSL was RECEIVED for this QSO (set by the
|
// 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
|
// 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"
|
// the card: received → "TNX QSL" (thanks for your card), not received → "PSE QSL"
|
||||||
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
|
// (please send one). Independent of ADIF qsl_rcvd, like the sent field.
|
||||||
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
|
const appQSLCardRcvdField = "APP_OPSLOG_QSL_RCVD"
|
||||||
|
|
||||||
@@ -681,7 +681,7 @@ func (a *App) qslVars(q qso.QSO) (map[string]string, qslcard.CountryInfo, error)
|
|||||||
// QSO (appQSLCardRcvdField): received → thank them, otherwise ask for a card.
|
// QSO (appQSLCardRcvdField): received → thank them, otherwise ask for a card.
|
||||||
pseTnx := "PSE QSL"
|
pseTnx := "PSE QSL"
|
||||||
if q.Extras != nil && strings.TrimSpace(q.Extras[appQSLCardRcvdField]) != "" {
|
if q.Extras != nil && strings.TrimSpace(q.Extras[appQSLCardRcvdField]) != "" {
|
||||||
pseTnx = "TNX"
|
pseTnx = "TNX QSL"
|
||||||
}
|
}
|
||||||
vars := map[string]string{
|
vars := map[string]string{
|
||||||
"profile.callsign": info.Callsign,
|
"profile.callsign": info.Callsign,
|
||||||
|
|||||||
@@ -1,4 +1,48 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.24.1",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Recent QSOs: the Max box can be lowered again. It could not be emptied — clearing it put the old number straight back — so going from a large figure down to a small one was a fight against the field, and looked like the setting refusing to stick. Type freely now and press Enter (or click away) to apply. The value was already saved and travels with your data folder; only the box was in the way.",
|
||||||
|
"Memory: the awards cache is given back once you stop using it. Opening the Awards panel loads the whole logbook into memory and kept it there for the rest of the session — a few tens of megabytes on a small log, but several hundred on a large one, and it was never released because the cache only expired when the logbook changed. It is now dropped after fifteen minutes without use, and the memory returned to Windows. Fifteen minutes on purpose: working through your awards keeps it warm, since reloading a large log takes seconds. The log also records the heap size each time the cache is built or released, so a memory report can be answered with a figure instead of a guess.",
|
||||||
|
"Performance: the DX-cluster console no longer drags the whole interface down. Every line of traffic — spots, MOTD, everything — was applied to the screen one at a time, and an RBN feed alone sends hundreds a second: that meant two copies of a 2000-line buffer and a redraw for each one, whether the console was open or not. Lines are now grouped and applied five times a second. The difference is most visible on an older PC, where this alone could make the app crawl.",
|
||||||
|
"Update: \"stage current exe: … Accès refusé\" is fixed. Two causes, both handled. The previous build was always staged under the same name, so one leftover that could not be deleted — an antivirus holding it open is the usual reason — blocked every later update, permanently, with no way out but deleting the file by hand; the staging name is now unique. And when the running program cannot be renamed at all, which some endpoint protection deliberately prevents, OpsLog no longer gives up: it leaves the new build beside the old one and swaps them after closing, when its own file is an ordinary file again. If even that fails, OpsLog restarts on the current version rather than leaving you with nothing, and the download is kept for the next attempt.",
|
||||||
|
"Band map: the width can be dragged. Both the map docked beside the tables and the per-band cards in the Band map tab were locked at a fixed width, so an operator watching a busy band could not give the map more room — nor take it back for the log. Grab the edge to resize, double-click it to go back to the default. The width is remembered and travels with your data folder, like the other layout settings. In the tab, one width applies to every card: they sit side by side, and columns of different widths read as a mistake."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"QSO récents : la case Max se laisse enfin baisser. Impossible de la vider — l'effacer y remettait aussitôt l'ancien nombre — donc passer d'un grand chiffre à un petit était un combat contre le champ, et donnait l'impression que le réglage ne tenait pas. Tape librement puis Entrée (ou clique ailleurs) pour appliquer. La valeur était déjà enregistrée et voyage avec ton dossier de données ; c'était la case qui bloquait.",
|
||||||
|
"Mémoire : le cache des diplômes est rendu quand tu ne t'en sers plus. Ouvrir le panneau Diplômes charge tout le journal en mémoire et l'y gardait jusqu'à la fermeture — quelques dizaines de Mo sur un petit journal, plusieurs centaines sur un gros, et jamais libérés puisque le cache n'expirait qu'au changement du journal. Il est désormais abandonné après quinze minutes sans usage, et la mémoire rendue à Windows. Quinze minutes volontairement : parcourir tes diplômes le garde chaud, recharger un gros journal coûtant plusieurs secondes. Le journal technique note aussi la taille du tas à chaque construction ou libération, pour qu'un signalement de mémoire se réponde avec un chiffre plutôt qu'une supposition.",
|
||||||
|
"Performance : la console du cluster DX ne plombe plus toute l'interface. Chaque ligne de trafic — spots, MOTD, tout — était appliquée à l'écran une par une, et un flux RBN en envoie à lui seul des centaines par seconde : cela faisait deux copies d'un tampon de 2000 lignes et un redessin pour chacune, que la console soit ouverte ou non. Les lignes sont désormais groupées et appliquées cinq fois par seconde. La différence se voit surtout sur un PC ancien, où cela suffisait à faire ramer l'application.",
|
||||||
|
"Mise à jour : le « stage current exe : … Accès refusé » est corrigé. Deux causes, traitées toutes les deux. L'ancienne version était toujours mise de côté sous le même nom : un seul reliquat impossible à supprimer — un antivirus qui le garde ouvert, le plus souvent — bloquait définitivement toutes les mises à jour suivantes, sans autre issue que d'effacer le fichier à la main ; ce nom est désormais unique. Et quand le programme en cours d'exécution ne peut pas être renommé du tout, ce que certaines protections empêchent volontairement, OpsLog n'abandonne plus : il laisse la nouvelle version à côté de l'ancienne et les échange après sa fermeture, quand son propre fichier redevient un fichier ordinaire. Si même cela échoue, OpsLog redémarre sur la version actuelle plutôt que de te laisser sans rien, et le téléchargement est conservé pour la prochaine tentative.",
|
||||||
|
"Band map : la largeur se règle à la souris. La carte ancrée à côté des tableaux et les cartes par bande de l'onglet Band map étaient figées à une largeur fixe : impossible de donner plus de place à la carte sur une bande chargée, ni de la reprendre pour le journal. Attrape le bord pour redimensionner, double-clic pour revenir au défaut. La largeur est mémorisée et voyage avec ton dossier de données, comme les autres réglages de disposition. Dans l'onglet, une seule largeur vaut pour toutes les cartes : elles sont côte à côte, et des colonnes de largeurs différentes se lisent comme une erreur."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.0",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Worked before: an operator's portable callsigns now count as the same station. Typing RK3DWA finds the RK3DWA/3, /P and /MM contacts too, and the other way round — before, the history only appeared if you typed the exact form. Can be turned off in Settings → General; contest dupe checking is unaffected and stays exact.",
|
||||||
|
"QSO editor: the OpsLog card now appears with the other confirmations. It has its own Sent / Received row in the QSL Info table, next to QSL, LoTW, eQSL and the rest, and the \"QSL received\" tick moved there from Contact's details — with its PSE QSL / TNX indicator, which is unchanged. Sent stays read-only: OpsLog stamps it when the card actually goes out.",
|
||||||
|
"QSL card: the {qso.pse_tnx} stamp now prints \"TNX QSL\" instead of just \"TNX\", to read as the counterpart of \"PSE QSL\".",
|
||||||
|
"Four new themes, with real colour this time: Indigo (deep blue-violet, electric accent), Ocean (deep teal, cyan), Plum (aubergine, magenta) and Nordic light (crisp cool white, indigo). The seven existing ones were all neutral — beige, slate, graphite, black — with an orange accent, so picking a theme only ever changed the shade of grey. Each new one colours the surfaces, not just the accent, and takes its own primary. The status colours stay exactly where they were: red still means a problem.",
|
||||||
|
"Awards: the Prefix now completes a reference the operator typed without it. A station that puts just \"74\" in State counts for DDFM (codes D01…D95) with match-by \"code\" and Prefix \"D\" — before, that found nothing and the only way through was to write a regex, in a mode where you had chosen \"code\" and not \"pattern\". The prefix was applied after the reference lookup, that is, after the step that had already failed. A field that already holds the whole code is no longer prefixed twice either (\"D74\" used to become \"DD74\" as soon as a prefix was set).",
|
||||||
|
"UDP: WSJT-X traffic arriving through a relay is read again. A forwarder such as W&P prepends the origin as text — \"127.0.0.1:2237|\" — in front of the packet it re-broadcasts, which pushed the WSJT-X signature 15 bytes in and made every datagram fail. That header is now skipped, so MSHV / WSJT-X / JTDX behind a relay work on the ordinary \"WSJT-X / JTDX / MSHV\" service: no new setting, nothing to reconfigure.",
|
||||||
|
"UDP: an unreadable packet now says who sent it and what it contained — the sender's address, the size, a text preview and a hex dump — instead of just a magic number. And it stops after five: a port receiving the wrong traffic was writing that line a hundred times a second, filling the log and burying everything else. A closing line points at the two things to check, the sender and the service type.",
|
||||||
|
"Awards: the QRZ.com and Custom confirmation sources actually work now. Both were offered in the award editor but neither was implemented, so ticking one marked no QSO as confirmed — silently. QRZ.com reads the download status (them confirming back, not our upload). Custom reads any QSO field or ADIF tag you name, with an optional list of values that count: point it at APP_OPSLOG_QSL_RCVD for a card received through OpsLog, or at a tag stamped by a club list you imported. Leave the value empty and any non-empty content confirms. A Custom source naming no field confirms nothing.",
|
||||||
|
"Window: closing OpsLog while it is minimised no longer loses its size and position. Windows parks a minimised window at -32000,-32000 with a stub size, and that was what got saved — so the next launch found geometry no screen could hold, discarded it, and reopened at the default place. The stored geometry is now kept instead; it repairs itself the first time you close a window that is on screen."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Déjà contacté : les indicatifs portables d'un opérateur comptent désormais comme la même station. Taper RK3DWA retrouve aussi les QSO en RK3DWA/3, /P et /MM, et inversement — avant, l'historique n'apparaissait que si tu tapais la forme exacte. Désactivable dans Réglages → Général ; le contrôle de doublon en concours n'est pas touché et reste strict.",
|
||||||
|
"Éditeur de QSO : la carte OpsLog rejoint les autres confirmations. Elle a sa propre ligne Envoyée / Reçue dans le tableau de l'onglet QSL Info, à côté de QSL, LoTW, eQSL et les autres, et la case « QSL reçue » y a été déplacée depuis Détails du contact — avec son indicateur PSE QSL / TNX, inchangé. « Envoyée » reste en lecture seule : OpsLog l'inscrit quand la carte part réellement.",
|
||||||
|
"Carte QSL : le tampon {qso.pse_tnx} imprime désormais « TNX QSL » et non plus « TNX » seul, pour répondre à « PSE QSL ».",
|
||||||
|
"Quatre nouveaux thèmes, avec de la vraie couleur cette fois : Indigo (bleu-violet profond, accent électrique), Océan (turquoise profond, cyan), Prune (aubergine, magenta) et Clair nordique (blanc froid net, indigo). Les sept existants étaient tous neutres — beige, ardoise, graphite, noir — avec un accent orange : choisir un thème ne changeait que la nuance de gris. Les nouveaux colorent les surfaces, pas seulement l'accent, et ont chacun leur couleur principale. Les couleurs de statut ne bougent pas : le rouge veut toujours dire un problème.",
|
||||||
|
"Diplômes : le Préfixe complète désormais une référence saisie sans lui. Une station qui met simplement « 74 » dans State compte pour le DDFM (codes D01…D95) avec correspondance « code » et Préfixe « D » — avant, cela ne trouvait rien et le seul recours était d'écrire une regex, dans un mode où tu avais justement choisi « code » et pas « pattern ». Le préfixe était appliqué après la recherche de la référence, c'est-à-dire après l'étape qui venait d'échouer. Un champ contenant déjà le code complet n'est plus préfixé deux fois non plus (« D74 » devenait « DD74 » dès qu'un préfixe était réglé).",
|
||||||
|
"UDP : le trafic WSJT-X qui arrive via un relais est de nouveau lu. Un réexpéditeur comme W&P place l'origine en texte — « 127.0.0.1:2237| » — devant le paquet qu'il rediffuse, ce qui décalait la signature WSJT-X de 15 octets et faisait échouer chaque datagramme. Cet en-tête est désormais ignoré : MSHV / WSJT-X / JTDX derrière un relais fonctionnent avec le service « WSJT-X / JTDX / MSHV » habituel, sans nouveau réglage ni reconfiguration.",
|
||||||
|
"UDP : un paquet illisible indique désormais qui l'a envoyé et ce qu'il contenait — adresse de l'émetteur, taille, aperçu en texte et vidage hexadécimal — au lieu d'un simple nombre magique. Et il s'arrête après cinq : un port recevant le mauvais trafic écrivait cette ligne cent fois par seconde, saturant le journal et enterrant tout le reste. Une ligne finale rappelle les deux choses à vérifier, l'émetteur et le type de service.",
|
||||||
|
"Diplômes : les sources de confirmation QRZ.com et Custom fonctionnent enfin. Les deux étaient proposées dans l'éditeur de diplômes sans être implémentées : cocher l'une ou l'autre ne confirmait aucun QSO, en silence. QRZ.com lit le statut de téléchargement (leur confirmation en retour, pas notre envoi). Custom lit n'importe quel champ de QSO ou balise ADIF que tu désignes, avec une liste facultative de valeurs qui comptent : pointe-la sur APP_OPSLOG_QSL_RCVD pour une carte reçue via OpsLog, ou sur une balise inscrite à l'import d'une liste de club. Laisse la valeur vide et tout contenu non vide confirme. Une source Custom sans champ ne confirme rien.",
|
||||||
|
"Fenêtre : fermer OpsLog alors qu'il est réduit ne fait plus perdre sa taille et sa position. Windows range une fenêtre réduite en -32000,-32000 avec une taille factice, et c'est cela qui était enregistré — au lancement suivant, OpsLog trouvait une géométrie qu'aucun écran ne peut contenir, la rejetait et rouvrait à l'emplacement par défaut. La géométrie déjà enregistrée est désormais conservée ; cela se répare tout seul à la première fermeture d'une fenêtre visible à l'écran."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.23.9",
|
"version": "0.23.9",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+135
-14
@@ -907,6 +907,49 @@ export default function App() {
|
|||||||
return Number.isFinite(n) && n >= 15 && n <= 85 ? n : 50;
|
return Number.isFinite(n) && n >= 15 && n <= 85 ? n : 50;
|
||||||
});
|
});
|
||||||
useEffect(() => { writeUiPref('opslog.mainSplit', String(Math.round(mainSplit))); }, [mainSplit]);
|
useEffect(() => { writeUiPref('opslog.mainSplit', String(Math.round(mainSplit))); }, [mainSplit]);
|
||||||
|
|
||||||
|
// Band-map widths. Two of them, because they are two different things: the
|
||||||
|
// docked map sits beside the tables and competes with them for room, while
|
||||||
|
// the cards in the Band map tab share a scrolling row and want to be uniform.
|
||||||
|
// Both were hardcoded — 300px and 260px — so an operator watching a busy band
|
||||||
|
// could not give the map the space it needed, nor claw it back for the log.
|
||||||
|
const BANDMAP_W_DEFAULT = 300, BANDMAP_W_MIN = 200, BANDMAP_W_MAX = 900;
|
||||||
|
const BANDMAP_TAB_W_DEFAULT = 260, BANDMAP_TAB_W_MIN = 160, BANDMAP_TAB_W_MAX = 700;
|
||||||
|
const readWidth = (key: string, def: number, min: number, max: number) => {
|
||||||
|
const n = parseFloat(localStorage.getItem(key) || '');
|
||||||
|
return Number.isFinite(n) && n >= min && n <= max ? n : def;
|
||||||
|
};
|
||||||
|
const [bandMapWidth, setBandMapWidth] = useState<number>(
|
||||||
|
() => readWidth('opslog.bandMapWidth', BANDMAP_W_DEFAULT, BANDMAP_W_MIN, BANDMAP_W_MAX));
|
||||||
|
const [bandMapTabWidth, setBandMapTabWidth] = useState<number>(
|
||||||
|
() => readWidth('opslog.bandMapTabWidth', BANDMAP_TAB_W_DEFAULT, BANDMAP_TAB_W_MIN, BANDMAP_TAB_W_MAX));
|
||||||
|
useEffect(() => { writeUiPref('opslog.bandMapWidth', String(Math.round(bandMapWidth))); }, [bandMapWidth]);
|
||||||
|
useEffect(() => { writeUiPref('opslog.bandMapTabWidth', String(Math.round(bandMapTabWidth))); }, [bandMapTabWidth]);
|
||||||
|
|
||||||
|
// Drag one edge of a fixed-width column. Measures from the pointer's START
|
||||||
|
// position rather than the container, so it behaves the same whether the grip
|
||||||
|
// is on the left or the right edge — the docked map is docked on either side.
|
||||||
|
const startWidthDrag = (
|
||||||
|
e: React.PointerEvent, current: number, edge: 'left' | 'right',
|
||||||
|
min: number, max: number, apply: (w: number) => void,
|
||||||
|
) => {
|
||||||
|
e.preventDefault();
|
||||||
|
// Pointer capture, for the same reason as the main splitter: without it a
|
||||||
|
// map or a grid under the cursor swallows the moves.
|
||||||
|
(e.currentTarget as HTMLElement).setPointerCapture(e.pointerId);
|
||||||
|
const x0 = e.clientX;
|
||||||
|
const onMove = (ev: PointerEvent) => {
|
||||||
|
const delta = edge === 'right' ? ev.clientX - x0 : x0 - ev.clientX;
|
||||||
|
apply(Math.min(max, Math.max(min, Math.round(current + delta))));
|
||||||
|
};
|
||||||
|
const onUp = () => {
|
||||||
|
window.removeEventListener('pointermove', onMove);
|
||||||
|
window.removeEventListener('pointerup', onUp);
|
||||||
|
};
|
||||||
|
window.addEventListener('pointermove', onMove);
|
||||||
|
window.addEventListener('pointerup', onUp);
|
||||||
|
};
|
||||||
|
|
||||||
const mainSplitRef = useRef<HTMLDivElement | null>(null);
|
const mainSplitRef = useRef<HTMLDivElement | null>(null);
|
||||||
const startMainSplitDrag = (e: React.PointerEvent) => {
|
const startMainSplitDrag = (e: React.PointerEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -957,6 +1000,19 @@ export default function App() {
|
|||||||
return Number.isFinite(raw) && raw > 0 ? raw : 500;
|
return Number.isFinite(raw) && raw > 0 ? raw : 500;
|
||||||
});
|
});
|
||||||
useEffect(() => { writeUiPref('hamlog.qsoLimit', String(qsoLimit)); }, [qsoLimit]);
|
useEffect(() => { writeUiPref('hamlog.qsoLimit', String(qsoLimit)); }, [qsoLimit]);
|
||||||
|
// Raw text for the Max box, committed on blur/Enter — never per keystroke.
|
||||||
|
// Bound straight to the number, the field could not be EMPTIED: clearing it
|
||||||
|
// gives "", Number("") is 0, 0 fails the "> 0" test, so the state never moved
|
||||||
|
// and value={qsoLimit} snapped the old number straight back. Going from 200000
|
||||||
|
// to 100 was a fight against the input, and looked like the setting refusing
|
||||||
|
// to stick. It also wrote the preference once per keystroke (1, 10, 100).
|
||||||
|
const [qsoLimitText, setQsoLimitText] = useState(String(qsoLimit));
|
||||||
|
useEffect(() => { setQsoLimitText(String(qsoLimit)); }, [qsoLimit]);
|
||||||
|
const commitQsoLimit = () => {
|
||||||
|
const n = Math.floor(Number(qsoLimitText));
|
||||||
|
if (Number.isFinite(n) && n > 0) setQsoLimit(n);
|
||||||
|
else setQsoLimitText(String(qsoLimit)); // nonsense typed → put the live value back
|
||||||
|
};
|
||||||
|
|
||||||
// Contest session: load once, then persist on every change (merge + save).
|
// Contest session: load once, then persist on every change (merge + save).
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -1370,14 +1426,42 @@ export default function App() {
|
|||||||
const [clusterLines, setClusterLines] = useState<ClusterLine[]>([]);
|
const [clusterLines, setClusterLines] = useState<ClusterLine[]>([]);
|
||||||
const [clusterConsoleOpen, setClusterConsoleOpen] = useState(false);
|
const [clusterConsoleOpen, setClusterConsoleOpen] = useState(false);
|
||||||
const clusterConsoleRef = useRef<HTMLDivElement | null>(null);
|
const clusterConsoleRef = useRef<HTMLDivElement | null>(null);
|
||||||
|
// Console lines are STAGED and flushed on a timer, never applied one by one.
|
||||||
|
//
|
||||||
|
// Every line of cluster traffic reaches this handler — spots, MOTD, WHO, the
|
||||||
|
// lot — and an RBN feed alone puts out hundreds a second. Committing each one
|
||||||
|
// meant two copies of a 2000-element array (spread, then slice) plus a React
|
||||||
|
// render PER LINE: tens of megabytes of garbage per second, and the renders
|
||||||
|
// happened even with the console closed, so an operator paid for a panel they
|
||||||
|
// were not looking at. On an older machine that is enough to make the whole UI
|
||||||
|
// crawl. Batching turns hundreds of updates a second into five.
|
||||||
|
const pendingLinesRef = useRef<ClusterLine[]>([]);
|
||||||
|
const pendingLineTimer = useRef<number | undefined>(undefined);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const off = EventsOn('cluster:line', (l: any) => {
|
const flushLines = () => {
|
||||||
|
pendingLineTimer.current = undefined;
|
||||||
|
const batch = pendingLinesRef.current;
|
||||||
|
if (batch.length === 0) return;
|
||||||
|
pendingLinesRef.current = [];
|
||||||
setClusterLines((prev) => {
|
setClusterLines((prev) => {
|
||||||
const next = [...prev, l as ClusterLine];
|
const total = prev.length + batch.length;
|
||||||
return next.length > CONSOLE_CAP ? next.slice(next.length - CONSOLE_CAP) : next;
|
return total > CONSOLE_CAP ? prev.slice(total - CONSOLE_CAP).concat(batch) : prev.concat(batch);
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
const off = EventsOn('cluster:line', (l: any) => {
|
||||||
|
const buf = pendingLinesRef.current;
|
||||||
|
buf.push(l as ClusterLine);
|
||||||
|
// Bound the staging buffer too: a burst longer than the console can show
|
||||||
|
// would otherwise be carried in full just to be sliced away on commit.
|
||||||
|
if (buf.length > CONSOLE_CAP) buf.splice(0, buf.length - CONSOLE_CAP);
|
||||||
|
if (pendingLineTimer.current === undefined) {
|
||||||
|
pendingLineTimer.current = window.setTimeout(flushLines, 200);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return () => { off?.(); };
|
return () => {
|
||||||
|
off?.();
|
||||||
|
if (pendingLineTimer.current !== undefined) window.clearTimeout(pendingLineTimer.current);
|
||||||
|
};
|
||||||
}, []);
|
}, []);
|
||||||
// Follow the tail, but ONLY when already at the bottom — otherwise scrolling up
|
// Follow the tail, but ONLY when already at the bottom — otherwise scrolling up
|
||||||
// to read a SH/DX reply would yank you back down on the next spot.
|
// to read a SH/DX reply would yank you back down on the next spot.
|
||||||
@@ -5948,9 +6032,15 @@ export default function App() {
|
|||||||
|
|
||||||
{/* ===== LOWER: tabbed table / cluster / band map ===== */}
|
{/* ===== LOWER: tabbed table / cluster / band map ===== */}
|
||||||
{compact ? null : <>
|
{compact ? null : <>
|
||||||
<div className={cn('grid gap-2.5 p-2.5 flex-1 min-h-0 grid-rows-[minmax(0,1fr)]',
|
{/* The band map is a fixed-width column with a draggable grip on its inner
|
||||||
showBandMap ? (bandMapSide === 'left' ? 'grid-cols-[300px_1fr]' : 'grid-cols-[1fr_300px]') : 'grid-cols-[1fr]')}>
|
edge — the gap between the two panes doubles as the handle, so no room
|
||||||
<section className="bg-card border border-border rounded-lg shadow-sm flex flex-col min-h-0 overflow-hidden">
|
is spent on it. Same idiom as the Main tab's splitter. */}
|
||||||
|
<div className={cn('grid gap-0 p-2.5 flex-1 min-h-0 grid-rows-[minmax(0,1fr)]', !showBandMap && 'grid-cols-[1fr]')}
|
||||||
|
style={showBandMap
|
||||||
|
? { gridTemplateColumns: bandMapSide === 'left' ? `${bandMapWidth}px 10px 1fr` : `1fr 10px ${bandMapWidth}px` }
|
||||||
|
: undefined}>
|
||||||
|
<section className={cn('bg-card border border-border rounded-lg shadow-sm flex flex-col min-h-0 overflow-hidden',
|
||||||
|
showBandMap && (bandMapSide === 'left' ? 'order-3' : 'order-1'))}>
|
||||||
<Tabs value={activeTab} onValueChange={setActiveTab} className="flex flex-col min-h-0 flex-1">
|
<Tabs value={activeTab} onValueChange={setActiveTab} className="flex flex-col min-h-0 flex-1">
|
||||||
<TabsList className="px-3 shrink-0">
|
<TabsList className="px-3 shrink-0">
|
||||||
<TabsTrigger value="main">{t('tab.main')}</TabsTrigger>
|
<TabsTrigger value="main">{t('tab.main')}</TabsTrigger>
|
||||||
@@ -6209,11 +6299,11 @@ export default function App() {
|
|||||||
min={1}
|
min={1}
|
||||||
step={100}
|
step={100}
|
||||||
className="w-24 h-7 font-mono text-xs"
|
className="w-24 h-7 font-mono text-xs"
|
||||||
value={qsoLimit}
|
value={qsoLimitText}
|
||||||
onChange={(e) => {
|
onChange={(e) => setQsoLimitText(e.target.value)}
|
||||||
const n = Number(e.target.value);
|
onBlur={commitQsoLimit}
|
||||||
if (Number.isFinite(n) && n > 0) setQsoLimit(Math.floor(n));
|
onKeyDown={(e) => { if (e.key === 'Enter') (e.target as HTMLInputElement).blur(); }}
|
||||||
}}
|
title="Rows loaded into the list — press Enter to apply"
|
||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
@@ -6522,7 +6612,23 @@ export default function App() {
|
|||||||
Pick one or more bands above to show their band maps side by side.
|
Pick one or more bands above to show their band maps side by side.
|
||||||
</div>
|
</div>
|
||||||
) : bandMapBands.map((b) => (
|
) : bandMapBands.map((b) => (
|
||||||
<div key={b} className="w-[260px] shrink-0 min-h-0 border border-border rounded-lg overflow-hidden flex flex-col">
|
<div key={b} className="relative shrink-0 min-h-0 border border-border rounded-lg overflow-hidden flex flex-col"
|
||||||
|
style={{ width: bandMapTabWidth }}>
|
||||||
|
{/* One width for every card: they sit side by side in a
|
||||||
|
scrolling row, and columns of different widths read as a
|
||||||
|
mistake rather than a choice. Grip on the right edge. */}
|
||||||
|
<div
|
||||||
|
role="separator"
|
||||||
|
aria-orientation="vertical"
|
||||||
|
title={t('bmp.widthTip')}
|
||||||
|
onPointerDown={(e) => startWidthDrag(
|
||||||
|
e, bandMapTabWidth, 'right',
|
||||||
|
BANDMAP_TAB_W_MIN, BANDMAP_TAB_W_MAX, setBandMapTabWidth)}
|
||||||
|
onDoubleClick={() => setBandMapTabWidth(BANDMAP_TAB_W_DEFAULT)}
|
||||||
|
className="group absolute inset-y-0 right-0 z-10 w-2 cursor-col-resize flex items-center justify-center"
|
||||||
|
>
|
||||||
|
<span className="h-10 w-[3px] rounded-full bg-transparent group-hover:bg-primary transition-colors" />
|
||||||
|
</div>
|
||||||
<BandMap
|
<BandMap
|
||||||
band={b}
|
band={b}
|
||||||
spots={spots.filter((s) => s.band === b)}
|
spots={spots.filter((s) => s.band === b)}
|
||||||
@@ -6541,7 +6647,22 @@ export default function App() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
{showBandMap && (
|
{showBandMap && (
|
||||||
<div className={cn('bg-card border border-border rounded-lg shadow-sm flex flex-col min-h-0 overflow-hidden', bandMapSide === 'left' && 'order-first')}>
|
<div
|
||||||
|
role="separator"
|
||||||
|
aria-orientation="vertical"
|
||||||
|
title={t('bmp.widthTip')}
|
||||||
|
onPointerDown={(e) => startWidthDrag(
|
||||||
|
e, bandMapWidth, bandMapSide === 'left' ? 'right' : 'left',
|
||||||
|
BANDMAP_W_MIN, BANDMAP_W_MAX, setBandMapWidth)}
|
||||||
|
onDoubleClick={() => setBandMapWidth(BANDMAP_W_DEFAULT)}
|
||||||
|
className="group relative order-2 cursor-col-resize flex items-center justify-center"
|
||||||
|
>
|
||||||
|
<span className="h-10 w-[3px] rounded-full bg-border group-hover:bg-primary transition-colors" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{showBandMap && (
|
||||||
|
<div className={cn('bg-card border border-border rounded-lg shadow-sm flex flex-col min-h-0 overflow-hidden',
|
||||||
|
bandMapSide === 'left' ? 'order-1' : 'order-3')}>
|
||||||
<BandMap
|
<BandMap
|
||||||
side={bandMapSide}
|
side={bandMapSide}
|
||||||
onToggleSide={toggleBandMapSide}
|
onToggleSide={toggleBandMapSide}
|
||||||
|
|||||||
@@ -38,6 +38,9 @@ export type AwardDef = {
|
|||||||
or_rules?: AwardOrRule[];
|
or_rules?: AwardOrRule[];
|
||||||
dxcc_filter: number[] | null; valid_bands?: string[]; valid_modes?: string[]; emission?: string[];
|
dxcc_filter: number[] | null; valid_bands?: string[]; valid_modes?: string[]; emission?: string[];
|
||||||
confirm: string[] | null; validate?: string[] | null; grant_codes?: string; export_credit_granted?: boolean;
|
confirm: string[] | null; validate?: string[] | null; grant_codes?: string; export_credit_granted?: boolean;
|
||||||
|
// The "custom" confirmation source: the field it reads and, optionally, the
|
||||||
|
// value(s) that count. Empty value = any non-empty value confirms.
|
||||||
|
confirm_field?: string; confirm_value?: string;
|
||||||
total: number; builtin?: boolean; version?: number;
|
total: number; builtin?: boolean; version?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -622,6 +625,30 @@ export function AwardEditor({ open, onClose, onSaved }: Props) {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* "Custom" is only meaningful once it names a field, so the
|
||||||
|
inputs appear as soon as it is ticked in either column —
|
||||||
|
and a custom source with no field confirms nothing. */}
|
||||||
|
{((cur.confirm ?? []).includes('custom') || (cur.validate ?? []).includes('custom')) && (
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<Label className="text-xs font-semibold">{t('awed.customLabel')}</Label>
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-[11px] text-muted-foreground">{t('awed.customField')}</Label>
|
||||||
|
<Input className="h-8 font-mono text-xs" placeholder="APP_OPSLOG_QSL_RCVD"
|
||||||
|
value={(cur as any).confirm_field ?? ''}
|
||||||
|
onChange={(e) => patch({ confirm_field: e.target.value.trim().toUpperCase() } as any)} />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Label className="text-[11px] text-muted-foreground">{t('awed.customValue')}</Label>
|
||||||
|
<Input className="h-8 font-mono text-xs" placeholder="Y,V"
|
||||||
|
value={(cur as any).confirm_value ?? ''}
|
||||||
|
onChange={(e) => patch({ confirm_value: e.target.value } as any)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground leading-relaxed">{t('awed.customHint')}</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
{/* "Grant codes" and "export credit_granted" used to live here. No
|
{/* "Grant codes" and "export credit_granted" used to live here. No
|
||||||
ADIF export has ever written CREDIT_GRANTED, so both controls
|
ADIF export has ever written CREDIT_GRANTED, so both controls
|
||||||
did nothing at all. The stored values are kept (see award.Def);
|
did nothing at all. The stored values are kept (see award.Def);
|
||||||
|
|||||||
@@ -73,6 +73,11 @@ const CONF_LABEL_KEYS: Record<string, string> = {
|
|||||||
QSL: 'qedit.confQslPaper',
|
QSL: 'qedit.confQslPaper',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// OpsLog's own card. Kept out of CONFIRMATIONS on purpose — that list maps QSO
|
||||||
|
// columns and this channel is backed by ADIF extras — but it still belongs in
|
||||||
|
// the channel picker and the status table alongside the rest.
|
||||||
|
const OPSLOG_CONF = 'OPSLOG';
|
||||||
|
|
||||||
// Colour-coded status cell for the confirmation grid.
|
// Colour-coded status cell for the confirmation grid.
|
||||||
function StatusCell({ value }: { value?: string }) {
|
function StatusCell({ value }: { value?: string }) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -430,10 +435,14 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
);
|
);
|
||||||
|
|
||||||
// OpsLog QSL "received" marker (ADIF extra). Drives the card's PSE/TNX stamp:
|
// 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).
|
// received → TNX QSL (thanks for your card), otherwise PSE QSL (please send one).
|
||||||
// Saved with the normal Save via draft.extras.
|
// Saved with the normal Save via draft.extras.
|
||||||
const OPSLOG_QSL_RCVD = 'APP_OPSLOG_QSL_RCVD';
|
const OPSLOG_QSL_RCVD = 'APP_OPSLOG_QSL_RCVD';
|
||||||
const qslReceived = !!String(draft.extras?.[OPSLOG_QSL_RCVD] ?? '').trim();
|
const qslReceived = !!String(draft.extras?.[OPSLOG_QSL_RCVD] ?? '').trim();
|
||||||
|
// Sent side, for the confirmations table. Two key names because the marker was
|
||||||
|
// renamed once and old QSOs still carry the first one — same test the Recent
|
||||||
|
// QSOs "OpsLog QSL" column makes.
|
||||||
|
const opslogQslSent = !!(draft.extras?.['APP_OPSLOG_QSL_SENT'] || draft.extras?.['APP_OPSLOG_QSL_CARD_SENT']);
|
||||||
const toggleQslReceived = (on: boolean) => {
|
const toggleQslReceived = (on: boolean) => {
|
||||||
// Reflect immediately in the draft (for the PSE/TNX indicator)…
|
// Reflect immediately in the draft (for the PSE/TNX indicator)…
|
||||||
const next = { ...(draft.extras ?? {}) };
|
const next = { ...(draft.extras ?? {}) };
|
||||||
@@ -617,18 +626,12 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<div className="flex flex-col flex-1"><Label>Lat</Label><Input type="number" step="0.000001" value={draft.lat ?? ''} onChange={(e) => set('lat', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
|
<div className="flex flex-col flex-1"><Label>Lat</Label><Input type="number" step="0.000001" value={draft.lat ?? ''} onChange={(e) => set('lat', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
|
||||||
<div className="flex flex-col flex-1"><Label>Lon</Label><Input type="number" step="0.000001" value={draft.lon ?? ''} onChange={(e) => set('lon', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
|
<div className="flex flex-col flex-1"><Label>Lon</Label><Input type="number" step="0.000001" value={draft.lon ?? ''} onChange={(e) => set('lon', numOrUndef(e.target.value) as any)} className="font-mono" /></div>
|
||||||
</div>
|
</div>
|
||||||
|
{/* The OpsLog QSL marker used to sit here, under QSL Msg. It
|
||||||
|
belongs with the other confirmation channels — see the QSL
|
||||||
|
Info tab. */}
|
||||||
<div>
|
<div>
|
||||||
<Label>{t('qedit.qslMsg')}</Label>
|
<Label>{t('qedit.qslMsg')}</Label>
|
||||||
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
<Input value={draft.qsl_msg ?? ''} onChange={(e) => set('qsl_msg', e.target.value)} />
|
||||||
<div 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>
|
||||||
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
|
<div><Label>{t('qedit.qslVia')}</Label><Input value={draft.qsl_via ?? ''} onChange={(e) => set('qsl_via', e.target.value)} /></div>
|
||||||
</div>
|
</div>
|
||||||
@@ -677,25 +680,69 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<Label>{t('qedit.manageConf')}</Label>
|
<Label>{t('qedit.manageConf')}</Label>
|
||||||
<Select value={confSel} onValueChange={setConfSel}>
|
<Select value={confSel} onValueChange={setConfSel}>
|
||||||
<SelectTrigger><SelectValue /></SelectTrigger>
|
<SelectTrigger><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>{CONFIRMATIONS.map((c) => <SelectItem key={c.key} value={c.key}>{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</SelectItem>)}</SelectContent>
|
<SelectContent>
|
||||||
|
{CONFIRMATIONS.map((c) => <SelectItem key={c.key} value={c.key}>{CONF_LABEL_KEYS[c.key] ? t(CONF_LABEL_KEYS[c.key]) : c.label}</SelectItem>)}
|
||||||
|
{/* Listed here but NOT in CONFIRMATIONS: that table maps
|
||||||
|
QSO columns, and this channel lives in the ADIF
|
||||||
|
extras. It gets its own editor below rather than the
|
||||||
|
generic sent/received/date grid, which has no field
|
||||||
|
to bind to. */}
|
||||||
|
<SelectItem value={OPSLOG_CONF}>{t('qedit.confOpsLog')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
<div className="grid grid-cols-2 gap-3">
|
|
||||||
<div><Label>{t('qedit.sent')}</Label><QslSelect value={val(def.sent)} onChange={(v) => put(def.sent, v)} /></div>
|
{confSel === OPSLOG_CONF ? (
|
||||||
<div><Label>{t('qedit.received')}</Label>
|
/* OpsLog's own card. "Sent" is stamped when the card
|
||||||
{def.rcvd
|
actually goes out, so it is shown, not offered: ticking
|
||||||
? <QslSelect value={val(def.rcvd)} onChange={(v) => put(def.rcvd, v)} />
|
it by hand would record something that never happened.
|
||||||
: <Input disabled value="—" />}
|
"Received" drives the PSE/TNX stamp printed on the card,
|
||||||
|
which is the whole reason the flag exists — hence the
|
||||||
|
live indicator next to it. It writes immediately rather
|
||||||
|
than on Save, because clearing an extras key would not
|
||||||
|
survive the merge Save does. */
|
||||||
|
<div className="space-y-3">
|
||||||
|
<div className="grid grid-cols-2 gap-3">
|
||||||
|
<div>
|
||||||
|
<Label>{t('qedit.sent')}</Label>
|
||||||
|
<Input disabled value={opslogQslSent ? t('qedit.qslYes') : t('qedit.qslNo')} />
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Label>{t('qedit.received')}</Label>
|
||||||
|
<label className="flex h-9 items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={qslReceived} onCheckedChange={(c) => toggleQslReceived(!!c)} />
|
||||||
|
{t('qedit.qslReceived')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<span className="text-[11px] font-mono px-1.5 py-0.5 rounded bg-muted text-muted-foreground">
|
||||||
|
{qslReceived ? 'TNX QSL' : 'PSE QSL'}
|
||||||
|
</span>
|
||||||
|
<span className="text-[11px] text-muted-foreground">{t('qedit.pseTnxHint')}</span>
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('qedit.opslogSentHint')}</p>
|
||||||
</div>
|
</div>
|
||||||
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
|
) : (
|
||||||
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
|
<>
|
||||||
{def.via && (
|
<div className="grid grid-cols-2 gap-3">
|
||||||
<div className="col-span-2"><Label>{t('qedit.via')}</Label><Input value={val(def.via)} onChange={(e) => put(def.via, e.target.value)} placeholder={t('qedit.viaPlaceholder')} /></div>
|
<div><Label>{t('qedit.sent')}</Label><QslSelect value={val(def.sent)} onChange={(v) => put(def.sent, v)} /></div>
|
||||||
)}
|
<div><Label>{t('qedit.received')}</Label>
|
||||||
</div>
|
{def.rcvd
|
||||||
<p className="text-[11px] text-muted-foreground">
|
? <QslSelect value={val(def.rcvd)} onChange={(v) => put(def.rcvd, v)} />
|
||||||
{t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>.
|
: <Input disabled value="—" />}
|
||||||
</p>
|
</div>
|
||||||
|
<div><Label>{t('qedit.dateSent')}</Label><AdifDateInput value={val(def.sentDate)} onChange={(v) => put(def.sentDate, v)} /></div>
|
||||||
|
<div><Label>{t('qedit.dateReceived')}</Label><AdifDateInput value={val(def.rcvdDate)} onChange={(v) => put(def.rcvdDate, v)} disabled={!def.rcvdDate} /></div>
|
||||||
|
{def.via && (
|
||||||
|
<div className="col-span-2"><Label>{t('qedit.via')}</Label><Input value={val(def.via)} onChange={(e) => put(def.via, e.target.value)} placeholder={t('qedit.viaPlaceholder')} /></div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground">
|
||||||
|
{t('qedit.qslPanelHint')} <strong>{t('qedit.saveChanges')}</strong>.
|
||||||
|
</p>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Right: live status grid for every channel.
|
{/* Right: live status grid for every channel.
|
||||||
@@ -720,6 +767,17 @@ export function QSOEditModal({ qso, onSave, onDelete, onClose, countries = [], b
|
|||||||
<td className="w-24">{c.rcvd ? <StatusCell value={val(c.rcvd)} /> : <span className="block text-center text-[11px] text-muted-foreground">—</span>}</td>
|
<td className="w-24">{c.rcvd ? <StatusCell value={val(c.rcvd)} /> : <span className="block text-center text-[11px] text-muted-foreground">—</span>}</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
|
{/* OpsLog's own card, read from the ADIF extras rather
|
||||||
|
than a QSO column — hence a hand-written row instead
|
||||||
|
of a CONFIRMATIONS entry. "Sent" is stamped by OpsLog
|
||||||
|
when the card actually goes out, so it stays
|
||||||
|
read-only here: an operator ticking it by hand would
|
||||||
|
be recording something that never happened. */}
|
||||||
|
<tr className="text-xs">
|
||||||
|
<td className="font-medium pr-3 py-0.5 whitespace-nowrap">{t('qedit.confOpsLog')}</td>
|
||||||
|
<td className="w-24"><StatusCell value={opslogQslSent ? 'Y' : 'N'} /></td>
|
||||||
|
<td className="w-24"><StatusCell value={qslReceived ? 'Y' : 'N'} /></td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import {
|
|||||||
AudioStartTX, AudioStopTX, AudioTXActive,
|
AudioStartTX, AudioStopTX, AudioTXActive,
|
||||||
ListClusterServers, SaveClusterServer, DeleteClusterServer,
|
ListClusterServers, SaveClusterServer, DeleteClusterServer,
|
||||||
GetClusterAutoConnect, SetClusterAutoConnect, GetSelfSpotSettings, SaveSelfSpotSettings,
|
GetClusterAutoConnect, SetClusterAutoConnect, GetSelfSpotSettings, SaveSelfSpotSettings,
|
||||||
|
GetWorkedCallVariants, SetWorkedCallVariants,
|
||||||
ConnectClusterServer, DisconnectClusterServer,
|
ConnectClusterServer, DisconnectClusterServer,
|
||||||
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus,
|
ConnectAllClusters, DisconnectAllClusters, GetClusterStatus,
|
||||||
GetBackupSettings, SaveBackupSettings, RunBackupNow, PickBackupFolder,
|
GetBackupSettings, SaveBackupSettings, RunBackupNow, PickBackupFolder,
|
||||||
@@ -402,9 +403,13 @@ const THEME_SWATCH: Record<Exclude<ThemeChoice, 'auto'>, { bg: string; card: str
|
|||||||
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
'light-warm': { bg: '#e8dfc9', card: '#faf6ea', accent: '#b8410c' },
|
||||||
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
'light-cool': { bg: '#f4f6f8', card: '#ffffff', accent: '#2563eb' },
|
||||||
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
'light-sage': { bg: '#eef1ec', card: '#f8faf6', accent: '#2f855a' },
|
||||||
|
'light-nordic': { bg: '#eef1f7', card: '#ffffff', accent: '#4f46e5' },
|
||||||
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
'dim-slate': { bg: '#343b47', card: '#3d4552', accent: '#fb923c' },
|
||||||
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
'dark-warm': { bg: '#221d18', card: '#2e2820', accent: '#e07a2e' },
|
||||||
'dark-graphite': { bg: '#16181d', card: '#1f232b', accent: '#f97316' },
|
'dark-graphite': { bg: '#16181d', card: '#1f232b', accent: '#f97316' },
|
||||||
|
'dark-indigo': { bg: '#0e0f1f', card: '#181a30', accent: '#7c6cff' },
|
||||||
|
'dark-teal': { bg: '#061c21', card: '#0d2c33', accent: '#22d3ee' },
|
||||||
|
'dark-plum': { bg: '#180f1e', card: '#251830', accent: '#f472b6' },
|
||||||
'high-contrast': { bg: '#000000', card: '#0d0d0d', accent: '#ff7a1a' },
|
'high-contrast': { bg: '#000000', card: '#0d0d0d', accent: '#ff7a1a' },
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1524,6 +1529,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
|
|
||||||
const [clusterServers, setClusterServers] = useState<ClusterServer[]>([]);
|
const [clusterServers, setClusterServers] = useState<ClusterServer[]>([]);
|
||||||
const [clusterAutoConnect, setClusterAutoConnectState] = useState(false);
|
const [clusterAutoConnect, setClusterAutoConnectState] = useState(false);
|
||||||
|
// Defaults to true so the checkbox matches the backend before the read lands.
|
||||||
|
const [workedVariants, setWorkedVariants] = useState(true);
|
||||||
// Self-spot. SELF_SPOT_MIN_MIN mirrors the backend floor — the input clamps on
|
// 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
|
// blur, not per keystroke, or typing "10" would be rewritten to "5" the moment
|
||||||
// the "1" landed and the field would fight the operator.
|
// the "1" landed and the field would fight the operator.
|
||||||
@@ -1632,6 +1639,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
try { setAudioCfg(await GetAudioSettings() as any); } catch {}
|
try { setAudioCfg(await GetAudioSettings() as any); } catch {}
|
||||||
try { setEmailCfg(await GetEmailSettings() as any); } catch {}
|
try { setEmailCfg(await GetEmailSettings() as any); } catch {}
|
||||||
try { setEqslCfg(await QSLGetEmailTemplates() as any); } catch {}
|
try { setEqslCfg(await QSLGetEmailTemplates() as any); } catch {}
|
||||||
|
try { setWorkedVariants(await GetWorkedCallVariants()); } catch {}
|
||||||
reloadAudioDevices();
|
reloadAudioDevices();
|
||||||
reloadDvk();
|
reloadDvk();
|
||||||
} catch (e: any) {
|
} catch (e: any) {
|
||||||
@@ -5666,6 +5674,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Checkbox checked={autofocusWB} onCheckedChange={(c) => { const v = !!c; setAutofocusWB(v); writeUiPref('opslog.autofocusWB', v ? '1' : '0'); }} />
|
<Checkbox checked={autofocusWB} onCheckedChange={(c) => { const v = !!c; setAutofocusWB(v); writeUiPref('opslog.autofocusWB', v ? '1' : '0'); }} />
|
||||||
{t('gen.autofocusWB')}
|
{t('gen.autofocusWB')}
|
||||||
</label>
|
</label>
|
||||||
|
{/* Backend setting, not a UI pref: the fold happens in the SQL. Saved
|
||||||
|
instantly like the rest of this panel. */}
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={workedVariants}
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setWorkedVariants(v); SetWorkedCallVariants(v).catch((e: any) => setErr(String(e?.message ?? e))); }} />
|
||||||
|
{t('gen.workedVariants')} <span className="text-xs text-muted-foreground">{t('gen.workedVariantsHint')}</span>
|
||||||
|
</label>
|
||||||
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
<Checkbox checked={showBeamMap} onCheckedChange={(c) => { const v = !!c; setShowBeamMap(v); writeUiPref('opslog.showBeamOnMap', v ? '1' : '0'); }} />
|
<Checkbox checked={showBeamMap} onCheckedChange={(c) => { const v = !!c; setShowBeamMap(v); writeUiPref('opslog.showBeamOnMap', v ? '1' : '0'); }} />
|
||||||
{t('gen.showBeam')}
|
{t('gen.showBeam')}
|
||||||
|
|||||||
+12
-10
File diff suppressed because one or more lines are too long
@@ -6,11 +6,16 @@ import { GetUIPref } from '../../wailsjs/go/main/App';
|
|||||||
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
// CSS variables in style.css key off of. 'auto' follows the OS light/dark
|
||||||
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
// preference. The choice is persisted (localStorage + portable UI pref, so it
|
||||||
// travels with the data/ folder like the language).
|
// travels with the data/ folder like the language).
|
||||||
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'high-contrast';
|
export type ThemeChoice = 'auto' | 'light-warm' | 'light-cool' | 'light-sage' | 'light-nordic'
|
||||||
|
| 'dim-slate' | 'dark-warm' | 'dark-graphite' | 'dark-indigo' | 'dark-teal' | 'dark-plum' | 'high-contrast';
|
||||||
|
|
||||||
// Selectable, concrete themes (excludes 'auto') in display order.
|
// Selectable, concrete themes (excludes 'auto') in display order: lights first,
|
||||||
|
// then darks, with high-contrast last — it is an accessibility choice, not a
|
||||||
|
// taste one, and listing it among the moods buries it.
|
||||||
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
export const CONCRETE_THEMES: Exclude<ThemeChoice, 'auto'>[] = [
|
||||||
'light-warm', 'light-cool', 'light-sage', 'dim-slate', 'dark-warm', 'dark-graphite', 'high-contrast',
|
'light-warm', 'light-cool', 'light-sage', 'light-nordic',
|
||||||
|
'dim-slate', 'dark-warm', 'dark-graphite', 'dark-indigo', 'dark-teal', 'dark-plum',
|
||||||
|
'high-contrast',
|
||||||
];
|
];
|
||||||
|
|
||||||
export const LS_KEY = 'opslog.theme';
|
export const LS_KEY = 'opslog.theme';
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ const PORTABLE_KEYS = [
|
|||||||
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
'opslog.clusterModeFilter', 'opslog.clusterSearch', 'opslog.clusterHideWorked',
|
||||||
'opslog.activeTab', // last selected tab
|
'opslog.activeTab', // last selected tab
|
||||||
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
'opslog.mainSplit', // Main tab: width share of the left pane (percent)
|
||||||
|
'opslog.bandMapWidth', // docked band map: column width (px)
|
||||||
|
'opslog.bandMapTabWidth', // Band map tab: shared card width (px)
|
||||||
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
// NOTE: 'hamlog.awardColsShown' and the grid column layouts are NOT listed here.
|
||||||
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
// They are handled by lib/gridPrefs, which scopes the localStorage cache PER
|
||||||
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
// PROFILE and mirrors to the DB (already per-profile) itself — mirroring them
|
||||||
|
|||||||
+288
-3
@@ -495,6 +495,286 @@
|
|||||||
color-scheme: dark;
|
color-scheme: dark;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ---- Theme 5: Indigo — deep blue-violet, electric accent ----------------
|
||||||
|
The first seven themes are all neutral (beige, slate, graphite, black) with an
|
||||||
|
orange accent, so "another dark theme" only ever meant another grey. These
|
||||||
|
four carry a real hue in the SURFACES, not just in the accent, and each takes
|
||||||
|
a different primary — violet, cyan, pink, indigo — so they are told apart at a
|
||||||
|
glance in the picker.
|
||||||
|
|
||||||
|
Every one keeps the same contract: the semantic colours (success / warning /
|
||||||
|
caution / danger / info) must stay recognisable as themselves. A logger is
|
||||||
|
read for hours and "red = a problem" cannot become a decorative choice, so the
|
||||||
|
hue budget is spent on the surfaces and the primary, never on the meanings. */
|
||||||
|
[data-theme="dark-indigo"] {
|
||||||
|
--background: #0e0f1f;
|
||||||
|
--foreground: #e4e5f2;
|
||||||
|
--card: #181a30;
|
||||||
|
--card-foreground: #e4e5f2;
|
||||||
|
--popover: #181a30;
|
||||||
|
--popover-foreground: #e4e5f2;
|
||||||
|
--primary: #7c6cff; /* electric violet */
|
||||||
|
--primary-foreground: #0b0a1a;
|
||||||
|
--secondary: #222542;
|
||||||
|
--secondary-foreground: #e4e5f2;
|
||||||
|
--muted: #1e2038;
|
||||||
|
--muted-foreground: #9d9fbe;
|
||||||
|
--accent: #2a2d51;
|
||||||
|
--accent-foreground: #c7c9ee;
|
||||||
|
--destructive: #f2555a;
|
||||||
|
--destructive-foreground: #12030a;
|
||||||
|
--destructive-muted: #34131c;
|
||||||
|
--destructive-muted-foreground: #fca5a5;
|
||||||
|
--border: #2a2d4c;
|
||||||
|
--input: #2a2d4c;
|
||||||
|
--ring: #9b8dff;
|
||||||
|
|
||||||
|
--success: #34d399;
|
||||||
|
--success-foreground: #052018;
|
||||||
|
--success-muted: #0e2f27;
|
||||||
|
--success-muted-foreground: #6ee7b7;
|
||||||
|
--success-border: #165241;
|
||||||
|
|
||||||
|
--warning: #fbbf24;
|
||||||
|
--warning-foreground: #221803;
|
||||||
|
--warning-muted: #33280f;
|
||||||
|
--warning-muted-foreground: #fcd34d;
|
||||||
|
--warning-border: #4f3e15;
|
||||||
|
|
||||||
|
--caution: #facc15;
|
||||||
|
--caution-foreground: #221e04;
|
||||||
|
--caution-muted: #322d0e;
|
||||||
|
--caution-muted-foreground: #fde047;
|
||||||
|
--caution-border: #4b4315;
|
||||||
|
|
||||||
|
--danger: #fb7185;
|
||||||
|
--danger-foreground: #250912;
|
||||||
|
--danger-muted: #37151f;
|
||||||
|
--danger-muted-foreground: #fda4af;
|
||||||
|
--danger-border: #562533;
|
||||||
|
|
||||||
|
--info: #38bdf8;
|
||||||
|
--info-foreground: #051d29;
|
||||||
|
--info-muted: #0b2a3a;
|
||||||
|
--info-muted-foreground: #7dd3fc;
|
||||||
|
--info-border: #12475c;
|
||||||
|
|
||||||
|
/* The entity ramp moves to CYAN here: violet is the primary, and a violet
|
||||||
|
"entity confirmed" cell would read as a button. */
|
||||||
|
--mx-call-conf: #22c55e;
|
||||||
|
--mx-call-work: #2c7a52;
|
||||||
|
--mx-dx-conf: #22d3ee;
|
||||||
|
--mx-dx-work: #1b6b7c;
|
||||||
|
--mx-none: #2c2f4d;
|
||||||
|
|
||||||
|
--scrollbar-thumb: #383c63;
|
||||||
|
--scrollbar-thumb-hover: #4c5182;
|
||||||
|
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(228, 229, 242, 0.05);
|
||||||
|
color-scheme: dark;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---- Theme 6: Ocean — deep teal, cyan accent --------------------------- */
|
||||||
|
[data-theme="dark-teal"] {
|
||||||
|
--background: #061c21;
|
||||||
|
--foreground: #dcecee;
|
||||||
|
--card: #0d2c33;
|
||||||
|
--card-foreground: #dcecee;
|
||||||
|
--popover: #0d2c33;
|
||||||
|
--popover-foreground: #dcecee;
|
||||||
|
--primary: #22d3ee; /* cyan */
|
||||||
|
--primary-foreground: #041d24;
|
||||||
|
--secondary: #143b44;
|
||||||
|
--secondary-foreground: #dcecee;
|
||||||
|
--muted: #10333b;
|
||||||
|
--muted-foreground: #92b4ba;
|
||||||
|
--accent: #15424c;
|
||||||
|
--accent-foreground: #a5d8e0;
|
||||||
|
--destructive: #f2555a;
|
||||||
|
--destructive-foreground: #12030a;
|
||||||
|
--destructive-muted: #35161a;
|
||||||
|
--destructive-muted-foreground: #fca5a5;
|
||||||
|
--border: #1a4652;
|
||||||
|
--input: #1a4652;
|
||||||
|
--ring: #5fe3f5;
|
||||||
|
|
||||||
|
--success: #4ade80;
|
||||||
|
--success-foreground: #04220f;
|
||||||
|
--success-muted: #0e3020;
|
||||||
|
--success-muted-foreground: #86efac;
|
||||||
|
--success-border: #17593a;
|
||||||
|
|
||||||
|
--warning: #fbbf24;
|
||||||
|
--warning-foreground: #221803;
|
||||||
|
--warning-muted: #33280f;
|
||||||
|
--warning-muted-foreground: #fcd34d;
|
||||||
|
--warning-border: #4f3e15;
|
||||||
|
|
||||||
|
--caution: #facc15;
|
||||||
|
--caution-foreground: #221e04;
|
||||||
|
--caution-muted: #312d0e;
|
||||||
|
--caution-muted-foreground: #fde047;
|
||||||
|
--caution-border: #4a4315;
|
||||||
|
|
||||||
|
--danger: #fb7185;
|
||||||
|
--danger-foreground: #250912;
|
||||||
|
--danger-muted: #38161f;
|
||||||
|
--danger-muted-foreground: #fda4af;
|
||||||
|
--danger-border: #572634;
|
||||||
|
|
||||||
|
/* Info moves to a BLUE: a cyan "info" would be the primary colour again. */
|
||||||
|
--info: #7aa2f7;
|
||||||
|
--info-foreground: #04122e;
|
||||||
|
--info-muted: #16233f;
|
||||||
|
--info-muted-foreground: #a9c2fb;
|
||||||
|
--info-border: #2b3d66;
|
||||||
|
|
||||||
|
--mx-call-conf: #4ade80;
|
||||||
|
--mx-call-work: #2b7a4d;
|
||||||
|
--mx-dx-conf: #a78bfa;
|
||||||
|
--mx-dx-work: #5b4a9c;
|
||||||
|
--mx-none: #1c4550;
|
||||||
|
|
||||||
|
--scrollbar-thumb: #235a68;
|
||||||
|
--scrollbar-thumb-hover: #31788a;
|
||||||
|
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(220, 236, 238, 0.05);
|
||||||
|
color-scheme: dark;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---- Theme 7: Plum — aubergine, magenta accent ------------------------- */
|
||||||
|
[data-theme="dark-plum"] {
|
||||||
|
--background: #180f1e;
|
||||||
|
--foreground: #eee0f0;
|
||||||
|
--card: #251830;
|
||||||
|
--card-foreground: #eee0f0;
|
||||||
|
--popover: #251830;
|
||||||
|
--popover-foreground: #eee0f0;
|
||||||
|
--primary: #f472b6; /* magenta-pink */
|
||||||
|
--primary-foreground: #250518;
|
||||||
|
--secondary: #33203f;
|
||||||
|
--secondary-foreground: #eee0f0;
|
||||||
|
--muted: #2b1b36;
|
||||||
|
--muted-foreground: #b39dbd;
|
||||||
|
--accent: #3b2648;
|
||||||
|
--accent-foreground: #dcc2e6;
|
||||||
|
--destructive: #f2555a;
|
||||||
|
--destructive-foreground: #12030a;
|
||||||
|
--destructive-muted: #3a1620;
|
||||||
|
--destructive-muted-foreground: #fca5a5;
|
||||||
|
--border: #3a2547;
|
||||||
|
--input: #3a2547;
|
||||||
|
--ring: #f9a8d4;
|
||||||
|
|
||||||
|
--success: #34d399;
|
||||||
|
--success-foreground: #052018;
|
||||||
|
--success-muted: #10302a;
|
||||||
|
--success-muted-foreground: #6ee7b7;
|
||||||
|
--success-border: #1a5745;
|
||||||
|
|
||||||
|
--warning: #fbbf24;
|
||||||
|
--warning-foreground: #221803;
|
||||||
|
--warning-muted: #352a12;
|
||||||
|
--warning-muted-foreground: #fcd34d;
|
||||||
|
--warning-border: #524019;
|
||||||
|
|
||||||
|
--caution: #facc15;
|
||||||
|
--caution-foreground: #221e04;
|
||||||
|
--caution-muted: #342e12;
|
||||||
|
--caution-muted-foreground: #fde047;
|
||||||
|
--caution-border: #4e4519;
|
||||||
|
|
||||||
|
/* Danger goes RED here, not rose: a rose "danger" beside a pink primary is
|
||||||
|
indistinguishable, and this is the one colour that must never be missed. */
|
||||||
|
--danger: #f43f3f;
|
||||||
|
--danger-foreground: #2a0606;
|
||||||
|
--danger-muted: #3d1418;
|
||||||
|
--danger-muted-foreground: #fca5a5;
|
||||||
|
--danger-border: #5c2128;
|
||||||
|
|
||||||
|
--info: #38bdf8;
|
||||||
|
--info-foreground: #051d29;
|
||||||
|
--info-muted: #0f2b3a;
|
||||||
|
--info-muted-foreground: #7dd3fc;
|
||||||
|
--info-border: #16485d;
|
||||||
|
|
||||||
|
--mx-call-conf: #22c55e;
|
||||||
|
--mx-call-work: #2f7d55;
|
||||||
|
--mx-dx-conf: #60a5fa;
|
||||||
|
--mx-dx-work: #35538c;
|
||||||
|
--mx-none: #3a2647;
|
||||||
|
|
||||||
|
--scrollbar-thumb: #4a3159;
|
||||||
|
--scrollbar-thumb-hover: #644176;
|
||||||
|
--card-shadow: 0 1px 2px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(238, 224, 240, 0.05);
|
||||||
|
color-scheme: dark;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---- Theme 8: Nordic light — crisp cool white, indigo accent ----------- */
|
||||||
|
[data-theme="light-nordic"] {
|
||||||
|
--background: #eef1f7;
|
||||||
|
--foreground: #1b2130;
|
||||||
|
--card: #ffffff;
|
||||||
|
--card-foreground: #1b2130;
|
||||||
|
--popover: #ffffff;
|
||||||
|
--popover-foreground: #1b2130;
|
||||||
|
--primary: #4f46e5; /* indigo */
|
||||||
|
--primary-foreground: #ffffff;
|
||||||
|
--secondary: #dfe4ee;
|
||||||
|
--secondary-foreground: #1b2130;
|
||||||
|
--muted: #e2e7f0;
|
||||||
|
--muted-foreground: #4a5468;
|
||||||
|
--accent: #dcdcfb;
|
||||||
|
--accent-foreground: #312a91;
|
||||||
|
--destructive: #b91c1c;
|
||||||
|
--destructive-foreground: #ffffff;
|
||||||
|
--destructive-muted: #fef2f2;
|
||||||
|
--destructive-muted-foreground: #b91c1c;
|
||||||
|
--border: #c9d1e0;
|
||||||
|
--input: #c9d1e0;
|
||||||
|
--ring: #6366f1;
|
||||||
|
|
||||||
|
--success: #15803d;
|
||||||
|
--success-foreground: #ffffff;
|
||||||
|
--success-muted: #dcfce7;
|
||||||
|
--success-muted-foreground: #14532d;
|
||||||
|
--success-border: #86efac;
|
||||||
|
|
||||||
|
--warning: #b45309;
|
||||||
|
--warning-foreground: #ffffff;
|
||||||
|
--warning-muted: #fef3c7;
|
||||||
|
--warning-muted-foreground: #92400e;
|
||||||
|
--warning-border: #fcd34d;
|
||||||
|
|
||||||
|
--caution: #a16207;
|
||||||
|
--caution-foreground: #ffffff;
|
||||||
|
--caution-muted: #fef9c3;
|
||||||
|
--caution-muted-foreground: #854d0e;
|
||||||
|
--caution-border: #fde047;
|
||||||
|
|
||||||
|
--danger: #dc2626;
|
||||||
|
--danger-foreground: #ffffff;
|
||||||
|
--danger-muted: #fee2e2;
|
||||||
|
--danger-muted-foreground: #991b1b;
|
||||||
|
--danger-border: #fca5a5;
|
||||||
|
|
||||||
|
--info: #0369a1;
|
||||||
|
--info-foreground: #ffffff;
|
||||||
|
--info-muted: #e0f2fe;
|
||||||
|
--info-muted-foreground: #075985;
|
||||||
|
--info-border: #7dd3fc;
|
||||||
|
|
||||||
|
/* Entity ramp shifts to TEAL: indigo is the primary here. */
|
||||||
|
--mx-call-conf: #15803d;
|
||||||
|
--mx-call-work: #86efac;
|
||||||
|
--mx-dx-conf: #0f766e;
|
||||||
|
--mx-dx-work: #99f6e4;
|
||||||
|
--mx-none: #dde3ec;
|
||||||
|
|
||||||
|
--scrollbar-thumb: #b6c0d2;
|
||||||
|
--scrollbar-thumb-hover: #93a0b8;
|
||||||
|
--card-shadow: 0 1px 2px rgba(27, 33, 48, 0.06), 0 0 0 1px rgba(27, 33, 48, 0.03);
|
||||||
|
color-scheme: light;
|
||||||
|
}
|
||||||
|
|
||||||
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
/* ── Data-viz palette (Statistics dashboard) ────────────────────────────────
|
||||||
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
A VALIDATED categorical palette, not hand-picked: the slot ORDER is what makes
|
||||||
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
it colour-blind-safe (worst adjacent ΔE 24.2 light / 10.3 dark), so never
|
||||||
@@ -512,7 +792,8 @@
|
|||||||
:root,
|
:root,
|
||||||
[data-theme="light-warm"],
|
[data-theme="light-warm"],
|
||||||
[data-theme="light-cool"],
|
[data-theme="light-cool"],
|
||||||
[data-theme="light-sage"] {
|
[data-theme="light-sage"],
|
||||||
|
[data-theme="light-nordic"] {
|
||||||
--chart-1: #2a78d6; /* blue — default single-series hue */
|
--chart-1: #2a78d6; /* blue — default single-series hue */
|
||||||
--chart-2: #1baf7a; /* aqua */
|
--chart-2: #1baf7a; /* aqua */
|
||||||
--chart-3: #eda100; /* yellow */
|
--chart-3: #eda100; /* yellow */
|
||||||
@@ -533,7 +814,10 @@
|
|||||||
[data-theme="dim-slate"],
|
[data-theme="dim-slate"],
|
||||||
[data-theme="dark-warm"],
|
[data-theme="dark-warm"],
|
||||||
[data-theme="dark-graphite"],
|
[data-theme="dark-graphite"],
|
||||||
[data-theme="high-contrast"] {
|
[data-theme="high-contrast"],
|
||||||
|
[data-theme="dark-indigo"],
|
||||||
|
[data-theme="dark-teal"],
|
||||||
|
[data-theme="dark-plum"] {
|
||||||
--chart-1: #3987e5;
|
--chart-1: #3987e5;
|
||||||
--chart-2: #199e70;
|
--chart-2: #199e70;
|
||||||
--chart-3: #c98500;
|
--chart-3: #c98500;
|
||||||
@@ -681,7 +965,8 @@
|
|||||||
help. */
|
help. */
|
||||||
Every temporal input carries the same glyph, so the rule names them all:
|
Every temporal input carries the same glyph, so the rule names them all:
|
||||||
datetime-local was left out at first and its icon stayed invisible. */
|
datetime-local was left out at first and its icon stayed invisible. */
|
||||||
:is([data-theme='dim-slate'], [data-theme='dark-warm'], [data-theme='dark-graphite'], [data-theme='high-contrast'])
|
:is([data-theme='dim-slate'], [data-theme='dark-warm'], [data-theme='dark-graphite'], [data-theme='high-contrast'],
|
||||||
|
[data-theme='dark-indigo'], [data-theme='dark-teal'], [data-theme='dark-plum'])
|
||||||
:is(input[type='date'], input[type='datetime-local'], input[type='time'], input[type='month'], input[type='week'])::-webkit-calendar-picker-indicator {
|
:is(input[type='date'], input[type='datetime-local'], input[type='time'], input[type='month'], input[type='week'])::-webkit-calendar-picker-indicator {
|
||||||
filter: invert(1) brightness(1.8);
|
filter: invert(1) brightness(1.8);
|
||||||
opacity: 0.9;
|
opacity: 0.9;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.23.9';
|
export const APP_VERSION = '0.24.1';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+4
@@ -515,6 +515,8 @@ export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
|||||||
|
|
||||||
export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
export function GetWinkeyerStatus():Promise<winkeyer.Status>;
|
||||||
|
|
||||||
|
export function GetWorkedCallVariants():Promise<boolean>;
|
||||||
|
|
||||||
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
export function GetYaesuState():Promise<cat.YaesuTXState>;
|
||||||
|
|
||||||
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
export function HasBuiltinReferences(arg1:string):Promise<boolean>;
|
||||||
@@ -967,6 +969,8 @@ export function SetUltrabeamDirection(arg1:number):Promise<void>;
|
|||||||
|
|
||||||
export function SetWinkeyerTrace(arg1:boolean):Promise<void>;
|
export function SetWinkeyerTrace(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
|
export function SetWorkedCallVariants(arg1:boolean):Promise<void>;
|
||||||
|
|
||||||
export function SetYaesuAFGain(arg1:number):Promise<void>;
|
export function SetYaesuAFGain(arg1:number):Promise<void>;
|
||||||
|
|
||||||
export function SetYaesuAGC(arg1:string):Promise<void>;
|
export function SetYaesuAGC(arg1:string):Promise<void>;
|
||||||
|
|||||||
@@ -978,6 +978,10 @@ export function GetWinkeyerStatus() {
|
|||||||
return window['go']['main']['App']['GetWinkeyerStatus']();
|
return window['go']['main']['App']['GetWinkeyerStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetWorkedCallVariants() {
|
||||||
|
return window['go']['main']['App']['GetWorkedCallVariants']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetYaesuState() {
|
export function GetYaesuState() {
|
||||||
return window['go']['main']['App']['GetYaesuState']();
|
return window['go']['main']['App']['GetYaesuState']();
|
||||||
}
|
}
|
||||||
@@ -1882,6 +1886,10 @@ export function SetWinkeyerTrace(arg1) {
|
|||||||
return window['go']['main']['App']['SetWinkeyerTrace'](arg1);
|
return window['go']['main']['App']['SetWinkeyerTrace'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SetWorkedCallVariants(arg1) {
|
||||||
|
return window['go']['main']['App']['SetWorkedCallVariants'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SetYaesuAFGain(arg1) {
|
export function SetYaesuAFGain(arg1) {
|
||||||
return window['go']['main']['App']['SetYaesuAFGain'](arg1);
|
return window['go']['main']['App']['SetYaesuAFGain'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -325,6 +325,8 @@ export namespace award {
|
|||||||
emission?: string[];
|
emission?: string[];
|
||||||
confirm: string[];
|
confirm: string[];
|
||||||
validate?: string[];
|
validate?: string[];
|
||||||
|
confirm_field?: string;
|
||||||
|
confirm_value?: string;
|
||||||
grant_codes?: string;
|
grant_codes?: string;
|
||||||
export_credit_granted?: boolean;
|
export_credit_granted?: boolean;
|
||||||
total: number;
|
total: number;
|
||||||
@@ -367,6 +369,8 @@ export namespace award {
|
|||||||
this.emission = source["emission"];
|
this.emission = source["emission"];
|
||||||
this.confirm = source["confirm"];
|
this.confirm = source["confirm"];
|
||||||
this.validate = source["validate"];
|
this.validate = source["validate"];
|
||||||
|
this.confirm_field = source["confirm_field"];
|
||||||
|
this.confirm_value = source["confirm_value"];
|
||||||
this.grant_codes = source["grant_codes"];
|
this.grant_codes = source["grant_codes"];
|
||||||
this.export_credit_granted = source["export_credit_granted"];
|
this.export_credit_granted = source["export_credit_granted"];
|
||||||
this.total = source["total"];
|
this.total = source["total"];
|
||||||
|
|||||||
+93
-6
@@ -111,6 +111,18 @@ type Def struct {
|
|||||||
// --- Confirmation ---
|
// --- Confirmation ---
|
||||||
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
|
Confirm []string `json:"confirm"` // worked-confirmed: lotw|qsl|eqsl|qrzcom|custom
|
||||||
Validate []string `json:"validate,omitempty"` // validated/granted sources
|
Validate []string `json:"validate,omitempty"` // validated/granted sources
|
||||||
|
// The "custom" source, for confirmations OpsLog has no dedicated column for:
|
||||||
|
// ConfirmField names a QSO field or an ADIF extras key, ConfirmValue the
|
||||||
|
// value(s) that count (comma-separated, case-insensitive).
|
||||||
|
//
|
||||||
|
// An EMPTY ConfirmValue means "any non-empty value confirms" — which is what
|
||||||
|
// the OpsLog card marker needs: APP_OPSLOG_QSL_RCVD stores the timestamp of
|
||||||
|
// the day the card arrived, not a Y/N flag. The same shape serves a key
|
||||||
|
// stamped by an outside source (a club's CSV imported into an extras field),
|
||||||
|
// so one mechanism covers every "confirmed somewhere else" case instead of a
|
||||||
|
// new checkbox per site.
|
||||||
|
ConfirmField string `json:"confirm_field,omitempty"`
|
||||||
|
ConfirmValue string `json:"confirm_value,omitempty"`
|
||||||
// NOT IMPLEMENTED. Kept so the values operators already typed are not lost, but
|
// NOT IMPLEMENTED. Kept so the values operators already typed are not lost, but
|
||||||
// nothing reads them: no ADIF export has ever written CREDIT_GRANTED. Their
|
// nothing reads them: no ADIF export has ever written CREDIT_GRANTED. Their
|
||||||
// controls have been removed from the editor — a checkbox that quietly does
|
// controls have been removed from the editor — a checkbox that quietly does
|
||||||
@@ -523,8 +535,8 @@ func Compute(defs []Def, qsos []qso.QSO, refMetas map[string][]RefMeta, nameOf N
|
|||||||
}
|
}
|
||||||
band := strings.ToLower(strings.TrimSpace(q.Band))
|
band := strings.ToLower(strings.TrimSpace(q.Band))
|
||||||
modeClass := ModeClass(q.Mode)
|
modeClass := ModeClass(q.Mode)
|
||||||
isConf := confirmed(q, d.Confirm)
|
isConf := confirmed(q, d.Confirm, d)
|
||||||
isVal := confirmed(q, d.Validate)
|
isVal := confirmed(q, d.Validate, d)
|
||||||
for _, ref := range refs {
|
for _, ref := range refs {
|
||||||
a := agg[i][ref]
|
a := agg[i][ref]
|
||||||
if a == nil {
|
if a == nil {
|
||||||
@@ -685,8 +697,9 @@ func manualRefs(q *qso.QSO, code string) []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Confirmed reports whether a QSO satisfies any of the given confirmation
|
// Confirmed reports whether a QSO satisfies any of the given confirmation
|
||||||
// sources (lotw|qsl|eqsl). Exported for the statistics view.
|
// sources (lotw|qsl|eqsl|qrzcom|custom). Exported for the statistics view.
|
||||||
func Confirmed(q *qso.QSO, sources []string) bool { return confirmed(q, sources) }
|
// The Def is needed for the "custom" source, which reads the field IT names.
|
||||||
|
func Confirmed(q *qso.QSO, d Def, sources []string) bool { return confirmed(q, sources, &d) }
|
||||||
|
|
||||||
// InScope reports whether a QSO falls within an award's scope (DXCC entity,
|
// InScope reports whether a QSO falls within an award's scope (DXCC entity,
|
||||||
// bands, modes, emission, dates) — independent of whether a reference was
|
// bands, modes, emission, dates) — independent of whether a reference was
|
||||||
@@ -780,6 +793,10 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
|||||||
byDesc := predefined && strings.EqualFold(strings.TrimSpace(matchBy), "description")
|
byDesc := predefined && strings.EqualFold(strings.TrimSpace(matchBy), "description")
|
||||||
|
|
||||||
var found []string
|
var found []string
|
||||||
|
// codesAreFinal: this branch produced references straight from the award's
|
||||||
|
// LIST, so they are already whole codes. The blanket prefix at the end must
|
||||||
|
// leave them alone — prefixing a code that is already "D74" yields "DD74".
|
||||||
|
codesAreFinal := false
|
||||||
switch {
|
switch {
|
||||||
case re != nil:
|
case re != nil:
|
||||||
// Award-level regex: capture group 1 (or whole match) for each hit.
|
// Award-level regex: capture group 1 (or whole match) for each hit.
|
||||||
@@ -788,6 +805,7 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
|||||||
// Match references by their DESCRIPTION/name appearing in the field
|
// Match references by their DESCRIPTION/name appearing in the field
|
||||||
// (e.g. WAJA finds the prefecture name inside the QTH). ExactMatch means
|
// (e.g. WAJA finds the prefecture name inside the QTH). ExactMatch means
|
||||||
// the field equals the name; otherwise the name is a substring of it.
|
// the field equals the name; otherwise the name is a substring of it.
|
||||||
|
codesAreFinal = true
|
||||||
up := strings.ToUpper(raw)
|
up := strings.ToUpper(raw)
|
||||||
for _, nc := range rl.names {
|
for _, nc := range rl.names {
|
||||||
if exact {
|
if exact {
|
||||||
@@ -810,9 +828,23 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
|||||||
// "Search reference inside the field": look up each token of the field in
|
// "Search reference inside the field": look up each token of the field in
|
||||||
// the list — O(tokens), not O(all references) — plus test the few
|
// the list — O(tokens), not O(all references) — plus test the few
|
||||||
// references that declare a regex.
|
// references that declare a regex.
|
||||||
|
codesAreFinal = true
|
||||||
for _, tok := range tokenize(raw) {
|
for _, tok := range tokenize(raw) {
|
||||||
if _, ok := rl.byCode[tok]; ok {
|
if _, ok := rl.byCode[tok]; ok {
|
||||||
found = append(found, tok)
|
found = append(found, tok)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// The field may carry the reference WITHOUT the award's letter: a French
|
||||||
|
// operator writes "74" in STATE while the DDFM codes are "D74". Prefix is
|
||||||
|
// exactly what that case is for, so try the prefixed form HERE — applying
|
||||||
|
// it after the lookup (as the blanket pass below used to) could never
|
||||||
|
// help, because the lookup is the step that failed. Without this, the
|
||||||
|
// only way to match a bare department was to write a regex, in a mode
|
||||||
|
// where the operator had chosen "code" and not "pattern".
|
||||||
|
if prefix != "" {
|
||||||
|
if _, ok := rl.byCode[prefix+tok]; ok {
|
||||||
|
found = append(found, prefix+tok)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, code := range rl.withPattern {
|
for _, code := range rl.withPattern {
|
||||||
@@ -826,7 +858,7 @@ func searchOne(field, matchBy string, re *regexp.Regexp, exact bool, leading, tr
|
|||||||
// counts each reference separately.
|
// counts each reference separately.
|
||||||
found = splitRefs(raw)
|
found = splitRefs(raw)
|
||||||
}
|
}
|
||||||
if prefix != "" {
|
if prefix != "" && !codesAreFinal {
|
||||||
for i := range found {
|
for i := range found {
|
||||||
found[i] = prefix + found[i]
|
found[i] = prefix + found[i]
|
||||||
}
|
}
|
||||||
@@ -1374,7 +1406,7 @@ func dxccAllowed(dxcc *int, filter []int) bool {
|
|||||||
|
|
||||||
// confirmed reports whether the QSO satisfies any accepted confirmation source.
|
// confirmed reports whether the QSO satisfies any accepted confirmation source.
|
||||||
// ADIF *_QSL_RCVD values Y (confirmed) and V (verified) both count.
|
// ADIF *_QSL_RCVD values Y (confirmed) and V (verified) both count.
|
||||||
func confirmed(q *qso.QSO, sources []string) bool {
|
func confirmed(q *qso.QSO, sources []string, d *Def) bool {
|
||||||
for _, s := range sources {
|
for _, s := range sources {
|
||||||
switch s {
|
switch s {
|
||||||
case "lotw":
|
case "lotw":
|
||||||
@@ -1389,11 +1421,66 @@ func confirmed(q *qso.QSO, sources []string) bool {
|
|||||||
if isYes(q.EQSLRcvd) {
|
if isYes(q.EQSLRcvd) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
case "qrzcom":
|
||||||
|
// The DOWNLOAD status, not the upload one: uploading a QSO to QRZ is
|
||||||
|
// us telling them, not them confirming it back.
|
||||||
|
if isYes(q.QRZComDownloadStatus) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
case "custom":
|
||||||
|
if customConfirmed(q, d) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// customConfirmed answers the operator-defined confirmation source: the field
|
||||||
|
// named by ConfirmField, optionally required to hold one of ConfirmValue's
|
||||||
|
// comma-separated values.
|
||||||
|
//
|
||||||
|
// A source that names no field confirms NOTHING. That is deliberate: ticking
|
||||||
|
// "custom" without saying what it means used to mark every QSO as unconfirmed
|
||||||
|
// anyway, and silently marking them all CONFIRMED instead would be far worse.
|
||||||
|
func customConfirmed(q *qso.QSO, d *Def) bool {
|
||||||
|
if d == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
field := strings.TrimSpace(d.ConfirmField)
|
||||||
|
if field == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
got := strings.TrimSpace(customFieldValue(q, field))
|
||||||
|
if got == "" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
want := strings.TrimSpace(d.ConfirmValue)
|
||||||
|
if want == "" {
|
||||||
|
return true // any value at all counts — see ConfirmField's doc
|
||||||
|
}
|
||||||
|
for _, w := range strings.Split(want, ",") {
|
||||||
|
if w = strings.TrimSpace(w); w != "" && strings.EqualFold(w, got) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// customFieldValue resolves the field a custom confirmation names: one of the
|
||||||
|
// engine's known QSO fields first, then the ADIF extras — which is where the
|
||||||
|
// OpsLog card marker (APP_OPSLOG_QSL_RCVD) and anything stamped by an outside
|
||||||
|
// import actually live.
|
||||||
|
func customFieldValue(q *qso.QSO, field string) string {
|
||||||
|
if v := strings.TrimSpace(fieldRaw(field, q)); v != "" {
|
||||||
|
return v
|
||||||
|
}
|
||||||
|
if q.Extras == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return q.Extras[strings.ToUpper(strings.TrimSpace(field))]
|
||||||
|
}
|
||||||
|
|
||||||
func isYes(v string) bool {
|
func isYes(v string) bool {
|
||||||
switch strings.ToUpper(strings.TrimSpace(v)) {
|
switch strings.ToUpper(strings.TrimSpace(v)) {
|
||||||
case "Y", "V":
|
case "Y", "V":
|
||||||
|
|||||||
@@ -20,7 +20,10 @@
|
|||||||
"match_by": "description"
|
"match_by": "description"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"dxcc_filter": null,
|
"dxcc_filter": [
|
||||||
|
15,
|
||||||
|
54
|
||||||
|
],
|
||||||
"valid_bands": [
|
"valid_bands": [
|
||||||
"160m",
|
"160m",
|
||||||
"60m",
|
"60m",
|
||||||
@@ -43,7 +46,7 @@
|
|||||||
],
|
],
|
||||||
"total": 0,
|
"total": 0,
|
||||||
"builtin": true,
|
"builtin": true,
|
||||||
"version": 1
|
"version": 2
|
||||||
},
|
},
|
||||||
"references": [
|
"references": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Every source the editor offers must actually do something. "qrzcom" and
|
||||||
|
// "custom" were listed in the UI and in Def's doc comment but had no case in the
|
||||||
|
// switch, so ticking either marked nothing as confirmed — a checkbox that is
|
||||||
|
// trusted and silently inert.
|
||||||
|
func TestConfirmedSources(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
q qso.QSO
|
||||||
|
d Def
|
||||||
|
sources []string
|
||||||
|
want bool
|
||||||
|
}{
|
||||||
|
{"lotw", qso.QSO{LOTWRcvd: "Y"}, Def{}, []string{"lotw"}, true},
|
||||||
|
{"qsl", qso.QSO{QSLRcvd: "Y"}, Def{}, []string{"qsl"}, true},
|
||||||
|
{"eqsl", qso.QSO{EQSLRcvd: "Y"}, Def{}, []string{"eqsl"}, true},
|
||||||
|
|
||||||
|
// QRZ confirms on the DOWNLOAD status. The upload one is us telling QRZ
|
||||||
|
// about the QSO, which is not a confirmation of anything.
|
||||||
|
{"qrz download", qso.QSO{QRZComDownloadStatus: "Y"}, Def{}, []string{"qrzcom"}, true},
|
||||||
|
{"qrz upload only", qso.QSO{QRZComUploadStatus: "Y"}, Def{}, []string{"qrzcom"}, false},
|
||||||
|
|
||||||
|
// Custom, no value required: any non-empty value counts. This is the
|
||||||
|
// OpsLog card case — the marker holds a timestamp, not a flag.
|
||||||
|
{"custom any value",
|
||||||
|
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": "2026-08-09T01:00:00Z"}},
|
||||||
|
Def{ConfirmField: "APP_OPSLOG_QSL_RCVD"}, []string{"custom"}, true},
|
||||||
|
{"custom field empty",
|
||||||
|
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": ""}},
|
||||||
|
Def{ConfirmField: "APP_OPSLOG_QSL_RCVD"}, []string{"custom"}, false},
|
||||||
|
|
||||||
|
// Custom with an explicit value list, matched case-insensitively.
|
||||||
|
{"custom value match",
|
||||||
|
qso.QSO{Extras: map[string]string{"APP_CLUB_CONF": "v"}},
|
||||||
|
Def{ConfirmField: "APP_CLUB_CONF", ConfirmValue: "Y,V"}, []string{"custom"}, true},
|
||||||
|
{"custom value mismatch",
|
||||||
|
qso.QSO{Extras: map[string]string{"APP_CLUB_CONF": "N"}},
|
||||||
|
Def{ConfirmField: "APP_CLUB_CONF", ConfirmValue: "Y,V"}, []string{"custom"}, false},
|
||||||
|
|
||||||
|
// A custom source naming no field must confirm NOTHING — never everything.
|
||||||
|
{"custom without a field",
|
||||||
|
qso.QSO{Extras: map[string]string{"APP_OPSLOG_QSL_RCVD": "x"}},
|
||||||
|
Def{}, []string{"custom"}, false},
|
||||||
|
|
||||||
|
// Known QSO fields resolve too, not just extras.
|
||||||
|
{"custom on a known field", qso.QSO{State: "TX"},
|
||||||
|
Def{ConfirmField: "state", ConfirmValue: "TX"}, []string{"custom"}, true},
|
||||||
|
|
||||||
|
// Any source in the list is enough.
|
||||||
|
{"first source misses, second hits", qso.QSO{EQSLRcvd: "Y"}, Def{},
|
||||||
|
[]string{"lotw", "eqsl"}, true},
|
||||||
|
{"no source set", qso.QSO{LOTWRcvd: "Y"}, Def{}, nil, false},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := Confirmed(&c.q, c.d, c.sources); got != c.want {
|
||||||
|
t.Errorf("%s: Confirmed = %v, want %v", c.name, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
package award
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ddfmLike is a small stand-in for the French departments award: predefined
|
||||||
|
// references whose codes carry a letter the operator does not type.
|
||||||
|
func ddfmLike() []Def {
|
||||||
|
return []Def{{
|
||||||
|
Code: "DDFM", Name: "Departments", Type: TypeQSOFields,
|
||||||
|
Field: "state", MatchBy: "code", Prefix: "D",
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func ddfmRefs() map[string][]RefMeta {
|
||||||
|
return map[string][]RefMeta{"DDFM": {
|
||||||
|
{Code: "D29", Name: "Finistère", Valid: true},
|
||||||
|
{Code: "D49", Name: "Maine-et-Loire", Valid: true},
|
||||||
|
{Code: "D74", Name: "Haute-Savoie", Valid: true},
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func refsOf(t *testing.T, defs []Def, q qso.QSO) []string {
|
||||||
|
t.Helper()
|
||||||
|
res := Compute(defs, []qso.QSO{q}, ddfmRefs(), nil)
|
||||||
|
if len(res) != 1 {
|
||||||
|
t.Fatalf("want 1 result, got %d", len(res))
|
||||||
|
}
|
||||||
|
var out []string
|
||||||
|
for _, r := range res[0].Refs {
|
||||||
|
if r.Worked {
|
||||||
|
out = append(out, r.Ref)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// The reported case: the operator writes just "74" in STATE, the award's codes
|
||||||
|
// are "D74", match-by is "code" and a Prefix of "D" is set. That found nothing —
|
||||||
|
// the prefix was applied only AFTER the list lookup, i.e. after the step that
|
||||||
|
// had already failed — so the only workaround was a regex, in a mode where the
|
||||||
|
// operator had explicitly chosen "code" rather than "pattern".
|
||||||
|
func TestPrefixCompletesABareReference(t *testing.T) {
|
||||||
|
got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "74"})
|
||||||
|
if len(got) != 1 || got[0] != "D74" {
|
||||||
|
t.Errorf("bare state 74 with prefix D → %v, want [D74]", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// And a field that ALREADY holds the whole code must not be prefixed twice.
|
||||||
|
// The blanket pass turned "D74" into "DD74" whenever a prefix was configured.
|
||||||
|
func TestPrefixDoesNotDoubleUpOnACompleteCode(t *testing.T) {
|
||||||
|
got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "D74"})
|
||||||
|
if len(got) != 1 || got[0] != "D74" {
|
||||||
|
t.Errorf("state D74 with prefix D → %v, want [D74]", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A token that is neither a code nor a prefixable one stays unmatched: the
|
||||||
|
// prefix must not invent references.
|
||||||
|
func TestPrefixDoesNotInventReferences(t *testing.T) {
|
||||||
|
if got := refsOf(t, ddfmLike(), qso.QSO{Callsign: "F5AYE", State: "99"}); len(got) != 0 {
|
||||||
|
t.Errorf("unknown department 99 → %v, want none", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Without a prefix nothing changes: a bare number matches nothing, a full code
|
||||||
|
// matches itself.
|
||||||
|
func TestNoPrefixKeepsExactCodeMatching(t *testing.T) {
|
||||||
|
defs := ddfmLike()
|
||||||
|
defs[0].Prefix = ""
|
||||||
|
if got := refsOf(t, defs, qso.QSO{Callsign: "F5AYE", State: "74"}); len(got) != 0 {
|
||||||
|
t.Errorf("no prefix, state 74 → %v, want none", got)
|
||||||
|
}
|
||||||
|
if got := refsOf(t, defs, qso.QSO{Callsign: "F5AYE", State: "D74"}); len(got) != 1 || got[0] != "D74" {
|
||||||
|
t.Errorf("no prefix, state D74 → %v, want [D74]", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The diagnostic that matters: a text payload arriving on a WSJT port must be
|
||||||
|
// READABLE in the log. "bad magic 0x3132372e" alone told the operator nothing —
|
||||||
|
// those four bytes are ASCII "127.", i.e. some program broadcasting an address
|
||||||
|
// where WSJT-X binary was expected.
|
||||||
|
func TestDescribePacketShowsTextAndHex(t *testing.T) {
|
||||||
|
got := describePacket([]byte("127.0.0.1:4532"))
|
||||||
|
for _, want := range []string{`14 bytes`, `"127.0.0.1:4532"`, `31 32 37 2e`} {
|
||||||
|
if !strings.Contains(got, want) {
|
||||||
|
t.Errorf("describePacket missing %q\ngot: %s", want, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Binary stays inspectable: unprintable bytes become dots in the preview and
|
||||||
|
// the hex carries the real values.
|
||||||
|
func TestDescribePacketHandlesBinary(t *testing.T) {
|
||||||
|
got := describePacket([]byte{0xad, 0xbc, 0xcb, 0xda, 0x00})
|
||||||
|
if !strings.Contains(got, `"....."`) || !strings.Contains(got, "ad bc cb da 00") {
|
||||||
|
t.Errorf("binary preview wrong: %s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A long datagram is truncated, and says so, rather than dumping a whole packet
|
||||||
|
// into the log on every line.
|
||||||
|
func TestDescribePacketTruncates(t *testing.T) {
|
||||||
|
got := describePacket([]byte(strings.Repeat("A", 300)))
|
||||||
|
if !strings.Contains(got, "300 bytes") {
|
||||||
|
t.Errorf("lost the real length: %s", got)
|
||||||
|
}
|
||||||
|
if !strings.Contains(got, "…") {
|
||||||
|
t.Errorf("truncation not marked: %s", got)
|
||||||
|
}
|
||||||
|
if strings.Count(got, "41 ") > 96 {
|
||||||
|
t.Errorf("hex not capped: %s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package udp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Bytes captured from a real W&P relay in front of MSHV: the origin as text,
|
||||||
|
// a '|', then the untouched WSJT-X packet. This exact datagram produced
|
||||||
|
// "bad magic 0x3132372e" — 0x3132372e being ASCII "127.".
|
||||||
|
var wpDecode = []byte{
|
||||||
|
// "127.0.0.1:2237|"
|
||||||
|
0x31, 0x32, 0x37, 0x2e, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x3a, 0x32, 0x32, 0x33, 0x37, 0x7c,
|
||||||
|
// magic, schema 3, type 2 (Decode), id "MSHV"
|
||||||
|
0xad, 0xbc, 0xcb, 0xda, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02,
|
||||||
|
0x00, 0x00, 0x00, 0x04, 0x4d, 0x53, 0x48, 0x56,
|
||||||
|
0x01, 0x01, 0x4b, 0x31, 0x28, 0x00, 0x00, 0x00, 0x16,
|
||||||
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8a,
|
||||||
|
0x00, 0x00, 0x00, 0x03, 0x46, 0x54, 0x38, // "FT8"
|
||||||
|
0x00, 0x00, 0x00, 0x0e, 0x54, 0x4e, 0x38, 0x47, 0x44, 0x20, 0x39, 0x41, 0x31, 0x4d, 0x4d, 0x20, 0x37, 0x33, // "TN8GD 9A1MM 73"
|
||||||
|
0x00, 0x00,
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseWSJTBehindAForwarder(t *testing.T) {
|
||||||
|
if _, _, err := ParseWSJT(wpDecode); err != nil {
|
||||||
|
t.Fatalf("relayed packet still fails: %v", err)
|
||||||
|
}
|
||||||
|
// And the header is what was in the way: without it the same bytes parse.
|
||||||
|
if _, _, err := ParseWSJT(wpDecode[15:]); err != nil {
|
||||||
|
t.Fatalf("bare packet fails: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStripForwarderHeader(t *testing.T) {
|
||||||
|
bare := wpDecode[15:]
|
||||||
|
|
||||||
|
if got := stripForwarderHeader(bare); !bytes.Equal(got, bare) {
|
||||||
|
t.Error("a packet with no header must be returned untouched")
|
||||||
|
}
|
||||||
|
if got := stripForwarderHeader(wpDecode); !bytes.Equal(got, bare) {
|
||||||
|
t.Error("the text header was not stripped")
|
||||||
|
}
|
||||||
|
|
||||||
|
// A BINARY prefix is not a forwarder header — refusing it is what stops a
|
||||||
|
// corrupt packet that merely contains the magic from becoming a QSO.
|
||||||
|
binPrefix := append([]byte{0x00, 0x01, 0x02}, bare...)
|
||||||
|
if got := stripForwarderHeader(binPrefix); !bytes.Equal(got, binPrefix) {
|
||||||
|
t.Error("a non-printable prefix must not be treated as a header")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Beyond the window, the magic is ignored however printable the prefix is.
|
||||||
|
far := append(bytes.Repeat([]byte("A"), maxFwdHeader+1), bare...)
|
||||||
|
if got := stripForwarderHeader(far); !bytes.Equal(got, far) {
|
||||||
|
t.Error("magic past maxFwdHeader must not be trusted")
|
||||||
|
}
|
||||||
|
|
||||||
|
// No magic anywhere, and runt packets, must not panic or invent anything.
|
||||||
|
for _, junk := range [][]byte{[]byte("127.0.0.1:2237|hello"), {}, {0xad}, {0xad, 0xbc, 0xcb}} {
|
||||||
|
if got := stripForwarderHeader(junk); !bytes.Equal(got, junk) {
|
||||||
|
t.Errorf("junk %q was altered", junk)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -94,6 +94,47 @@ type Server struct {
|
|||||||
// id is distinct whenever there is more than one.
|
// id is distinct whenever there is more than one.
|
||||||
dialHz map[string]int64
|
dialHz map[string]int64
|
||||||
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
lastDX string // WSJT: last non-empty DX Call seen, to detect a clear
|
||||||
|
|
||||||
|
// badPkts counts datagrams this listener could not parse, so the diagnostic
|
||||||
|
// dump below stays bounded. A misconfigured port is not a one-off: the
|
||||||
|
// sender that produced "bad magic 0x3132372e" put out ~150 packets a second,
|
||||||
|
// which fills the whole rotating log with the same line and buries the
|
||||||
|
// evidence of anything else.
|
||||||
|
badPkts int
|
||||||
|
}
|
||||||
|
|
||||||
|
// maxBadPktDumps is how many unparseable datagrams a listener describes in full
|
||||||
|
// before going quiet. Enough to identify the sender and the payload; few enough
|
||||||
|
// that a permanently misconfigured port costs a handful of lines, not a log.
|
||||||
|
const maxBadPktDumps = 5
|
||||||
|
|
||||||
|
// describePacket renders a datagram for the log: its size, a printable preview
|
||||||
|
// and the first bytes in hex.
|
||||||
|
//
|
||||||
|
// Both forms, deliberately. "bad magic 0x3132372e" is already readable as ASCII
|
||||||
|
// "127." to someone who thinks to decode it — and that one fact (the sender is
|
||||||
|
// emitting text, not WSJT-X binary) is the whole diagnosis. The hex stays for
|
||||||
|
// the case where the payload really is binary and the preview shows nothing.
|
||||||
|
func describePacket(pkt []byte) string {
|
||||||
|
const maxShown = 96
|
||||||
|
head := pkt
|
||||||
|
if len(head) > maxShown {
|
||||||
|
head = head[:maxShown]
|
||||||
|
}
|
||||||
|
var text, hex strings.Builder
|
||||||
|
for _, b := range head {
|
||||||
|
if b >= 0x20 && b < 0x7f {
|
||||||
|
text.WriteByte(b)
|
||||||
|
} else {
|
||||||
|
text.WriteByte('.')
|
||||||
|
}
|
||||||
|
fmt.Fprintf(&hex, "%02x ", b)
|
||||||
|
}
|
||||||
|
more := ""
|
||||||
|
if len(pkt) > maxShown {
|
||||||
|
more = "…"
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%d bytes | text %q%s | hex %s%s", len(pkt), text.String(), more, strings.TrimSpace(hex.String()), more)
|
||||||
}
|
}
|
||||||
|
|
||||||
func newServer(cfg Config, out chan<- Event) *Server {
|
func newServer(cfg Config, out chan<- Event) *Server {
|
||||||
@@ -201,13 +242,38 @@ func (s *Server) run() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// logBadPacket reports a datagram this listener could not parse, with enough of
|
||||||
|
// it to identify the sender — then falls silent.
|
||||||
|
//
|
||||||
|
// The point is the SENDER: an unparseable packet on a WSJT port almost always
|
||||||
|
// means another program is broadcasting on it, or the service type is wrong for
|
||||||
|
// what is actually arriving. The remote address names the culprit, and the
|
||||||
|
// payload preview says what it really is. Neither was logged before, so the
|
||||||
|
// operator saw only a magic number repeated a few hundred times a second.
|
||||||
|
func (s *Server) logBadPacket(kind string, remote *net.UDPAddr, pkt []byte, err error) {
|
||||||
|
s.mu.Lock()
|
||||||
|
s.badPkts++
|
||||||
|
n := s.badPkts
|
||||||
|
s.mu.Unlock()
|
||||||
|
if n > maxBadPktDumps {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
applog.Printf("udp: [%s] %s parse error from %s: %v — %s\n",
|
||||||
|
s.cfg.Name, kind, remote, err, describePacket(pkt))
|
||||||
|
if n == maxBadPktDumps {
|
||||||
|
applog.Printf("udp: [%s] further unparseable packets on port %d will not be logged — "+
|
||||||
|
"check that the sender belongs on this port and that the service type matches\n",
|
||||||
|
s.cfg.Name, s.cfg.Port)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
||||||
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
|
ev := Event{ConfigID: s.cfg.ID, Service: s.cfg.ServiceType, Source: remote.String()}
|
||||||
switch s.cfg.ServiceType {
|
switch s.cfg.ServiceType {
|
||||||
case ServiceWSJT:
|
case ServiceWSJT:
|
||||||
w, ok, err := ParseWSJT(pkt)
|
w, ok, err := ParseWSJT(pkt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
applog.Printf("udp: [%s] WSJT parse error: %v\n", s.cfg.Name, err)
|
s.logBadPacket("WSJT", remote, pkt, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -321,7 +387,7 @@ func (s *Server) handle(pkt []byte, remote *net.UDPAddr) {
|
|||||||
case ServiceN1MM:
|
case ServiceN1MM:
|
||||||
adifText, ok, err := ParseN1MM(pkt)
|
adifText, ok, err := ParseN1MM(pkt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
applog.Printf("udp: [%s] N1MM parse error: %v\n", s.cfg.Name, err)
|
s.logBadPacket("N1MM", remote, pkt, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !ok {
|
if !ok {
|
||||||
|
|||||||
@@ -56,12 +56,61 @@ type WSJTEvent struct {
|
|||||||
IsCQ bool // the decode was a CQ call
|
IsCQ bool // the decode was a CQ call
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// maxFwdHeader bounds how far into a packet the WSJT-X magic may sit behind a
|
||||||
|
// forwarder's header. The one seen in the field ("127.0.0.1:2237|") is 15 bytes;
|
||||||
|
// 64 leaves room for a longer address without ever scanning a real payload.
|
||||||
|
const maxFwdHeader = 64
|
||||||
|
|
||||||
|
// stripForwarderHeader removes the origin header a UDP relay prepends.
|
||||||
|
//
|
||||||
|
// A relay that re-broadcasts WSJT-X traffic has to say where each datagram came
|
||||||
|
// from, and it does so as plain text in front of the payload:
|
||||||
|
//
|
||||||
|
// "127.0.0.1:2237|" + <the original, untouched WSJT-X packet>
|
||||||
|
//
|
||||||
|
// The magic then sits 15 bytes in, every packet fails on "bad magic", and an
|
||||||
|
// operator running MSHV behind such a relay gets nothing at all. There is no
|
||||||
|
// need for a separate service type: what follows the header IS a WSJT-X packet,
|
||||||
|
// so the whole parser and everything downstream apply unchanged.
|
||||||
|
//
|
||||||
|
// Deliberately narrow. The magic must appear within maxFwdHeader bytes AND
|
||||||
|
// everything before it must be printable ASCII — a truncated or corrupt packet
|
||||||
|
// that happens to contain those four bytes somewhere is not resurrected into a
|
||||||
|
// QSO. Anything else is returned untouched, and still fails as it did.
|
||||||
|
func stripForwarderHeader(pkt []byte) []byte {
|
||||||
|
if len(pkt) < 4 {
|
||||||
|
return pkt
|
||||||
|
}
|
||||||
|
if binary.BigEndian.Uint32(pkt) == wsjtMagic {
|
||||||
|
return pkt // no header — the overwhelmingly common case
|
||||||
|
}
|
||||||
|
limit := len(pkt) - 4
|
||||||
|
if limit > maxFwdHeader {
|
||||||
|
limit = maxFwdHeader
|
||||||
|
}
|
||||||
|
for i := 1; i <= limit; i++ {
|
||||||
|
if binary.BigEndian.Uint32(pkt[i:]) != wsjtMagic {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, b := range pkt[:i] {
|
||||||
|
if b < 0x20 || b >= 0x7f {
|
||||||
|
return pkt // not a text header — leave it alone
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pkt[i:]
|
||||||
|
}
|
||||||
|
return pkt
|
||||||
|
}
|
||||||
|
|
||||||
// ParseWSJT decodes one UDP packet. Returns ok=false for messages we
|
// ParseWSJT decodes one UDP packet. Returns ok=false for messages we
|
||||||
// don't care about (heartbeat, clears, etc.).
|
// don't care about (heartbeat, clears, etc.).
|
||||||
func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
func ParseWSJT(pkt []byte) (WSJTEvent, bool, error) {
|
||||||
if len(pkt) < 12 {
|
if len(pkt) < 12 {
|
||||||
return WSJTEvent{}, false, fmt.Errorf("packet too short")
|
return WSJTEvent{}, false, fmt.Errorf("packet too short")
|
||||||
}
|
}
|
||||||
|
// A relay (W&P and friends) puts its own origin header in front — skip it so
|
||||||
|
// the packet parses exactly as if it had arrived from WSJT-X directly.
|
||||||
|
pkt = stripForwarderHeader(pkt)
|
||||||
r := bytes.NewReader(pkt)
|
r := bytes.NewReader(pkt)
|
||||||
var magic, schema, mtype uint32
|
var magic, schema, mtype uint32
|
||||||
if err := binary.Read(r, binary.BigEndian, &magic); err != nil {
|
if err := binary.Read(r, binary.BigEndian, &magic); err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package qso
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// The predicate behind "Worked before". Exact when folding is off; with it on,
|
||||||
|
// a station's portable forms are one operator — and the fold has to work from
|
||||||
|
// either end, because you may type the base call or the portable one.
|
||||||
|
func TestCallMatch(t *testing.T) {
|
||||||
|
if pred, args := callMatch("RK3DWA", false); pred != "callsign = ?" || len(args) != 1 || args[0] != "RK3DWA" {
|
||||||
|
t.Errorf("exact: got %q %v", pred, args)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Typing the base call: match it and everything suffixed off it.
|
||||||
|
pred, args := callMatch("RK3DWA", true)
|
||||||
|
if pred != "(callsign = ? OR callsign LIKE ?)" {
|
||||||
|
t.Errorf("variants predicate = %q", pred)
|
||||||
|
}
|
||||||
|
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
|
||||||
|
t.Errorf("variants args = %v, want [RK3DWA RK3DWA/%%]", args)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Typing a portable form must reach the plain call too — the suffix is
|
||||||
|
// stripped from the INPUT, not just matched in the column.
|
||||||
|
_, args = callMatch("RK3DWA/3", true)
|
||||||
|
if len(args) != 2 || args[0] != "RK3DWA" || args[1] != "RK3DWA/%" {
|
||||||
|
t.Errorf("portable input args = %v, want [RK3DWA RK3DWA/%%]", args)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A leading slash is not a suffix marker — dropping to "" there would match
|
||||||
|
// the entire logbook.
|
||||||
|
if _, args := callMatch("/RK3DWA", true); args[0] != "/RK3DWA" {
|
||||||
|
t.Errorf("leading slash: args[0] = %v, want the call unchanged", args[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
+32
-7
@@ -1585,11 +1585,35 @@ type BandMode struct {
|
|||||||
// rendering a recent-contacts mini-list.
|
// rendering a recent-contacts mini-list.
|
||||||
const maxWorkedEntries = 50
|
const maxWorkedEntries = 50
|
||||||
|
|
||||||
|
// callMatch builds the WHERE fragment that selects one station's QSOs.
|
||||||
|
//
|
||||||
|
// Exact by default. With variants on, an operator's portable forms count as the
|
||||||
|
// same station: RK3DWA, RK3DWA/3, RK3DWA/P and RK3DWA/QRP are one person, and
|
||||||
|
// someone asking "have I worked RK3DWA?" means the person, not the string.
|
||||||
|
// Typing 21 QSOs' worth of history only when you happen to add "/3" is the
|
||||||
|
// behaviour this replaces. The suffix is stripped from what was TYPED too, so
|
||||||
|
// it matches both ways round — RK3DWA/3 also finds the plain RK3DWA contacts.
|
||||||
|
//
|
||||||
|
// Deliberately NOT a bare "starts with": LIKE 'RK3DWA%' would also drag in
|
||||||
|
// RK3DWAB, which is a different station. The '/' is what makes it the same one.
|
||||||
|
func callMatch(call string, variants bool) (string, []any) {
|
||||||
|
if !variants {
|
||||||
|
return "callsign = ?", []any{call}
|
||||||
|
}
|
||||||
|
base := call
|
||||||
|
if i := strings.IndexByte(base, '/'); i > 0 {
|
||||||
|
base = base[:i]
|
||||||
|
}
|
||||||
|
return "(callsign = ? OR callsign LIKE ?)", []any{base, base + "/%"}
|
||||||
|
}
|
||||||
|
|
||||||
// WorkedBefore returns aggregated history at both callsign and DXCC level.
|
// WorkedBefore returns aggregated history at both callsign and DXCC level.
|
||||||
// dxccHint lets the caller pass a known DXCC number (e.g. from a fresh QRZ
|
// dxccHint lets the caller pass a known DXCC number (e.g. from a fresh QRZ
|
||||||
// lookup) when the call has never been worked. If 0, the DXCC is inferred
|
// lookup) when the call has never been worked. If 0, the DXCC is inferred
|
||||||
// from the most recent prior QSO with the same callsign.
|
// from the most recent prior QSO with the same callsign.
|
||||||
func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int) (WorkedBefore, error) {
|
//
|
||||||
|
// matchVariants folds the portable forms of the call together — see callMatch.
|
||||||
|
func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int, matchVariants bool) (WorkedBefore, error) {
|
||||||
wb := WorkedBefore{
|
wb := WorkedBefore{
|
||||||
Callsign: upperTrim(callsign),
|
Callsign: upperTrim(callsign),
|
||||||
Bands: []string{},
|
Bands: []string{},
|
||||||
@@ -1605,17 +1629,18 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ---- Per-callsign stats ----
|
// ---- Per-callsign stats ----
|
||||||
|
pred, predArgs := callMatch(wb.Callsign, matchVariants)
|
||||||
if err := r.db.QueryRowContext(ctx,
|
if err := r.db.QueryRowContext(ctx,
|
||||||
`SELECT COUNT(*) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&wb.Count); err != nil {
|
`SELECT COUNT(*) FROM qso WHERE `+pred, predArgs...).Scan(&wb.Count); err != nil {
|
||||||
return wb, fmt.Errorf("count worked: %w", err)
|
return wb, fmt.Errorf("count worked: %w", err)
|
||||||
}
|
}
|
||||||
if wb.Count > 0 {
|
if wb.Count > 0 {
|
||||||
// Pull the full QSO records (same columns as the Recent QSOs list) so
|
// Pull the full QSO records (same columns as the Recent QSOs list) so
|
||||||
// the Worked-before grid can offer the same rich column picker.
|
// the Worked-before grid can offer the same rich column picker.
|
||||||
rows, err := r.db.QueryContext(ctx, `SELECT `+selectCols+`
|
rows, err := r.db.QueryContext(ctx, `SELECT `+selectCols+`
|
||||||
FROM qso WHERE callsign = ?
|
FROM qso WHERE `+pred+`
|
||||||
ORDER BY qso_date DESC, id DESC
|
ORDER BY qso_date DESC, id DESC
|
||||||
LIMIT ?`, wb.Callsign, maxWorkedEntries)
|
LIMIT ?`, append(append([]any{}, predArgs...), maxWorkedEntries)...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return wb, fmt.Errorf("query worked: %w", err)
|
return wb, fmt.Errorf("query worked: %w", err)
|
||||||
}
|
}
|
||||||
@@ -1648,7 +1673,7 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
|||||||
if wb.Count > maxWorkedEntries {
|
if wb.Count > maxWorkedEntries {
|
||||||
var firstStr sql.NullString
|
var firstStr sql.NullString
|
||||||
_ = r.db.QueryRowContext(ctx,
|
_ = r.db.QueryRowContext(ctx,
|
||||||
`SELECT MIN(qso_date) FROM qso WHERE callsign = ?`, wb.Callsign).Scan(&firstStr)
|
`SELECT MIN(qso_date) FROM qso WHERE `+pred, predArgs...).Scan(&firstStr)
|
||||||
if firstStr.Valid {
|
if firstStr.Valid {
|
||||||
wb.First = parseTimeLoose(firstStr.String)
|
wb.First = parseTimeLoose(firstStr.String)
|
||||||
}
|
}
|
||||||
@@ -1673,8 +1698,8 @@ func (r *Repo) WorkedBefore(ctx context.Context, callsign string, dxccHint int)
|
|||||||
var d sql.NullInt64
|
var d sql.NullInt64
|
||||||
_ = r.db.QueryRowContext(ctx, `
|
_ = r.db.QueryRowContext(ctx, `
|
||||||
SELECT dxcc FROM qso
|
SELECT dxcc FROM qso
|
||||||
WHERE callsign = ? AND dxcc IS NOT NULL
|
WHERE `+pred+` AND dxcc IS NOT NULL
|
||||||
ORDER BY qso_date DESC LIMIT 1`, wb.Callsign).Scan(&d)
|
ORDER BY qso_date DESC LIMIT 1`, predArgs...).Scan(&d)
|
||||||
if d.Valid {
|
if d.Valid {
|
||||||
dxcc = int(d.Int64)
|
dxcc = int(d.Int64)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||||
appVersion = "0.23.9"
|
appVersion = "0.24.1"
|
||||||
|
|
||||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||||
// to https://us.i.posthog.com for a US project.
|
// to https://us.i.posthog.com for a US project.
|
||||||
|
|||||||
@@ -150,15 +150,55 @@ func (a *App) DownloadAndApplyUpdate(url string) error {
|
|||||||
// Swap: rename the running exe out of the way (Windows allows renaming a
|
// Swap: rename the running exe out of the way (Windows allows renaming a
|
||||||
// running image), move the new one into its place, then relaunch. Roll back if
|
// running image), move the new one into its place, then relaunch. Roll back if
|
||||||
// the second rename fails so we never end up with no exe.
|
// the second rename fails so we never end up with no exe.
|
||||||
oldExe := exe + ".old"
|
//
|
||||||
_ = os.Remove(oldExe)
|
// The staging name is UNIQUE, not a fixed ".old". With a fixed name, one
|
||||||
if err := os.Rename(exe, oldExe); err != nil {
|
// leftover that could not be deleted — an antivirus holding it open is the
|
||||||
_ = os.Remove(newExe)
|
// usual reason — poisoned every later update: the rename replaces its target,
|
||||||
return fmt.Errorf("stage current exe: %w", err)
|
// the target was locked, and the operator got "stage current exe: … Accès
|
||||||
|
// refusé" for ever with no way out but deleting the file by hand.
|
||||||
|
oldExe := fmt.Sprintf("%s.old-%d", exe, time.Now().UnixNano())
|
||||||
|
var stageErr error
|
||||||
|
staged := false
|
||||||
|
// Retry briefly: a real-time scanner opens the file it has just seen written
|
||||||
|
// and holds it for a moment, so the first attempt lands exactly in that window.
|
||||||
|
for attempt := 0; attempt < 5; attempt++ {
|
||||||
|
if stageErr = os.Rename(exe, oldExe); stageErr == nil {
|
||||||
|
staged = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
time.Sleep(time.Duration(150*(attempt+1)) * time.Millisecond)
|
||||||
}
|
}
|
||||||
if err := os.Rename(newExe, exe); err != nil {
|
|
||||||
_ = os.Rename(oldExe, exe) // roll back
|
if staged {
|
||||||
return fmt.Errorf("install new exe: %w", err)
|
if err := os.Rename(newExe, exe); err != nil {
|
||||||
|
_ = os.Rename(oldExe, exe) // roll back
|
||||||
|
return fmt.Errorf("install new exe: %w", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Could not rename our own running image at all. Some endpoint protection
|
||||||
|
// (Bitdefender's ransomware remediation among them) blocks precisely that,
|
||||||
|
// and no amount of retrying gets past it.
|
||||||
|
//
|
||||||
|
// So don't fight it: leave the new build beside the old one and let the
|
||||||
|
// relaunch helper do the swap AFTER this process has exited, when the file
|
||||||
|
// is no longer a running image. Reported by several operators, all with the
|
||||||
|
// same "Accès refusé" on the staging rename.
|
||||||
|
applog.Printf("update: cannot rename the running exe (%v) — deferring the swap to after exit", stageErr)
|
||||||
|
pending := exe + ".new"
|
||||||
|
_ = os.Remove(pending)
|
||||||
|
if err := os.Rename(newExe, pending); err != nil {
|
||||||
|
_ = os.Remove(newExe)
|
||||||
|
return fmt.Errorf("stage new exe: %w (the folder %s must be writable, and an antivirus may be holding OpsLog.exe)", err, dir)
|
||||||
|
}
|
||||||
|
if err := a.scheduleDeferredSwap(exe, pending); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.Quit(a.ctx)
|
||||||
|
} else {
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
// Clear the "downloaded from the internet" mark (NTFS Zone.Identifier stream).
|
// Clear the "downloaded from the internet" mark (NTFS Zone.Identifier stream).
|
||||||
// Otherwise Windows SmartScreen wants to prompt "are you sure you want to open
|
// Otherwise Windows SmartScreen wants to prompt "are you sure you want to open
|
||||||
@@ -189,6 +229,46 @@ func (a *App) DownloadAndApplyUpdate(url string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// scheduleDeferredSwap hands the exe swap to a detached helper that runs AFTER
|
||||||
|
// this process is gone.
|
||||||
|
//
|
||||||
|
// The fallback for when the running image cannot be renamed at all. Once OpsLog
|
||||||
|
// has exited its exe is an ordinary file again, so the move that was refused a
|
||||||
|
// moment earlier succeeds — and the helper keeps trying for ten seconds, because
|
||||||
|
// an antivirus that was holding the file usually lets go a beat after the
|
||||||
|
// process dies rather than instantly.
|
||||||
|
//
|
||||||
|
// OpsLog is restarted either way. If the move failed, that starts the OLD build
|
||||||
|
// — the update simply has not applied — and the operator keeps a working logger
|
||||||
|
// instead of having it vanish mid-session, which for someone in a QSO is worse
|
||||||
|
// than an update that waits. Only a successful swap passes --post-update, so a
|
||||||
|
// failure leaves the .new file in place for the next attempt rather than having
|
||||||
|
// the cleanup delete the download.
|
||||||
|
func (a *App) scheduleDeferredSwap(exe, pending string) error {
|
||||||
|
// Clear the "downloaded from the internet" mark before it becomes the exe —
|
||||||
|
// SmartScreen silently blocks a programmatic launch of a marked file, and the
|
||||||
|
// mark follows the file across the move.
|
||||||
|
_ = os.Remove(pending + ":Zone.Identifier")
|
||||||
|
|
||||||
|
q := func(s string) string { return strings.ReplaceAll(s, "'", "''") }
|
||||||
|
ps := fmt.Sprintf(
|
||||||
|
"Wait-Process -Id %d -ErrorAction SilentlyContinue; "+
|
||||||
|
"$ok=$false; "+
|
||||||
|
"for ($i=0; $i -lt 40; $i++) { "+
|
||||||
|
"try { Move-Item -LiteralPath '%s' -Destination '%s' -Force -ErrorAction Stop; $ok=$true; break } "+
|
||||||
|
"catch { Start-Sleep -Milliseconds 250 } }; "+
|
||||||
|
"if ($ok) { Start-Process -FilePath '%s' -ArgumentList '--post-update' } "+
|
||||||
|
"else { Start-Process -FilePath '%s' }",
|
||||||
|
os.Getpid(), q(pending), q(exe), q(exe), q(exe))
|
||||||
|
cmd := exec.Command("powershell", "-NoProfile", "-WindowStyle", "Hidden", "-Command", ps)
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true, CreationFlags: 0x08000000} // CREATE_NO_WINDOW
|
||||||
|
if err := cmd.Start(); err != nil {
|
||||||
|
return fmt.Errorf("schedule the update swap: %w", err)
|
||||||
|
}
|
||||||
|
applog.Printf("update: swap scheduled for after exit (%s → %s)", filepath.Base(pending), filepath.Base(exe))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// downloadWithProgress streams url into dest, emitting "update:progress" (0-100).
|
// downloadWithProgress streams url into dest, emitting "update:progress" (0-100).
|
||||||
func (a *App) downloadWithProgress(url, dest string) error {
|
func (a *App) downloadWithProgress(url, dest string) error {
|
||||||
client := &http.Client{Timeout: 10 * time.Minute}
|
client := &http.Client{Timeout: 10 * time.Minute}
|
||||||
@@ -274,12 +354,27 @@ func extractExeFromZip(zipPath, dir string) (string, error) {
|
|||||||
return "", fmt.Errorf("no .exe inside the archive")
|
return "", fmt.Errorf("no .exe inside the archive")
|
||||||
}
|
}
|
||||||
|
|
||||||
// cleanupOldUpdateBinary removes the previous exe left behind by a self-update
|
// cleanupOldUpdateBinary removes what a self-update left behind. Called at
|
||||||
// (exe + ".old"). Called at startup after a --post-update relaunch. Best-effort:
|
// startup after a --post-update relaunch. Best-effort throughout: a file may
|
||||||
// the file may still be briefly locked, in which case the next launch gets it.
|
// still be locked by a scanner, and the next launch will get it.
|
||||||
|
//
|
||||||
|
// Sweeps a PATTERN, not one name. Staging uses a unique ".old-<nanos>" precisely
|
||||||
|
// so a locked leftover cannot block the next update, which means leftovers
|
||||||
|
// accumulate unless something collects them — and the pre-0.24.1 ".old" may be
|
||||||
|
// sitting there too, from the very update that could not delete it.
|
||||||
func cleanupOldUpdateBinary() {
|
func cleanupOldUpdateBinary() {
|
||||||
if exe, err := os.Executable(); err == nil {
|
exe, err := os.Executable()
|
||||||
_ = os.Remove(exe + ".old")
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_ = os.Remove(exe + ".old") // the old fixed name
|
||||||
|
_ = os.Remove(exe + ".new") // a deferred swap that has been applied
|
||||||
|
matches, err := filepath.Glob(exe + ".old-*")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, m := range matches {
|
||||||
|
_ = os.Remove(m)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user