Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6497568813 | ||
|
|
9f62808392 | ||
|
|
9d8b69d804 | ||
|
|
6825af135a | ||
|
|
ca42fd90f9 | ||
|
|
18a583901c | ||
|
|
2cb1add3db | ||
|
|
a3815c24a1 | ||
|
|
f6f5235a8b | ||
|
|
86a644863a | ||
|
|
dd9fddbc5b | ||
|
|
74acf88976 | ||
|
|
da9c76e161 | ||
|
|
fb78b1c052 | ||
|
|
e51abd262e | ||
|
|
0ec855d95a | ||
|
|
ae06495f91 | ||
|
|
4dd2c3b997 |
@@ -294,6 +294,11 @@ const (
|
|||||||
|
|
||||||
keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on
|
keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on
|
||||||
|
|
||||||
|
// Web publishing: the whole config as one JSON blob. A single key rather than
|
||||||
|
// twenty: it is read and written as a unit by one settings panel, and the FTP
|
||||||
|
// password rides inside it — see isSensitiveSetting.
|
||||||
|
keyWebPublish = "webpublish.config"
|
||||||
|
|
||||||
// Worked-before: fold an operator's portable forms (X, X/3, X/P) together.
|
// 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
|
// 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
|
// install that has never seen the key, which is the behaviour operators asked
|
||||||
@@ -690,6 +695,8 @@ type App struct {
|
|||||||
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)
|
awardSnapUsed time.Time // last read — the snapshot is dropped once it goes cold (see awardSnapshotJanitor)
|
||||||
|
webpub webPublisher // log-to-website publishing: debounce timer, periodic ticker, last result
|
||||||
|
bandOpen bandOpenState // sporadic-E / band-opening detector over the spot stream
|
||||||
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
|
||||||
@@ -1238,6 +1245,7 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
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
|
go a.awardSnapshotJanitor() // give the award snapshot's memory back once it goes cold
|
||||||
|
a.restartWebPublishTimer() // periodic log-to-website refresh, if configured
|
||||||
|
|
||||||
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
|
||||||
@@ -2464,6 +2472,19 @@ func (a *App) groupDigitalSlots() bool {
|
|||||||
// Off (default) → a call worked on any band/mode reads as already worked. On →
|
// Off (default) → a call worked on any band/mode reads as already worked. On →
|
||||||
// the WORKED-call flag needs the same band and mode (digital-grouped when that
|
// the WORKED-call flag needs the same band and mode (digital-grouped when that
|
||||||
// option is also on).
|
// option is also on).
|
||||||
|
// clusterSlotHighlight reports the "colour the stations I have NOT worked on
|
||||||
|
// this band and mode" preference (Settings -> DX Cluster). It needs the same
|
||||||
|
// per-slot index as clusterWorkedSameSlot, which is why the index is built when
|
||||||
|
// EITHER is on: that map is one entry per worked call+band+mode, so on a large
|
||||||
|
// log it is not something to hold for an operator using neither.
|
||||||
|
func (a *App) clusterSlotHighlight() bool {
|
||||||
|
if a.settings == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
v, _ := a.settings.Get(a.ctx, "ui.opslog.clusterSlotHighlight")
|
||||||
|
return v == "1"
|
||||||
|
}
|
||||||
|
|
||||||
func (a *App) clusterWorkedSameSlot() bool {
|
func (a *App) clusterWorkedSameSlot() bool {
|
||||||
if a.settings == nil {
|
if a.settings == nil {
|
||||||
return false
|
return false
|
||||||
@@ -2655,6 +2676,7 @@ func (a *App) AddQSO(q qso.QSO) (id int64, err error) {
|
|||||||
}
|
}
|
||||||
a.maybeAutoSendEQSL(qc)
|
a.maybeAutoSendEQSL(qc)
|
||||||
a.maybeSelfSpot(qc)
|
a.maybeSelfSpot(qc)
|
||||||
|
a.publishSoon() // refresh the published web page, debounced
|
||||||
if a.udp != nil {
|
if a.udp != nil {
|
||||||
a.udp.EmitLoggedADIF(adif.SingleRecordADIF(qc))
|
a.udp.EmitLoggedADIF(adif.SingleRecordADIF(qc))
|
||||||
}
|
}
|
||||||
@@ -7816,6 +7838,10 @@ func (a *App) clusterEventWorker() {
|
|||||||
if s.Historical {
|
if s.Historical {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
// Band-opening detector. Deliberately AFTER the Historical guard above: a
|
||||||
|
// SH/DX reply replays a hundred past spots in a second, which is exactly
|
||||||
|
// the shape of a burst and would announce an opening that ended hours ago.
|
||||||
|
a.detectBandOpening(s)
|
||||||
// Fire any matching alert rules (sound / visual / e-mail).
|
// Fire any matching alert rules (sound / visual / e-mail).
|
||||||
a.evaluateAlerts(s)
|
a.evaluateAlerts(s)
|
||||||
// Mirror the spot onto the FlexRadio panadapter when enabled. Infer the
|
// Mirror the spot onto the FlexRadio panadapter when enabled. Infer the
|
||||||
@@ -11704,6 +11730,7 @@ func (a *App) LogUDPLoggedADIF(adifText string) (int64, error) {
|
|||||||
}
|
}
|
||||||
a.maybeAutoSendEQSL(qc)
|
a.maybeAutoSendEQSL(qc)
|
||||||
a.maybeSelfSpot(qc)
|
a.maybeSelfSpot(qc)
|
||||||
|
a.publishSoon() // refresh the published web page, debounced
|
||||||
// Forward to the outbound UDP integrations, exactly like the manual log
|
// Forward to the outbound UDP integrations, exactly like the manual log
|
||||||
// path — otherwise a QSO logged FROM WSJT-X/JTDX/MSHV was never re-emitted
|
// path — otherwise a QSO logged FROM WSJT-X/JTDX/MSHV was never re-emitted
|
||||||
// to the outbound ADIF listeners (Log4OM, N1MM, gridtracker…).
|
// to the outbound ADIF listeners (Log4OM, N1MM, gridtracker…).
|
||||||
@@ -16367,6 +16394,11 @@ type SpotStatus struct {
|
|||||||
// is resolved from the callsign via the offline ULS store (US only, and only
|
// is resolved from the callsign via the offline ULS store (US only, and only
|
||||||
// when that database has been downloaded); POTA from the spot's tagged park.
|
// when that database has been downloaded); POTA from the spot's tagged park.
|
||||||
NewCounty bool `json:"new_county"`
|
NewCounty bool `json:"new_county"`
|
||||||
|
// County and State are that resolved county, so the cluster can show it as a
|
||||||
|
// column instead of only flagging it. Free: the ULS lookup that decides
|
||||||
|
// NewCounty already has them in hand.
|
||||||
|
County string `json:"county,omitempty"`
|
||||||
|
State string `json:"state,omitempty"`
|
||||||
NewPOTA bool `json:"new_pota"`
|
NewPOTA bool `json:"new_pota"`
|
||||||
// NewPfx flags a CQ WPX prefix never worked before, and Pfx is that prefix.
|
// NewPfx flags a CQ WPX prefix never worked before, and Pfx is that prefix.
|
||||||
// Also orthogonal: a common entity on a worked band can still carry a prefix
|
// Also orthogonal: a common entity on a worked band can still carry a prefix
|
||||||
@@ -16374,6 +16406,12 @@ type SpotStatus struct {
|
|||||||
// scanning the cluster for.
|
// scanning the cluster for.
|
||||||
NewPfx bool `json:"new_pfx"`
|
NewPfx bool `json:"new_pfx"`
|
||||||
Pfx string `json:"pfx,omitempty"`
|
Pfx string `json:"pfx,omitempty"`
|
||||||
|
// WorkedSlot: this exact callsign already worked on THIS band and mode.
|
||||||
|
// Distinct from WorkedCall, which follows the "same slot" preference and so
|
||||||
|
// means different things depending on it. This one is always slot-scoped, so
|
||||||
|
// the UI can highlight what is still to be worked here without the two
|
||||||
|
// options having to agree. Only filled when the slot index is built.
|
||||||
|
WorkedSlot bool `json:"worked_slot"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
|
// clusterStatusCache holds the whole-logbook maps ClusterSpotStatuses colours
|
||||||
@@ -16392,6 +16430,7 @@ type clusterStatusCache struct {
|
|||||||
normMode func(string) string // nil unless digital-mode grouping is on
|
normMode func(string) string // nil unless digital-mode grouping is on
|
||||||
groupDigital bool // settings the maps were built under —
|
groupDigital bool // settings the maps were built under —
|
||||||
sameSlot bool // a change rebuilds the snapshot
|
sameSlot bool // a change rebuilds the snapshot
|
||||||
|
slotHighlight bool // (same: the slot index is built for either)
|
||||||
}
|
}
|
||||||
|
|
||||||
// clusterStatusMaps returns the cached worked-index snapshot, building it once
|
// clusterStatusMaps returns the cached worked-index snapshot, building it once
|
||||||
@@ -16401,12 +16440,13 @@ type clusterStatusCache struct {
|
|||||||
func (a *App) clusterStatusMaps() *clusterStatusCache {
|
func (a *App) clusterStatusMaps() *clusterStatusCache {
|
||||||
groupDigital := a.groupDigitalSlots()
|
groupDigital := a.groupDigitalSlots()
|
||||||
sameSlot := a.clusterWorkedSameSlot()
|
sameSlot := a.clusterWorkedSameSlot()
|
||||||
|
slotHighlight := a.clusterSlotHighlight()
|
||||||
a.clusterStatusMu.Lock()
|
a.clusterStatusMu.Lock()
|
||||||
defer a.clusterStatusMu.Unlock()
|
defer a.clusterStatusMu.Unlock()
|
||||||
if c := a.clusterStatusIdx; c != nil && c.groupDigital == groupDigital && c.sameSlot == sameSlot {
|
if c := a.clusterStatusIdx; c != nil && c.groupDigital == groupDigital && c.sameSlot == sameSlot && c.slotHighlight == slotHighlight {
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
c := &clusterStatusCache{groupDigital: groupDigital, sameSlot: sameSlot}
|
c := &clusterStatusCache{groupDigital: groupDigital, sameSlot: sameSlot, slotHighlight: slotHighlight}
|
||||||
if a.qso == nil {
|
if a.qso == nil {
|
||||||
a.clusterStatusIdx = c
|
a.clusterStatusIdx = c
|
||||||
return c
|
return c
|
||||||
@@ -16446,7 +16486,7 @@ func (a *App) clusterStatusMaps() *clusterStatusCache {
|
|||||||
// "Already worked only on the same slot" option (Settings → DX Cluster): the
|
// "Already worked only on the same slot" option (Settings → DX Cluster): the
|
||||||
// WORKED-call flag then needs the SAME band and mode (digital-grouped through
|
// WORKED-call flag then needs the SAME band and mode (digital-grouped through
|
||||||
// the same normMode when that option is on) rather than the call anywhere.
|
// the same normMode when that option is on) rather than the call anywhere.
|
||||||
if sameSlot {
|
if sameSlot || slotHighlight {
|
||||||
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
|
c.workedCallSlots, _ = a.qso.WorkedCallSlotKeys(a.ctx, c.normMode)
|
||||||
}
|
}
|
||||||
// Orthogonal dimensions: worked US counties (for the ULS callsign→county
|
// Orthogonal dimensions: worked US counties (for the ULS callsign→county
|
||||||
@@ -16496,6 +16536,21 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
|||||||
Band: strings.ToLower(q.Band),
|
Band: strings.ToLower(q.Band),
|
||||||
Mode: strings.ToUpper(q.Mode),
|
Mode: strings.ToUpper(q.Mode),
|
||||||
}
|
}
|
||||||
|
// Slot-scoped worked flag, independent of the sameSlot preference: it is
|
||||||
|
// what "highlight what I have NOT worked here" reads, and that must not
|
||||||
|
// change meaning because a different option was toggled.
|
||||||
|
if workedCallSlots != nil {
|
||||||
|
upCall := strings.ToUpper(q.Call)
|
||||||
|
cm := out[i].Mode
|
||||||
|
if normMode != nil && cm != "" {
|
||||||
|
cm = normMode(cm)
|
||||||
|
}
|
||||||
|
if cm == "" {
|
||||||
|
_, out[i].WorkedSlot = workedCallSlots[upCall+"|"+out[i].Band]
|
||||||
|
} else {
|
||||||
|
_, out[i].WorkedSlot = workedCallSlots[upCall+"|"+out[i].Band+"|"+cm]
|
||||||
|
}
|
||||||
|
}
|
||||||
if sameSlot {
|
if sameSlot {
|
||||||
// Already worked ONLY when this exact band+mode slot was worked. With no
|
// Already worked ONLY when this exact band+mode slot was worked. With no
|
||||||
// inferable mode, fall back to same-band (better than claiming the whole
|
// inferable mode, fall back to same-band (better than claiming the whole
|
||||||
@@ -16530,6 +16585,7 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
|||||||
// store (US only; inert until downloaded) and flag if never worked.
|
// store (US only; inert until downloaded) and flag if never worked.
|
||||||
if a.uls != nil {
|
if a.uls != nil {
|
||||||
if loc, ok := a.uls.Resolve(q.Call); ok {
|
if loc, ok := a.uls.Resolve(q.Call); ok {
|
||||||
|
out[i].County, out[i].State = loc.County, loc.State
|
||||||
if key := award.USCountyKey(loc.State, loc.County); key != "" {
|
if key := award.USCountyKey(loc.State, loc.County); key != "" {
|
||||||
if _, done := workedCounties[key]; !done {
|
if _, done := workedCounties[key]; !done {
|
||||||
out[i].NewCounty = true
|
out[i].NewCounty = true
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ var sensitiveSettingKeys = map[string]bool{
|
|||||||
keyExtHRDLogCode: true,
|
keyExtHRDLogCode: true,
|
||||||
keyExtEQSLPassword: true,
|
keyExtEQSLPassword: true,
|
||||||
keyExtCloudlogAPIKey: true,
|
keyExtCloudlogAPIKey: true,
|
||||||
|
// The web-publish config is one JSON blob and the FTP password lives inside
|
||||||
|
// it, so the whole blob is encrypted. That costs nothing — it is read and
|
||||||
|
// written as a unit anyway — and beats storing a server password in clear
|
||||||
|
// next to the rest.
|
||||||
|
keyWebPublish: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
func isSensitiveSetting(key string) bool { return sensitiveSettingKeys[key] }
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Band-opening announcements — the app-side glue for internal/bandopen.
|
||||||
|
//
|
||||||
|
// The detector needs nothing OpsLog does not already compute: the cluster event
|
||||||
|
// worker enriches every spot with the great-circle distance and bearing from
|
||||||
|
// the operator's grid before this is called. So watching for sporadic E costs
|
||||||
|
// one function call per spot and no new data source.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/bandopen"
|
||||||
|
"hamlog/internal/cluster"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
type bandOpenState struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
det *bandopen.Detector
|
||||||
|
last []bandopen.Opening // most recent first, for the UI
|
||||||
|
}
|
||||||
|
|
||||||
|
const maxRememberedOpenings = 20
|
||||||
|
|
||||||
|
// detectBandOpening feeds one spot to the detector and announces a hit.
|
||||||
|
func (a *App) detectBandOpening(s cluster.Spot) {
|
||||||
|
// No operator grid = no distance and no bearing on the spot, and the whole
|
||||||
|
// detection rests on those two. Say nothing rather than guess.
|
||||||
|
if !a.opSet || s.DistanceKm <= 0 || !bandopen.Watched(s.Band) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
if a.bandOpen.det == nil {
|
||||||
|
a.bandOpen.det = bandopen.New(bandopen.DefaultConfig())
|
||||||
|
}
|
||||||
|
op := a.bandOpen.det.Add(bandopen.Spot{
|
||||||
|
Call: s.DXCall, Band: s.Band, DistKm: s.DistanceKm,
|
||||||
|
Bearing: s.ShortPath, At: s.ReceivedAt,
|
||||||
|
}, a.opLat)
|
||||||
|
if op != nil {
|
||||||
|
a.bandOpen.last = append([]bandopen.Opening{*op}, a.bandOpen.last...)
|
||||||
|
if len(a.bandOpen.last) > maxRememberedOpenings {
|
||||||
|
a.bandOpen.last = a.bandOpen.last[:maxRememberedOpenings]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
a.bandOpen.mu.Unlock()
|
||||||
|
if op == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
applog.Printf("bandopen: %s opening — %d stations, ~%d km, %s%s (%s)",
|
||||||
|
op.Band, op.Calls, op.MedianKm, op.Sector(),
|
||||||
|
map[bool]string{true: "", false: " — UNUSUAL for the season"}[op.InSeason],
|
||||||
|
strings.Join(op.Examples, " "))
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "bandopen:detected", op)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBandOpenings returns the openings seen this session, newest first. The UI
|
||||||
|
// polls this so a detection is still visible after its toast has gone.
|
||||||
|
func (a *App) GetBandOpenings() []bandopen.Opening {
|
||||||
|
a.bandOpen.mu.Lock()
|
||||||
|
defer a.bandOpen.mu.Unlock()
|
||||||
|
out := make([]bandopen.Opening, len(a.bandOpen.last))
|
||||||
|
copy(out, a.bandOpen.last)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// BandOpeningSummary is the one-line form used in the toast and the log.
|
||||||
|
func BandOpeningSummary(o bandopen.Opening) string {
|
||||||
|
s := fmt.Sprintf("%s open — %d stations ~%d km, %s", strings.ToUpper(o.Band), o.Calls, o.MedianKm, o.Sector())
|
||||||
|
if !o.InSeason {
|
||||||
|
s += " (unusual for the season)"
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -1,4 +1,38 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.24.3",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Band openings: OpsLog now tells you when 6, 4 or 2 m opens. It watches the spots already arriving from your clusters and RBN — several different stations appearing at single-hop range (500–2400 km) in the same bearing sector within a few minutes is the signature of sporadic E, and nothing else looks like it. You get one message per band per opening, naming the sector and the typical distance. An opening outside the usual season is still announced, and flagged as unusual: those are the ones worth knowing about. Nothing to configure — but the quality depends on having a cluster or RBN feed carrying VHF spots, and 2 m openings are often worked without ever being spotted.",
|
||||||
|
"DX cluster, two display options (Settings › DX cluster). The first drops the colour and the badges on stations you have already worked: they stay in the list, they simply stop competing for your attention. The second colours every callsign you have not worked on this band and this mode, even when the entity itself is long since confirmed — the view for filling slots rather than chasing new ones. Both apply to the cluster list and to the band map, so the two panels always agree.",
|
||||||
|
"DX cluster, clearer at a glance. A novelty now FILLS the cell that carries it — a filled Band cell means new band, a filled Pfx cell means new prefix, a filled County cell means new county — instead of only tinting the text. A US County column joins the list, resolved offline from the ULS database. The station-not-worked-here highlight is its own NEW CALL status with its own filter chip, no longer borrowed from NEW SLOT, which means something narrower. The two display options moved from Preferences into the cluster filter panel, next to Hide worked. The Locator column is now labelled Spotter locator, because that is what a cluster line actually carries.",
|
||||||
|
"Web publishing: the published page sorts properly. The Date column would not sort at all, and neither would callsigns starting with a digit — the script read a number from the front of the text, so every date in the same year counted as equal. A third click on a header now puts the table back in the order it was published in, and an arrow shows which way a column is pointing."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Ouvertures de bande : OpsLog te signale désormais l ouverture du 6, du 4 ou du 2 m. Il surveille les spots qui arrivent déjà de tes clusters et du RBN — plusieurs stations différentes apparaissant à distance de saut simple (500–2400 km) dans le même secteur d azimut en quelques minutes, c est la signature de l Es, et rien d autre n y ressemble. Un message par bande et par ouverture, avec le secteur et la distance typique. Une ouverture hors saison est annoncée quand même, et signalée comme inhabituelle : ce sont celles qu il ne faut surtout pas manquer. Rien à configurer — mais la qualité dépend d avoir un flux cluster ou RBN qui porte des spots VHF, et les ouvertures 2 m sont souvent travaillées sans jamais être spottées.",
|
||||||
|
"Cluster DX, deux options d affichage (Paramètres › Cluster DX). La première enlève la couleur et les badges sur les stations déjà contactées : elles restent dans la liste, elles cessent simplement d attirer l œil. La seconde colore tout indicatif non contacté sur cette bande et ce mode, même si l entité est confirmée depuis longtemps — la vue pour remplir des slots plutôt que pour chasser du nouveau. Les deux s appliquent à la liste cluster et au bandmap, les deux panneaux restent donc cohérents.",
|
||||||
|
"Cluster DX, plus lisible d un coup d œil. Une nouveauté REMPLIT désormais la cellule qui la porte — cellule Bande remplie = nouvelle bande, cellule Préf. remplie = nouveau préfixe, cellule Comté remplie = nouveau comté — au lieu de seulement colorer le texte. Une colonne Comté US rejoint la liste, résolue hors ligne depuis la base ULS. La mise en couleur des stations non contactées ici devient un statut CALL NEUF à part entière, avec sa propre puce de filtre, au lieu d emprunter NOUV SLOT qui veut dire autre chose. Les deux options d affichage passent des Préférences au panneau de filtres du cluster, à côté de Hide worked. La colonne Locator s appelle maintenant Locator du spotter, puisque c est ce qu une ligne de cluster porte réellement.",
|
||||||
|
"Publication web : la page publiée se trie correctement. La colonne Date ne se triait pas du tout, ni les indicatifs commençant par un chiffre — le script lisait un nombre au début du texte, donc toutes les dates d une même année se valaient. Un troisième clic sur un en-tête remet le tableau dans l ordre de publication, et une flèche indique le sens du tri."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.24.2",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Web publishing: OpsLog can now write your log to a file for a website — a standalone HTML page (sortable, dark/light, no external request of any kind) or a CSV. You pick the columns and how many QSOs, it refreshes when you log and, if you want, on a timer, and it can upload the result by FTP or FTPS. The file is always written locally first, so a network failure leaves a good file on disk instead of a truncated one on the server. Settings → Web publishing.",
|
||||||
|
"Icom console: an IC-9700 gets the bands it actually has. The band row was hardwired to 160–6 m, so the one radio in the range with no HF at all showed ten dead buttons and none of 2 m, 70 cm or 23 cm. The row now follows the model, as the attenuator steps already did — an IC-705 gains 2 m and 70 cm, an IC-9100 those plus 23 cm.",
|
||||||
|
"Maps: the tiles are back. OpenStreetMap blocked OpsLog on its volunteer-run tile servers and every map filled with \"Access blocked\" squares. Their policy requires an application to identify itself with its own User-Agent on each request — something a program drawing maps inside a web view cannot do, the browser sets that header itself. So the two layers that still used those servers, the Street basemap and the locator map, have moved to services whose terms do cover a distributed application: Esri for Street, Carto for the locator map. OpenStreetMap is still credited — Carto's tiles are built from its data — and the locator map now throttles its tile requests like the world map already did.",
|
||||||
|
"Band map: a station you have just worked stops showing as NEW. After each QSO the spot colours are refreshed, but only when the DX-cluster list was on screen — the band map was left out, so working a station with the usual layout (Recent QSOs on the left, band map on the right) left its pill orange until you happened to open the cluster tab. The band map, docked or in its own tab, now counts as on screen like the cluster does.",
|
||||||
|
"Band map: new POTA, new county and already-worked callsign are shown at last. The band map only ever coloured the entity status — new DXCC, new band, new slot, worked — and ignored the other three markers, even though it was already receiving them: a new park on an entity you have worked looked like any other worked spot. They now appear on the pill's left strip, in the same colours the DX-cluster list uses, so a fact is not blue in one panel and green in the next. They stack rather than replace: a worked entity that is also a new park shows both, the way the cluster list already spells them out side by side. A new county is now violet instead of sharing green with a new park — in BOTH panels, since the two would otherwise disagree; the marker colours moved to one shared table, which is also what a per-marker colour setting will drive."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Publication web : OpsLog peut désormais écrire ton journal dans un fichier destiné à un site — une page HTML autonome (triable, claire ou sombre, sans aucune requête externe) ou un CSV. Tu choisis les colonnes et le nombre de QSO, il se rafraîchit à chaque enregistrement et, si tu veux, périodiquement, et il peut envoyer le résultat par FTP ou FTPS. Le fichier est toujours écrit en local d abord : une panne réseau laisse donc un bon fichier sur le disque plutôt qu un fichier tronqué sur le serveur. Réglages → Publication web.",
|
||||||
|
"Console Icom : un IC-9700 reçoit enfin les bandes qu il possède. La rangée de bandes était figée sur 160–6 m, si bien que la seule radio de la gamme sans aucune HF affichait dix boutons morts et aucune de ses bandes 2 m, 70 cm et 23 cm. La rangée suit maintenant le modèle, comme le faisaient déjà les pas d atténuateur — un IC-705 gagne le 2 m et le 70 cm, un IC-9100 ceux-là plus le 23 cm.",
|
||||||
|
"Cartes : les tuiles sont de retour. OpenStreetMap a bloqué OpsLog sur ses serveurs de tuiles bénévoles et toutes les cartes se sont remplies de carrés « Access blocked ». Leur politique exige qu'une application s'identifie par son propre User-Agent à chaque requête — ce qu'un programme qui dessine ses cartes dans une vue web ne peut pas faire, c'est le navigateur qui pose cet en-tête. Les deux couches qui utilisaient encore ces serveurs, le fond Street et la carte des locators, passent donc sur des services dont les conditions couvrent une application distribuée : Esri pour Street, Carto pour les locators. OpenStreetMap reste crédité — les tuiles Carto sont construites à partir de ses données — et la carte des locators limite désormais son débit de requêtes comme le faisait déjà la carte du monde.",
|
||||||
|
"Band map : une station que tu viens de contacter cesse d'apparaître en NEW. Après chaque QSO, les couleurs des spots sont rafraîchies, mais seulement quand la liste du cluster DX était à l'écran — la band map avait été oubliée. Contacter une station dans la disposition habituelle (QSO récents à gauche, band map à droite) laissait donc sa pastille en orange jusqu'à ce qu'on ouvre l'onglet cluster. La band map, ancrée ou dans son onglet, compte désormais comme visible au même titre que le cluster.",
|
||||||
|
"Band map : nouveau POTA, nouveau comté et indicatif déjà contacté sont enfin visibles. La band map ne colorait que le statut d'entité — nouveau DXCC, nouvelle bande, nouveau créneau, contacté — et ignorait les trois autres marqueurs alors qu'elle les recevait déjà : un nouveau parc sur une entité déjà travaillée ressemblait à n'importe quel spot contacté. Ils apparaissent désormais sur la bande latérale de la pastille, dans les couleurs de la liste du cluster DX, pour qu'un même fait ne soit pas bleu dans un panneau et vert dans l'autre. Ils s'empilent au lieu de se remplacer : une entité contactée qui est aussi un nouveau parc affiche les deux, comme la liste du cluster les énumère déjà côte à côte. Un nouveau comté passe en violet au lieu de partager le vert avec un nouveau parc — dans les DEUX panneaux, sinon ils se contrediraient ; les couleurs des marqueurs sont désormais dans une table unique, celle-là même que pilotera l'option de couleur à venir."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.24.1",
|
"version": "0.24.1",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+72
-15
@@ -89,6 +89,7 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
|
|||||||
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
||||||
import { ClusterGrid } from '@/components/ClusterGrid';
|
import { ClusterGrid } from '@/components/ClusterGrid';
|
||||||
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
||||||
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||||
import { NetControlPanel } from '@/components/NetControlPanel';
|
import { NetControlPanel } from '@/components/NetControlPanel';
|
||||||
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
||||||
@@ -1484,7 +1485,14 @@ export default function App() {
|
|||||||
// county or a new park is not a DXCC state, it is another dimension of the
|
// county or a new park is not a DXCC state, it is another dimension of the
|
||||||
// same spot — which is why the grid shows them as separate badges. Filtering
|
// same spot — which is why the grid shows them as separate badges. Filtering
|
||||||
// is an OR across all of them, as it already was for a worked callsign.
|
// is an OR across all of them, as it already was for a worked callsign.
|
||||||
type SpotFilterKey = SpotStatusKey | 'new-pota' | 'new-county' | 'new-pfx';
|
// 'new-call' is a DISPLAY status, produced by the slot-highlight option rather
|
||||||
|
// than by the backend, so it is named here and not in SpotStatusKey.
|
||||||
|
type SpotFilterKey = SpotStatusKey | 'new-pota' | 'new-county' | 'new-pfx' | 'new-call';
|
||||||
|
// Display options, shared with the band map through lib/spotDisplay. Kept in
|
||||||
|
// localStorage (mirrored to settings by writeUiPref) so both panels and the
|
||||||
|
// filter predicate read one source without prop-drilling through three levels.
|
||||||
|
const [clusterMuteWorked, setClusterMuteWorked] = useState(() => localStorage.getItem('opslog.clusterMuteWorked') === '1');
|
||||||
|
const [clusterSlotHighlight, setClusterSlotHighlight] = useState(() => localStorage.getItem('opslog.clusterSlotHighlight') === '1');
|
||||||
const [clusterStatusFilter, setClusterStatusFilter] = useState<Set<SpotFilterKey>>(() => lsSet<SpotFilterKey>('opslog.clusterStatusFilter'));
|
const [clusterStatusFilter, setClusterStatusFilter] = useState<Set<SpotFilterKey>>(() => lsSet<SpotFilterKey>('opslog.clusterStatusFilter'));
|
||||||
// Mode filter chips. Empty set = show every mode. Categories map the
|
// Mode filter chips. Empty set = show every mode. Categories map the
|
||||||
// inferred per-spot mode onto SSB (phone) / CW / DATA (digital).
|
// inferred per-spot mode onto SSB (phone) / CW / DATA (digital).
|
||||||
@@ -1580,7 +1588,10 @@ export default function App() {
|
|||||||
// Cached per-call slot status: "new" | "new-band" | "new-slot" | "worked".
|
// Cached per-call slot status: "new" | "new-band" | "new-slot" | "worked".
|
||||||
// Keyed by `${call}|${band}|${mode}` so two spots of the same call on
|
// Keyed by `${call}|${band}|${mode}` so two spots of the same call on
|
||||||
// different slots don't share the same colour.
|
// different slots don't share the same colour.
|
||||||
const [spotStatus, setSpotStatus] = useState<Record<string, { status: string; country?: string; continent?: string; worked_call?: boolean; new_county?: boolean; new_pota?: boolean; new_pfx?: boolean; pfx?: string }>>({});
|
// worked_slot must be carried explicitly like every other field: this map is
|
||||||
|
// assembled field by field, so a backend flag that nobody copies here simply
|
||||||
|
// never reaches the panels — silently, since the extra key is just dropped.
|
||||||
|
const [spotStatus, setSpotStatus] = useState<Record<string, { status: string; country?: string; continent?: string; worked_call?: boolean; worked_slot?: boolean; new_county?: boolean; county?: string; state?: string; new_pota?: boolean; new_pfx?: boolean; pfx?: string }>>({});
|
||||||
// Live mirror of spotStatus so the incoming-spot buffer can tell which slots
|
// Live mirror of spotStatus so the incoming-spot buffer can tell which slots
|
||||||
// still need resolving without re-subscribing the cluster:spot listener.
|
// still need resolving without re-subscribing the cluster:spot listener.
|
||||||
const spotStatusRef = useRef(spotStatus);
|
const spotStatusRef = useRef(spotStatus);
|
||||||
@@ -1630,7 +1641,7 @@ export default function App() {
|
|||||||
const k = `${r.call}|${r.band ?? ''}|${(r.mode ?? '').toUpperCase()}`;
|
const k = `${r.call}|${r.band ?? ''}|${(r.mode ?? '').toUpperCase()}`;
|
||||||
next[k] = {
|
next[k] = {
|
||||||
status: r.status ?? '', country: r.country, continent: (r as any).continent,
|
status: r.status ?? '', country: r.country, continent: (r as any).continent,
|
||||||
worked_call: !!(r as any).worked_call, new_county: !!(r as any).new_county,
|
worked_call: !!(r as any).worked_call, worked_slot: !!(r as any).worked_slot, new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||||
new_pota: !!(r as any).new_pota, new_pfx: !!(r as any).new_pfx, pfx: (r as any).pfx,
|
new_pota: !!(r as any).new_pota, new_pfx: !!(r as any).new_pfx, pfx: (r as any).pfx,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1640,23 +1651,30 @@ export default function App() {
|
|||||||
}, []);
|
}, []);
|
||||||
// After a QSO is logged, refresh the shown spots so a call/entity/POTA/prefix/
|
// After a QSO is logged, refresh the shown spots so a call/entity/POTA/prefix/
|
||||||
// slot just worked drops its NEW badge — WITHOUT blanking the others (see the
|
// slot just worked drops its NEW badge — WITHOUT blanking the others (see the
|
||||||
// merge above). Kept cheap: only while the cluster is on screen (a log while
|
// merge above). Kept cheap: only while something that DRAWS a spot status is on
|
||||||
// hidden marks it dirty and refreshes ONCE on next open), and debounced so a
|
// screen (a log while hidden marks it dirty and refreshes ONCE on the next
|
||||||
// fast run coalesces instead of re-scanning per QSO.
|
// open), and debounced so a fast run coalesces instead of re-scanning per QSO.
|
||||||
const clusterVisibleRef = useRef(false);
|
//
|
||||||
|
// "Something" means the band map as much as the cluster list. The test used to
|
||||||
|
// name only the cluster, so working a station while the docked band map was up
|
||||||
|
// — the ordinary layout: Recent QSOs on the left, band map on the right — left
|
||||||
|
// its pill NEW until the cluster tab happened to be opened. Reported on an E51
|
||||||
|
// that stayed orange after the QSO was in the log.
|
||||||
|
const spotsVisibleRef = useRef(false);
|
||||||
const spotsDirtyRef = useRef(false);
|
const spotsDirtyRef = useRef(false);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const vis = mainPaneLeft === 'cluster' || mainPaneRight === 'cluster' || activeTab === 'cluster';
|
const vis = mainPaneLeft === 'cluster' || mainPaneRight === 'cluster'
|
||||||
if (vis && !clusterVisibleRef.current && spotsDirtyRef.current) {
|
|| activeTab === 'cluster' || activeTab === 'bandmap' || showBandMap;
|
||||||
|
if (vis && !spotsVisibleRef.current && spotsDirtyRef.current) {
|
||||||
spotsDirtyRef.current = false;
|
spotsDirtyRef.current = false;
|
||||||
void refreshSpotStatuses();
|
void refreshSpotStatuses();
|
||||||
}
|
}
|
||||||
clusterVisibleRef.current = vis;
|
spotsVisibleRef.current = vis;
|
||||||
}, [mainPaneLeft, mainPaneRight, activeTab, refreshSpotStatuses]);
|
}, [mainPaneLeft, mainPaneRight, activeTab, showBandMap, refreshSpotStatuses]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let t: number | undefined;
|
let t: number | undefined;
|
||||||
const off = EventsOn('qso:logged', () => {
|
const off = EventsOn('qso:logged', () => {
|
||||||
if (!clusterVisibleRef.current) { spotsDirtyRef.current = true; return; }
|
if (!spotsVisibleRef.current) { spotsDirtyRef.current = true; return; }
|
||||||
if (t) window.clearTimeout(t);
|
if (t) window.clearTimeout(t);
|
||||||
t = window.setTimeout(() => void refreshSpotStatuses(), 2000);
|
t = window.setTimeout(() => void refreshSpotStatuses(), 2000);
|
||||||
});
|
});
|
||||||
@@ -2070,6 +2088,23 @@ export default function App() {
|
|||||||
return () => { off(); };
|
return () => { off(); };
|
||||||
}, [showToast]);
|
}, [showToast]);
|
||||||
|
|
||||||
|
// Band openings — sporadic E on 6/4/2 m, detected from the spot stream.
|
||||||
|
//
|
||||||
|
// A toast rather than a rule-based alert: this is not "a station you wanted
|
||||||
|
// appeared", it is "the band itself just changed", and it fires a handful of
|
||||||
|
// times a season. The detector already announces each band once per opening,
|
||||||
|
// so there is nothing to throttle here.
|
||||||
|
useEffect(() => {
|
||||||
|
const off = EventsOn('bandopen:detected', (o: any) => {
|
||||||
|
if (!o?.band) return;
|
||||||
|
const season = o.in_season ? '' : ` — ${t('bmp.openUnusual')}`;
|
||||||
|
showToast(`📡 ${t('bmp.openToast', {
|
||||||
|
band: String(o.band).toUpperCase(), n: o.calls, km: o.median_km,
|
||||||
|
})}${season}`);
|
||||||
|
});
|
||||||
|
return () => { off(); };
|
||||||
|
}, [showToast, t]);
|
||||||
|
|
||||||
// DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no
|
// DX-cluster spot alerts: a matched rule fires here. Play a beep (WebAudio, no
|
||||||
// asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions.
|
// asset needed — CSP-safe) and/or show a toast, per the rule's chosen actions.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -2705,7 +2740,8 @@ export default function App() {
|
|||||||
country: r.country,
|
country: r.country,
|
||||||
continent: (r as any).continent,
|
continent: (r as any).continent,
|
||||||
worked_call: !!(r as any).worked_call,
|
worked_call: !!(r as any).worked_call,
|
||||||
new_county: !!(r as any).new_county,
|
worked_slot: !!(r as any).worked_slot,
|
||||||
|
new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||||
new_pota: !!(r as any).new_pota,
|
new_pota: !!(r as any).new_pota,
|
||||||
new_pfx: !!(r as any).new_pfx,
|
new_pfx: !!(r as any).new_pfx,
|
||||||
pfx: (r as any).pfx,
|
pfx: (r as any).pfx,
|
||||||
@@ -3172,7 +3208,8 @@ export default function App() {
|
|||||||
country: r.country,
|
country: r.country,
|
||||||
continent: (r as any).continent,
|
continent: (r as any).continent,
|
||||||
worked_call: !!(r as any).worked_call,
|
worked_call: !!(r as any).worked_call,
|
||||||
new_county: !!(r as any).new_county,
|
worked_slot: !!(r as any).worked_slot,
|
||||||
|
new_county: !!(r as any).new_county, county: (r as any).county, state: (r as any).state,
|
||||||
new_pota: !!(r as any).new_pota,
|
new_pota: !!(r as any).new_pota,
|
||||||
new_pfx: !!(r as any).new_pfx,
|
new_pfx: !!(r as any).new_pfx,
|
||||||
pfx: (r as any).pfx,
|
pfx: (r as any).pfx,
|
||||||
@@ -4652,7 +4689,10 @@ export default function App() {
|
|||||||
}
|
}
|
||||||
if (clusterStatusFilter.size > 0) {
|
if (clusterStatusFilter.size > 0) {
|
||||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||||
const e = spotStatus[k];
|
// Filter on what is DISPLAYED, not on the raw backend status: NEW CALL is
|
||||||
|
// produced by the slot-highlight option, so a filter reading the raw
|
||||||
|
// entry would offer a chip that never matches a single row.
|
||||||
|
const e = applySpotDisplay(spotStatus[k], readSpotDisplayOptions());
|
||||||
const st = (e?.status || '') as SpotStatusKey;
|
const st = (e?.status || '') as SpotStatusKey;
|
||||||
// WORKED means "I've worked THIS callsign" — the blue WKD-CALL flag —
|
// WORKED means "I've worked THIS callsign" — the blue WKD-CALL flag —
|
||||||
// NOT the entity status 'worked' (entity/band/mode already worked, which
|
// NOT the entity status 'worked' (entity/band/mode already worked, which
|
||||||
@@ -4722,6 +4762,20 @@ export default function App() {
|
|||||||
<Checkbox checked={clusterGroup} onCheckedChange={(c) => setClusterGroup(!!c)} />
|
<Checkbox checked={clusterGroup} onCheckedChange={(c) => setClusterGroup(!!c)} />
|
||||||
Group duplicates
|
Group duplicates
|
||||||
</label>
|
</label>
|
||||||
|
{/* Two ways to cut through a busy cluster, and they compose: mute what
|
||||||
|
is done, light up what is not. They sit HERE, with the other things
|
||||||
|
an operator changes mid-run, and not in the preferences dialog.
|
||||||
|
Both drive the band map as well, through lib/spotDisplay. */}
|
||||||
|
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<Checkbox checked={clusterMuteWorked}
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setClusterMuteWorked(v); writeUiPref('opslog.clusterMuteWorked', v ? '1' : '0'); }} />
|
||||||
|
{t('clu.muteWorkedShort')}
|
||||||
|
</label>
|
||||||
|
<label className="flex items-center gap-1.5 cursor-pointer">
|
||||||
|
<Checkbox checked={clusterSlotHighlight}
|
||||||
|
onCheckedChange={(c) => { const v = !!c; setClusterSlotHighlight(v); writeUiPref('opslog.clusterSlotHighlight', v ? '1' : '0'); }} />
|
||||||
|
{t('clu.slotHighlightShort')}
|
||||||
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Band filter — multi-select listbox */}
|
{/* Band filter — multi-select listbox */}
|
||||||
@@ -4781,6 +4835,9 @@ export default function App() {
|
|||||||
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
|
{ k: 'new-band' as SpotFilterKey, label: 'NEW BAND', cls: 'bg-warning-muted text-warning-muted-foreground border-warning-border' },
|
||||||
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
{ k: 'new-mode' as SpotFilterKey, label: 'NEW MODE', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
{ k: 'new-slot' as SpotFilterKey, label: 'NEW SLOT', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
|
// NEW CALL is about the CALLSIGN, not the entity: never worked on this
|
||||||
|
// band and mode. Only appears when the slot-highlight option is on.
|
||||||
|
{ k: 'new-call' as SpotFilterKey, label: 'NEW CALL', cls: 'bg-caution-muted text-caution-muted-foreground border-caution-border' },
|
||||||
// Same colours as the badges in the grid — a filter that does not
|
// Same colours as the badges in the grid — a filter that does not
|
||||||
// look like what it selects has to be learned twice.
|
// look like what it selects has to be learned twice.
|
||||||
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
{ k: 'new-pota' as SpotFilterKey, label: 'NEW POTA', cls: 'bg-success-muted text-success-muted-foreground border-success-border' },
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ import { Minus, Plus, Crosshair, X, PanelLeft, PanelRight } from 'lucide-react';
|
|||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
import { spotStatusKey, inferSpotMode, spotModeCategory } from '@/lib/spot';
|
||||||
|
import { SPOT_MARKERS, activeMarkers } from '@/lib/spotMarkers';
|
||||||
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
|
|
||||||
// BandMap — vertical spectrum panel inspired by Log4OM.
|
// BandMap — vertical spectrum panel inspired by Log4OM.
|
||||||
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
// - Full band is always visible; zoom changes pixels-per-kHz, scroll
|
||||||
@@ -24,7 +26,45 @@ interface Spot {
|
|||||||
spotter?: string;
|
spotter?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
type SpotStatusEntry = { status: string; country?: string };
|
// The FULL status entry, not the two fields the map used to declare. The extra
|
||||||
|
// markers were already arriving in this object — the local type simply never
|
||||||
|
// mentioned them, so they could not be drawn.
|
||||||
|
type SpotStatusEntry = {
|
||||||
|
status?: string;
|
||||||
|
country?: string;
|
||||||
|
worked_call?: boolean;
|
||||||
|
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||||
|
worked_slot?: boolean;
|
||||||
|
new_county?: boolean;
|
||||||
|
new_pota?: boolean;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
// muted: the status was emptied on purpose by the "no colour on worked
|
||||||
|
// stations" option, so an empty status here is a choice, not an unknown.
|
||||||
|
muted?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
// The extra markers are ORTHOGONAL to the entity status: a spot can be a worked
|
||||||
|
// entity AND a new park. The cluster list stacks them as separate badges instead
|
||||||
|
// of letting one replace another, so the map stacks them too — as segments of
|
||||||
|
// the pill's left accent bar, which until now only repeated the pill's own
|
||||||
|
// colour and carried no information of its own.
|
||||||
|
//
|
||||||
|
// Their colours come from lib/spotMarkers, shared with the cluster list: the
|
||||||
|
// same fact must not be violet in one panel and green in the next.
|
||||||
|
// The map shows three of the four. A new PREFIX is left to the cluster list: the
|
||||||
|
// pill is 22 px tall, and a fourth segment turns the strip into a colour code
|
||||||
|
// nobody can read at a glance. Add it here the day the strip earns more room.
|
||||||
|
const BMP_MARKERS = SPOT_MARKERS.filter((m) => m.key !== 'new_pfx');
|
||||||
|
const markersFor = (e: SpotStatusEntry | undefined) =>
|
||||||
|
activeMarkers(e).filter((m) => m.key !== 'new_pfx');
|
||||||
|
|
||||||
|
// The legend spells the markers out; the cluster list's badges are abbreviated
|
||||||
|
// ("NEW CTY") because they sit in a narrow cell, and there is room here.
|
||||||
|
const BMP_MARKER_LABEL: Record<string, string> = {
|
||||||
|
new_pota: 'bmp.legendNewPota',
|
||||||
|
new_county: 'bmp.legendNewCounty',
|
||||||
|
worked_call: 'bmp.legendWorkedCall',
|
||||||
|
};
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
band: string;
|
band: string;
|
||||||
@@ -112,17 +152,39 @@ function LegendDot({ cls, colour, label }: { cls?: string; colour?: string; labe
|
|||||||
|
|
||||||
// Human-readable label for a spot status — used in the pill hover tooltip
|
// Human-readable label for a spot status — used in the pill hover tooltip
|
||||||
// so the operator can see WHY a spot is coloured the way it is.
|
// so the operator can see WHY a spot is coloured the way it is.
|
||||||
function statusLabel(s: string, t: (k: string) => string): string {
|
function statusLabel(s: string, t: (k: string) => string, muted = false): string {
|
||||||
switch (s) {
|
switch (s) {
|
||||||
case 'new': return t('bmp.statusNew');
|
case 'new': return t('bmp.statusNew');
|
||||||
case 'new-band': return t('bmp.statusNewBand');
|
case 'new-band': return t('bmp.statusNewBand');
|
||||||
|
case 'new-mode': return t('bmp.statusNewMode');
|
||||||
case 'new-slot': return t('bmp.statusNewSlot');
|
case 'new-slot': return t('bmp.statusNewSlot');
|
||||||
|
case 'new-call': return t('bmp.statusNewCall');
|
||||||
case 'worked': return t('bmp.statusWorked');
|
case 'worked': return t('bmp.statusWorked');
|
||||||
default: return t('bmp.statusUnresolved');
|
// An empty status means the entity could not be resolved — EXCEPT when the
|
||||||
|
// "no colour on worked stations" option emptied it on purpose. Saying
|
||||||
|
// "entity not resolved" there was a flat contradiction of the country
|
||||||
|
// printed two words earlier in the same tooltip.
|
||||||
|
default: return muted ? t('bmp.statusMuted') : t('bmp.statusUnresolved');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusStyle(s: string): { pill: string; bar: string; line: string; dot: string } {
|
// QUIET: no status colour at all. The pill keeps the card background and the
|
||||||
|
// accent drops to a plain border grey, so the spot is present but says nothing.
|
||||||
|
const QUIET_STYLE = {
|
||||||
|
pill: 'bg-card text-muted-foreground border-border/60 hover:bg-muted/50',
|
||||||
|
bar: 'bg-muted-foreground/30',
|
||||||
|
line: 'stroke-border',
|
||||||
|
dot: 'fill-border',
|
||||||
|
};
|
||||||
|
|
||||||
|
function statusStyle(s: string, muted = false): { pill: string; bar: string; line: string; dot: string } {
|
||||||
|
// A muted spot must land on QUIET, never on the default branch below. That
|
||||||
|
// default paints bg-primary/60 — the theme's burnt orange at 60 % over a dark
|
||||||
|
// card, i.e. brown — because it was written for the rare unresolved entity and
|
||||||
|
// orange is this app's "look here" colour. With the mute option on, most of
|
||||||
|
// the map is muted, so the whole band map turned brown and the quietest spots
|
||||||
|
// shouted the loudest.
|
||||||
|
if (muted) return QUIET_STYLE;
|
||||||
// pill = full pill background+text+border
|
// pill = full pill background+text+border
|
||||||
// bar = thick left accent inside the pill
|
// bar = thick left accent inside the pill
|
||||||
// line = SVG leader stroke (visible on hover)
|
// line = SVG leader stroke (visible on hover)
|
||||||
@@ -140,18 +202,14 @@ function statusStyle(s: string): { pill: string; bar: string; line: string; dot:
|
|||||||
line: 'stroke-warning',
|
line: 'stroke-warning',
|
||||||
dot: 'fill-warning',
|
dot: 'fill-warning',
|
||||||
};
|
};
|
||||||
|
case 'new-call':
|
||||||
case 'new-slot': return {
|
case 'new-slot': return {
|
||||||
pill: 'bg-caution-muted text-caution-muted-foreground border-caution-border hover:bg-caution-muted',
|
pill: 'bg-caution-muted text-caution-muted-foreground border-caution-border hover:bg-caution-muted',
|
||||||
bar: 'bg-caution',
|
bar: 'bg-caution',
|
||||||
line: 'stroke-caution',
|
line: 'stroke-caution',
|
||||||
dot: 'fill-caution',
|
dot: 'fill-caution',
|
||||||
};
|
};
|
||||||
case 'worked': return {
|
case 'worked': return QUIET_STYLE;
|
||||||
pill: 'bg-card text-muted-foreground border-border/60 hover:bg-muted/50',
|
|
||||||
bar: 'bg-muted-foreground/30',
|
|
||||||
line: 'stroke-border',
|
|
||||||
dot: 'fill-border',
|
|
||||||
};
|
|
||||||
default: return {
|
default: return {
|
||||||
pill: 'bg-card text-foreground border-border hover:bg-accent/40',
|
pill: 'bg-card text-foreground border-border hover:bg-accent/40',
|
||||||
bar: 'bg-primary/60',
|
bar: 'bg-primary/60',
|
||||||
@@ -179,8 +237,24 @@ const BOT_PAD = 14; // the top-most freq label isn't clipped at y=0
|
|||||||
// last; ties broken by closeness to the rig freq).
|
// last; ties broken by closeness to the rig freq).
|
||||||
const MAX_VISIBLE_SPOTS = 30;
|
const MAX_VISIBLE_SPOTS = 30;
|
||||||
|
|
||||||
export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
export function BandMap({ band, spots, spotStatus: spotStatusRaw, currentFreqHz, onSpotClick, onClose, side = 'right', onToggleSide, hideDigital = false, fitToBand = false, keyNav = false }: Props) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
|
// The two display options are applied ONCE here, on the whole map, so the
|
||||||
|
// leader lines, the dots, the pills and the badges can never disagree — and so
|
||||||
|
// the map and the cluster list share the single rule set in lib/spotDisplay.
|
||||||
|
// Re-derived whenever the poll delivers a new status map, which is also when a
|
||||||
|
// just-changed option takes effect.
|
||||||
|
// Read at render time, not inside the memo: the options must be part of the
|
||||||
|
// dependencies. Keyed only on spotStatusRaw, toggling an option changed
|
||||||
|
// nothing until the next poll happened to hand over a fresh object.
|
||||||
|
const dispOpts = readSpotDisplayOptions();
|
||||||
|
const spotStatus = useMemo(() => {
|
||||||
|
if (!dispOpts.muteWorked && !dispOpts.slotHighlight) return spotStatusRaw;
|
||||||
|
const out: Record<string, SpotStatusEntry> = {};
|
||||||
|
for (const k of Object.keys(spotStatusRaw)) out[k] = applySpotDisplay(spotStatusRaw[k], dispOpts) as SpotStatusEntry;
|
||||||
|
return out;
|
||||||
|
}, [spotStatusRaw, dispOpts.muteWorked, dispOpts.slotHighlight]);
|
||||||
const range = BAND_RANGES[band];
|
const range = BAND_RANGES[band];
|
||||||
const segments = SEGMENT_COLORS[band] ?? [];
|
const segments = SEGMENT_COLORS[band] ?? [];
|
||||||
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
const [zoomIdx, setZoomIdx] = useState(2); // default 32 px/kHz
|
||||||
@@ -248,6 +322,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
case 'new': return 0;
|
case 'new': return 0;
|
||||||
case 'new-band': return 1;
|
case 'new-band': return 1;
|
||||||
case 'new-slot': return 2;
|
case 'new-slot': return 2;
|
||||||
|
case 'new-call': return 2;
|
||||||
case 'worked': return 4;
|
case 'worked': return 4;
|
||||||
default: return 3;
|
default: return 3;
|
||||||
}
|
}
|
||||||
@@ -506,7 +581,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
{placed.map((p, i) => {
|
{placed.map((p, i) => {
|
||||||
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
||||||
const st = spotStatus[k]?.status ?? '';
|
const st = spotStatus[k]?.status ?? '';
|
||||||
const style = statusStyle(st);
|
const style = statusStyle(st, spotStatus[k]?.muted);
|
||||||
const labelMidY = p.labelY + PILL_H / 2;
|
const labelMidY = p.labelY + PILL_H / 2;
|
||||||
const bumped = Math.abs(p.freqY - labelMidY) > 0.5;
|
const bumped = Math.abs(p.freqY - labelMidY) > 0.5;
|
||||||
return (
|
return (
|
||||||
@@ -554,7 +629,7 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
const k = spotStatusKey(p.spot.dx_call, p.spot.band ?? '', p.spot.comment ?? '', p.spot.freq_hz);
|
||||||
const entry = spotStatus[k];
|
const entry = spotStatus[k];
|
||||||
const st = entry?.status ?? '';
|
const st = entry?.status ?? '';
|
||||||
const style = statusStyle(st);
|
const style = statusStyle(st, entry?.muted);
|
||||||
const mode = inferSpotMode(p.spot.comment ?? '', p.spot.freq_hz);
|
const mode = inferSpotMode(p.spot.comment ?? '', p.spot.freq_hz);
|
||||||
return (
|
return (
|
||||||
<button
|
<button
|
||||||
@@ -567,10 +642,21 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
'hover:translate-x-0.5 hover:shadow',
|
'hover:translate-x-0.5 hover:shadow',
|
||||||
style.pill,
|
style.pill,
|
||||||
)}
|
)}
|
||||||
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t)}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
title={`${p.spot.dx_call}${entry?.country ? ' · ' + entry.country : ''} · ${p.spot.freq_khz.toFixed(1)} kHz · ${statusLabel(st, t, entry?.muted)}${markersFor(entry).map((m) => ' · ' + t(BMP_MARKER_LABEL[m.key])).join('')}${p.spot.comment ? ' · ' + p.spot.comment : ''}${p.spot.spotter ? ' · de ' + p.spot.spotter : ''}`}
|
||||||
>
|
>
|
||||||
{/* Status accent strip on the left */}
|
{/* Left accent strip. With no extra marker it repeats the status
|
||||||
<span className={cn('w-1 shrink-0', style.bar)} aria-hidden />
|
colour, exactly as before; otherwise it splits into one
|
||||||
|
segment per marker, so "worked entity + new park" shows both
|
||||||
|
instead of one hiding the other. */}
|
||||||
|
{(() => {
|
||||||
|
const marks = markersFor(entry);
|
||||||
|
if (marks.length === 0) return <span className={cn('w-1 shrink-0', style.bar)} aria-hidden />;
|
||||||
|
return (
|
||||||
|
<span className="w-1 shrink-0 flex flex-col" aria-hidden>
|
||||||
|
{marks.map((m) => <span key={m.key} className="flex-1" style={{ background: m.colour }} />)}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
})()}
|
||||||
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
<span className="flex items-center gap-1.5 px-2 font-mono text-[11px] font-bold leading-none">
|
||||||
<span>{p.spot.dx_call}</span>
|
<span>{p.spot.dx_call}</span>
|
||||||
{mode && (
|
{mode && (
|
||||||
@@ -590,6 +676,11 @@ export function BandMap({ band, spots, spotStatus, currentFreqHz, onSpotClick, o
|
|||||||
<LegendDot cls="bg-warning" label={t('bmp.legendNewBand')} />
|
<LegendDot cls="bg-warning" label={t('bmp.legendNewBand')} />
|
||||||
<LegendDot cls="bg-caution" label={t('bmp.legendNewSlot')} />
|
<LegendDot cls="bg-caution" label={t('bmp.legendNewSlot')} />
|
||||||
<LegendDot cls="bg-muted-foreground/30" label={t("bmp.legendWorked")} />
|
<LegendDot cls="bg-muted-foreground/30" label={t("bmp.legendWorked")} />
|
||||||
|
{/* The stacked markers, straight from the shared table so the legend
|
||||||
|
cannot drift from what the pills actually draw. */}
|
||||||
|
{BMP_MARKERS.map((m) => (
|
||||||
|
<LegendDot key={m.key} colour={m.colour} label={t(BMP_MARKER_LABEL[m.key])} />
|
||||||
|
))}
|
||||||
{/* Sub-band shading, so the wash behind the pills is never colour-alone. */}
|
{/* Sub-band shading, so the wash behind the pills is never colour-alone. */}
|
||||||
<span className="mx-0.5 opacity-40">|</span>
|
<span className="mx-0.5 opacity-40">|</span>
|
||||||
<LegendDot colour={SEG_CW} label={t("bmp.legendCW")} />
|
<LegendDot colour={SEG_CW} label={t("bmp.legendCW")} />
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import {
|
|||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Checkbox } from '@/components/ui/checkbox';
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot';
|
import { cleanSpotter, inferSpotMode, spotStatusKey } from '@/lib/spot';
|
||||||
|
import { markerColour } from '@/lib/spotMarkers';
|
||||||
|
import { applySpotDisplay, readSpotDisplayOptions } from '@/lib/spotDisplay';
|
||||||
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
|
import { loadLocal, loadRemote, saveState, seedLocal, whenGridPrefsReady } from '@/lib/gridPrefs';
|
||||||
import { useI18n } from '@/lib/i18n';
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
|
||||||
@@ -51,7 +53,14 @@ export type SpotStatusEntry = {
|
|||||||
country?: string;
|
country?: string;
|
||||||
continent?: string;
|
continent?: string;
|
||||||
worked_call?: boolean;
|
worked_call?: boolean;
|
||||||
|
// worked_slot: this exact callsign already worked on THIS band and mode.
|
||||||
|
// Always slot-scoped, unlike worked_call which follows the "same slot" option.
|
||||||
|
worked_slot?: boolean;
|
||||||
new_county?: boolean;
|
new_county?: boolean;
|
||||||
|
// The resolved US county and state, so the grid can SHOW them and not merely
|
||||||
|
// flag them. Filled from the offline ULS store, US callsigns only.
|
||||||
|
county?: string;
|
||||||
|
state?: string;
|
||||||
new_pota?: boolean;
|
new_pota?: boolean;
|
||||||
new_pfx?: boolean;
|
new_pfx?: boolean;
|
||||||
pfx?: string;
|
pfx?: string;
|
||||||
@@ -96,26 +105,54 @@ type ColEntry = ColDef<ClusterSpot> & { group: string; label: string; defaultVis
|
|||||||
// statusFor resolves the precomputed spot status (new / new-band / new-slot /
|
// statusFor resolves the precomputed spot status (new / new-band / new-slot /
|
||||||
// worked-call) for an ag-Grid cell's row.
|
// worked-call) for an ag-Grid cell's row.
|
||||||
function statusFor(p: any): SpotStatusEntry | undefined {
|
function statusFor(p: any): SpotStatusEntry | undefined {
|
||||||
return p?.context?.spotStatus?.[
|
const s = p?.context?.spotStatus?.[
|
||||||
spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
|
spotStatusKey(p.data?.dx_call, p.data?.band ?? '', p.data?.comment ?? '', p.data?.freq_hz)
|
||||||
];
|
];
|
||||||
|
// One chokepoint: the colour, the badges and the Status text all read through
|
||||||
|
// here, so the two display options are applied once rather than in each
|
||||||
|
// renderer — and the band map applies the very same function.
|
||||||
|
return applySpotDisplay(s, readSpotDisplayOptions());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Spot status is shown by COLOURING THE TEXT, never by a pill or a badge.
|
// Spot status is shown on the CELL that carries the fact — filled background for
|
||||||
|
// a novelty, tinted text otherwise — never by a pill or a badge.
|
||||||
//
|
//
|
||||||
// The pills were dropped: a rounded box has its own height and padding, so it
|
// The pills were dropped and stay dropped: a rounded box has its own height and
|
||||||
// sat off the row's baseline and the callsign inside it no longer lined up with
|
// padding, so it sat off the row's baseline and the callsign inside it no longer
|
||||||
// the plain callsigns above and below. A whole column of them read as chrome
|
// lined up with the plain callsigns above and below. A whole column of them read
|
||||||
// rather than as data. Same reasoning — and the same semantic tokens — as the
|
// as chrome rather than as data. Same reasoning — and the same semantic tokens —
|
||||||
// Y/N/R QSL columns in lib/qslStatus.ts.
|
// as the Y/N/R QSL columns in lib/qslStatus.ts.
|
||||||
//
|
//
|
||||||
// Which cell is coloured IS the message, so one colour is enough for all three:
|
// Which cell is marked IS the message:
|
||||||
//
|
//
|
||||||
// yellow call → new DXCC yellow band → new band yellow mode → new mode
|
// filled call → new DXCC filled band → new band filled mode → new mode
|
||||||
// blue call → already worked
|
// filled pfx → new prefix filled POTA → new park filled county → new county
|
||||||
|
// blue call → already worked (not a novelty, so text only)
|
||||||
const NEW = 'var(--warning)'; // yellow: something here is new
|
const NEW = 'var(--warning)'; // yellow: something here is new
|
||||||
const WKD = 'var(--info)'; // blue: this callsign is already in the log
|
const WKD = 'var(--info)'; // blue: this callsign is already in the log
|
||||||
|
|
||||||
|
// FILLING the cell that carries the fact, rather than only tinting its text.
|
||||||
|
//
|
||||||
|
// This is not a return to the pills that were dropped. A pill is a box INSIDE
|
||||||
|
// the cell: it has its own height and padding, so it sat off the row baseline
|
||||||
|
// and the callsign inside it stopped lining up with the plain callsigns above
|
||||||
|
// and below. A cell background has no geometry of its own — the text does not
|
||||||
|
// move by a single pixel — and it reads from across the room, which a tinted
|
||||||
|
// glyph does not.
|
||||||
|
//
|
||||||
|
// Which cell is filled is still the whole message: filled Band means new band,
|
||||||
|
// filled Pfx means new prefix, filled County means new county.
|
||||||
|
//
|
||||||
|
// The colours come from the same places they already came from — the semantic
|
||||||
|
// status tokens and lib/spotMarkers — so a fact keeps one colour across the
|
||||||
|
// grid, the band map and the filter chips. 22 % is the wash that survived both
|
||||||
|
// themes: enough to see at a glance, not enough to fight the text on it.
|
||||||
|
const fillStyle = (colour: string) => ({
|
||||||
|
background: `color-mix(in srgb, ${colour} 22%, transparent)`,
|
||||||
|
color: colour,
|
||||||
|
fontWeight: 700,
|
||||||
|
});
|
||||||
|
|
||||||
// cellText renders a cell value in an optional colour. An empty value keeps the
|
// cellText renders a cell value in an optional colour. An empty value keeps the
|
||||||
// muted dash the grid used before, so blank cells still read as "nothing here"
|
// muted dash the grid used before, so blank cells still read as "nothing here"
|
||||||
// rather than as a gap.
|
// rather than as a gap.
|
||||||
@@ -134,6 +171,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
|||||||
case 'new-band':
|
case 'new-band':
|
||||||
case 'new-mode':
|
case 'new-mode':
|
||||||
case 'new-slot':
|
case 'new-slot':
|
||||||
|
case 'new-call':
|
||||||
return NEW;
|
return NEW;
|
||||||
default:
|
default:
|
||||||
return s?.worked_call ? WKD : null;
|
return s?.worked_call ? WKD : null;
|
||||||
@@ -149,7 +187,7 @@ function statusColor(s: SpotStatusEntry | undefined): string | null {
|
|||||||
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
// (still loading, or entity unknown) are NOT dimmed — that would flicker.
|
||||||
function isDull(s: SpotStatusEntry | undefined): boolean {
|
function isDull(s: SpotStatusEntry | undefined): boolean {
|
||||||
if (!s || !s.status) return false;
|
if (!s || !s.status) return false;
|
||||||
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot') return false;
|
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||||
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
|
return !(s.worked_call || s.new_pota || s.new_county || s.new_pfx);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,11 +214,12 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
|
headerName: t('clg2.c.call'), field: 'dx_call' as any, width: 120,
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
// NEW DXCC → yellow call. Already worked → blue call. Anything else keeps
|
// NEW DXCC fills the call cell. Already worked only tints the text blue:
|
||||||
// the theme's normal ink so ordinary callsigns don't shout.
|
// 'worked' is not a novelty, and filling it would wash most of the rows.
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.status === 'new' ? fillStyle('var(--danger)') : null) as any,
|
||||||
cellRenderer: (p: any) => {
|
cellRenderer: (p: any) => {
|
||||||
const s = statusFor(p);
|
const s = statusFor(p);
|
||||||
const color = s?.status === 'new' ? NEW : s?.worked_call ? WKD : null;
|
const color = s?.status === 'new' ? null : s?.worked_call ? WKD : null;
|
||||||
return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
|
return <span style={{ color: color ?? undefined, fontWeight: 700 }}>{p.value ?? ''}</span>;
|
||||||
},
|
},
|
||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
@@ -203,6 +242,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
|
else if (s?.status === 'new-band') parts.push(t('clg2.newBand'));
|
||||||
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
|
else if (s?.status === 'new-mode') parts.push(t('clg2.newMode'));
|
||||||
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
|
else if (s?.status === 'new-slot') parts.push(t('clg2.newSlot'));
|
||||||
|
else if (s?.status === 'new-call') parts.push(t('clg2.newCall'));
|
||||||
else if (s?.worked_call) parts.push(t('clg2.wkdCall'));
|
else if (s?.worked_call) parts.push(t('clg2.wkdCall'));
|
||||||
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
if (s?.new_county) parts.push(t('clg2.newCounty'));
|
||||||
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
if (s?.new_pota) parts.push(t('clg2.newPota'));
|
||||||
@@ -218,12 +258,15 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
: s?.status === 'new-band' ? t('clg2.newBand')
|
: s?.status === 'new-band' ? t('clg2.newBand')
|
||||||
: s?.status === 'new-mode' ? t('clg2.newMode')
|
: s?.status === 'new-mode' ? t('clg2.newMode')
|
||||||
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
: s?.status === 'new-slot' ? t('clg2.newSlot')
|
||||||
|
: s?.status === 'new-call' ? t('clg2.newCall')
|
||||||
: t('clg2.wkdCall');
|
: t('clg2.wkdCall');
|
||||||
parts.push({ text: label, color: main });
|
parts.push({ text: label, color: main });
|
||||||
}
|
}
|
||||||
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: 'var(--success)' });
|
// Colours from lib/spotMarkers — shared with the band map so a marker is
|
||||||
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: 'var(--success)' });
|
// never one colour here and another there.
|
||||||
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: 'var(--caution)' });
|
if (s?.new_county) parts.push({ text: t('clg2.newCounty'), color: markerColour('new_county') });
|
||||||
|
if (s?.new_pota) parts.push({ text: t('clg2.newPota'), color: markerColour('new_pota') });
|
||||||
|
if (s?.new_pfx) parts.push({ text: t('clg2.newPfx'), color: markerColour('new_pfx') });
|
||||||
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
if (parts.length === 0) return <span style={{ color: 'var(--muted-foreground)', fontSize: 10 }}>—</span>;
|
||||||
return (
|
return (
|
||||||
<span style={{ whiteSpace: 'nowrap' }}>
|
<span style={{ whiteSpace: 'nowrap' }}>
|
||||||
@@ -240,6 +283,7 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
if (s?.status === 'new') return t('clg2.tipNewDxcc', { country: s?.country ?? '' });
|
||||||
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
if (s?.status === 'new-band') return t('clg2.tipNewBand');
|
||||||
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
if (s?.status === 'new-slot') return t('clg2.tipNewSlotBand');
|
||||||
|
if (s?.status === 'new-call') return t('clg2.tipNewCall');
|
||||||
if (s?.worked_call) return t('clg2.tipWorkedCall');
|
if (s?.worked_call) return t('clg2.tipWorkedCall');
|
||||||
return undefined;
|
return undefined;
|
||||||
},
|
},
|
||||||
@@ -248,7 +292,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
|
group: 'Spot', label: t('clg2.c.pota'), colId: 'pota',
|
||||||
headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
headerName: t('clg2.c.pota'), field: 'pota_ref' as any, width: 92, cellClass: 'font-mono',
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellStyle: { color: 'var(--success)' },
|
cellStyle: (p: any) => (statusFor(p)?.new_pota
|
||||||
|
? fillStyle(markerColour('new_pota'))
|
||||||
|
: { color: 'var(--success)' }) as any,
|
||||||
tooltipValueGetter: (p: any) => (p.data?.pota_name ? t('clg2.tipPota', { name: p.data.pota_name }) : undefined),
|
tooltipValueGetter: (p: any) => (p.data?.pota_name ? t('clg2.tipPota', { name: p.data.pota_name }) : undefined),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -263,8 +309,9 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
headerName: t('clg2.c.band'), field: 'band' as any, width: 75,
|
||||||
defaultVisible: true,
|
defaultVisible: true,
|
||||||
cellClass: 'font-mono',
|
cellClass: 'font-mono',
|
||||||
// NEW BAND for this entity → the band text turns yellow.
|
// NEW BAND for this entity → the band cell is filled.
|
||||||
cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-band' ? NEW : null),
|
cellStyle: (p: any) => (statusFor(p)?.status === 'new-band' ? fillStyle(NEW) : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
|
tooltipValueGetter: (p: any) => (statusFor(p)?.status === 'new-band' ? t('clg2.tipNewBand') : undefined),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -277,7 +324,8 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
// for the entity. NEW SLOT means band AND mode were each worked before (just
|
// for the entity. NEW SLOT means band AND mode were each worked before (just
|
||||||
// not together), so highlighting the mode cell would wrongly imply "CW is new";
|
// not together), so highlighting the mode cell would wrongly imply "CW is new";
|
||||||
// that case is signalled by the Status badge alone.
|
// that case is signalled by the Status badge alone.
|
||||||
cellRenderer: (p: any) => cellText(p.value, statusFor(p)?.status === 'new-mode' ? NEW : null),
|
cellStyle: (p: any) => (statusFor(p)?.status === 'new-mode' ? fillStyle('var(--caution)') : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
tooltipValueGetter: (p: any) => {
|
tooltipValueGetter: (p: any) => {
|
||||||
const st = statusFor(p)?.status;
|
const st = statusFor(p)?.status;
|
||||||
if (st === 'new-mode') return t('clg2.tipNewMode');
|
if (st === 'new-mode') return t('clg2.tipNewMode');
|
||||||
@@ -289,7 +337,25 @@ const makeColCatalog = (t: TFn): ColEntry[] => [
|
|||||||
group: 'Spot', label: t('clg2.c.pfx'), colId: 'pfx',
|
group: 'Spot', label: t('clg2.c.pfx'), colId: 'pfx',
|
||||||
headerName: t('clg2.c.pfx'), width: 60, cellClass: 'font-mono',
|
headerName: t('clg2.c.pfx'), width: 60, cellClass: 'font-mono',
|
||||||
valueGetter: (p: any) => fmtPfx(p.data?.dx_call ?? ''),
|
valueGetter: (p: any) => fmtPfx(p.data?.dx_call ?? ''),
|
||||||
cellStyle: { color: 'var(--muted-foreground)' },
|
// NEW PFX fills the prefix cell, in the prefix marker's own colour.
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.new_pfx
|
||||||
|
? fillStyle(markerColour('new_pfx'))
|
||||||
|
: { color: 'var(--muted-foreground)' }) as any,
|
||||||
|
tooltipValueGetter: (p: any) => (statusFor(p)?.new_pfx ? t('clg2.tipNewPfx') : undefined),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
group: 'Geo', label: t('clg2.c.county'), colId: 'county',
|
||||||
|
headerName: t('clg2.c.county'), width: 130, cellClass: 'font-mono',
|
||||||
|
// Not on the spot: resolved per callsign from the offline ULS store, so it
|
||||||
|
// stays empty for non-US calls and until that database is downloaded.
|
||||||
|
valueGetter: (p: any) => {
|
||||||
|
const s = statusFor(p);
|
||||||
|
if (!s?.county) return '';
|
||||||
|
return s.state ? s.county + ', ' + s.state : s.county;
|
||||||
|
},
|
||||||
|
cellStyle: (p: any) => (statusFor(p)?.new_county ? fillStyle(markerColour('new_county')) : null) as any,
|
||||||
|
cellRenderer: (p: any) => cellText(p.value, null),
|
||||||
|
tooltipValueGetter: (p: any) => (statusFor(p)?.new_county ? t('clg2.tipNewCounty') : undefined),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
group: 'Geo', label: t('clg2.c.cqz'), colId: 'cqz',
|
group: 'Geo', label: t('clg2.c.cqz'), colId: 'cqz',
|
||||||
|
|||||||
@@ -47,12 +47,33 @@ const ZERO: IcomState = {
|
|||||||
|
|
||||||
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
||||||
// the plain SetFrequency command — no band-stacking codes needed. Hz values.
|
// the plain SetFrequency command — no band-stacking codes needed. Hz values.
|
||||||
const BANDS: { l: string; hz: number }[] = [
|
type Band = { l: string; hz: number };
|
||||||
|
|
||||||
|
const HF_BANDS: Band[] = [
|
||||||
{ l: '160', hz: 1_840_000 }, { l: '80', hz: 3_750_000 }, { l: '40', hz: 7_100_000 },
|
{ l: '160', hz: 1_840_000 }, { l: '80', hz: 3_750_000 }, { l: '40', hz: 7_100_000 },
|
||||||
{ l: '30', hz: 10_130_000 }, { l: '20', hz: 14_150_000 }, { l: '17', hz: 18_130_000 },
|
{ l: '30', hz: 10_130_000 }, { l: '20', hz: 14_150_000 }, { l: '17', hz: 18_130_000 },
|
||||||
{ l: '15', hz: 21_250_000 }, { l: '12', hz: 24_950_000 }, { l: '10', hz: 28_400_000 },
|
{ l: '15', hz: 21_250_000 }, { l: '12', hz: 24_950_000 }, { l: '10', hz: 28_400_000 },
|
||||||
{ l: '6', hz: 50_150_000 },
|
|
||||||
];
|
];
|
||||||
|
const B6 = { l: '6', hz: 50_150_000 };
|
||||||
|
const B2 = { l: '2', hz: 144_300_000 }; // SSB calling
|
||||||
|
const B70 = { l: '70cm', hz: 432_200_000 }; // SSB calling
|
||||||
|
const B23 = { l: '23cm', hz: 1_296_200_000 }; // SSB calling
|
||||||
|
|
||||||
|
// Band buttons jump the VFO to a sensible default frequency (SSB/CW mix) using
|
||||||
|
// the plain SetFrequency command — no band-stacking codes needed.
|
||||||
|
//
|
||||||
|
// Which buttons to OFFER depends on the radio, exactly as the attenuator steps
|
||||||
|
// do below. An IC-9700 has no HF at all, yet the console was showing it 160
|
||||||
|
// through 6 and none of the bands it actually covers: ten dead buttons, and no
|
||||||
|
// way to change band from here on the only rig where you would want to.
|
||||||
|
function bandsFor(model?: string): Band[] {
|
||||||
|
const m = (model ?? '').toUpperCase();
|
||||||
|
if (m.includes('9700')) return [B2, B70, B23]; // VHF/UHF/SHF only
|
||||||
|
if (m.includes('705')) return [...HF_BANDS, B6, B2, B70];
|
||||||
|
if (m.includes('9100')) return [...HF_BANDS, B6, B2, B70, B23];
|
||||||
|
// 7300 / 7610 / 7100 / unknown: HF + 6 m, the historical list.
|
||||||
|
return [...HF_BANDS, B6];
|
||||||
|
}
|
||||||
|
|
||||||
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
|
// Mode buttons for the console (like RS-BA1's row). SetCATMode picks USB/LSB for
|
||||||
// SSB by frequency and the rig's data variant for digital modes.
|
// SSB by frequency and the rig's data variant for digital modes.
|
||||||
@@ -85,7 +106,10 @@ function bandOfHz(hz?: number): string {
|
|||||||
['160', 1.8, 2.0], ['80', 3.5, 4.0], ['60', 5.25, 5.45], ['40', 7.0, 7.3],
|
['160', 1.8, 2.0], ['80', 3.5, 4.0], ['60', 5.25, 5.45], ['40', 7.0, 7.3],
|
||||||
['30', 10.1, 10.15], ['20', 14.0, 14.35], ['17', 18.068, 18.168],
|
['30', 10.1, 10.15], ['20', 14.0, 14.35], ['17', 18.068, 18.168],
|
||||||
['15', 21.0, 21.45], ['12', 24.89, 24.99], ['10', 28.0, 29.7],
|
['15', 21.0, 21.45], ['12', 24.89, 24.99], ['10', 28.0, 29.7],
|
||||||
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0], ['70', 430.0, 450.0],
|
// Labels must match the band buttons' exactly — this is only used to light
|
||||||
|
// the button for the band the rig is on, and '70' never matched '70cm'.
|
||||||
|
['6', 50.0, 54.0], ['4', 70.0, 70.5], ['2', 144.0, 148.0],
|
||||||
|
['70cm', 430.0, 450.0], ['23cm', 1240.0, 1300.0],
|
||||||
];
|
];
|
||||||
for (const [name, lo, hi] of bands) if (mhz >= lo && mhz <= hi) return name;
|
for (const [name, lo, hi] of bands) if (mhz >= lo && mhz <= hi) return name;
|
||||||
return '';
|
return '';
|
||||||
@@ -749,7 +773,7 @@ export function IcomPanel({ onReportRST, isNetwork = false }: { onReportRST?: (r
|
|||||||
{/* Band buttons + antenna selection. */}
|
{/* Band buttons + antenna selection. */}
|
||||||
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
<Card icon={Antenna} title={t('icmp.bandsAntenna')} accent="#0891b2">
|
||||||
<div className="grid grid-cols-5 gap-1.5">
|
<div className="grid grid-cols-5 gap-1.5">
|
||||||
{BANDS.map((b) => {
|
{bandsFor(st.model).map((b) => {
|
||||||
const here = bandOfHz(mainHz) === b.l;
|
const here = bandOfHz(mainHz) === b.l;
|
||||||
return (
|
return (
|
||||||
<button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
|
<button key={b.l} type="button" onClick={() => SetCATFrequency(b.hz).catch(() => {})}
|
||||||
|
|||||||
@@ -43,9 +43,20 @@ function unwrapLon(ring: [number, number][]): [number, number][] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
const CARTO_LIGHT = 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png';
|
||||||
const OSM = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
|
|
||||||
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
const CARTO_ATTR = '© OpenStreetMap © CARTO';
|
||||||
const OSM_ATTR = '© OpenStreetMap contributors';
|
|
||||||
|
// NOT tile.openstreetmap.org. Those are OpenStreetMap's VOLUNTEER-run servers,
|
||||||
|
// and their usage policy does not cover a desktop application handed to an
|
||||||
|
// unbounded number of operators — they blocked OpsLog for it, and every user's
|
||||||
|
// map filled with "Access blocked / 403" tiles at once.
|
||||||
|
//
|
||||||
|
// The replacements are tile services whose terms do cover redistributed apps,
|
||||||
|
// with no API key: Carto (whose tiles are OSM-derived, hence the attribution
|
||||||
|
// still credits OpenStreetMap) and Esri. Anything added here later must be
|
||||||
|
// checked the same way — a free tile URL is not the same thing as a tile URL we
|
||||||
|
// are allowed to ship.
|
||||||
|
const ESRI_STREET = 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}';
|
||||||
|
const ESRI_STREET_ATTR = 'Tiles © Esri — Source: Esri, HERE, Garmin, © OpenStreetMap contributors';
|
||||||
|
|
||||||
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
// Selectable basemaps for the world (great-circle) map. All key-free and all
|
||||||
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
// LABELLED (country/continent names). `labelsUrl` adds a transparent place-name
|
||||||
@@ -55,7 +66,7 @@ const BASEMAPS: Record<BasemapKey, { label: string; url: string; attr: string; s
|
|||||||
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
light: { label: 'Light', url: CARTO_LIGHT, attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
voyager: { label: 'Voyager', url: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png',
|
||||||
attr: CARTO_ATTR, subdomains: 'abcd' },
|
attr: CARTO_ATTR, subdomains: 'abcd' },
|
||||||
street: { label: 'Street', url: OSM, attr: OSM_ATTR },
|
street: { label: 'Street', url: ESRI_STREET, attr: ESRI_STREET_ATTR },
|
||||||
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
satellite: { label: 'Satellite', url: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||||
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
attr: 'Tiles © Esri — Source: Esri, Maxar, Earthstar Geographics',
|
||||||
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
labelsUrl: 'https://server.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer/tile/{z}/{y}/{x}' },
|
||||||
@@ -416,7 +427,14 @@ export function LocatorMap({ toGrid, toLabel }: LocatorProps) {
|
|||||||
if (locatorRef.current && !locatorMap.current) {
|
if (locatorRef.current && !locatorMap.current) {
|
||||||
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
const m = L.map(locatorRef.current, { zoomControl: true, attributionControl: true })
|
||||||
.setView([20, 0], 2);
|
.setView([20, 0], 2);
|
||||||
L.tileLayer(OSM, { attribution: OSM_ATTR, maxZoom: 19 }).addTo(m);
|
// Same restraint as the world map: fetch on idle, not mid-pan, and keep a
|
||||||
|
// single ring of buffer tiles. Requesting tiles as fast as the pointer
|
||||||
|
// moves is what gets an app blocked, and the next provider is under no
|
||||||
|
// more obligation to tolerate it than the last one was.
|
||||||
|
L.tileLayer(CARTO_LIGHT, {
|
||||||
|
attribution: CARTO_ATTR, subdomains: 'abcd', maxZoom: 19,
|
||||||
|
updateWhenIdle: true, updateWhenZooming: false, keepBuffer: 1,
|
||||||
|
}).addTo(m);
|
||||||
locatorOverlay.current = L.layerGroup().addTo(m);
|
locatorOverlay.current = L.layerGroup().addTo(m);
|
||||||
locatorMap.current = m;
|
locatorMap.current = m;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ import { EventsOn } from '../../wailsjs/runtime/runtime';
|
|||||||
import {
|
import {
|
||||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter, DialogDescription,
|
||||||
} from '@/components/ui/dialog';
|
} from '@/components/ui/dialog';
|
||||||
|
import { WebPublishPanel } from '@/components/WebPublishPanel';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Input } from '@/components/ui/input';
|
import { Input } from '@/components/ui/input';
|
||||||
import { Label } from '@/components/ui/label';
|
import { Label } from '@/components/ui/label';
|
||||||
@@ -182,6 +183,7 @@ type SectionId =
|
|||||||
| 'external-services'
|
| 'external-services'
|
||||||
| 'udp'
|
| 'udp'
|
||||||
| 'adifmon'
|
| 'adifmon'
|
||||||
|
| 'webpublish'
|
||||||
| 'lookup'
|
| 'lookup'
|
||||||
| 'lists-bands'
|
| 'lists-bands'
|
||||||
| 'lists-modes'
|
| 'lists-modes'
|
||||||
@@ -272,6 +274,7 @@ function buildTree(flexAvailable: boolean, t: (k: string) => string): TreeNode[]
|
|||||||
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
{ kind: 'item', label: t('sec.cluster'), id: 'cluster' },
|
||||||
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
{ kind: 'item', label: t('sec.udp'), id: 'udp' },
|
||||||
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
{ kind: 'item', label: t('sec.adifmon'), id: 'adifmon' },
|
||||||
|
{ kind: 'item', label: t('sec.webpublish'), id: 'webpublish' },
|
||||||
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
{ kind: 'item', label: t('sec.uscounties'), id: 'uscounties' },
|
||||||
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
{ kind: 'item', label: t('sec.database'), id: 'database' },
|
||||||
{ kind: 'item', label: t('sec.autostart'), id: 'autostart' },
|
{ kind: 'item', label: t('sec.autostart'), id: 'autostart' },
|
||||||
@@ -289,6 +292,7 @@ const SECTION_KEY: Partial<Record<SectionId, string>> = {
|
|||||||
'external-services': 'sec.external', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
'external-services': 'sec.external', lookup: 'sec.lookup', 'lists-bands': 'sec.bands', 'lists-modes': 'sec.modes',
|
||||||
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
cluster: 'sec.cluster', backup: 'sec.backup', database: 'sec.database', autostart: 'sec.autostart', udp: 'sec.udp',
|
||||||
adifmon: 'sec.adifmon',
|
adifmon: 'sec.adifmon',
|
||||||
|
webpublish: 'sec.webpublish',
|
||||||
uscounties: 'sec.uscounties',
|
uscounties: 'sec.uscounties',
|
||||||
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
awards: 'sec.awards', cat: 'sec.cat', rotator: 'sec.rotator', winkeyer: 'sec.winkeyer', antenna: 'sec.antenna',
|
||||||
antgenius: 'sec.antgenius', tunergenius: 'sec.tunergenius', pgxl: 'sec.pgxl', flex: 'sec.flex', audio: 'sec.audio', general: 'sec.general', email: 'sec.email',
|
antgenius: 'sec.antgenius', tunergenius: 'sec.tunergenius', pgxl: 'sec.pgxl', flex: 'sec.flex', audio: 'sec.audio', general: 'sec.general', email: 'sec.email',
|
||||||
@@ -311,6 +315,7 @@ const SECTION_LABELS: Partial<Record<SectionId, string>> = {
|
|||||||
autostart: 'Autostart',
|
autostart: 'Autostart',
|
||||||
udp: 'UDP integrations',
|
udp: 'UDP integrations',
|
||||||
adifmon: 'ADIF monitor',
|
adifmon: 'ADIF monitor',
|
||||||
|
webpublish: 'Web publishing',
|
||||||
awards: 'Awards',
|
awards: 'Awards',
|
||||||
cat: 'CAT interface',
|
cat: 'CAT interface',
|
||||||
rotator: 'Rotator',
|
rotator: 'Rotator',
|
||||||
@@ -4132,6 +4137,11 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
|
onCheckedChange={(c) => { const v = !!c; setClusterWorkedSameSlot(v); writeUiPref('opslog.clusterWorkedSameSlot', v ? '1' : '0'); }} />
|
||||||
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
|
<span>{t('clu.workedSameSlot')} <span className="text-xs text-muted-foreground">{t('clu.workedSameSlotHint')}</span></span>
|
||||||
</label>
|
</label>
|
||||||
|
{/* "No colour on worked" and "colour what is unworked here" used to live
|
||||||
|
here. They moved to the Cluster tab's filter panel, next to Hide
|
||||||
|
worked: they are things an operator changes while working a run, not
|
||||||
|
things set up once. A preferences dialog you reopen every ten minutes
|
||||||
|
is a filter in the wrong place. */}
|
||||||
|
|
||||||
{/* Self-spot. The interval only shows once it's on — an interval for
|
{/* Self-spot. The interval only shows once it's on — an interval for
|
||||||
something switched off is just a question the operator can't act on. */}
|
something switched off is just a question the operator can't act on. */}
|
||||||
@@ -6025,6 +6035,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
|
// — useState/useEffect/useI18n — get a proper component context; PANELS[x]()
|
||||||
// is a plain call and hook-holding panels must go through JSX like this.
|
// is a plain call and hook-holding panels must go through JSX like this.
|
||||||
adifmon: () => <ADIFMonitorPanel />,
|
adifmon: () => <ADIFMonitorPanel />,
|
||||||
|
webpublish: () => <WebPublishPanel />,
|
||||||
relayauto: () => <RelayAutoPanel />,
|
relayauto: () => <RelayAutoPanel />,
|
||||||
backup: BackupPanel,
|
backup: BackupPanel,
|
||||||
database: DatabasePanel,
|
database: DatabasePanel,
|
||||||
|
|||||||
@@ -0,0 +1,211 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
|
import { Upload, FolderOpen, Loader2 } from 'lucide-react';
|
||||||
|
import {
|
||||||
|
GetWebPublishConfig, SaveWebPublishConfig, WebPublishColumns,
|
||||||
|
TestWebPublishFTP, PublishLogNow, GetWebPublishStatus, PickBackupFolder,
|
||||||
|
} from '../../wailsjs/go/main/App';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Checkbox } from '@/components/ui/checkbox';
|
||||||
|
import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select';
|
||||||
|
import { useI18n } from '@/lib/i18n';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
|
type Cfg = {
|
||||||
|
enabled: boolean; format: string; folder: string; file_name: string; title: string;
|
||||||
|
count: number; interval_min: number; columns: string[];
|
||||||
|
ftp_enabled: boolean; ftp_host: string; ftp_port: number; ftp_user: string;
|
||||||
|
ftp_password: string; ftp_tls: boolean; ftp_folder: string; ftp_file_name: string;
|
||||||
|
};
|
||||||
|
type Col = { key: string; header: string };
|
||||||
|
|
||||||
|
export function WebPublishPanel() {
|
||||||
|
const { t } = useI18n();
|
||||||
|
const [cfg, setCfg] = useState<Cfg | null>(null);
|
||||||
|
const [cols, setCols] = useState<Col[]>([]);
|
||||||
|
const [busy, setBusy] = useState<'' | 'test' | 'publish'>('');
|
||||||
|
const [msg, setMsg] = useState('');
|
||||||
|
const [err, setErr] = useState('');
|
||||||
|
// Raw text for the two numeric boxes: bound straight to the number they could
|
||||||
|
// not be cleared, the same trap as the Recent-QSOs Max field.
|
||||||
|
const [countText, setCountText] = useState('');
|
||||||
|
const [everyText, setEveryText] = useState('');
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
(async () => {
|
||||||
|
try {
|
||||||
|
const [c, k, st] = await Promise.all([GetWebPublishConfig(), WebPublishColumns(), GetWebPublishStatus()]);
|
||||||
|
setCfg(c as any);
|
||||||
|
setCols((k ?? []) as Col[]);
|
||||||
|
setCountText(String((c as any).count ?? 100));
|
||||||
|
setEveryText(String((c as any).interval_min ?? 0));
|
||||||
|
const s: any = st;
|
||||||
|
if (s?.last_err) setErr(s.last_err);
|
||||||
|
else if (s?.last_run) setMsg(t('wpub.lastRun') + ' ' + s.last_run);
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
})();
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
if (!cfg) return <p className="text-xs text-muted-foreground">…</p>;
|
||||||
|
const set = (p: Partial<Cfg>) => setCfg((c) => (c ? { ...c, ...p } : c));
|
||||||
|
|
||||||
|
// Every control saves immediately: this panel has no Save button of its own,
|
||||||
|
// matching the other "saved instantly" panels.
|
||||||
|
const save = async (next: Cfg) => {
|
||||||
|
setCfg(next);
|
||||||
|
try { await SaveWebPublishConfig(next as any); setErr(''); }
|
||||||
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
};
|
||||||
|
const patch = (p: Partial<Cfg>) => save({ ...cfg, ...p });
|
||||||
|
|
||||||
|
const toggleCol = (key: string) => {
|
||||||
|
const has = cfg.columns?.includes(key);
|
||||||
|
patch({ columns: has ? cfg.columns.filter((c) => c !== key) : [...(cfg.columns ?? []), key] });
|
||||||
|
};
|
||||||
|
|
||||||
|
const run = async (what: 'test' | 'publish') => {
|
||||||
|
setBusy(what); setMsg(''); setErr('');
|
||||||
|
try {
|
||||||
|
const r = what === 'test' ? await TestWebPublishFTP(cfg as any) : await PublishLogNow();
|
||||||
|
setMsg(String(r));
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
|
finally { setBusy(''); }
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="space-y-4 max-w-3xl">
|
||||||
|
<p className="text-xs text-muted-foreground leading-relaxed">{t('wpub.hint')}</p>
|
||||||
|
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.enabled} onCheckedChange={(c) => patch({ enabled: !!c })} />
|
||||||
|
{t('wpub.enable')}
|
||||||
|
</label>
|
||||||
|
|
||||||
|
{cfg.enabled && (<>
|
||||||
|
{/* ── The file ── */}
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<Label className="text-xs font-semibold">{t('wpub.fileSection')}</Label>
|
||||||
|
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||||
|
<Label className="text-sm">{t('wpub.format')}</Label>
|
||||||
|
<Select value={cfg.format} onValueChange={(v) => patch({ format: v })}>
|
||||||
|
<SelectTrigger className="h-8 w-56"><SelectValue /></SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="html">{t('wpub.formatHtml')}</SelectItem>
|
||||||
|
<SelectItem value="csv">{t('wpub.formatCsv')}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.folder')}</Label>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input className="h-8 font-mono text-xs flex-1" value={cfg.folder}
|
||||||
|
onChange={(e) => set({ folder: e.target.value })} onBlur={() => patch({ folder: cfg.folder })} />
|
||||||
|
<Button variant="outline" size="sm" className="h-8" onClick={async () => {
|
||||||
|
try { const p = await PickBackupFolder(); if (p) patch({ folder: p }); } catch { /* cancelled */ }
|
||||||
|
}}><FolderOpen className="size-3.5" /> {t('wpub.browse')}</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.fileName')}</Label>
|
||||||
|
<Input className="h-8 w-56 font-mono text-xs" value={cfg.file_name}
|
||||||
|
onChange={(e) => set({ file_name: e.target.value })} onBlur={() => patch({ file_name: cfg.file_name })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.title')}</Label>
|
||||||
|
<Input className="h-8" placeholder={t('wpub.titlePh')} value={cfg.title}
|
||||||
|
onChange={(e) => set({ title: e.target.value })} onBlur={() => patch({ title: cfg.title })} />
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.count')}</Label>
|
||||||
|
<Input type="number" min={1} max={100000} className="h-8 w-28 font-mono text-xs" value={countText}
|
||||||
|
onChange={(e) => setCountText(e.target.value)}
|
||||||
|
onBlur={() => {
|
||||||
|
const n = Math.floor(Number(countText));
|
||||||
|
if (Number.isFinite(n) && n > 0) patch({ count: n }); else setCountText(String(cfg.count));
|
||||||
|
}} />
|
||||||
|
|
||||||
|
<Label className="text-sm">{t('wpub.every')}</Label>
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Input type="number" min={0} max={1440} className="h-8 w-28 font-mono text-xs" value={everyText}
|
||||||
|
onChange={(e) => setEveryText(e.target.value)}
|
||||||
|
onBlur={() => {
|
||||||
|
const n = Math.floor(Number(everyText));
|
||||||
|
if (Number.isFinite(n) && n >= 0) patch({ interval_min: n }); else setEveryText(String(cfg.interval_min));
|
||||||
|
}} />
|
||||||
|
<span className="text-xs text-muted-foreground">{t('wpub.everyHint')}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Columns ── */}
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<Label className="text-xs font-semibold">{t('wpub.columns')}</Label>
|
||||||
|
<div className="flex flex-wrap gap-1.5">
|
||||||
|
{cols.map((c) => {
|
||||||
|
const on = cfg.columns?.includes(c.key);
|
||||||
|
return (
|
||||||
|
<button key={c.key} type="button" onClick={() => toggleCol(c.key)}
|
||||||
|
className={cn('px-2 py-0.5 rounded-full border text-[11px] font-medium transition-colors',
|
||||||
|
on ? 'border-primary bg-primary text-primary-foreground' : 'border-border text-muted-foreground hover:bg-muted')}>
|
||||||
|
{c.header}
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
<p className="text-[11px] text-muted-foreground">{t('wpub.columnsHint')}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* ── Upload ── */}
|
||||||
|
<div className="space-y-2 border-t border-border/60 pt-3">
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.ftp_enabled} onCheckedChange={(c) => patch({ ftp_enabled: !!c })} />
|
||||||
|
{t('wpub.ftpEnable')}
|
||||||
|
</label>
|
||||||
|
{cfg.ftp_enabled && (
|
||||||
|
<div className="grid grid-cols-[130px_1fr] gap-2 items-center">
|
||||||
|
<Label className="text-sm">{t('wpub.ftpHost')}</Label>
|
||||||
|
<div className="flex gap-2">
|
||||||
|
<Input className="h-8 flex-1" placeholder="ftp.example.com" value={cfg.ftp_host}
|
||||||
|
onChange={(e) => set({ ftp_host: e.target.value })} onBlur={() => patch({ ftp_host: cfg.ftp_host })} />
|
||||||
|
<Input type="number" className="h-8 w-24 font-mono text-xs" value={cfg.ftp_port}
|
||||||
|
onChange={(e) => set({ ftp_port: Number(e.target.value) || 21 })}
|
||||||
|
onBlur={() => patch({ ftp_port: cfg.ftp_port })} />
|
||||||
|
</div>
|
||||||
|
<Label className="text-sm">{t('wpub.ftpUser')}</Label>
|
||||||
|
<Input className="h-8" value={cfg.ftp_user}
|
||||||
|
onChange={(e) => set({ ftp_user: e.target.value })} onBlur={() => patch({ ftp_user: cfg.ftp_user })} />
|
||||||
|
<Label className="text-sm">{t('wpub.ftpPassword')}</Label>
|
||||||
|
<Input type="password" className="h-8" value={cfg.ftp_password}
|
||||||
|
onChange={(e) => set({ ftp_password: e.target.value })} onBlur={() => patch({ ftp_password: cfg.ftp_password })} />
|
||||||
|
<Label className="text-sm">{t('wpub.ftpFolder')}</Label>
|
||||||
|
<Input className="h-8 font-mono text-xs" placeholder="/www/log" value={cfg.ftp_folder}
|
||||||
|
onChange={(e) => set({ ftp_folder: e.target.value })} onBlur={() => patch({ ftp_folder: cfg.ftp_folder })} />
|
||||||
|
<Label className="text-sm">{t('wpub.ftpFileName')}</Label>
|
||||||
|
<Input className="h-8 w-56 font-mono text-xs" value={cfg.ftp_file_name}
|
||||||
|
onChange={(e) => set({ ftp_file_name: e.target.value })} onBlur={() => patch({ ftp_file_name: cfg.ftp_file_name })} />
|
||||||
|
<span />
|
||||||
|
<label className="flex items-center gap-2 text-sm cursor-pointer">
|
||||||
|
<Checkbox checked={cfg.ftp_tls} onCheckedChange={(c) => patch({ ftp_tls: !!c })} />
|
||||||
|
{t('wpub.ftpTls')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex items-center gap-3 border-t border-border/60 pt-3 flex-wrap">
|
||||||
|
<Button size="sm" onClick={() => run('publish')} disabled={busy !== ''}>
|
||||||
|
{busy === 'publish' ? <Loader2 className="size-3.5 animate-spin" /> : <Upload className="size-3.5" />}
|
||||||
|
{t('wpub.publishNow')}
|
||||||
|
</Button>
|
||||||
|
{cfg.ftp_enabled && (
|
||||||
|
<Button variant="outline" size="sm" onClick={() => run('test')} disabled={busy !== ''}>
|
||||||
|
{busy === 'test' ? <Loader2 className="size-3.5 animate-spin" /> : null}
|
||||||
|
{t('wpub.testFtp')}
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>)}
|
||||||
|
|
||||||
|
{msg && <p className="text-xs text-success break-all">{msg}</p>}
|
||||||
|
{err && <p className="text-xs text-danger break-all">{err}</p>}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,85 @@
|
|||||||
|
// Two operator options that change how a spot LOOKS, shared by the DX-cluster
|
||||||
|
// list and the band map so the two panels can never disagree about the same
|
||||||
|
// spot — the lesson already learnt with the marker colours.
|
||||||
|
//
|
||||||
|
// muteWorked — a station already worked gets no colour and no badge. It
|
||||||
|
// stays in the list, it simply stops competing for attention.
|
||||||
|
// slotHighlight — a callsign not yet worked on THIS band and mode is coloured,
|
||||||
|
// whatever the entity says. For an operator filling slots, a
|
||||||
|
// common entity on a new band+mode is the whole point, and the
|
||||||
|
// entity-level status calls it "worked".
|
||||||
|
//
|
||||||
|
// They compose deliberately: mute what is done, light up what is not.
|
||||||
|
|
||||||
|
export type SpotDisplayOptions = { muteWorked: boolean; slotHighlight: boolean };
|
||||||
|
|
||||||
|
export function readSpotDisplayOptions(): SpotDisplayOptions {
|
||||||
|
try {
|
||||||
|
return {
|
||||||
|
muteWorked: localStorage.getItem('opslog.clusterMuteWorked') === '1',
|
||||||
|
slotHighlight: localStorage.getItem('opslog.clusterSlotHighlight') === '1',
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return { muteWorked: false, slotHighlight: false };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Entry = {
|
||||||
|
status?: string;
|
||||||
|
worked_call?: boolean;
|
||||||
|
worked_slot?: boolean;
|
||||||
|
new_county?: boolean;
|
||||||
|
new_pota?: boolean;
|
||||||
|
new_pfx?: boolean;
|
||||||
|
muted?: boolean;
|
||||||
|
} | undefined;
|
||||||
|
|
||||||
|
// bringsNothingNew: the ENTITY is resolved and worked, and no other dimension
|
||||||
|
// (county, park, prefix) is new. Same test the cluster list already used to dim
|
||||||
|
// a row — muting reuses it rather than inventing a second notion of "done".
|
||||||
|
//
|
||||||
|
// Entity-level, NOT callsign-level: an operator can be on their 421st Bulgarian
|
||||||
|
// and still have never worked that particular station. That spot is muted here
|
||||||
|
// by design — it brings nothing to an award — and turning on the slot option is
|
||||||
|
// what brings it back, which is why the promotion above runs first.
|
||||||
|
//
|
||||||
|
// Note what is NOT muted: a status of new-band / new-slot survives, because
|
||||||
|
// having worked that callsign once on another band says nothing about the band
|
||||||
|
// in front of you.
|
||||||
|
function bringsNothingNew(s: Entry): boolean {
|
||||||
|
if (!s || !s.status) return false; // unresolved — never hide, it would flicker
|
||||||
|
if (s.status === 'new' || s.status === 'new-band' || s.status === 'new-mode' || s.status === 'new-slot' || s.status === 'new-call') return false;
|
||||||
|
return !(s.new_pota || s.new_county || s.new_pfx);
|
||||||
|
}
|
||||||
|
|
||||||
|
// applySpotDisplay rewrites a status entry per the options, so every consumer —
|
||||||
|
// colour, badge, status text — follows from one decision instead of each panel
|
||||||
|
// re-deriving it.
|
||||||
|
export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions): T {
|
||||||
|
if (!s) return s;
|
||||||
|
let e = s;
|
||||||
|
|
||||||
|
// ORDER MATTERS, and it is the whole difference between the two options
|
||||||
|
// composing and one cancelling the other.
|
||||||
|
//
|
||||||
|
// Slot promotion runs FIRST. A callsign not yet worked on this band and mode
|
||||||
|
// is not "done", so it must never be swallowed by the mute below — yet the
|
||||||
|
// mute test only looks at the entity, and an unworked callsign inside a worked
|
||||||
|
// entity is precisely the spot the second option exists to surface. Promoting
|
||||||
|
// first protects it for free: bringsNothingNew() returns false on new-slot.
|
||||||
|
if (o.slotHighlight && e.worked_slot === false && (!e.status || e.status === 'worked')) {
|
||||||
|
e = { ...e, status: 'new-call' } as NonNullable<T>;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (o.muteWorked && bringsNothingNew(e)) {
|
||||||
|
// Strip everything that paints: the row keeps its data, loses its emphasis.
|
||||||
|
//
|
||||||
|
// muted says WHY the status went empty. An empty status already meant
|
||||||
|
// "entity not resolved" in the band map, so without this flag every muted
|
||||||
|
// spot claimed its entity was unknown — with the country printed right next
|
||||||
|
// to it. Blanking is still what drives the colour, the badges and the
|
||||||
|
// ranking; muted only lets the tooltip stay honest.
|
||||||
|
return { ...e, status: '', worked_call: false, muted: true } as T;
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
// The "extra" spot markers — the ones ORTHOGONAL to the entity status.
|
||||||
|
//
|
||||||
|
// A spot's entity status (new DXCC / new band / new slot / worked) answers one
|
||||||
|
// question. These answer others that can be true at the same time: the park is
|
||||||
|
// new even if the entity is worked, the county is new even if the band is not.
|
||||||
|
// Both the DX-cluster list and the band map show them, and they have to agree —
|
||||||
|
// the same fact must not be green in one panel and violet in the next, so the
|
||||||
|
// colours live HERE and nowhere else. This is also the table a per-marker colour
|
||||||
|
// setting will drive, which is why it is a table rather than three constants.
|
||||||
|
//
|
||||||
|
// Colour choices:
|
||||||
|
// POTA green — parks; the association is worth keeping
|
||||||
|
// county violet — a chart hue, because every semantic token was already
|
||||||
|
// spoken for: red, orange and yellow are the entity
|
||||||
|
// statuses, blue is "callsign worked", green is POTA
|
||||||
|
// worked blue — matches the WKD-CALL badge the cluster list has always used
|
||||||
|
// prefix yellow — unchanged
|
||||||
|
export type SpotMarkerKey = 'new_pota' | 'new_county' | 'new_pfx' | 'worked_call';
|
||||||
|
|
||||||
|
export type SpotMarker = {
|
||||||
|
key: SpotMarkerKey;
|
||||||
|
colour: string; // a CSS colour — a var() reference, so it follows the theme
|
||||||
|
labelKey: string; // i18n key, short form (badge / legend)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Order is the display order, in both panels.
|
||||||
|
export const SPOT_MARKERS: SpotMarker[] = [
|
||||||
|
{ key: 'new_pota', colour: 'var(--success)', labelKey: 'clg2.newPota' },
|
||||||
|
{ key: 'new_county', colour: 'var(--chart-5)', labelKey: 'clg2.newCounty' },
|
||||||
|
{ key: 'new_pfx', colour: 'var(--caution)', labelKey: 'clg2.newPfx' },
|
||||||
|
{ key: 'worked_call', colour: 'var(--info)', labelKey: 'clg2.wkdCall' },
|
||||||
|
];
|
||||||
|
|
||||||
|
export const markerColour = (key: SpotMarkerKey): string =>
|
||||||
|
SPOT_MARKERS.find((m) => m.key === key)?.colour ?? 'var(--muted-foreground)';
|
||||||
|
|
||||||
|
// activeMarkers returns the markers set on a status entry, in display order.
|
||||||
|
export function activeMarkers(e: Record<string, unknown> | undefined): SpotMarker[] {
|
||||||
|
if (!e) return [];
|
||||||
|
return SPOT_MARKERS.filter((m) => !!e[m.key]);
|
||||||
|
}
|
||||||
@@ -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.clusterMuteWorked', // cluster/band map: no colour or badge on worked spots
|
||||||
|
'opslog.clusterSlotHighlight', // cluster/band map: colour calls not worked on this band+mode
|
||||||
'opslog.bandMapWidth', // docked band map: column width (px)
|
'opslog.bandMapWidth', // docked band map: column width (px)
|
||||||
'opslog.bandMapTabWidth', // Band map tab: shared card 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.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// Single source of truth for the app version shown in the UI (header + About).
|
// Single source of truth for the app version shown in the UI (header + About).
|
||||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||||
export const APP_VERSION = '0.24.1';
|
export const APP_VERSION = '0.24.3';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+16
@@ -10,12 +10,14 @@ import {catemu} from '../models';
|
|||||||
import {antgenius} from '../models';
|
import {antgenius} from '../models';
|
||||||
import {award} from '../models';
|
import {award} from '../models';
|
||||||
import {awardref} from '../models';
|
import {awardref} from '../models';
|
||||||
|
import {bandopen} from '../models';
|
||||||
import {cluster} from '../models';
|
import {cluster} from '../models';
|
||||||
import {extsvc} from '../models';
|
import {extsvc} from '../models';
|
||||||
import {powergenius} from '../models';
|
import {powergenius} from '../models';
|
||||||
import {spe} from '../models';
|
import {spe} from '../models';
|
||||||
import {solar} from '../models';
|
import {solar} from '../models';
|
||||||
import {tunergenius} from '../models';
|
import {tunergenius} from '../models';
|
||||||
|
import {webpub} from '../models';
|
||||||
import {winkeyer} from '../models';
|
import {winkeyer} from '../models';
|
||||||
import {alerts} from '../models';
|
import {alerts} from '../models';
|
||||||
import {audio} from '../models';
|
import {audio} from '../models';
|
||||||
@@ -385,6 +387,8 @@ export function GetAwards():Promise<Array<award.Result>>;
|
|||||||
|
|
||||||
export function GetBackupSettings():Promise<main.BackupSettings>;
|
export function GetBackupSettings():Promise<main.BackupSettings>;
|
||||||
|
|
||||||
|
export function GetBandOpenings():Promise<Array<bandopen.Opening>>;
|
||||||
|
|
||||||
export function GetCATSettings():Promise<main.CATSettings>;
|
export function GetCATSettings():Promise<main.CATSettings>;
|
||||||
|
|
||||||
export function GetCATState():Promise<cat.RigState>;
|
export function GetCATState():Promise<cat.RigState>;
|
||||||
@@ -509,6 +513,10 @@ export function GetUltrabeamSettings():Promise<main.UltrabeamSettings>;
|
|||||||
|
|
||||||
export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
|
export function GetUltrabeamStatus():Promise<main.UltrabeamStatusInfo>;
|
||||||
|
|
||||||
|
export function GetWebPublishConfig():Promise<webpub.Config>;
|
||||||
|
|
||||||
|
export function GetWebPublishStatus():Promise<main.WebPublishStatus>;
|
||||||
|
|
||||||
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
export function GetWhatsNew():Promise<Array<main.ChangelogEntry>>;
|
||||||
|
|
||||||
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
export function GetWinkeyerSettings():Promise<main.WinkeyerSettings>;
|
||||||
@@ -737,6 +745,8 @@ export function PickSaveDatabase():Promise<string>;
|
|||||||
|
|
||||||
export function PopulateBuiltinReferences(arg1:string):Promise<number>;
|
export function PopulateBuiltinReferences(arg1:string):Promise<number>;
|
||||||
|
|
||||||
|
export function PublishLogNow():Promise<string>;
|
||||||
|
|
||||||
export function QSLDefaultTemplateID():Promise<number>;
|
export function QSLDefaultTemplateID():Promise<number>;
|
||||||
|
|
||||||
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
export function QSLDeleteTemplate(arg1:number):Promise<void>;
|
||||||
@@ -913,6 +923,8 @@ export function SaveUDPIntegration(arg1:udp.Config):Promise<udp.Config>;
|
|||||||
|
|
||||||
export function SaveUltrabeamSettings(arg1:main.UltrabeamSettings):Promise<void>;
|
export function SaveUltrabeamSettings(arg1:main.UltrabeamSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function SaveWebPublishConfig(arg1:webpub.Config):Promise<void>;
|
||||||
|
|
||||||
export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
export function SaveWinkeyerSettings(arg1:main.WinkeyerSettings):Promise<void>;
|
||||||
|
|
||||||
export function ScpLookup(arg1:string):Promise<scp.Result>;
|
export function ScpLookup(arg1:string):Promise<scp.Result>;
|
||||||
@@ -1047,6 +1059,8 @@ export function TestStationDevice(arg1:main.StationDevice):Promise<main.StationT
|
|||||||
|
|
||||||
export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
export function TestUltrabeam(arg1:main.UltrabeamSettings):Promise<void>;
|
||||||
|
|
||||||
|
export function TestWebPublishFTP(arg1:webpub.Config):Promise<string>;
|
||||||
|
|
||||||
export function TuneYaesuATU():Promise<void>;
|
export function TuneYaesuATU():Promise<void>;
|
||||||
|
|
||||||
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
export function TunerGeniusActivate(arg1:number):Promise<void>;
|
||||||
@@ -1079,6 +1093,8 @@ export function UploadCallsign(arg1:string):Promise<string>;
|
|||||||
|
|
||||||
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
export function UploadQSOsManual(arg1:string,arg2:Array<number>):Promise<void>;
|
||||||
|
|
||||||
|
export function WebPublishColumns():Promise<Array<Record<string, string>>>;
|
||||||
|
|
||||||
export function WinkeyerBackspace():Promise<void>;
|
export function WinkeyerBackspace():Promise<void>;
|
||||||
|
|
||||||
export function WinkeyerConnect():Promise<void>;
|
export function WinkeyerConnect():Promise<void>;
|
||||||
|
|||||||
@@ -718,6 +718,10 @@ export function GetBackupSettings() {
|
|||||||
return window['go']['main']['App']['GetBackupSettings']();
|
return window['go']['main']['App']['GetBackupSettings']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetBandOpenings() {
|
||||||
|
return window['go']['main']['App']['GetBandOpenings']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetCATSettings() {
|
export function GetCATSettings() {
|
||||||
return window['go']['main']['App']['GetCATSettings']();
|
return window['go']['main']['App']['GetCATSettings']();
|
||||||
}
|
}
|
||||||
@@ -966,6 +970,14 @@ export function GetUltrabeamStatus() {
|
|||||||
return window['go']['main']['App']['GetUltrabeamStatus']();
|
return window['go']['main']['App']['GetUltrabeamStatus']();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function GetWebPublishConfig() {
|
||||||
|
return window['go']['main']['App']['GetWebPublishConfig']();
|
||||||
|
}
|
||||||
|
|
||||||
|
export function GetWebPublishStatus() {
|
||||||
|
return window['go']['main']['App']['GetWebPublishStatus']();
|
||||||
|
}
|
||||||
|
|
||||||
export function GetWhatsNew() {
|
export function GetWhatsNew() {
|
||||||
return window['go']['main']['App']['GetWhatsNew']();
|
return window['go']['main']['App']['GetWhatsNew']();
|
||||||
}
|
}
|
||||||
@@ -1422,6 +1434,10 @@ export function PopulateBuiltinReferences(arg1) {
|
|||||||
return window['go']['main']['App']['PopulateBuiltinReferences'](arg1);
|
return window['go']['main']['App']['PopulateBuiltinReferences'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function PublishLogNow() {
|
||||||
|
return window['go']['main']['App']['PublishLogNow']();
|
||||||
|
}
|
||||||
|
|
||||||
export function QSLDefaultTemplateID() {
|
export function QSLDefaultTemplateID() {
|
||||||
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
return window['go']['main']['App']['QSLDefaultTemplateID']();
|
||||||
}
|
}
|
||||||
@@ -1774,6 +1790,10 @@ export function SaveUltrabeamSettings(arg1) {
|
|||||||
return window['go']['main']['App']['SaveUltrabeamSettings'](arg1);
|
return window['go']['main']['App']['SaveUltrabeamSettings'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function SaveWebPublishConfig(arg1) {
|
||||||
|
return window['go']['main']['App']['SaveWebPublishConfig'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function SaveWinkeyerSettings(arg1) {
|
export function SaveWinkeyerSettings(arg1) {
|
||||||
return window['go']['main']['App']['SaveWinkeyerSettings'](arg1);
|
return window['go']['main']['App']['SaveWinkeyerSettings'](arg1);
|
||||||
}
|
}
|
||||||
@@ -2042,6 +2062,10 @@ export function TestUltrabeam(arg1) {
|
|||||||
return window['go']['main']['App']['TestUltrabeam'](arg1);
|
return window['go']['main']['App']['TestUltrabeam'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function TestWebPublishFTP(arg1) {
|
||||||
|
return window['go']['main']['App']['TestWebPublishFTP'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function TuneYaesuATU() {
|
export function TuneYaesuATU() {
|
||||||
return window['go']['main']['App']['TuneYaesuATU']();
|
return window['go']['main']['App']['TuneYaesuATU']();
|
||||||
}
|
}
|
||||||
@@ -2106,6 +2130,10 @@ export function UploadQSOsManual(arg1, arg2) {
|
|||||||
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
return window['go']['main']['App']['UploadQSOsManual'](arg1, arg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function WebPublishColumns() {
|
||||||
|
return window['go']['main']['App']['WebPublishColumns']();
|
||||||
|
}
|
||||||
|
|
||||||
export function WinkeyerBackspace() {
|
export function WinkeyerBackspace() {
|
||||||
return window['go']['main']['App']['WinkeyerBackspace']();
|
return window['go']['main']['App']['WinkeyerBackspace']();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -677,6 +677,56 @@ export namespace awardref {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace bandopen {
|
||||||
|
|
||||||
|
export class Opening {
|
||||||
|
band: string;
|
||||||
|
calls: number;
|
||||||
|
median_km: number;
|
||||||
|
bearing_min: number;
|
||||||
|
bearing_max: number;
|
||||||
|
in_season: boolean;
|
||||||
|
// Go type: time
|
||||||
|
at: any;
|
||||||
|
examples: string[];
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Opening(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.band = source["band"];
|
||||||
|
this.calls = source["calls"];
|
||||||
|
this.median_km = source["median_km"];
|
||||||
|
this.bearing_min = source["bearing_min"];
|
||||||
|
this.bearing_max = source["bearing_max"];
|
||||||
|
this.in_season = source["in_season"];
|
||||||
|
this.at = this.convertValues(source["at"], null);
|
||||||
|
this.examples = source["examples"];
|
||||||
|
}
|
||||||
|
|
||||||
|
convertValues(a: any, classs: any, asMap: boolean = false): any {
|
||||||
|
if (!a) {
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
if (a.slice && a.map) {
|
||||||
|
return (a as any[]).map(elem => this.convertValues(elem, classs));
|
||||||
|
} else if ("object" === typeof a) {
|
||||||
|
if (asMap) {
|
||||||
|
for (const key of Object.keys(a)) {
|
||||||
|
a[key] = new classs(a[key]);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
return new classs(a);
|
||||||
|
}
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace cat {
|
export namespace cat {
|
||||||
|
|
||||||
export class FlexMeter {
|
export class FlexMeter {
|
||||||
@@ -2959,9 +3009,12 @@ export namespace main {
|
|||||||
status: string;
|
status: string;
|
||||||
worked_call: boolean;
|
worked_call: boolean;
|
||||||
new_county: boolean;
|
new_county: boolean;
|
||||||
|
county?: string;
|
||||||
|
state?: string;
|
||||||
new_pota: boolean;
|
new_pota: boolean;
|
||||||
new_pfx: boolean;
|
new_pfx: boolean;
|
||||||
pfx?: string;
|
pfx?: string;
|
||||||
|
worked_slot: boolean;
|
||||||
|
|
||||||
static createFrom(source: any = {}) {
|
static createFrom(source: any = {}) {
|
||||||
return new SpotStatus(source);
|
return new SpotStatus(source);
|
||||||
@@ -2977,9 +3030,12 @@ export namespace main {
|
|||||||
this.status = source["status"];
|
this.status = source["status"];
|
||||||
this.worked_call = source["worked_call"];
|
this.worked_call = source["worked_call"];
|
||||||
this.new_county = source["new_county"];
|
this.new_county = source["new_county"];
|
||||||
|
this.county = source["county"];
|
||||||
|
this.state = source["state"];
|
||||||
this.new_pota = source["new_pota"];
|
this.new_pota = source["new_pota"];
|
||||||
this.new_pfx = source["new_pfx"];
|
this.new_pfx = source["new_pfx"];
|
||||||
this.pfx = source["pfx"];
|
this.pfx = source["pfx"];
|
||||||
|
this.worked_slot = source["worked_slot"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export class StartupStatus {
|
export class StartupStatus {
|
||||||
@@ -3267,6 +3323,20 @@ export namespace main {
|
|||||||
this.text = source["text"];
|
this.text = source["text"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class WebPublishStatus {
|
||||||
|
last_run: string;
|
||||||
|
last_err: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new WebPublishStatus(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.last_run = source["last_run"];
|
||||||
|
this.last_err = source["last_err"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class WinkeyerSettings {
|
export class WinkeyerSettings {
|
||||||
enabled: boolean;
|
enabled: boolean;
|
||||||
port: string;
|
port: string;
|
||||||
@@ -4813,6 +4883,53 @@ export namespace udp {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export namespace webpub {
|
||||||
|
|
||||||
|
export class Config {
|
||||||
|
enabled: boolean;
|
||||||
|
format: string;
|
||||||
|
folder: string;
|
||||||
|
file_name: string;
|
||||||
|
title: string;
|
||||||
|
count: number;
|
||||||
|
interval_min: number;
|
||||||
|
columns: string[];
|
||||||
|
ftp_enabled: boolean;
|
||||||
|
ftp_host: string;
|
||||||
|
ftp_port: number;
|
||||||
|
ftp_user: string;
|
||||||
|
ftp_password: string;
|
||||||
|
ftp_tls: boolean;
|
||||||
|
ftp_folder: string;
|
||||||
|
ftp_file_name: string;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new Config(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.enabled = source["enabled"];
|
||||||
|
this.format = source["format"];
|
||||||
|
this.folder = source["folder"];
|
||||||
|
this.file_name = source["file_name"];
|
||||||
|
this.title = source["title"];
|
||||||
|
this.count = source["count"];
|
||||||
|
this.interval_min = source["interval_min"];
|
||||||
|
this.columns = source["columns"];
|
||||||
|
this.ftp_enabled = source["ftp_enabled"];
|
||||||
|
this.ftp_host = source["ftp_host"];
|
||||||
|
this.ftp_port = source["ftp_port"];
|
||||||
|
this.ftp_user = source["ftp_user"];
|
||||||
|
this.ftp_password = source["ftp_password"];
|
||||||
|
this.ftp_tls = source["ftp_tls"];
|
||||||
|
this.ftp_folder = source["ftp_folder"];
|
||||||
|
this.ftp_file_name = source["ftp_file_name"];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
export namespace winkeyer {
|
export namespace winkeyer {
|
||||||
|
|
||||||
export class Status {
|
export class Status {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ require (
|
|||||||
github.com/go-ole/go-ole v1.3.0
|
github.com/go-ole/go-ole v1.3.0
|
||||||
github.com/go-sql-driver/mysql v1.10.0
|
github.com/go-sql-driver/mysql v1.10.0
|
||||||
github.com/gorilla/websocket v1.5.3
|
github.com/gorilla/websocket v1.5.3
|
||||||
|
github.com/jlaffaye/ftp v0.2.2
|
||||||
github.com/moutend/go-wca v0.3.0
|
github.com/moutend/go-wca v0.3.0
|
||||||
github.com/wailsapp/wails/v2 v2.11.0
|
github.com/wailsapp/wails/v2 v2.11.0
|
||||||
github.com/wneessen/go-mail v0.7.3
|
github.com/wneessen/go-mail v0.7.3
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs
|
|||||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
|
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
|
||||||
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
|
||||||
|
github.com/jlaffaye/ftp v0.2.2 h1:JwjrXCAIjN9ZYrF1/8qlmHFXDteh9MHYaiEIh/Oqtd8=
|
||||||
|
github.com/jlaffaye/ftp v0.2.2/go.mod h1:zuLAKdqFqFvNgkCrH0SC7K1XyUiydS7BFCmmoHUWWg0=
|
||||||
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
|
github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
|
||||||
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
|
github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
|
||||||
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
|
||||||
@@ -64,8 +66,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
|||||||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
|
github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
|
||||||
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
|
github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
|
||||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
|
github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
|
||||||
github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
|
github.com/tkrajina/go-reflector v0.5.8/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
|
||||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||||
|
|||||||
@@ -0,0 +1,253 @@
|
|||||||
|
// Package bandopen spots a band OPENING in the cluster stream — sporadic-E on
|
||||||
|
// 6 m, 4 m and 2 m above all.
|
||||||
|
//
|
||||||
|
// This is observation, not prediction. Every spot OpsLog receives is already
|
||||||
|
// enriched with the great-circle distance and bearing from the operator's own
|
||||||
|
// grid, so the signature of a single-hop Es opening is directly measurable:
|
||||||
|
// several distinct stations appearing on a VHF band, all at single-hop range,
|
||||||
|
// all in the same bearing sector, within a few minutes. That combination does
|
||||||
|
// not happen by chance — scattered spots at random distances and bearings are
|
||||||
|
// just a busy band.
|
||||||
|
//
|
||||||
|
// The season is REPORTED, never used to suppress. Es peaks in late spring and
|
||||||
|
// summer, so an opening in November is unusual — and an unusual opening is
|
||||||
|
// precisely the one an operator must not be told about last. InSeason only
|
||||||
|
// labels the announcement.
|
||||||
|
package bandopen
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Spot is the little a detection needs, taken from an enriched cluster spot.
|
||||||
|
type Spot struct {
|
||||||
|
Call string
|
||||||
|
Band string
|
||||||
|
DistKm int
|
||||||
|
Bearing int // degrees from the operator, short path
|
||||||
|
At time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// Config tunes the detector. The defaults describe single-hop sporadic E.
|
||||||
|
type Config struct {
|
||||||
|
Window time.Duration // how far back a burst may span
|
||||||
|
MinCalls int // distinct DX calls before it counts as an opening
|
||||||
|
MinKm, MaxKm int // single-hop Es range
|
||||||
|
BearingSpread int // widest arc (degrees) the spots may cover
|
||||||
|
Requiet time.Duration // silence after announcing a band, so it is announced once
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultConfig is the single-hop Es envelope.
|
||||||
|
//
|
||||||
|
// 500–2400 km: below ~500 km a 6 m contact is ordinary tropo or ground wave and
|
||||||
|
// says nothing about the ionosphere; beyond ~2400 km it is no longer one hop, so
|
||||||
|
// the bearing test stops meaning anything. 90° of spread because a genuine Es
|
||||||
|
// cloud illuminates a sector, not the whole horizon — the constraint that
|
||||||
|
// separates an opening from a merely busy evening.
|
||||||
|
func DefaultConfig() Config {
|
||||||
|
return Config{
|
||||||
|
Window: 12 * time.Minute,
|
||||||
|
MinCalls: 4,
|
||||||
|
MinKm: 500,
|
||||||
|
MaxKm: 2400,
|
||||||
|
BearingSpread: 90,
|
||||||
|
Requiet: 45 * time.Minute,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Bands watched. HF is deliberately absent: an "opening" on 20 m is the normal
|
||||||
|
// state of the band and announcing it would be noise.
|
||||||
|
var watched = map[string]bool{"6m": true, "4m": true, "2m": true}
|
||||||
|
|
||||||
|
// Watched reports whether a band is one the detector looks at.
|
||||||
|
func Watched(band string) bool { return watched[strings.ToLower(strings.TrimSpace(band))] }
|
||||||
|
|
||||||
|
// Opening is a detected opening, ready to be announced.
|
||||||
|
type Opening struct {
|
||||||
|
Band string `json:"band"`
|
||||||
|
Calls int `json:"calls"` // distinct DX stations seen
|
||||||
|
MedianKm int `json:"median_km"` // typical hop length
|
||||||
|
BearingMin int `json:"bearing_min"` // sector, degrees
|
||||||
|
BearingMax int `json:"bearing_max"`
|
||||||
|
InSeason bool `json:"in_season"` // false = unusual for the time of year
|
||||||
|
At time.Time `json:"at"`
|
||||||
|
Examples []string `json:"examples"` // a few callsigns, for the announcement
|
||||||
|
}
|
||||||
|
|
||||||
|
// Detector keeps the rolling window and the per-band quiet period.
|
||||||
|
type Detector struct {
|
||||||
|
cfg Config
|
||||||
|
recent []Spot
|
||||||
|
lastFire map[string]time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(cfg Config) *Detector {
|
||||||
|
if cfg.Window <= 0 {
|
||||||
|
cfg = DefaultConfig()
|
||||||
|
}
|
||||||
|
return &Detector{cfg: cfg, lastFire: map[string]time.Time{}}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add records a spot and returns an Opening when this spot completes one.
|
||||||
|
//
|
||||||
|
// Returns nil far more often than not; that is the point. lat is the operator's
|
||||||
|
// latitude, for the hemisphere the season depends on.
|
||||||
|
func (d *Detector) Add(s Spot, lat float64) *Opening {
|
||||||
|
if !Watched(s.Band) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
band := strings.ToLower(strings.TrimSpace(s.Band))
|
||||||
|
s.Band = band
|
||||||
|
if s.At.IsZero() {
|
||||||
|
s.At = time.Now()
|
||||||
|
}
|
||||||
|
// Out-of-range spots are dropped rather than stored: they can never be part
|
||||||
|
// of a single-hop detection, and keeping them only grows the window.
|
||||||
|
if s.DistKm < d.cfg.MinKm || s.DistKm > d.cfg.MaxKm {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
d.recent = append(d.recent, s)
|
||||||
|
d.prune(s.At)
|
||||||
|
|
||||||
|
if last, ok := d.lastFire[band]; ok && s.At.Sub(last) < d.cfg.Requiet {
|
||||||
|
return nil // already announced this band recently
|
||||||
|
}
|
||||||
|
|
||||||
|
inBand := make([]Spot, 0, len(d.recent))
|
||||||
|
for _, r := range d.recent {
|
||||||
|
if r.Band == band {
|
||||||
|
inBand = append(inBand, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
op := evaluate(band, inBand, d.cfg)
|
||||||
|
if op == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
op.At = s.At
|
||||||
|
op.InSeason = InSeason(band, s.At, lat)
|
||||||
|
d.lastFire[band] = s.At
|
||||||
|
return op
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Detector) prune(now time.Time) {
|
||||||
|
cut := now.Add(-d.cfg.Window)
|
||||||
|
keep := d.recent[:0]
|
||||||
|
for _, r := range d.recent {
|
||||||
|
if r.At.After(cut) {
|
||||||
|
keep = append(keep, r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
d.recent = keep
|
||||||
|
}
|
||||||
|
|
||||||
|
// evaluate decides whether a band's recent spots look like one opening.
|
||||||
|
func evaluate(band string, spots []Spot, cfg Config) *Opening {
|
||||||
|
// Distinct callsigns, not spot count: one station spotted by six skimmers is
|
||||||
|
// six spots and one station, and it is not an opening.
|
||||||
|
seen := map[string]Spot{}
|
||||||
|
for _, s := range spots {
|
||||||
|
c := strings.ToUpper(strings.TrimSpace(s.Call))
|
||||||
|
if c == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, dup := seen[c]; !dup {
|
||||||
|
seen[c] = s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(seen) < cfg.MinCalls {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
bearings := make([]int, 0, len(seen))
|
||||||
|
dists := make([]int, 0, len(seen))
|
||||||
|
calls := make([]string, 0, len(seen))
|
||||||
|
for c, s := range seen {
|
||||||
|
bearings = append(bearings, ((s.Bearing%360)+360)%360)
|
||||||
|
dists = append(dists, s.DistKm)
|
||||||
|
calls = append(calls, c)
|
||||||
|
}
|
||||||
|
lo, hi, spread := arc(bearings)
|
||||||
|
if spread > cfg.BearingSpread {
|
||||||
|
return nil // spots all round the compass — a busy band, not an opening
|
||||||
|
}
|
||||||
|
sort.Ints(dists)
|
||||||
|
sort.Strings(calls)
|
||||||
|
if len(calls) > 5 {
|
||||||
|
calls = calls[:5]
|
||||||
|
}
|
||||||
|
return &Opening{
|
||||||
|
Band: band, Calls: len(seen), MedianKm: dists[len(dists)/2],
|
||||||
|
BearingMin: lo, BearingMax: hi, Examples: calls,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// arc returns the smallest compass sector containing every bearing, coping with
|
||||||
|
// the wrap at north: 350° and 10° are 20° apart, not 340°.
|
||||||
|
func arc(b []int) (lo, hi, spread int) {
|
||||||
|
if len(b) == 0 {
|
||||||
|
return 0, 0, 0
|
||||||
|
}
|
||||||
|
s := append([]int(nil), b...)
|
||||||
|
sort.Ints(s)
|
||||||
|
// The widest GAP between consecutive bearings (round the circle) is the part
|
||||||
|
// NOT covered; the sector is everything else.
|
||||||
|
worst, at := -1, 0
|
||||||
|
for i := range s {
|
||||||
|
next := s[(i+1)%len(s)]
|
||||||
|
gap := next - s[i]
|
||||||
|
if i == len(s)-1 {
|
||||||
|
gap = next + 360 - s[i]
|
||||||
|
}
|
||||||
|
if gap > worst {
|
||||||
|
worst, at = gap, i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lo = s[(at+1)%len(s)]
|
||||||
|
hi = s[at]
|
||||||
|
spread = 360 - worst
|
||||||
|
return lo, hi, spread
|
||||||
|
}
|
||||||
|
|
||||||
|
// InSeason reports whether the time of year is one where sporadic E is common
|
||||||
|
// at the operator's latitude.
|
||||||
|
//
|
||||||
|
// Each hemisphere has a strong summer peak AND a smaller winter one, and both
|
||||||
|
// count as expected: a December opening in Europe surprises nobody. What the
|
||||||
|
// label marks is the genuinely odd month — an equinox opening.
|
||||||
|
//
|
||||||
|
// This LABELS a detection, it never gates one. Out-of-season Es exists, and it
|
||||||
|
// is precisely the opening an operator must not be told about last.
|
||||||
|
func InSeason(band string, t time.Time, lat float64) bool {
|
||||||
|
m := t.UTC().Month()
|
||||||
|
var months map[time.Month]bool
|
||||||
|
if lat >= 0 {
|
||||||
|
months = map[time.Month]bool{
|
||||||
|
time.May: true, time.June: true, time.July: true, time.August: true, // main
|
||||||
|
time.December: true, time.January: true, // lesser winter peak
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
months = map[time.Month]bool{
|
||||||
|
time.November: true, time.December: true, time.January: true, time.February: true,
|
||||||
|
time.June: true, time.July: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return months[m]
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sector renders the bearing range for a human, e.g. "NE (35–75°)".
|
||||||
|
func (o *Opening) Sector() string {
|
||||||
|
return compass(float64(o.BearingMin+o.BearingMax)/2) +
|
||||||
|
" (" + strconv.Itoa(o.BearingMin) + "–" + strconv.Itoa(o.BearingMax) + "°)"
|
||||||
|
}
|
||||||
|
|
||||||
|
func compass(deg float64) string {
|
||||||
|
names := []string{"N", "NE", "E", "SE", "S", "SW", "W", "NW"}
|
||||||
|
i := int(math.Round(deg/45)) % 8
|
||||||
|
if i < 0 {
|
||||||
|
i += 8
|
||||||
|
}
|
||||||
|
return names[i]
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
package bandopen
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func at(min int) time.Time {
|
||||||
|
return time.Date(2026, time.June, 15, 12, min, 0, 0, time.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
// feed pushes spots and returns the last Opening produced, if any.
|
||||||
|
func feed(d *Detector, lat float64, spots ...Spot) *Opening {
|
||||||
|
var last *Opening
|
||||||
|
for _, s := range spots {
|
||||||
|
if o := d.Add(s, lat); o != nil {
|
||||||
|
last = o
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return last
|
||||||
|
}
|
||||||
|
|
||||||
|
// The signature that must fire: several distinct stations, single-hop range,
|
||||||
|
// one bearing sector, within the window.
|
||||||
|
func TestDetectsSingleHopEs(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
o := feed(d, 46,
|
||||||
|
Spot{Call: "I0ABC", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||||
|
Spot{Call: "IK1DEF", Band: "6m", DistKm: 900, Bearing: 150, At: at(1)},
|
||||||
|
Spot{Call: "9A2GHI", Band: "6m", DistKm: 1200, Bearing: 120, At: at(2)},
|
||||||
|
Spot{Call: "S51JKL", Band: "6m", DistKm: 1000, Bearing: 130, At: at(3)},
|
||||||
|
)
|
||||||
|
if o == nil {
|
||||||
|
t.Fatal("four stations at single-hop range in one sector must read as an opening")
|
||||||
|
}
|
||||||
|
if o.Band != "6m" || o.Calls != 4 {
|
||||||
|
t.Errorf("got band=%s calls=%d, want 6m/4", o.Band, o.Calls)
|
||||||
|
}
|
||||||
|
if o.MedianKm < 900 || o.MedianKm > 1200 {
|
||||||
|
t.Errorf("median %d km outside the fed range", o.MedianKm)
|
||||||
|
}
|
||||||
|
if !o.InSeason {
|
||||||
|
t.Error("June in the northern hemisphere is Es season")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spots all round the compass are a busy band, not an opening — the bearing
|
||||||
|
// test is what separates the two.
|
||||||
|
func TestScatteredBearingsAreNotAnOpening(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
if o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 10, At: at(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 110, At: at(1)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 210, At: at(2)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 300, At: at(3)},
|
||||||
|
); o != nil {
|
||||||
|
t.Errorf("bearings spread round the compass must not fire (got %+v)", o)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// One station spotted by six skimmers is six spots and one station.
|
||||||
|
func TestRepeatedSpotsOfOneStationDoNotFire(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
var spots []Spot
|
||||||
|
for i := 0; i < 6; i++ {
|
||||||
|
spots = append(spots, Spot{Call: "I0ABC", Band: "6m", DistKm: 1100, Bearing: 140, At: at(i)})
|
||||||
|
}
|
||||||
|
if o := feed(d, 46, spots...); o != nil {
|
||||||
|
t.Error("one distinct callsign is not an opening however often it is spotted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Out of the single-hop window there is nothing to conclude: under ~500 km a
|
||||||
|
// 6 m contact is ordinary tropo.
|
||||||
|
func TestTropoRangeIsIgnored(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
if o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 120, Bearing: 140, At: at(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 200, Bearing: 145, At: at(1)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 90, Bearing: 150, At: at(2)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 150, Bearing: 135, At: at(3)},
|
||||||
|
); o != nil {
|
||||||
|
t.Error("short-range spots must not read as sporadic E")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spread over more than the window is not one burst.
|
||||||
|
func TestSpotsOutsideTheWindowDoNotAccumulate(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
if o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: at(20)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: at(40)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: at(60)},
|
||||||
|
); o != nil {
|
||||||
|
t.Error("spots an hour apart are not one opening")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// HF is never announced: an "opening" on 20 m is the band's normal state.
|
||||||
|
func TestHFIsNotWatched(t *testing.T) {
|
||||||
|
if Watched("20m") || Watched("40m") {
|
||||||
|
t.Error("HF must not be watched")
|
||||||
|
}
|
||||||
|
if !Watched("6m") || !Watched("2m") || !Watched("4m") {
|
||||||
|
t.Error("6/4/2 m must be watched")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Announced once, then quiet — an opening lasts hours and produces hundreds of
|
||||||
|
// spots; one alert is information, forty is noise.
|
||||||
|
func TestOneAnnouncementPerOpening(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
base := []Spot{
|
||||||
|
{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: at(0)},
|
||||||
|
{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: at(1)},
|
||||||
|
{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: at(2)},
|
||||||
|
{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: at(3)},
|
||||||
|
}
|
||||||
|
if o := feed(d, 46, base...); o == nil {
|
||||||
|
t.Fatal("expected the first opening")
|
||||||
|
}
|
||||||
|
if o := d.Add(Spot{Call: "E", Band: "6m", DistKm: 1050, Bearing: 135, At: at(4)}, 46); o != nil {
|
||||||
|
t.Error("a second alert inside the quiet period is noise")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Out-of-season openings still fire — they are the ones worth knowing about —
|
||||||
|
// and are simply labelled as unusual.
|
||||||
|
func TestOutOfSeasonStillFiresButIsLabelled(t *testing.T) {
|
||||||
|
d := New(DefaultConfig())
|
||||||
|
nov := func(m int) time.Time { return time.Date(2026, time.November, 3, 9, m, 0, 0, time.UTC) }
|
||||||
|
o := feed(d, 46,
|
||||||
|
Spot{Call: "A", Band: "6m", DistKm: 1100, Bearing: 140, At: nov(0)},
|
||||||
|
Spot{Call: "B", Band: "6m", DistKm: 900, Bearing: 150, At: nov(1)},
|
||||||
|
Spot{Call: "C", Band: "6m", DistKm: 1200, Bearing: 120, At: nov(2)},
|
||||||
|
Spot{Call: "D", Band: "6m", DistKm: 1000, Bearing: 130, At: nov(3)},
|
||||||
|
)
|
||||||
|
if o == nil {
|
||||||
|
t.Fatal("an out-of-season opening must still be announced")
|
||||||
|
}
|
||||||
|
if o.InSeason {
|
||||||
|
t.Error("November in the north is not Es season — it must be flagged unusual")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both hemispheres have a summer peak and a lesser winter one, and both read as
|
||||||
|
// expected. What must come out as UNUSUAL is an equinox month.
|
||||||
|
func TestSeasonFollowsTheHemisphere(t *testing.T) {
|
||||||
|
on := func(m time.Month) time.Time { return time.Date(2026, m, 15, 0, 0, 0, 0, time.UTC) }
|
||||||
|
const north, south = 46.0, -33.0
|
||||||
|
|
||||||
|
if !InSeason("6m", on(time.June), north) {
|
||||||
|
t.Error("June is the northern main season")
|
||||||
|
}
|
||||||
|
if !InSeason("6m", on(time.December), north) {
|
||||||
|
t.Error("December is the northern winter peak — not a surprise")
|
||||||
|
}
|
||||||
|
if !InSeason("6m", on(time.December), south) {
|
||||||
|
t.Error("December is the southern main season")
|
||||||
|
}
|
||||||
|
if !InSeason("6m", on(time.June), south) {
|
||||||
|
t.Error("June is the southern winter peak")
|
||||||
|
}
|
||||||
|
// The equinoxes are the quiet months in both hemispheres.
|
||||||
|
for _, lat := range []float64{north, south} {
|
||||||
|
for _, m := range []time.Month{time.March, time.April, time.September, time.October} {
|
||||||
|
if InSeason("6m", on(m), lat) {
|
||||||
|
t.Errorf("%v at lat %.0f should read as unusual", m, lat)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The sector must cope with the wrap at north: 350° and 10° are 20° apart.
|
||||||
|
func TestBearingArcWrapsAtNorth(t *testing.T) {
|
||||||
|
lo, hi, spread := arc([]int{350, 10, 0, 355})
|
||||||
|
if spread > 30 {
|
||||||
|
t.Errorf("spread %d° across north should be small (lo=%d hi=%d)", spread, lo, hi)
|
||||||
|
}
|
||||||
|
if _, _, s := arc([]int{0, 90, 180, 270}); s < 270 {
|
||||||
|
t.Errorf("bearings on all four quadrants should span nearly the circle, got %d", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,397 @@
|
|||||||
|
// Package webpub publishes the log as a file an operator can put on a website:
|
||||||
|
// a self-contained HTML page or a CSV, written locally and optionally uploaded
|
||||||
|
// by FTP/FTPS.
|
||||||
|
//
|
||||||
|
// Design notes that matter:
|
||||||
|
//
|
||||||
|
// - The local file is ALWAYS written first and the upload layered on top. A
|
||||||
|
// network failure then leaves a good file on disk rather than a truncated
|
||||||
|
// one on the server, and the operator can publish it by any other means.
|
||||||
|
// - The page is self-contained: no external CSS, font or script. It has to
|
||||||
|
// work dropped into any hosting, including one that blocks third-party
|
||||||
|
// requests, and it must not leak the reader's visit to anyone.
|
||||||
|
// - Columns are a fixed, curated set rather than "every ADIF field". This is
|
||||||
|
// a page shown to the public: RST and QSL status belong, the operator's
|
||||||
|
// home address does not.
|
||||||
|
package webpub
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/tls"
|
||||||
|
"encoding/csv"
|
||||||
|
"fmt"
|
||||||
|
"html"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/jlaffaye/ftp"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config is the whole feature's configuration. Stored per profile.
|
||||||
|
type Config struct {
|
||||||
|
Enabled bool `json:"enabled"`
|
||||||
|
Format string `json:"format"` // "html" | "csv"
|
||||||
|
Folder string `json:"folder"` // local output folder
|
||||||
|
FileName string `json:"file_name"` // e.g. "log.html"
|
||||||
|
Title string `json:"title"` // page heading; blank → callsign
|
||||||
|
Count int `json:"count"` // publish the last N QSOs
|
||||||
|
// IntervalMin is the periodic refresh in minutes. 0 = only republish when a
|
||||||
|
// QSO is logged. Every publish is debounced regardless (see Publisher).
|
||||||
|
IntervalMin int `json:"interval_min"`
|
||||||
|
Columns []string `json:"columns"`
|
||||||
|
|
||||||
|
FTPEnabled bool `json:"ftp_enabled"`
|
||||||
|
FTPHost string `json:"ftp_host"`
|
||||||
|
FTPPort int `json:"ftp_port"`
|
||||||
|
FTPUser string `json:"ftp_user"`
|
||||||
|
FTPPassword string `json:"ftp_password"`
|
||||||
|
FTPTLS bool `json:"ftp_tls"` // explicit AUTH TLS (FTPS)
|
||||||
|
FTPFolder string `json:"ftp_folder"`
|
||||||
|
FTPFileName string `json:"ftp_file_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Column is one publishable field: a stable key, the header printed in the
|
||||||
|
// file, and how to read it off a QSO.
|
||||||
|
type Column struct {
|
||||||
|
Key string
|
||||||
|
Header string
|
||||||
|
Value func(q *qso.QSO) string
|
||||||
|
}
|
||||||
|
|
||||||
|
func str(p *int) string {
|
||||||
|
if p == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strconv.Itoa(*p)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Columns is the curated set, in default display order. Add here to offer a new
|
||||||
|
// one; the stored config keeps keys, so order changes are safe.
|
||||||
|
var Columns = []Column{
|
||||||
|
{"date", "Date", func(q *qso.QSO) string { return q.QSODate.UTC().Format("2006-01-02") }},
|
||||||
|
{"time", "UTC", func(q *qso.QSO) string { return q.QSODate.UTC().Format("15:04") }},
|
||||||
|
{"callsign", "Call", func(q *qso.QSO) string { return q.Callsign }},
|
||||||
|
{"band", "Band", func(q *qso.QSO) string { return q.Band }},
|
||||||
|
{"mode", "Mode", func(q *qso.QSO) string { return q.Mode }},
|
||||||
|
{"freq", "Freq", func(q *qso.QSO) string {
|
||||||
|
if q.FreqHz == nil || *q.FreqHz == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strconv.FormatFloat(float64(*q.FreqHz)/1e6, 'f', 3, 64)
|
||||||
|
}},
|
||||||
|
{"rst_sent", "RST S", func(q *qso.QSO) string { return q.RSTSent }},
|
||||||
|
{"rst_rcvd", "RST R", func(q *qso.QSO) string { return q.RSTRcvd }},
|
||||||
|
{"name", "Name", func(q *qso.QSO) string { return q.Name }},
|
||||||
|
{"qth", "QTH", func(q *qso.QSO) string { return q.QTH }},
|
||||||
|
{"country", "Country", func(q *qso.QSO) string { return q.Country }},
|
||||||
|
{"grid", "Grid", func(q *qso.QSO) string { return q.Grid }},
|
||||||
|
{"dxcc", "DXCC", func(q *qso.QSO) string { return str(q.DXCC) }},
|
||||||
|
{"cqz", "CQ", func(q *qso.QSO) string { return str(q.CQZ) }},
|
||||||
|
{"ituz", "ITU", func(q *qso.QSO) string { return str(q.ITUZ) }},
|
||||||
|
{"iota", "IOTA", func(q *qso.QSO) string { return q.IOTA }},
|
||||||
|
{"pota", "POTA", func(q *qso.QSO) string { return q.POTARef }},
|
||||||
|
{"sota", "SOTA", func(q *qso.QSO) string { return q.SOTARef }},
|
||||||
|
{"qsl_sent", "QSL S", func(q *qso.QSO) string { return q.QSLSent }},
|
||||||
|
{"qsl_rcvd", "QSL R", func(q *qso.QSO) string { return q.QSLRcvd }},
|
||||||
|
{"lotw_rcvd", "LoTW", func(q *qso.QSO) string { return q.LOTWRcvd }},
|
||||||
|
{"station", "Station", func(q *qso.QSO) string { return q.StationCallsign }},
|
||||||
|
{"comment", "Comment", func(q *qso.QSO) string { return q.Comment }},
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultColumns is what a fresh configuration publishes — the columns a reader
|
||||||
|
// of someone else's log actually looks for.
|
||||||
|
var DefaultColumns = []string{"date", "time", "callsign", "band", "mode", "rst_sent", "rst_rcvd", "country"}
|
||||||
|
|
||||||
|
func columnsFor(keys []string) []Column {
|
||||||
|
if len(keys) == 0 {
|
||||||
|
keys = DefaultColumns
|
||||||
|
}
|
||||||
|
byKey := make(map[string]Column, len(Columns))
|
||||||
|
for _, c := range Columns {
|
||||||
|
byKey[c.Key] = c
|
||||||
|
}
|
||||||
|
out := make([]Column, 0, len(keys))
|
||||||
|
for _, k := range keys {
|
||||||
|
if c, ok := byKey[strings.TrimSpace(k)]; ok {
|
||||||
|
out = append(out, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(out) == 0 { // every stored key unknown (config from a newer build)
|
||||||
|
return columnsFor(DefaultColumns)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// KnownColumnKeys lists the offered columns, for the settings UI.
|
||||||
|
func KnownColumnKeys() []Column {
|
||||||
|
out := make([]Column, len(Columns))
|
||||||
|
copy(out, Columns)
|
||||||
|
sort.SliceStable(out, func(i, j int) bool { return false }) // keep declared order
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalise fills in the defaults a half-filled config would otherwise carry
|
||||||
|
// into the renderer.
|
||||||
|
func (c *Config) Normalise() {
|
||||||
|
if c.Format != "csv" {
|
||||||
|
c.Format = "html"
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(c.FileName) == "" {
|
||||||
|
if c.Format == "csv" {
|
||||||
|
c.FileName = "log.csv"
|
||||||
|
} else {
|
||||||
|
c.FileName = "log.html"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if c.Count <= 0 {
|
||||||
|
c.Count = 100
|
||||||
|
}
|
||||||
|
if c.FTPPort <= 0 {
|
||||||
|
c.FTPPort = 21
|
||||||
|
}
|
||||||
|
if len(c.Columns) == 0 {
|
||||||
|
c.Columns = append([]string{}, DefaultColumns...)
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(c.FTPFileName) == "" {
|
||||||
|
c.FTPFileName = c.FileName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Render builds the file contents for the given QSOs.
|
||||||
|
func Render(cfg Config, qsos []qso.QSO, stationCall string) ([]byte, error) {
|
||||||
|
cfg.Normalise()
|
||||||
|
cols := columnsFor(cfg.Columns)
|
||||||
|
if cfg.Format == "csv" {
|
||||||
|
return renderCSV(cols, qsos)
|
||||||
|
}
|
||||||
|
return renderHTML(cfg, cols, qsos, stationCall), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func renderCSV(cols []Column, qsos []qso.QSO) ([]byte, error) {
|
||||||
|
var b strings.Builder
|
||||||
|
w := csv.NewWriter(&b)
|
||||||
|
head := make([]string, len(cols))
|
||||||
|
for i, c := range cols {
|
||||||
|
head[i] = c.Header
|
||||||
|
}
|
||||||
|
if err := w.Write(head); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
row := make([]string, len(cols))
|
||||||
|
for i := range qsos {
|
||||||
|
for j, c := range cols {
|
||||||
|
row[j] = c.Value(&qsos[i])
|
||||||
|
}
|
||||||
|
if err := w.Write(row); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.Flush()
|
||||||
|
if err := w.Error(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return []byte(b.String()), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderHTML writes a standalone page: inline CSS, inline sort script, no
|
||||||
|
// external request of any kind.
|
||||||
|
func renderHTML(cfg Config, cols []Column, qsos []qso.QSO, stationCall string) []byte {
|
||||||
|
title := strings.TrimSpace(cfg.Title)
|
||||||
|
if title == "" {
|
||||||
|
if stationCall != "" {
|
||||||
|
title = stationCall + " — log"
|
||||||
|
} else {
|
||||||
|
title = "Log"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
esc := html.EscapeString
|
||||||
|
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString(`<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||||
|
<title>` + esc(title) + `</title>
|
||||||
|
<style>
|
||||||
|
:root{color-scheme:light dark;--bg:#fff;--fg:#16181d;--mut:#5b6270;--line:#e2e5ea;--head:#f4f6f8;--zebra:#fafbfc;--accent:#2a78d6}
|
||||||
|
@media (prefers-color-scheme:dark){:root{--bg:#16181d;--fg:#e6e8ec;--mut:#9aa2b1;--line:#2e343f;--head:#1f232b;--zebra:#1b1f26;--accent:#6da7ec}}
|
||||||
|
*{box-sizing:border-box}
|
||||||
|
body{margin:0;padding:1.5rem 1rem;background:var(--bg);color:var(--fg);
|
||||||
|
font:14px/1.5 system-ui,-apple-system,"Segoe UI",Roboto,sans-serif}
|
||||||
|
.wrap{max-width:1100px;margin:0 auto}
|
||||||
|
h1{margin:0 0 .25rem;font-size:1.35rem}
|
||||||
|
.meta{margin:0 0 1rem;color:var(--mut);font-size:.8rem}
|
||||||
|
.scroll{overflow-x:auto;border:1px solid var(--line);border-radius:8px}
|
||||||
|
table{border-collapse:collapse;width:100%;font-variant-numeric:tabular-nums}
|
||||||
|
th,td{padding:.45rem .6rem;text-align:left;border-bottom:1px solid var(--line);white-space:nowrap}
|
||||||
|
th{position:sticky;top:0;background:var(--head);font-size:.72rem;letter-spacing:.05em;
|
||||||
|
text-transform:uppercase;color:var(--mut);cursor:pointer;user-select:none}
|
||||||
|
th:hover{color:var(--fg)}
|
||||||
|
th::after{content:'';font-size:.7em;opacity:.7}
|
||||||
|
th[data-asc="1"]::after{content:' \25B2'}
|
||||||
|
th[data-asc="0"]::after{content:' \25BC'}
|
||||||
|
tbody tr:nth-child(even){background:var(--zebra)}
|
||||||
|
tbody tr:last-child td{border-bottom:0}
|
||||||
|
td.call{font-family:ui-monospace,Consolas,monospace;font-weight:700;color:var(--accent)}
|
||||||
|
.foot{margin-top:.75rem;color:var(--mut);font-size:.75rem}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body><div class="wrap">
|
||||||
|
<h1>` + esc(title) + `</h1>
|
||||||
|
<p class="meta">` + strconv.Itoa(len(qsos)) + ` QSO · ` + time.Now().UTC().Format("2006-01-02 15:04") + ` UTC</p>
|
||||||
|
<div class="scroll"><table><thead><tr>`)
|
||||||
|
for _, c := range cols {
|
||||||
|
b.WriteString(`<th>` + esc(c.Header) + `</th>`)
|
||||||
|
}
|
||||||
|
b.WriteString(`</tr></thead><tbody>`)
|
||||||
|
for i := range qsos {
|
||||||
|
// The row's position as published. Sorting is a view on top of it, so a
|
||||||
|
// third click can put the table back the way the operator first saw it.
|
||||||
|
b.WriteString(`<tr data-i="` + strconv.Itoa(i) + `">`)
|
||||||
|
for _, c := range cols {
|
||||||
|
cls := ""
|
||||||
|
if c.Key == "callsign" {
|
||||||
|
cls = ` class="call"`
|
||||||
|
}
|
||||||
|
b.WriteString(`<td` + cls + `>` + esc(c.Value(&qsos[i])) + `</td>`)
|
||||||
|
}
|
||||||
|
b.WriteString(`</tr>`)
|
||||||
|
}
|
||||||
|
b.WriteString(`</tbody></table></div>
|
||||||
|
<p class="foot">Generated by OpsLog</p>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
// Click a header to sort: ascending, descending, then back to the published
|
||||||
|
// order. Kept tiny and dependency-free — the page has to work offline and on any
|
||||||
|
// hosting, so no library is loaded.
|
||||||
|
//
|
||||||
|
// NUM is deliberately strict: the whole cell must be a number. parseFloat alone
|
||||||
|
// accepts a numeric PREFIX, so "2026-08-10" became 2026 and every date in a year
|
||||||
|
// compared equal — the date column looked as though it simply would not sort.
|
||||||
|
// Callsigns starting with a digit (8B81SU) hit the same trap.
|
||||||
|
var NUM=/^[+-]?\d+(\.\d+)?$/;
|
||||||
|
document.querySelectorAll('th').forEach(function(th,i){
|
||||||
|
th.addEventListener('click',function(){
|
||||||
|
var tb=th.closest('table').tBodies[0],
|
||||||
|
rows=Array.prototype.slice.call(tb.rows),
|
||||||
|
cur=th.dataset.asc,
|
||||||
|
next=cur===undefined?'1':(cur==='1'?'0':'');
|
||||||
|
if(next===''){
|
||||||
|
// Third click: restore the order the page was published in.
|
||||||
|
rows.sort(function(a,b){return a.dataset.i-b.dataset.i});
|
||||||
|
}else{
|
||||||
|
var asc=next==='1';
|
||||||
|
rows.sort(function(a,b){
|
||||||
|
var x=a.cells[i].textContent.trim(), y=b.cells[i].textContent.trim();
|
||||||
|
// Blanks always sink, whichever way the column is pointing: an empty
|
||||||
|
// cell is missing data, not the smallest value.
|
||||||
|
if(x===''||y==='') return x===y?0:(x===''?1:-1);
|
||||||
|
var c=NUM.test(x)&&NUM.test(y)?(parseFloat(x)-parseFloat(y)):x.localeCompare(y);
|
||||||
|
return asc?c:-c;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
rows.forEach(function(r){tb.appendChild(r)});
|
||||||
|
th.closest('tr').querySelectorAll('th').forEach(function(o){delete o.dataset.asc});
|
||||||
|
if(next!=='') th.dataset.asc=next;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body></html>
|
||||||
|
`)
|
||||||
|
return []byte(b.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteLocal writes the payload into the configured folder and returns the path.
|
||||||
|
func WriteLocal(cfg Config, data []byte) (string, error) {
|
||||||
|
cfg.Normalise()
|
||||||
|
dir := strings.TrimSpace(cfg.Folder)
|
||||||
|
if dir == "" {
|
||||||
|
return "", fmt.Errorf("no output folder set")
|
||||||
|
}
|
||||||
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
||||||
|
return "", fmt.Errorf("create %s: %w", dir, err)
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, cfg.FileName)
|
||||||
|
// Write to a temp file and rename over the target: a reader (or a syncing
|
||||||
|
// client) never sees a half-written page.
|
||||||
|
tmp := path + ".tmp"
|
||||||
|
if err := os.WriteFile(tmp, data, 0o644); err != nil {
|
||||||
|
return "", fmt.Errorf("write %s: %w", tmp, err)
|
||||||
|
}
|
||||||
|
if err := os.Rename(tmp, path); err != nil {
|
||||||
|
_ = os.Remove(tmp)
|
||||||
|
return "", fmt.Errorf("replace %s: %w", path, err)
|
||||||
|
}
|
||||||
|
return path, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Upload sends the payload to the configured FTP/FTPS server.
|
||||||
|
func Upload(cfg Config, data []byte) error {
|
||||||
|
cfg.Normalise()
|
||||||
|
host := strings.TrimSpace(cfg.FTPHost)
|
||||||
|
if host == "" {
|
||||||
|
return fmt.Errorf("no FTP server set")
|
||||||
|
}
|
||||||
|
c, err := dial(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer func() { _ = c.Quit() }()
|
||||||
|
|
||||||
|
if err := c.Login(cfg.FTPUser, cfg.FTPPassword); err != nil {
|
||||||
|
return fmt.Errorf("login as %q: %w", cfg.FTPUser, err)
|
||||||
|
}
|
||||||
|
if dir := strings.TrimSpace(cfg.FTPFolder); dir != "" {
|
||||||
|
if err := c.ChangeDir(dir); err != nil {
|
||||||
|
return fmt.Errorf("enter remote folder %q: %w", dir, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := c.Stor(cfg.FTPFileName, strings.NewReader(string(data))); err != nil {
|
||||||
|
return fmt.Errorf("upload %q: %w", cfg.FTPFileName, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func dial(cfg Config) (*ftp.ServerConn, error) {
|
||||||
|
addr := fmt.Sprintf("%s:%d", strings.TrimSpace(cfg.FTPHost), cfg.FTPPort)
|
||||||
|
opts := []ftp.DialOption{ftp.DialWithTimeout(20 * time.Second)}
|
||||||
|
if cfg.FTPTLS {
|
||||||
|
// Explicit FTPS (AUTH TLS), the form virtually every web host offers.
|
||||||
|
// InsecureSkipVerify is NOT set: a certificate that does not validate is
|
||||||
|
// a real warning, and silently accepting it would defeat the point of
|
||||||
|
// ticking the TLS box in the first place.
|
||||||
|
opts = append(opts, ftp.DialWithExplicitTLS(&tls.Config{ServerName: strings.TrimSpace(cfg.FTPHost)}))
|
||||||
|
}
|
||||||
|
c, err := ftp.Dial(addr, opts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("connect to %s: %w", addr, err)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test connects, logs in and enters the remote folder without uploading — the
|
||||||
|
// "Test connection" button. Returns a short human-readable success line.
|
||||||
|
func Test(cfg Config) (string, error) {
|
||||||
|
cfg.Normalise()
|
||||||
|
c, err := dial(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer func() { _ = c.Quit() }()
|
||||||
|
if err := c.Login(cfg.FTPUser, cfg.FTPPassword); err != nil {
|
||||||
|
return "", fmt.Errorf("login as %q: %w", cfg.FTPUser, err)
|
||||||
|
}
|
||||||
|
if dir := strings.TrimSpace(cfg.FTPFolder); dir != "" {
|
||||||
|
if err := c.ChangeDir(dir); err != nil {
|
||||||
|
return "", fmt.Errorf("enter remote folder %q: %w", dir, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cwd, _ := c.CurrentDir()
|
||||||
|
return "connected — remote folder " + cwd, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package webpub
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The published page carries its own sort script, so a regression there is
|
||||||
|
// silent: the table still renders, it just sorts wrongly. These pin the two
|
||||||
|
// things that were actually broken in the field.
|
||||||
|
|
||||||
|
func renderSample(t *testing.T) string {
|
||||||
|
t.Helper()
|
||||||
|
cfg := Config{Columns: []string{"qso_date", "callsign", "freq"}}
|
||||||
|
cfg.Normalise()
|
||||||
|
qsos := []qso.QSO{
|
||||||
|
{Callsign: "8B81SU", QSODate: time.Date(2026, 8, 10, 9, 56, 0, 0, time.UTC)},
|
||||||
|
{Callsign: "LZ8NG", QSODate: time.Date(2025, 12, 31, 23, 1, 0, 0, time.UTC)},
|
||||||
|
}
|
||||||
|
return string(renderHTML(cfg, columnsFor(cfg.Columns), qsos, "F4BPO"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// A third click restores the published order, which is only possible if each row
|
||||||
|
// remembers where it started.
|
||||||
|
func TestRowsCarryTheirPublishedIndex(t *testing.T) {
|
||||||
|
html := renderSample(t)
|
||||||
|
for _, want := range []string{`<tr data-i="0">`, `<tr data-i="1">`} {
|
||||||
|
if !strings.Contains(html, want) {
|
||||||
|
t.Errorf("published page is missing %s — the reset-to-original click cannot work", want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseFloat accepts a numeric PREFIX, so "2026-08-10" became 2026 and every
|
||||||
|
// date in the same year compared equal: the Date column looked unsortable.
|
||||||
|
// Callsigns starting with a digit ("8B81SU") hit the same trap. The whole cell
|
||||||
|
// must match for a numeric comparison to be used.
|
||||||
|
func TestSortScriptRejectsNumericPrefixes(t *testing.T) {
|
||||||
|
html := renderSample(t)
|
||||||
|
if !strings.Contains(html, `var NUM=/^[+-]?\d+(\.\d+)?$/;`) {
|
||||||
|
t.Error("the anchored numeric test is gone; a bare parseFloat makes dates and 8-prefixed calls sort as equal")
|
||||||
|
}
|
||||||
|
if strings.Contains(html, "n=!isNaN(nx)&&!isNaN(ny)") {
|
||||||
|
t.Error("the old prefix-tolerant numeric detection is back")
|
||||||
|
}
|
||||||
|
}
|
||||||
+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.24.1"
|
appVersion = "0.24.3"
|
||||||
|
|
||||||
// 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.
|
||||||
|
|||||||
+229
@@ -0,0 +1,229 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Web publishing — the Wails boundary for internal/webpub, plus the scheduling.
|
||||||
|
//
|
||||||
|
// Two triggers, deliberately: a QSO is logged, or the periodic timer fires.
|
||||||
|
// Both go through publishSoon, which DEBOUNCES: a run of contacts must not
|
||||||
|
// produce one FTP session per QSO, and a page that is fifteen seconds stale is
|
||||||
|
// indistinguishable from a live one to anybody reading it on the web.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
"hamlog/internal/qso"
|
||||||
|
"hamlog/internal/webpub"
|
||||||
|
|
||||||
|
wruntime "github.com/wailsapp/wails/v2/pkg/runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
// publishDebounce is how long a publish request waits for company. Long enough
|
||||||
|
// to fold a burst of logging into one upload, short enough that the page looks
|
||||||
|
// live to a reader who just heard you on the air.
|
||||||
|
const publishDebounce = 15 * time.Second
|
||||||
|
|
||||||
|
type webPublisher struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
timer *time.Timer
|
||||||
|
ticker *time.Ticker
|
||||||
|
tickStp chan struct{}
|
||||||
|
last time.Time
|
||||||
|
lastErr string
|
||||||
|
}
|
||||||
|
|
||||||
|
// WebPublishStatus is what the settings panel shows under the buttons.
|
||||||
|
//
|
||||||
|
// No column list here: the panel gets that from WebPublishColumns(). An
|
||||||
|
// anonymous struct in a bound type also breaks the Wails generator, which has
|
||||||
|
// no name to emit for it.
|
||||||
|
type WebPublishStatus struct {
|
||||||
|
LastRun string `json:"last_run"` // "" = never this session
|
||||||
|
LastErr string `json:"last_err"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetWebPublishConfig reads the stored configuration (defaults applied).
|
||||||
|
func (a *App) GetWebPublishConfig() (webpub.Config, error) {
|
||||||
|
var cfg webpub.Config
|
||||||
|
if a.settings == nil {
|
||||||
|
cfg.Normalise()
|
||||||
|
return cfg, fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
raw, err := a.settings.Get(a.ctx, keyWebPublish)
|
||||||
|
if err == nil && strings.TrimSpace(raw) != "" {
|
||||||
|
// A locked vault hands back "" rather than ciphertext — that reads as "not
|
||||||
|
// configured", which is exactly right here: publishing must not run with a
|
||||||
|
// password we cannot decrypt.
|
||||||
|
_ = json.Unmarshal([]byte(raw), &cfg)
|
||||||
|
}
|
||||||
|
cfg.Normalise()
|
||||||
|
return cfg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SaveWebPublishConfig persists it and restarts the periodic timer.
|
||||||
|
func (a *App) SaveWebPublishConfig(cfg webpub.Config) error {
|
||||||
|
if a.settings == nil {
|
||||||
|
return fmt.Errorf("db not initialized")
|
||||||
|
}
|
||||||
|
cfg.Normalise()
|
||||||
|
b, err := json.Marshal(cfg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := a.settings.Set(a.ctx, keyWebPublish, string(b)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
a.restartWebPublishTimer()
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// WebPublishColumns lists the offered columns for the picker.
|
||||||
|
func (a *App) WebPublishColumns() []map[string]string {
|
||||||
|
cols := webpub.KnownColumnKeys()
|
||||||
|
out := make([]map[string]string, 0, len(cols))
|
||||||
|
for _, c := range cols {
|
||||||
|
out = append(out, map[string]string{"key": c.Key, "header": c.Header})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestWebPublishFTP validates the server settings without uploading anything.
|
||||||
|
func (a *App) TestWebPublishFTP(cfg webpub.Config) (string, error) {
|
||||||
|
return webpub.Test(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublishLogNow renders and publishes immediately, ignoring the debounce, and
|
||||||
|
// reports what happened. This is the "Publish now" button: the operator is
|
||||||
|
// waiting on the answer, so it runs synchronously and returns the real error.
|
||||||
|
func (a *App) PublishLogNow() (string, error) {
|
||||||
|
cfg, _ := a.GetWebPublishConfig()
|
||||||
|
return a.publish(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// publish does the work: read the QSOs, render, write locally, then upload.
|
||||||
|
//
|
||||||
|
// Local FIRST and upload second, always. A network failure then leaves a good
|
||||||
|
// file on disk that the operator can publish another way, instead of a
|
||||||
|
// truncated one on the server.
|
||||||
|
func (a *App) publish(cfg webpub.Config) (string, error) {
|
||||||
|
if a.qso == nil {
|
||||||
|
return "", fmt.Errorf("logbook not ready")
|
||||||
|
}
|
||||||
|
cfg.Normalise()
|
||||||
|
qsos, err := a.qso.List(a.ctx, qso.ListFilter{Limit: cfg.Count})
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("read the log: %w", err)
|
||||||
|
}
|
||||||
|
station := ""
|
||||||
|
if p, perr := a.profiles.Active(a.ctx); perr == nil {
|
||||||
|
station = p.Callsign
|
||||||
|
}
|
||||||
|
data, err := webpub.Render(cfg, qsos, station)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("build the page: %w", err)
|
||||||
|
}
|
||||||
|
path, err := webpub.WriteLocal(cfg, data)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
msg := fmt.Sprintf("%d QSO → %s", len(qsos), path)
|
||||||
|
if cfg.FTPEnabled {
|
||||||
|
if err := webpub.Upload(cfg, data); err != nil {
|
||||||
|
// The local file IS written — say so, so the operator knows the failure
|
||||||
|
// is the transfer and not the export.
|
||||||
|
return msg, fmt.Errorf("written locally, but the upload failed: %w", err)
|
||||||
|
}
|
||||||
|
msg += fmt.Sprintf(" → ftp://%s/%s", cfg.FTPHost, strings.TrimPrefix(cfg.FTPFolder+"/"+cfg.FTPFileName, "/"))
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// publishSoon schedules a debounced publish. Called on every logged QSO.
|
||||||
|
func (a *App) publishSoon() {
|
||||||
|
cfg, _ := a.GetWebPublishConfig()
|
||||||
|
if !cfg.Enabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
a.webpub.mu.Lock()
|
||||||
|
defer a.webpub.mu.Unlock()
|
||||||
|
if a.webpub.timer != nil {
|
||||||
|
a.webpub.timer.Stop()
|
||||||
|
}
|
||||||
|
a.webpub.timer = time.AfterFunc(publishDebounce, a.publishNowBackground)
|
||||||
|
}
|
||||||
|
|
||||||
|
// publishNowBackground runs a scheduled publish and records the outcome for the
|
||||||
|
// settings panel. Never surfaces a dialog: this fires while the operator is
|
||||||
|
// working, and a web server that is down must not interrupt logging.
|
||||||
|
func (a *App) publishNowBackground() {
|
||||||
|
cfg, _ := a.GetWebPublishConfig()
|
||||||
|
if !cfg.Enabled {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
msg, err := a.publish(cfg)
|
||||||
|
a.webpub.mu.Lock()
|
||||||
|
a.webpub.last = time.Now()
|
||||||
|
if err != nil {
|
||||||
|
a.webpub.lastErr = err.Error()
|
||||||
|
} else {
|
||||||
|
a.webpub.lastErr = ""
|
||||||
|
}
|
||||||
|
a.webpub.mu.Unlock()
|
||||||
|
if err != nil {
|
||||||
|
applog.Printf("webpublish: %v", err)
|
||||||
|
} else {
|
||||||
|
applog.Printf("webpublish: %s", msg)
|
||||||
|
}
|
||||||
|
if a.ctx != nil {
|
||||||
|
wruntime.EventsEmit(a.ctx, "webpublish:done", msg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetWebPublishStatus reports the last run for the settings panel.
|
||||||
|
func (a *App) GetWebPublishStatus() WebPublishStatus {
|
||||||
|
var st WebPublishStatus
|
||||||
|
a.webpub.mu.Lock()
|
||||||
|
if !a.webpub.last.IsZero() {
|
||||||
|
st.LastRun = a.webpub.last.UTC().Format("2006-01-02 15:04:05") + " UTC"
|
||||||
|
}
|
||||||
|
st.LastErr = a.webpub.lastErr
|
||||||
|
a.webpub.mu.Unlock()
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
// restartWebPublishTimer (re)arms the periodic refresh from the saved interval.
|
||||||
|
// Stopped and rebuilt on every save, so a changed interval takes effect at once
|
||||||
|
// rather than after the old one has fired.
|
||||||
|
func (a *App) restartWebPublishTimer() {
|
||||||
|
a.webpub.mu.Lock()
|
||||||
|
if a.webpub.tickStp != nil {
|
||||||
|
close(a.webpub.tickStp)
|
||||||
|
a.webpub.tickStp = nil
|
||||||
|
}
|
||||||
|
a.webpub.mu.Unlock()
|
||||||
|
|
||||||
|
cfg, _ := a.GetWebPublishConfig()
|
||||||
|
if !cfg.Enabled || cfg.IntervalMin <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
stop := make(chan struct{})
|
||||||
|
a.webpub.mu.Lock()
|
||||||
|
a.webpub.tickStp = stop
|
||||||
|
a.webpub.mu.Unlock()
|
||||||
|
|
||||||
|
go func(every time.Duration) {
|
||||||
|
t := time.NewTicker(every)
|
||||||
|
defer t.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-stop:
|
||||||
|
return
|
||||||
|
case <-t.C:
|
||||||
|
a.publishNowBackground()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}(time.Duration(cfg.IntervalMin) * time.Minute)
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user