Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bcfb3bfd37 | ||
|
|
cb430a22ee | ||
|
|
abfed4afa2 |
@@ -716,6 +716,7 @@ type App struct {
|
|||||||
clublogMW *clublog.MostWanted // ClubLog "Most Wanted" DXCC ranking (opt-in)
|
clublogMW *clublog.MostWanted // ClubLog "Most Wanted" DXCC ranking (opt-in)
|
||||||
motorAnt motorAntenna // motorized antenna (Ultrabeam or SteppIR); nil when disabled
|
motorAnt motorAntenna // motorized antenna (Ultrabeam or SteppIR); nil when disabled
|
||||||
ubFollowStop chan struct{} // stops the "follow frequency" loop; nil when off
|
ubFollowStop chan struct{} // stops the "follow frequency" loop; nil when off
|
||||||
|
motorStartMu sync.Mutex // serialises startUltrabeam: two restarts at once left two poll loops on one COM port
|
||||||
motorInhibStop chan struct{} // stops the "inhibit TX while moving" loop; nil when off
|
motorInhibStop chan struct{} // stops the "inhibit TX while moving" loop; nil when off
|
||||||
motorMoveCmdNs atomic.Int64 // unixnano of the last commanded antenna move (grace window)
|
motorMoveCmdNs atomic.Int64 // unixnano of the last commanded antenna move (grace window)
|
||||||
motorInhibited atomic.Bool // TX currently inhibited by the motor-antenna watcher
|
motorInhibited atomic.Bool // TX currently inhibited by the motor-antenna watcher
|
||||||
@@ -1209,6 +1210,7 @@ func (a *App) startup(ctx context.Context) {
|
|||||||
applog.Printf("startup: logbook backend = %s", backend)
|
applog.Printf("startup: logbook backend = %s", backend)
|
||||||
a.logDb = logbookConn
|
a.logDb = logbookConn
|
||||||
a.qso = qso.NewRepo(logbookConn)
|
a.qso = qso.NewRepo(logbookConn)
|
||||||
|
a.tidyLogbookSchema(logbookConn)
|
||||||
a.backfillAwardRefsOnce() // one-time: materialise award_refs for pre-existing QSOs
|
a.backfillAwardRefsOnce() // one-time: materialise award_refs for pre-existing QSOs
|
||||||
go a.rebuildWorkedIndex() // in-memory worked-index for per-spot alert checks
|
go a.rebuildWorkedIndex() // in-memory worked-index for per-spot alert checks
|
||||||
go a.adifMonitorLoop() // watch external ADIF files (fldigi, N1MM…) for new QSOs
|
go a.adifMonitorLoop() // watch external ADIF files (fldigi, N1MM…) for new QSOs
|
||||||
@@ -2319,6 +2321,11 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
|||||||
}
|
}
|
||||||
if lp == "" {
|
if lp == "" {
|
||||||
a.logDbPath = "" // settings db serves as the logbook (split failed) — backup snapshots a.db
|
a.logDbPath = "" // settings db serves as the logbook (split failed) — backup snapshots a.db
|
||||||
|
// It may have had its unused qso table dropped while a separate logbook
|
||||||
|
// was in use (see tidyLogbookSchema); rebuild it before handing it over.
|
||||||
|
if err := db.EnsureQSOTable(a.db); err != nil {
|
||||||
|
return nil, "", err
|
||||||
|
}
|
||||||
return a.db, "sqlite", nil
|
return a.db, "sqlite", nil
|
||||||
}
|
}
|
||||||
// Resolve against THIS install before opening. Without it, a profile carried
|
// Resolve against THIS install before opening. Without it, a profile carried
|
||||||
@@ -2330,7 +2337,7 @@ func (a *App) connectLogbook(cfg profile.ProfileDB) (*sql.DB, string, error) {
|
|||||||
applog.Printf("logbook: profile path %q resolved to %q", lp, r)
|
applog.Printf("logbook: profile path %q resolved to %q", lp, r)
|
||||||
lp = r
|
lp = r
|
||||||
}
|
}
|
||||||
c, err := db.Open(lp)
|
c, err := db.OpenLogbook(lp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, "", fmt.Errorf("open logbook %s: %w", lp, err)
|
return nil, "", fmt.Errorf("open logbook %s: %w", lp, err)
|
||||||
}
|
}
|
||||||
@@ -14821,7 +14828,11 @@ func (a *App) restartAsync(name string, f func()) {
|
|||||||
go func() {
|
go func() {
|
||||||
t0 := time.Now()
|
t0 := time.Now()
|
||||||
f()
|
f()
|
||||||
if d := time.Since(t0); d > 2*time.Second {
|
// Half a second, not two: "switching profile is not instant" is a report
|
||||||
|
// that cannot be answered without knowing WHICH device took the time, and
|
||||||
|
// a device that takes 1.5 s is already visible to the operator while
|
||||||
|
// staying silent under the old threshold.
|
||||||
|
if d := time.Since(t0); d > 500*time.Millisecond {
|
||||||
applog.Printf("%s: restart took %s (device slow to release/connect)", name, d.Round(time.Millisecond))
|
applog.Printf("%s: restart took %s (device slow to release/connect)", name, d.Round(time.Millisecond))
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
@@ -14875,7 +14886,9 @@ func (a *App) reloadCAT() {
|
|||||||
// Clicking one of our spots on the panadapter fills the entry form.
|
// Clicking one of our spots on the panadapter fills the entry form.
|
||||||
fb.OnSpotClick = func(call string, hz int64, mode string) {
|
fb.OnSpotClick = func(call string, hz int64, mode string) {
|
||||||
if a.ctx != nil {
|
if a.ctx != nil {
|
||||||
wruntime.EventsEmit(a.ctx, "flex:spot_clicked", map[string]any{"call": call, "freq_hz": hz})
|
wruntime.EventsEmit(a.ctx, "flex:spot_clicked", map[string]any{
|
||||||
|
"call": call, "freq_hz": hz, "pota_ref": a.potaRefFor(call),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
// A spot clicked ON the panadapter deserves the same zoom as one
|
// A spot clicked ON the panadapter deserves the same zoom as one
|
||||||
// clicked in the band map: the operator did the same thing and is
|
// clicked in the band map: the operator did the same thing and is
|
||||||
@@ -14970,7 +14983,9 @@ func (a *App) reloadCAT() {
|
|||||||
// Clicking one of our spots on the ExpertSDR panorama fills the entry form.
|
// Clicking one of our spots on the ExpertSDR panorama fills the entry form.
|
||||||
tb.OnSpotClick = func(call string, hz int64) {
|
tb.OnSpotClick = func(call string, hz int64) {
|
||||||
if a.ctx != nil {
|
if a.ctx != nil {
|
||||||
wruntime.EventsEmit(a.ctx, "tci:spot_clicked", map[string]any{"call": call, "freq_hz": hz})
|
wruntime.EventsEmit(a.ctx, "tci:spot_clicked", map[string]any{
|
||||||
|
"call": call, "freq_hz": hz, "pota_ref": a.potaRefFor(call),
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
a.cat.Start(tb)
|
a.cat.Start(tb)
|
||||||
@@ -15160,7 +15175,18 @@ func (a *App) SaveStationSettings(s StationSettings) error {
|
|||||||
// "eu-005" would otherwise put a reference no award matcher recognises on
|
// "eu-005" would otherwise put a reference no award matcher recognises on
|
||||||
// every QSO of an activation.
|
// every QSO of an activation.
|
||||||
p.MyIOTA = strings.ToUpper(strings.TrimSpace(s.MyIOTA))
|
p.MyIOTA = strings.ToUpper(strings.TrimSpace(s.MyIOTA))
|
||||||
return a.profiles.Save(a.ctx, &p)
|
if err := a.profiles.Save(a.ctx, &p); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// The gate, at the moment the callsign is actually set.
|
||||||
|
//
|
||||||
|
// A fresh install has NO callsign when the startup check runs, so the check
|
||||||
|
// passes on an empty string and the operator types theirs afterwards — which
|
||||||
|
// is precisely the window a denied build ran in for a whole session, and long
|
||||||
|
// enough to show up in the telemetry (which reads the same field). Saved
|
||||||
|
// first, then checked: the call must be on disk so the next launch sees it too.
|
||||||
|
enforceCallGate(p.Callsign)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Profile bindings (multi-profile CRUD) ---
|
// --- Profile bindings (multi-profile CRUD) ---
|
||||||
@@ -15193,6 +15219,11 @@ func (a *App) SaveProfile(p profile.Profile) (profile.Profile, error) {
|
|||||||
if err := a.profiles.Save(a.ctx, &p); err != nil {
|
if err := a.profiles.Save(a.ctx, &p); err != nil {
|
||||||
return profile.Profile{}, err
|
return profile.Profile{}, err
|
||||||
}
|
}
|
||||||
|
// Only for the profile in use: editing some other profile's callsign is not
|
||||||
|
// running under it, and "--profile <other>" has to stay a way back in.
|
||||||
|
if act, aerr := a.profiles.Active(a.ctx); aerr == nil && act.ID == p.ID {
|
||||||
|
enforceCallGate(p.Callsign)
|
||||||
|
}
|
||||||
a.refreshOperatorGrid()
|
a.refreshOperatorGrid()
|
||||||
return p, nil
|
return p, nil
|
||||||
}
|
}
|
||||||
@@ -15218,6 +15249,16 @@ func (a *App) ActivateProfile(id int64) error {
|
|||||||
// EVERY setting is per-profile: re-scope the settings store first, so all
|
// EVERY setting is per-profile: re-scope the settings store first, so all
|
||||||
// the reloads below read this profile's values.
|
// the reloads below read this profile's values.
|
||||||
a.settings.SetProfile(id)
|
a.settings.SetProfile(id)
|
||||||
|
// The gate again, on the profile just activated.
|
||||||
|
//
|
||||||
|
// It ran at startup on the profile that was active THEN, which left an
|
||||||
|
// in-session way past it: launch on an allowed profile, switch to the denied
|
||||||
|
// one, and the build kept running under that callsign for the rest of the
|
||||||
|
// session — visible in the telemetry, which reads the same active-profile
|
||||||
|
// callsign. Startup is not the only moment the answer can change.
|
||||||
|
if p, err := a.profiles.Get(a.ctx, id); err == nil {
|
||||||
|
enforceCallGate(p.Callsign)
|
||||||
|
}
|
||||||
a.refreshOperatorGrid()
|
a.refreshOperatorGrid()
|
||||||
// The logbook follows the active profile: reconnect to this profile's DB
|
// The logbook follows the active profile: reconnect to this profile's DB
|
||||||
// target (local SQLite or its own MySQL) so QSOs go to the right logbook.
|
// target (local SQLite or its own MySQL) so QSOs go to the right logbook.
|
||||||
@@ -15254,6 +15295,13 @@ func (a *App) reloadAfterProfileSwitch() {
|
|||||||
// arriving every few minutes still means something is asking for it, and
|
// arriving every few minutes still means something is asking for it, and
|
||||||
// nothing in the log said so.
|
// nothing in the log said so.
|
||||||
applog.Printf("profile: re-applying every subsystem for the active profile")
|
applog.Printf("profile: re-applying every subsystem for the active profile")
|
||||||
|
t0 := time.Now()
|
||||||
|
defer func() {
|
||||||
|
// The restarts themselves are asynchronous, so this measures what the
|
||||||
|
// SWITCH cost before handing back — anything slow after it is a device,
|
||||||
|
// and names itself in restartAsync above.
|
||||||
|
applog.Printf("profile: re-apply issued in %s", time.Since(t0).Round(time.Millisecond))
|
||||||
|
}()
|
||||||
a.reloadLookupProviders()
|
a.reloadLookupProviders()
|
||||||
if a.extsvc != nil {
|
if a.extsvc != nil {
|
||||||
a.extsvc.SetConfig(a.loadExternalServices())
|
a.extsvc.SetConfig(a.loadExternalServices())
|
||||||
@@ -16439,6 +16487,7 @@ func (a *App) GetUltrabeamSettings() (UltrabeamSettings, error) {
|
|||||||
if st, _ := strconv.Atoi(m[keyUltrabeamStep]); st == 25 || st == 50 || st == 100 {
|
if st, _ := strconv.Atoi(m[keyUltrabeamStep]); st == 25 || st == 50 || st == 100 {
|
||||||
out.StepKHz = st
|
out.StepKHz = st
|
||||||
}
|
}
|
||||||
|
out.Baud = normMotorBaud(out.Type, out.Transport, out.Baud)
|
||||||
out.TrackMode = normMotorTrackMode(m[keyMotorTrackMode])
|
out.TrackMode = normMotorTrackMode(m[keyMotorTrackMode])
|
||||||
out.BandFreqs = decodeMotorBandFreqs(m[keyMotorBandFreqs])
|
out.BandFreqs = decodeMotorBandFreqs(m[keyMotorBandFreqs])
|
||||||
out.FreqMinMHz, _ = strconv.Atoi(m[keyMotorFreqMin])
|
out.FreqMinMHz, _ = strconv.Atoi(m[keyMotorFreqMin])
|
||||||
@@ -16511,7 +16560,7 @@ func (a *App) SaveUltrabeamSettings(s UltrabeamSettings) error {
|
|||||||
keyMotorType: s.Type,
|
keyMotorType: s.Type,
|
||||||
keyMotorTransport: s.Transport,
|
keyMotorTransport: s.Transport,
|
||||||
keyMotorCOM: strings.TrimSpace(s.COM),
|
keyMotorCOM: strings.TrimSpace(s.COM),
|
||||||
keyMotorBaud: strconv.Itoa(s.Baud),
|
keyMotorBaud: strconv.Itoa(normMotorBaud(s.Type, s.Transport, s.Baud)),
|
||||||
keyMotorTXInhibit: boolStr(s.TXInhibit),
|
keyMotorTXInhibit: boolStr(s.TXInhibit),
|
||||||
keyMotorFreqMin: strconv.Itoa(s.FreqMinMHz),
|
keyMotorFreqMin: strconv.Itoa(s.FreqMinMHz),
|
||||||
keyMotorFreqMax: strconv.Itoa(s.FreqMaxMHz),
|
keyMotorFreqMax: strconv.Itoa(s.FreqMaxMHz),
|
||||||
@@ -16525,6 +16574,28 @@ func (a *App) SaveUltrabeamSettings(s UltrabeamSettings) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ubSerialBaud is the ONLY line speed an Ultrabeam controller answers on over
|
||||||
|
// its USB cable. Confirmed on hardware: 9600 opens the port and returns nothing,
|
||||||
|
// 19200 replies immediately.
|
||||||
|
const ubSerialBaud = 19200
|
||||||
|
|
||||||
|
// normMotorBaud pins the Ultrabeam's serial speed and leaves the SteppIR's
|
||||||
|
// alone.
|
||||||
|
//
|
||||||
|
// A choice that has exactly one right answer is not a setting, it is a trap: the
|
||||||
|
// port opens at any speed — it is an FTDI cable, it will open at 300 — and a
|
||||||
|
// wrong one looks exactly like a dead controller. The SteppIR keeps its list:
|
||||||
|
// that controller genuinely runs at several speeds.
|
||||||
|
func normMotorBaud(typ, transport string, baud int) int {
|
||||||
|
if typ == "ultrabeam" && transport == "serial" {
|
||||||
|
return ubSerialBaud
|
||||||
|
}
|
||||||
|
if baud < 1200 || baud > 115200 {
|
||||||
|
return 9600
|
||||||
|
}
|
||||||
|
return baud
|
||||||
|
}
|
||||||
|
|
||||||
// newMotorClient builds the concrete client for the configured antenna type and
|
// newMotorClient builds the concrete client for the configured antenna type and
|
||||||
// transport, wrapped in the shared interface. Returns nil if nothing usable is
|
// transport, wrapped in the shared interface. Returns nil if nothing usable is
|
||||||
// configured (no host for TCP, no COM for serial).
|
// configured (no host for TCP, no COM for serial).
|
||||||
@@ -16556,6 +16627,15 @@ func newMotorClient(s UltrabeamSettings) motorAntenna {
|
|||||||
// antenna is enabled and configured. Safe to call repeatedly (on startup and
|
// antenna is enabled and configured. Safe to call repeatedly (on startup and
|
||||||
// after a settings save).
|
// after a settings save).
|
||||||
func (a *App) startUltrabeam() {
|
func (a *App) startUltrabeam() {
|
||||||
|
// ONE restart at a time.
|
||||||
|
//
|
||||||
|
// Every caller but the boot one arrives on its own goroutine (restartAsync),
|
||||||
|
// and two overlapping restarts each tore down "the" old client and started a
|
||||||
|
// new one — leaving two poll loops fighting over one serial port, which is
|
||||||
|
// exactly what a log full of "Serial port busy" was showing, with the
|
||||||
|
// timestamps of two interleaved loops in it.
|
||||||
|
a.motorStartMu.Lock()
|
||||||
|
defer a.motorStartMu.Unlock()
|
||||||
// Stop any running follow loop first.
|
// Stop any running follow loop first.
|
||||||
if a.ubFollowStop != nil {
|
if a.ubFollowStop != nil {
|
||||||
close(a.ubFollowStop)
|
close(a.ubFollowStop)
|
||||||
@@ -16566,12 +16646,8 @@ func (a *App) startUltrabeam() {
|
|||||||
close(a.motorInhibStop)
|
close(a.motorInhibStop)
|
||||||
a.motorInhibStop = nil
|
a.motorInhibStop = nil
|
||||||
}
|
}
|
||||||
if a.motorAnt != nil {
|
old := a.motorAnt
|
||||||
// Background teardown so saving Settings doesn't block on an in-progress
|
|
||||||
// connect (Stop waits for the dial timeout).
|
|
||||||
go a.motorAnt.Stop()
|
|
||||||
a.motorAnt = nil
|
a.motorAnt = nil
|
||||||
}
|
|
||||||
// Every way out of here used to be silent, which is how an antenna that had
|
// Every way out of here used to be silent, which is how an antenna that had
|
||||||
// been working for three minutes went off the air with NOTHING in the log
|
// been working for three minutes went off the air with NOTHING in the log
|
||||||
// after the disconnection — the operator could not tell a deliberate stop
|
// after the disconnection — the operator could not tell a deliberate stop
|
||||||
@@ -16599,8 +16675,19 @@ func (a *App) startUltrabeam() {
|
|||||||
} else {
|
} else {
|
||||||
applog.Printf("antenna: %s starting on %s:%d", s.Type, s.Host, s.Port)
|
applog.Printf("antenna: %s starting on %s:%d", s.Type, s.Host, s.Port)
|
||||||
}
|
}
|
||||||
|
// Release the previous client BEFORE opening the new one.
|
||||||
|
//
|
||||||
|
// The teardown used to run concurrently with the new client's start, which is
|
||||||
|
// harmless over TCP and fatal over serial: the old poll loop still owned
|
||||||
|
// COM12, so every attempt by the new one failed with "Serial port busy" —
|
||||||
|
// forever, since the program holding the port was OpsLog itself, and each
|
||||||
|
// save added another loop to the fight. Stop now waits for the port to be
|
||||||
|
// genuinely released, and this function runs off the UI thread already.
|
||||||
|
if old != nil {
|
||||||
|
old.Stop()
|
||||||
|
}
|
||||||
a.motorAnt = c
|
a.motorAnt = c
|
||||||
_ = a.motorAnt.Start()
|
_ = c.Start()
|
||||||
// One place starts the follow loop, whether the antenna just connected or the
|
// One place starts the follow loop, whether the antenna just connected or the
|
||||||
// operator flipped tracking from the Station Control widget. Two copies of
|
// operator flipped tracking from the Station Control widget. Two copies of
|
||||||
// this drifting apart is how a step change quietly stops taking effect.
|
// this drifting apart is how a step change quietly stops taking effect.
|
||||||
@@ -17202,6 +17289,27 @@ func (a *App) TestUltrabeam(s UltrabeamSettings) error {
|
|||||||
if s.Port <= 0 || s.Port > 65535 {
|
if s.Port <= 0 || s.Port > 65535 {
|
||||||
s.Port = 23
|
s.Port = 23
|
||||||
}
|
}
|
||||||
|
// TESTING A SERIAL PORT WE ALREADY OWN.
|
||||||
|
//
|
||||||
|
// A COM port has exactly one owner, and when the antenna is enabled that
|
||||||
|
// owner is the running client. Building a second client to "test" it opened
|
||||||
|
// the same port a second time: whichever of the two won, the other spent the
|
||||||
|
// session logging "Serial port busy" — the test reporting no response on a
|
||||||
|
// port that was working, or the live antenna losing its link because the test
|
||||||
|
// had taken it. Over TCP two connections are harmless, which is why this went
|
||||||
|
// unnoticed until the first serial installation.
|
||||||
|
//
|
||||||
|
// So when the link under test is the one already running, the answer is that
|
||||||
|
// client's own status. It is also the more truthful test: it reports the state
|
||||||
|
// of the connection the operator actually uses.
|
||||||
|
if s.Transport == "serial" {
|
||||||
|
if live, ok := a.liveMotorFor(s); ok {
|
||||||
|
if live.Status().Connected {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("no response on %s — the antenna is connected to this port but not answering", s.COM)
|
||||||
|
}
|
||||||
|
}
|
||||||
c := newMotorClient(s)
|
c := newMotorClient(s)
|
||||||
if c == nil {
|
if c == nil {
|
||||||
return fmt.Errorf("antenna not configured")
|
return fmt.Errorf("antenna not configured")
|
||||||
@@ -17225,6 +17333,28 @@ func (a *App) TestUltrabeam(s UltrabeamSettings) error {
|
|||||||
return fmt.Errorf("no response from %s:%d", s.Host, s.Port)
|
return fmt.Errorf("no response from %s:%d", s.Host, s.Port)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// liveMotorFor returns the running antenna client when it is the one the given
|
||||||
|
// settings describe — same type, same transport, same port.
|
||||||
|
//
|
||||||
|
// Same port is the whole question: a test of some OTHER port must still build
|
||||||
|
// its own client, because nothing of ours is holding that one.
|
||||||
|
func (a *App) liveMotorFor(s UltrabeamSettings) (motorAntenna, bool) {
|
||||||
|
if a.motorAnt == nil {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
cur, err := a.GetUltrabeamSettings()
|
||||||
|
if err != nil || !cur.Enabled {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
if cur.Type != s.Type || cur.Transport != s.Transport {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
if !strings.EqualFold(strings.TrimSpace(cur.COM), strings.TrimSpace(s.COM)) {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
return a.motorAnt, true
|
||||||
|
}
|
||||||
|
|
||||||
// ── Antenna Genius (4O3A) antenna switch (TCP, port fixed 9007) ─────────────
|
// ── Antenna Genius (4O3A) antenna switch (TCP, port fixed 9007) ─────────────
|
||||||
|
|
||||||
// AntGeniusSettings is the JSON shape for the Hardware → Antenna Genius panel.
|
// AntGeniusSettings is the JSON shape for the Hardware → Antenna Genius panel.
|
||||||
@@ -19993,3 +20123,57 @@ func lookupWhen(qsoDate string) time.Time {
|
|||||||
}
|
}
|
||||||
return t
|
return t
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// potaRefFor returns the park a callsign is currently activating, or "".
|
||||||
|
//
|
||||||
|
// A spot clicked on the RADIO's panadapter arrives as a callsign and a
|
||||||
|
// frequency — the radio knows nothing of parks — so the park has to be found
|
||||||
|
// again here, from the same live POTA index that tags the cluster spots. Without
|
||||||
|
// it the Awards tab stayed empty for a click on the panadapter while the very
|
||||||
|
// same spot clicked in OpsLog filled it in, which is a difference the operator
|
||||||
|
// has no way to explain.
|
||||||
|
func (a *App) potaRefFor(call string) string {
|
||||||
|
if a.pota == nil || strings.TrimSpace(call) == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if info, ok := a.pota.Lookup(call); ok {
|
||||||
|
return info.Reference
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// tidyLogbookSchema removes settings tables that an older OpsLog left inside the
|
||||||
|
// logbook.
|
||||||
|
//
|
||||||
|
// Two ways they got there: every database used to receive the full migration set
|
||||||
|
// (fixed in internal/db/roles.go, which now filters by role), and the one-time
|
||||||
|
// legacy split copies the whole settings database with VACUUM INTO and then
|
||||||
|
// treats the copy as the logbook. Empty ones are already dropped when the
|
||||||
|
// logbook is opened; the copies from the split have ROWS, and are dropped here
|
||||||
|
// because we can see the settings database still holding the originals.
|
||||||
|
//
|
||||||
|
// The check is the whole point: only when the logbook is a DIFFERENT database
|
||||||
|
// from the settings one, and that settings database still has its own profiles,
|
||||||
|
// is a profile row inside the logbook provably a duplicate. A profile pointing
|
||||||
|
// at a genuine legacy combined database as its logbook fails that test and keeps
|
||||||
|
// everything.
|
||||||
|
func (a *App) tidyLogbookSchema(logbookConn *sql.DB) {
|
||||||
|
if logbookConn == nil || a.db == nil || logbookConn == a.db {
|
||||||
|
return // the settings database IS the logbook: everything in it is in use
|
||||||
|
}
|
||||||
|
if a.dbBackend == "sqlite" && a.logDbPath != "" &&
|
||||||
|
strings.EqualFold(filepath.Clean(a.logDbPath), filepath.Clean(a.dbPath)) {
|
||||||
|
return // same file reached twice
|
||||||
|
}
|
||||||
|
var profiles int
|
||||||
|
if err := a.db.QueryRowContext(a.ctx, "SELECT COUNT(*) FROM station_profiles").Scan(&profiles); err != nil || profiles == 0 {
|
||||||
|
// No authoritative copy to point at — leave the logbook exactly as it is.
|
||||||
|
return
|
||||||
|
}
|
||||||
|
db.DropRedundantSettingsTables(logbookConn, "logbook")
|
||||||
|
// And the mirror image: the settings database keeps an empty qso table from
|
||||||
|
// the days when every database got the whole schema. It is not needed while
|
||||||
|
// the contacts have a database of their own, and EnsureQSOTable puts it back
|
||||||
|
// if this one is ever asked to serve as the logbook again.
|
||||||
|
db.DropEmptyQSOTable(a.db, filepath.Base(a.dbPath))
|
||||||
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ var deniedCallHashes = map[string]struct{}{
|
|||||||
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
"46fb61e71afb40627cb6493a6a59c9d4d0231ee3cad1a2bf3fcc4cdfce36fabc": {},
|
||||||
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
"d1ae6212ec057f9d5c6f379fb57acedac7c94142c9d49667dc04b2016d03d1b6": {},
|
||||||
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
"0741c9e394b42f43191899105553b47155ddc3026da12b5360701f9c181ff123": {},
|
||||||
|
"ab4926a3a0ab76d41b5b99cd3ad0683584970c341c29427c1dfa4b3c329ce415": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
// callDenied reports whether a callsign is on deniedCallHashes. The call is
|
||||||
|
|||||||
@@ -1,4 +1,52 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"version": "0.26.5",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Fixed the record button going missing after an update, until the audio settings were opened and saved. Whether a manual recording is possible depends on a per-profile setting, and the question was asked once at startup — before the profile was known on a launch that had more work to do.",
|
||||||
|
"Switching profile is quicker on a shared MySQL logbook: the one-off cleanup of unused settings tables is now recorded as done instead of being re-checked on every connection.",
|
||||||
|
"A profile switch now logs how long it took, and any device slower than half a second names itself — a switch that feels sluggish can be diagnosed from the log file.",
|
||||||
|
"Saving an alert rule or a filter preset now says so, with the name, for a few seconds. Both used to save in silence, leaving the dialog looking exactly as it did before the click.",
|
||||||
|
"Awards: the callsigns listed behind an award cell are now links. Clicking one opens the QSL Manager on Paper QSL with that station searched, ready for the card sent/received dates — chasing a missing confirmation no longer means retyping the callsign into another tab.",
|
||||||
|
"Motorised antennas over serial: the line format is now stated explicitly as 8N1, the baud list covers 1200 to 115200, and the first exchange after each connect is dumped to the log — which separates a silent controller from a wrong baud rate from a frame we misread.",
|
||||||
|
"Fixed a motorised antenna on a serial port failing with \"Serial port busy\" for ever. OpsLog was holding the port itself: stopping a client did not wait for its poll loop to leave, and the new client was started while the old one still owned the COM port — every settings save added another loop to the fight.",
|
||||||
|
"A serial antenna controller whose port is held by another program now says so by name in the log, instead of repeating \"Serial port busy\" — a COM port has one owner, usually the manufacturer control window left open.",
|
||||||
|
"Fixed \"Test connection\" on a serial motorised antenna taking the COM port away from the running antenna. A port has one owner, so the test now reports the live link's own status instead of opening a second connection to it.",
|
||||||
|
"A serial antenna controller that never answers now fails after four seconds with \"nothing came back\", instead of freezing the poll loop for minutes with nothing in the log. A silent serial port returns no bytes AND no error, and the buffered reader retried that a hundred times before giving up.",
|
||||||
|
"Ultrabeam over USB now works. The cable presents TWO COM ports and only the second reaches the controller, at 19200 baud — so the speed is now fixed at 19200 and the port field says which one to pick. Stopping a client no longer waits out the read timeout either, so changing port takes effect at once instead of leaving the old one held."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Correction du bouton d'enregistrement disparu après une mise à jour, jusqu'à ce qu'on ouvre et enregistre les réglages audio. La possibilité d'enregistrer dépend d'un réglage par profil, et la question n'était posée qu'une fois au démarrage — avant que le profil soit connu, sur un lancement qui avait plus de travail à faire.",
|
||||||
|
"Le changement de profil est plus rapide sur un journal MySQL partagé : le nettoyage ponctuel des tables de réglages inutilisées est désormais marqué comme fait, au lieu d'être revérifié à chaque connexion.",
|
||||||
|
"Un changement de profil enregistre maintenant sa durée dans le journal, et tout appareil dépassant la demi-seconde se nomme — un changement qui traîne peut donc être diagnostiqué depuis le fichier de log.",
|
||||||
|
"L'enregistrement d'une règle d'alerte ou d'un filtre affiche maintenant une confirmation avec son nom, quelques secondes. Les deux enregistraient en silence, la fenêtre restant identique à ce qu'elle était avant le clic.",
|
||||||
|
"Diplômes : les indicatifs listés derrière une case sont désormais cliquables. Un clic ouvre le gestionnaire QSL sur QSL papier avec la station déjà recherchée, prête pour les dates d'envoi et de réception — relancer une confirmation manquante ne demande plus de retaper l'indicatif dans un autre onglet.",
|
||||||
|
"Antennes motorisées en série : le format de ligne est désormais fixé explicitement en 8N1, la liste des vitesses va de 1200 à 115200, et le premier échange après chaque connexion est écrit dans le log — ce qui distingue un contrôleur muet d'une mauvaise vitesse et d'une trame mal relue.",
|
||||||
|
"Correction d'une antenne motorisée en série qui échouait indéfiniment sur « Serial port busy ». OpsLog occupait le port lui-même : l'arrêt d'un client n'attendait pas la sortie de sa boucle de scrutation, et le nouveau client démarrait alors que l'ancien détenait encore le port COM — chaque enregistrement des réglages ajoutait une boucle à la mêlée.",
|
||||||
|
"Un contrôleur d'antenne en série dont le port est occupé par un autre programme le dit maintenant explicitement dans le log, au lieu de répéter « Serial port busy » — un port COM n'a qu'un propriétaire, le plus souvent la fenêtre de contrôle du fabricant restée ouverte.",
|
||||||
|
"Correction du « Test de connexion » d'une antenne motorisée en série qui prenait le port COM à l'antenne en service. Un port n'a qu'un propriétaire : le test rapporte désormais l'état du lien en cours au lieu d'ouvrir une seconde connexion dessus.",
|
||||||
|
"Un contrôleur d'antenne en série qui ne répond jamais échoue maintenant en quatre secondes sur « rien n'est revenu », au lieu de figer la boucle de scrutation pendant des minutes sans rien écrire dans le log. Un port série muet ne renvoie ni octet ni erreur, et le lecteur tamponné réessayait cent fois avant d'abandonner.",
|
||||||
|
"Ultrabeam en USB fonctionne. Le câble présente DEUX ports COM et seul le second atteint le contrôleur, à 19200 bauds — la vitesse est donc fixée à 19200 et le champ du port indique lequel choisir. L'arrêt d'un client n'attend plus la fin du délai de lecture, donc un changement de port prend effet immédiatement au lieu de laisser l'ancien occupé."
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "0.26.4",
|
||||||
|
"date": "",
|
||||||
|
"en": [
|
||||||
|
"Clicking a spot on the radio panadapter now carries its POTA park into the Awards tab, like a click in OpsLog does.",
|
||||||
|
"Ultrabeam over serial: the COM port field now has a chevron that opens the list of detected ports. It was a combo box that only opened on a keystroke, so it looked like a plain text box.",
|
||||||
|
"The logbook database now contains only the contacts. Settings, station profiles, award reference lists and the lookup cache were being created in every database, including a shared MySQL logbook, which made the two look interchangeable; the unused tables are dropped on the next start, and any that hold data are left alone.",
|
||||||
|
"And the mirror image: the settings database drops its own unused, empty qso table once the contacts have a database of their own. It is rebuilt automatically if that database is ever pressed into service as the logbook again.",
|
||||||
|
"Settings → Database: a Compact button on each database. SQLite frees deleted pages inside the file and never shrinks it, so this is what gives the disk space back; the result shows the size before and after. A shared MySQL logbook has the button too, running OPTIMIZE TABLE instead."
|
||||||
|
],
|
||||||
|
"fr": [
|
||||||
|
"Cliquer un spot sur le panadapter de la radio reporte maintenant son parc POTA dans l’onglet Diplômes, comme un clic dans OpsLog.",
|
||||||
|
"Ultrabeam en série : le champ du port COM a maintenant un chevron qui ouvre la liste des ports détectés. C'était une liste déroulante qui ne s'ouvrait qu'en tapant, donc indiscernable d'un simple champ texte.",
|
||||||
|
"La base du journal ne contient plus que les contacts. Les réglages, profils station, listes de références et le cache de recherche étaient créés dans toutes les bases, y compris un MySQL partagé, ce qui laissait croire que les deux étaient interchangeables ; les tables inutilisées sont supprimées au prochain démarrage, et celles qui contiennent des données sont laissées telles quelles.",
|
||||||
|
"Et l'inverse : la base de réglages supprime sa propre table qso, vide et inutilisée, dès lors que les contacts ont leur base à eux. Elle est reconstruite automatiquement si cette base doit à nouveau servir de journal.",
|
||||||
|
"Réglages → Base de données : un bouton Compacter sur chaque base. SQLite libère les pages supprimées à l'intérieur du fichier sans jamais le réduire ; c'est donc ce qui rend l'espace disque, et le résultat affiche la taille avant et après. Un journal MySQL partagé a aussi le bouton, avec un OPTIMIZE TABLE à la place."
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"version": "0.26.3",
|
"version": "0.26.3",
|
||||||
"date": "",
|
"date": "",
|
||||||
|
|||||||
+102
@@ -0,0 +1,102 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
// Compacting a database.
|
||||||
|
//
|
||||||
|
// SQLite never shrinks a file on its own: deleting rows — or dropping a table,
|
||||||
|
// which is what the schema-role cleanup does — frees pages INSIDE the file and
|
||||||
|
// leaves the file the size it always was. A logbook that held 200 000 imported
|
||||||
|
// QSOs for a day is still a 200 MB file the day after they are gone, and the
|
||||||
|
// only thing that reclaims the space is a VACUUM, which rewrites the database
|
||||||
|
// from scratch.
|
||||||
|
//
|
||||||
|
// Offered as a button rather than done automatically: a VACUUM rewrites the
|
||||||
|
// whole file, needs room for a second copy of it while it runs, and takes real
|
||||||
|
// time on a large logbook. That is a decision for the operator, at a moment they
|
||||||
|
// choose — not something to spring on them during startup.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"hamlog/internal/applog"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CompactResult is what one compaction did.
|
||||||
|
type CompactResult struct {
|
||||||
|
// Path of the file compacted, empty for MySQL.
|
||||||
|
Path string `json:"path"`
|
||||||
|
// Backend is "sqlite" or "mysql" — a shared server is optimised, not vacuumed.
|
||||||
|
Backend string `json:"backend"`
|
||||||
|
// Before and After are file sizes in bytes; both 0 when there is no file.
|
||||||
|
Before int64 `json:"before"`
|
||||||
|
After int64 `json:"after"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompactDatabase reclaims the unused space in one of the two databases.
|
||||||
|
//
|
||||||
|
// target is "settings" or "logbook". They are separate on purpose: they are
|
||||||
|
// different files, of very different sizes, and an operator compacting a 400 MB
|
||||||
|
// logbook has no reason to wait on a 2 MB settings file as well.
|
||||||
|
func (a *App) CompactDatabase(target string) (CompactResult, error) {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(target)) {
|
||||||
|
case "settings":
|
||||||
|
if a.db == nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("the settings database is not open")
|
||||||
|
}
|
||||||
|
return a.vacuumSQLite(a.db, a.dbPath)
|
||||||
|
case "logbook":
|
||||||
|
if a.logDb == nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("the logbook is not open")
|
||||||
|
}
|
||||||
|
if a.dbBackend == "mysql" {
|
||||||
|
// A shared server's storage is the admin's business, and OPTIMIZE TABLE
|
||||||
|
// locks the table for the length of a rebuild — every other operator
|
||||||
|
// waits. Still offered, because a logbook that has had a large import
|
||||||
|
// deleted benefits from it just as much; it simply reports no sizes,
|
||||||
|
// which the server alone knows.
|
||||||
|
if _, err := a.logDb.ExecContext(a.ctx, "OPTIMIZE TABLE qso"); err != nil {
|
||||||
|
return CompactResult{}, fmt.Errorf("optimize qso: %w", err)
|
||||||
|
}
|
||||||
|
applog.Printf("compact: OPTIMIZE TABLE qso on the shared MySQL logbook")
|
||||||
|
return CompactResult{Backend: "mysql"}, nil
|
||||||
|
}
|
||||||
|
// No separate file: the settings database is serving as the logbook, and
|
||||||
|
// compacting it is the same operation.
|
||||||
|
if a.logDbPath == "" {
|
||||||
|
return a.vacuumSQLite(a.db, a.dbPath)
|
||||||
|
}
|
||||||
|
return a.vacuumSQLite(a.logDb, a.logDbPath)
|
||||||
|
}
|
||||||
|
return CompactResult{}, fmt.Errorf("unknown database %q", target)
|
||||||
|
}
|
||||||
|
|
||||||
|
// vacuumSQLite checkpoints the write-ahead log, then rewrites the file.
|
||||||
|
func (a *App) vacuumSQLite(conn *sql.DB, path string) (CompactResult, error) {
|
||||||
|
res := CompactResult{Path: path, Backend: "sqlite", Before: fileSizeOf(path)}
|
||||||
|
// Fold the WAL back into the main file first. Without it the pages freed by a
|
||||||
|
// recent DELETE can still be sitting in the -wal, and the vacuum reports a
|
||||||
|
// saving the file on disk does not show.
|
||||||
|
if _, err := conn.ExecContext(a.ctx, "PRAGMA wal_checkpoint(TRUNCATE)"); err != nil {
|
||||||
|
applog.Printf("compact: wal checkpoint on %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if _, err := conn.ExecContext(a.ctx, "VACUUM"); err != nil {
|
||||||
|
return res, fmt.Errorf("vacuum: %w", err)
|
||||||
|
}
|
||||||
|
res.After = fileSizeOf(path)
|
||||||
|
applog.Printf("compact: %s %d → %d bytes", path, res.Before, res.After)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// fileSizeOf returns a file's size, or 0 if it cannot be read.
|
||||||
|
func fileSizeOf(path string) int64 {
|
||||||
|
if strings.TrimSpace(path) == "" {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
fi, err := os.Stat(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
return fi.Size()
|
||||||
|
}
|
||||||
+32
-3
@@ -891,6 +891,13 @@ export default function App() {
|
|||||||
QSOAudioPlayOnAir().catch((e: any) => setError(String(e?.message ?? e)));
|
QSOAudioPlayOnAir().catch((e: any) => setError(String(e?.message ?? e)));
|
||||||
};
|
};
|
||||||
const refreshManualRecReady = () => { QSOAudioManualReady().then(setManualRecReady).catch(() => {}); };
|
const refreshManualRecReady = () => { QSOAudioManualReady().then(setManualRecReady).catch(() => {}); };
|
||||||
|
// Asked at mount, and asked AGAIN once the backend is really up (see the
|
||||||
|
// initial grid load) and on every profile change. The audio devices are a
|
||||||
|
// per-profile setting, so this question cannot be answered before the active
|
||||||
|
// profile is known — and a "no" then was final, which is why the record button
|
||||||
|
// went missing for a whole session after an update, when startup does more
|
||||||
|
// work and the first ask loses the race. Opening and closing the audio panel
|
||||||
|
// was the only way back.
|
||||||
useEffect(() => { refreshManualRecReady(); }, []);
|
useEffect(() => { refreshManualRecReady(); }, []);
|
||||||
const startManualRecording = () => {
|
const startManualRecording = () => {
|
||||||
QSOAudioManualStart().then((active) => {
|
QSOAudioManualStart().then((active) => {
|
||||||
@@ -1104,6 +1111,17 @@ export default function App() {
|
|||||||
};
|
};
|
||||||
// QSL Manager is a closable tab opened on demand from Tools → QSL Manager.
|
// QSL Manager is a closable tab opened on demand from Tools → QSL Manager.
|
||||||
const [qslTabOpen, setQslTabOpen] = useState(false);
|
const [qslTabOpen, setQslTabOpen] = useState(false);
|
||||||
|
// A callsign sent to the QSL Manager's Paper QSL view from elsewhere (the
|
||||||
|
// awards grid). The counter makes two clicks on the same callsign two
|
||||||
|
// requests — the panel is force-mounted and would otherwise see no change.
|
||||||
|
const [qslPaperReq, setQslPaperReq] = useState<{ call: string; n: number } | undefined>(undefined);
|
||||||
|
function openPaperQSLFor(call: string) {
|
||||||
|
const c = call.trim().toUpperCase();
|
||||||
|
if (!c) return;
|
||||||
|
setQslTabOpen(true);
|
||||||
|
setActiveTab('qsl');
|
||||||
|
setQslPaperReq((r) => ({ call: c, n: (r?.n ?? 0) + 1 }));
|
||||||
|
}
|
||||||
const [qslDesignerOpen, setQslDesignerOpen] = useState(false);
|
const [qslDesignerOpen, setQslDesignerOpen] = useState(false);
|
||||||
const [eqslQsoId, setEqslQsoId] = useState<number | null>(null); // QSO being sent as eQSL
|
const [eqslQsoId, setEqslQsoId] = useState<number | null>(null); // QSO being sent as eQSL
|
||||||
function closeQslTab() {
|
function closeQslTab() {
|
||||||
@@ -3087,6 +3105,7 @@ export default function App() {
|
|||||||
// Same race, same fix: the toolbar options were read once at mount,
|
// Same race, same fix: the toolbar options were read once at mount,
|
||||||
// possibly before the profile was active, and a "no" then was final.
|
// possibly before the profile was active, and a "no" then was final.
|
||||||
refreshChaseNew();
|
refreshChaseNew();
|
||||||
|
refreshManualRecReady();
|
||||||
} else if (!ok && alive && tries++ < 360) {
|
} else if (!ok && alive && tries++ < 360) {
|
||||||
// Quick retries at first (normal startup connects in ~2 s); then keep
|
// Quick retries at first (normal startup connects in ~2 s); then keep
|
||||||
// trying for several minutes, because the very first migration against a
|
// trying for several minutes, because the very first migration against a
|
||||||
@@ -3515,12 +3534,18 @@ export default function App() {
|
|||||||
// An explicit click always wins over whatever call is currently in the field.
|
// An explicit click always wins over whatever call is currently in the field.
|
||||||
const unsubFlexSpot = EventsOn('flex:spot_clicked', (p: any) => {
|
const unsubFlexSpot = EventsOn('flex:spot_clicked', (p: any) => {
|
||||||
const call = String(p?.call ?? '');
|
const call = String(p?.call ?? '');
|
||||||
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
if (!applyUdpCall(call, true)) return;
|
||||||
|
restartRecordingForNewTarget(call);
|
||||||
|
// The park, like a click in the band map: the radio reports only a
|
||||||
|
// callsign, so the backend looks it up again before sending the event.
|
||||||
|
applySpotPOTA(String(p?.pota_ref ?? ''));
|
||||||
});
|
});
|
||||||
// Clicking a spot on the ExpertSDR (TCI) panorama fills the call, like Flex.
|
// Clicking a spot on the ExpertSDR (TCI) panorama fills the call, like Flex.
|
||||||
const unsubTciSpot = EventsOn('tci:spot_clicked', (p: any) => {
|
const unsubTciSpot = EventsOn('tci:spot_clicked', (p: any) => {
|
||||||
const call = String(p?.call ?? '');
|
const call = String(p?.call ?? '');
|
||||||
if (applyUdpCall(call, true)) restartRecordingForNewTarget(call);
|
if (!applyUdpCall(call, true)) return;
|
||||||
|
restartRecordingForNewTarget(call);
|
||||||
|
applySpotPOTA(String(p?.pota_ref ?? ''));
|
||||||
});
|
});
|
||||||
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
|
const unsubBulk = EventsOn('bulkupdate:progress', (p: any) => {
|
||||||
const total = Number(p?.total ?? 0);
|
const total = Number(p?.total ?? 0);
|
||||||
@@ -3635,6 +3660,8 @@ export default function App() {
|
|||||||
setGridPrefsProfile(id ?? null);
|
setGridPrefsProfile(id ?? null);
|
||||||
setActiveProfileId(typeof id === 'number' ? id : null);
|
setActiveProfileId(typeof id === 'number' ? id : null);
|
||||||
loadStation(); loadLists(); loadCATCfg(); reloadWk(); loadMainPanes(); loadProfileList();
|
loadStation(); loadLists(); loadCATCfg(); reloadWk(); loadMainPanes(); loadProfileList();
|
||||||
|
// The sound devices are per profile: one may record and the next not.
|
||||||
|
refreshManualRecReady();
|
||||||
// The chat is per shared logbook — clear the previous profile's messages
|
// The chat is per shared logbook — clear the previous profile's messages
|
||||||
// and reload for the new logbook (or hide if it isn't a MySQL log).
|
// and reload for the new logbook (or hide if it isn't a MySQL log).
|
||||||
setChatMsgs([]); chatSeen.current.clear(); setChatOnline([]); setChatUnread(0);
|
setChatMsgs([]); chatSeen.current.clear(); setChatOnline([]); setChatUnread(0);
|
||||||
@@ -7682,6 +7709,7 @@ export default function App() {
|
|||||||
<TabsContent value="qsl" forceMount className="mt-0 flex flex-col min-h-0 flex-1 data-[state=inactive]:hidden">
|
<TabsContent value="qsl" forceMount className="mt-0 flex flex-col min-h-0 flex-1 data-[state=inactive]:hidden">
|
||||||
<QSLManagerPanel
|
<QSLManagerPanel
|
||||||
onEditQSO={openEdit}
|
onEditQSO={openEdit}
|
||||||
|
paperRequest={qslPaperReq}
|
||||||
// The same row actions the Recent QSOs grid offers. Only the
|
// The same row actions the Recent QSOs grid offers. Only the
|
||||||
// selection-based exports: exporting "the filter" would mean
|
// selection-based exports: exporting "the filter" would mean
|
||||||
// the Recent-QSOs filter, not the rows shown here.
|
// the Recent-QSOs filter, not the rows shown here.
|
||||||
@@ -7787,7 +7815,8 @@ export default function App() {
|
|||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<TabsContent value="awards" className="flex-1 min-h-0 p-0">
|
<TabsContent value="awards" className="flex-1 min-h-0 p-0">
|
||||||
<AwardsPanel onEditQSO={openEdit} onAwardsChanged={() => setAwardsVersion((v) => v + 1)} />
|
<AwardsPanel onEditQSO={openEdit} onAwardsChanged={() => setAwardsVersion((v) => v + 1)}
|
||||||
|
onPaperQSL={openPaperQSLFor} />
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
{statsTabOpen && (
|
{statsTabOpen && (
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
import { Bell, Plus, Trash2, Volume2, Mail, Eye, X, Search } from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription,
|
||||||
@@ -102,17 +102,40 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
|||||||
return alerts.Rule.createFrom({ ...d, [key]: next });
|
return alerts.Rule.createFrom({ ...d, [key]: next });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Saving used to be silent: the dialog stays open and the rule looks exactly
|
||||||
|
// as it did a second earlier, so there was nothing to tell an operator whether
|
||||||
|
// the click had registered. A line that says so, and clears itself.
|
||||||
|
const [savedMsg, setSavedMsg] = useState('');
|
||||||
|
const savedTimer = useRef(0);
|
||||||
|
function flashSaved(text: string) {
|
||||||
|
setSavedMsg(text);
|
||||||
|
window.clearTimeout(savedTimer.current);
|
||||||
|
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||||
|
}
|
||||||
|
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||||
|
|
||||||
async function save() {
|
async function save() {
|
||||||
if (!draft) return;
|
if (!draft) return;
|
||||||
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
if (!draft.name.trim()) { setErr(t('altm.giveName')); return; }
|
||||||
try { const saved = await SaveAlertRule(draft); await refresh(); loadDraft(saved as Rule); setErr(''); }
|
try {
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
const saved = await SaveAlertRule(draft);
|
||||||
|
await refresh();
|
||||||
|
loadDraft(saved as Rule);
|
||||||
|
setErr('');
|
||||||
|
flashSaved(t('altm.saved', { name: draft.name.trim() }));
|
||||||
|
} catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
async function del() {
|
async function del() {
|
||||||
if (!draft) return;
|
if (!draft) return;
|
||||||
if (!draft.id) { loadDraft(null); return; }
|
if (!draft.id) { loadDraft(null); return; }
|
||||||
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
if (!window.confirm(t('altm.deleteConfirm', { name: draft.name }))) return;
|
||||||
try { await DeleteAlertRule(draft.id); loadDraft(null); await refresh(); }
|
try {
|
||||||
|
const name = draft.name;
|
||||||
|
await DeleteAlertRule(draft.id);
|
||||||
|
loadDraft(null);
|
||||||
|
await refresh();
|
||||||
|
flashSaved(t('altm.deleted', { name }));
|
||||||
|
}
|
||||||
catch (e: any) { setErr(String(e?.message ?? e)); }
|
catch (e: any) { setErr(String(e?.message ?? e)); }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -257,6 +280,7 @@ export function AlertsModal({ onClose, bands, modes, countries }: {
|
|||||||
{/* Editor actions */}
|
{/* Editor actions */}
|
||||||
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
<div className="flex items-center gap-2 px-3 py-2 border-t border-border/60">
|
||||||
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
{err && <span className="text-[11px] text-danger flex-1 truncate">{err}</span>}
|
||||||
|
{!err && savedMsg && <span className="text-[11px] text-success flex-1 truncate">{savedMsg}</span>}
|
||||||
<div className="flex-1" />
|
<div className="flex-1" />
|
||||||
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
<Button variant="ghost" size="sm" className="text-danger" onClick={del}><Trash2 className="size-3.5" /> {t('altm.delete')}</Button>
|
||||||
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
<Button size="sm" onClick={save}>{t('altm.saveRule')}</Button>
|
||||||
|
|||||||
@@ -68,7 +68,11 @@ function ProgressBar({ worked, confirmed, total }: { worked: number; confirmed:
|
|||||||
// detection only means anything for those — see the Missing refs button.
|
// detection only means anything for those — see the Missing refs button.
|
||||||
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
type AwardListItem = { code: string; name: string; valid?: boolean; bands?: string[]; emission?: string[]; scoped?: boolean };
|
||||||
|
|
||||||
export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: number) => void; onAwardsChanged?: () => void } = {}) {
|
export function AwardsPanel({ onEditQSO, onAwardsChanged, onPaperQSL }: {
|
||||||
|
onEditQSO?: (id: number) => void;
|
||||||
|
onAwardsChanged?: () => void;
|
||||||
|
onPaperQSL?: (call: string) => void;
|
||||||
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
const [awardList, setAwardList] = useState<AwardListItem[]>([]);
|
||||||
// Computed results are cached per award code — each award is scanned only the
|
// Computed results are cached per award code — each award is scanned only the
|
||||||
@@ -604,7 +608,7 @@ export function AwardsPanel({ onEditQSO, onAwardsChanged }: { onEditQSO?: (id: n
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{cell && current && (
|
{cell && current && (
|
||||||
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} />
|
<CellQSOModal code={current.code} cell={cell} modeClass={modeFilter === 'all' ? '' : modeFilter} onClose={() => setCell(null)} onPaperQSL={onPaperQSL} />
|
||||||
)}
|
)}
|
||||||
{showMissing && current && (
|
{showMissing && current && (
|
||||||
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
<MissingQSOModal code={current.code} name={current.name} onClose={() => setShowMissing(false)} onEditQSO={onEditQSO} />
|
||||||
@@ -835,7 +839,14 @@ function MissingQSOModal({ code, name, onClose, onEditQSO }: { code: string; nam
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
// CellQSOModal lists the QSOs behind one award-grid cell (reference × band).
|
||||||
function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell: { ref: string; band: string; name?: string }; modeClass: string; onClose: () => void }) {
|
function CellQSOModal({ code, cell, modeClass, onClose, onPaperQSL }: {
|
||||||
|
code: string; cell: { ref: string; band: string; name?: string }; modeClass: string;
|
||||||
|
onClose: () => void;
|
||||||
|
// Send this callsign to the QSL Manager's Paper QSL view. Chasing a
|
||||||
|
// confirmation starts here — an unconfirmed entity, the contact behind it —
|
||||||
|
// and used to continue by retyping the callsign into another tab.
|
||||||
|
onPaperQSL?: (call: string) => void;
|
||||||
|
}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [qsos, setQsos] = useState<any[]>([]);
|
const [qsos, setQsos] = useState<any[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
@@ -872,7 +883,15 @@ function CellQSOModal({ code, cell, modeClass, onClose }: { code: string; cell:
|
|||||||
{qsos.map((q, i) => (
|
{qsos.map((q, i) => (
|
||||||
<tr key={q.id ?? i} className="border-b border-border/30">
|
<tr key={q.id ?? i} className="border-b border-border/30">
|
||||||
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
<td className="py-1 px-3 font-mono">{fmt(q.qso_date)}</td>
|
||||||
<td className="py-1 pr-2 font-mono font-semibold">{q.callsign}</td>
|
<td className="py-1 pr-2 font-mono font-semibold">
|
||||||
|
{onPaperQSL ? (
|
||||||
|
<button type="button" className="hover:underline text-primary"
|
||||||
|
title={t('awp.paperQslTip')}
|
||||||
|
onClick={() => { onPaperQSL(String(q.callsign ?? '')); onClose(); }}>
|
||||||
|
{q.callsign}
|
||||||
|
</button>
|
||||||
|
) : q.callsign}
|
||||||
|
</td>
|
||||||
<td className="py-1 pr-2">{q.band}</td>
|
<td className="py-1 pr-2">{q.band}</td>
|
||||||
<td className="py-1 pr-2">{q.mode}</td>
|
<td className="py-1 pr-2">{q.mode}</td>
|
||||||
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
<td className="py-1 pr-3 text-muted-foreground">{[isQSLConfirmed(q.lotw_rcvd) && 'LoTW', isQSLConfirmed(q.qsl_rcvd) && 'QSL', isQSLConfirmed(q.eqsl_rcvd) && 'eQSL'].filter(Boolean).join(', ')}</td>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
import { Plus, Trash2, Save, FolderOpen, X } from 'lucide-react';
|
||||||
import { writeUiPref } from '@/lib/uiPref';
|
import { writeUiPref } from '@/lib/uiPref';
|
||||||
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog';
|
||||||
@@ -192,6 +192,17 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
|
|
||||||
function apply() { onApply(buildFilter()); }
|
function apply() { onApply(buildFilter()); }
|
||||||
|
|
||||||
|
// Same silence as the alert rules: the preset landed in the list, but the list
|
||||||
|
// is not where the operator is looking when they press Save.
|
||||||
|
const [savedMsg, setSavedMsg] = useState('');
|
||||||
|
const savedTimer = useRef(0);
|
||||||
|
function flashSaved(text: string) {
|
||||||
|
setSavedMsg(text);
|
||||||
|
window.clearTimeout(savedTimer.current);
|
||||||
|
savedTimer.current = window.setTimeout(() => setSavedMsg(''), 3000);
|
||||||
|
}
|
||||||
|
useEffect(() => () => window.clearTimeout(savedTimer.current), []);
|
||||||
|
|
||||||
function saveCurrentPreset() {
|
function saveCurrentPreset() {
|
||||||
const name = presetName.trim();
|
const name = presetName.trim();
|
||||||
if (!name) return;
|
if (!name) return;
|
||||||
@@ -199,6 +210,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
savePresets(next);
|
savePresets(next);
|
||||||
setPresets(next);
|
setPresets(next);
|
||||||
setPresetName('');
|
setPresetName('');
|
||||||
|
flashSaved(t('fltb.presetSaved', { name }));
|
||||||
}
|
}
|
||||||
function loadPreset(name: string) {
|
function loadPreset(name: string) {
|
||||||
const f = presets[name];
|
const f = presets[name];
|
||||||
@@ -335,6 +347,7 @@ export function FilterBuilder({ open, initial, onApply, onClose }: Props) {
|
|||||||
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
<Button variant="outline" size="sm" className="h-8" disabled={!presetName.trim()} onClick={saveCurrentPreset}>
|
||||||
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
<Save className="size-3.5 mr-1" /> {t('fltb.savePreset')}
|
||||||
</Button>
|
</Button>
|
||||||
|
{savedMsg && <span className="text-[11px] text-success truncate">{savedMsg}</span>}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -134,9 +134,14 @@ export type GridActions = {
|
|||||||
onDelete?: (ids: number[]) => void;
|
onDelete?: (ids: number[]) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export function QSLManagerPanel({ onEditQSO, actions }: {
|
export function QSLManagerPanel({ onEditQSO, actions, paperRequest }: {
|
||||||
onEditQSO?: (id: number) => void;
|
onEditQSO?: (id: number) => void;
|
||||||
actions?: GridActions;
|
actions?: GridActions;
|
||||||
|
// A callsign to open the Paper QSL view on, sent from elsewhere in the app
|
||||||
|
// (the awards grid). Carries a counter rather than being a bare string: the
|
||||||
|
// panel is force-mounted and keeps its state, so asking twice for the SAME
|
||||||
|
// callsign has to be two requests, not one unchanged prop.
|
||||||
|
paperRequest?: { call: string; n: number };
|
||||||
} = {}) {
|
} = {}) {
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
const [service, setService] = useState('lotw');
|
const [service, setService] = useState('lotw');
|
||||||
@@ -198,6 +203,27 @@ export function QSLManagerPanel({ onEditQSO, actions }: {
|
|||||||
}, [paperCall]);
|
}, [paperCall]);
|
||||||
|
|
||||||
|
|
||||||
|
// Honour an incoming request: switch to Paper QSL, fill the callsign, search.
|
||||||
|
// The search runs from the effect below once paperCall has actually changed —
|
||||||
|
// searchPaper closes over paperCall, so calling it here would search the
|
||||||
|
// PREVIOUS callsign.
|
||||||
|
// The pending request's callsign, so the search fires for THAT callsign and
|
||||||
|
// for nothing else: the effect below also wakes on every keystroke in the
|
||||||
|
// field, and searching on each of them would query the log letter by letter.
|
||||||
|
const pendingPaperCall = useRef('');
|
||||||
|
useEffect(() => {
|
||||||
|
const call = paperRequest?.call?.trim().toUpperCase();
|
||||||
|
if (!call) return;
|
||||||
|
setService('paper');
|
||||||
|
setPaperCall(call);
|
||||||
|
pendingPaperCall.current = call;
|
||||||
|
}, [paperRequest?.call, paperRequest?.n]);
|
||||||
|
useEffect(() => {
|
||||||
|
if (!pendingPaperCall.current || paperCall !== pendingPaperCall.current) return;
|
||||||
|
pendingPaperCall.current = '';
|
||||||
|
searchPaper();
|
||||||
|
}, [paperCall, searchPaper]);
|
||||||
|
|
||||||
async function applyPaper() {
|
async function applyPaper() {
|
||||||
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
const ids = paperRows.filter((r) => paperSel.has(r.id)).map((r) => r.id);
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) return;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
ChevronDown, ChevronRight,
|
ChevronDown, ChevronRight,
|
||||||
User, Database, Radio, Cog, Server, Antenna as AntennaIcon,
|
User, Database, Radio, Cog, Server, Antenna as AntennaIcon,
|
||||||
Compass, Wifi, Construction, UploadCloud, Loader2, FolderOpen, Play, Power, Check, Pencil,
|
Compass, Wifi, Construction, UploadCloud, Loader2, FolderOpen, Play, Power, Check, Pencil,
|
||||||
|
Minimize2,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import {
|
import {
|
||||||
GetLookupSettings, SaveLookupSettings, ClearLookupCache, TestLookupProvider,
|
GetLookupSettings, SaveLookupSettings, ClearLookupCache, TestLookupProvider,
|
||||||
@@ -12,7 +13,7 @@ import {
|
|||||||
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
ListProfiles, GetActiveProfile, SaveProfile, DeleteProfile, ActivateProfile, DuplicateProfile,
|
||||||
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
GetRotators, SaveRotators, TestRotatorDevice, RotatorPark, RotatorStop,
|
||||||
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
|
GetRotorPresets, SaveRotorPresets, ResetRotorPresets,
|
||||||
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam,
|
GetUltrabeamSettings, SaveUltrabeamSettings, TestUltrabeam, CompactDatabase,
|
||||||
GetAntGeniusSettings, SaveAntGeniusSettings,
|
GetAntGeniusSettings, SaveAntGeniusSettings,
|
||||||
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
GetTunerGeniusSettings, SaveTunerGeniusSettings,
|
||||||
GetPSUSettings, SavePSUSettings,
|
GetPSUSettings, SavePSUSettings,
|
||||||
@@ -1838,6 +1839,16 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
};
|
};
|
||||||
// A date for a person: the day, not the timestamp the backend stores.
|
// A date for a person: the day, not the timestamp the backend stores.
|
||||||
const fmtDay = (v?: string) => (v ? String(v).slice(0, 10) : '—');
|
const fmtDay = (v?: string) => (v ? String(v).slice(0, 10) : '—');
|
||||||
|
// Binary units, one decimal, because the point of showing a size here is to
|
||||||
|
// compare two of them: "412.7 MB → 38.4 MB" says what a bare byte count does not.
|
||||||
|
const fmtBytes = (n: number) => {
|
||||||
|
if (!n || n < 0) return '—';
|
||||||
|
const u = ['B', 'KB', 'MB', 'GB'];
|
||||||
|
let i = 0;
|
||||||
|
let v = n;
|
||||||
|
while (v >= 1024 && i < u.length - 1) { v /= 1024; i++; }
|
||||||
|
return `${i === 0 ? v : v.toFixed(1)} ${u[i]}`;
|
||||||
|
};
|
||||||
const [rdaCount, setRdaCount] = useState(0);
|
const [rdaCount, setRdaCount] = useState(0);
|
||||||
const [rdaBusy, setRdaBusy] = useState(false);
|
const [rdaBusy, setRdaBusy] = useState(false);
|
||||||
const [rdaUseCurrent, setRdaUseCurrent] = useState(true);
|
const [rdaUseCurrent, setRdaUseCurrent] = useState(true);
|
||||||
@@ -3578,7 +3589,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{isSerial ? (
|
{isSerial ? (
|
||||||
<div className="grid grid-cols-3 gap-3">
|
<div className="grid grid-cols-3 gap-3">
|
||||||
<div className="space-y-1 col-span-2">
|
<div className="space-y-1 col-span-2">
|
||||||
<Label>{t('hw.motorCom')}</Label>
|
<Label>{t('hw.motorCom')}{!isSteppir && <span className="ml-1.5 font-normal text-muted-foreground">{t('hw.motorComUb')}</span>}</Label>
|
||||||
{/* A list AND a text field, which is why this is a Combobox and
|
{/* A list AND a text field, which is why this is a Combobox and
|
||||||
not the Select the other serial devices use: the port for a
|
not the Select the other serial devices use: the port for a
|
||||||
USB adapter that is currently unplugged does not appear in
|
USB adapter that is currently unplugged does not appear in
|
||||||
@@ -3591,6 +3602,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
options={wkPorts}
|
options={wkPorts}
|
||||||
allowFreeText
|
allowFreeText
|
||||||
commitOnType
|
commitOnType
|
||||||
|
showToggle
|
||||||
placeholder="COM3"
|
placeholder="COM3"
|
||||||
className="font-mono flex-1"
|
className="font-mono flex-1"
|
||||||
onChange={(v) => setUltrabeam((s) => ({ ...s, com: v.trim().toUpperCase() }))}
|
onChange={(v) => setUltrabeam((s) => ({ ...s, com: v.trim().toUpperCase() }))}
|
||||||
@@ -3601,12 +3613,19 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
</div>
|
</div>
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<Label>{t('hw.motorBaud')}</Label>
|
<Label>{t('hw.motorBaud')}</Label>
|
||||||
<Select value={String(ultrabeam.baud || 9600)} onValueChange={(v) => setUltrabeam((s) => ({ ...s, baud: parseInt(v, 10) || 9600 }))}>
|
{/* The Ultrabeam answers on 19200 and on nothing else, so there is
|
||||||
|
no choice to offer — an FTDI cable opens at any speed, and a
|
||||||
|
wrong one is indistinguishable from a dead controller. */}
|
||||||
|
{!isSteppir ? (
|
||||||
|
<Input className="h-9 font-mono" value="19200" readOnly disabled />
|
||||||
|
) : (
|
||||||
|
<Select value={String(ultrabeam.baud || 9600)} onValueChange={(s2) => setUltrabeam((s) => ({ ...s, baud: parseInt(s2, 10) || 9600 }))}>
|
||||||
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
<SelectTrigger className="h-9"><SelectValue /></SelectTrigger>
|
||||||
<SelectContent>
|
<SelectContent>
|
||||||
{[1200, 4800, 9600, 19200].map((b) => <SelectItem key={b} value={String(b)}>{b}</SelectItem>)}
|
{[1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200].map((b) => <SelectItem key={b} value={String(b)}>{b}</SelectItem>)}
|
||||||
</SelectContent>
|
</SelectContent>
|
||||||
</Select>
|
</Select>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
@@ -6166,6 +6185,24 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
}
|
}
|
||||||
|
|
||||||
function DatabasePanel() {
|
function DatabasePanel() {
|
||||||
|
// Compacting: which database is running, and what the last one saved.
|
||||||
|
// SQLite frees pages inside the file and never shrinks it, so this is the
|
||||||
|
// only thing that gives the disk space back after a large delete.
|
||||||
|
const [compacting, setCompacting] = useState('');
|
||||||
|
const [compactMsg, setCompactMsg] = useState<Record<string, string>>({});
|
||||||
|
function compact(target: 'settings' | 'logbook') {
|
||||||
|
setCompacting(target);
|
||||||
|
setCompactMsg((m) => ({ ...m, [target]: '' }));
|
||||||
|
CompactDatabase(target)
|
||||||
|
.then((r: any) => {
|
||||||
|
const msg = r?.backend === 'mysql'
|
||||||
|
? t('db.compactMysqlDone')
|
||||||
|
: t('db.compactDone', { before: fmtBytes(r?.before ?? 0), after: fmtBytes(r?.after ?? 0) });
|
||||||
|
setCompactMsg((m) => ({ ...m, [target]: msg }));
|
||||||
|
})
|
||||||
|
.catch((e: any) => setErr(String(e?.message ?? e)))
|
||||||
|
.finally(() => setCompacting(''));
|
||||||
|
}
|
||||||
async function refreshDb() { try { setDbSettings(await GetDatabaseSettings() as any); } catch {} }
|
async function refreshDb() { try { setDbSettings(await GetDatabaseSettings() as any); } catch {} }
|
||||||
async function refreshBackend() { try { setBackendStatus(await GetDBBackendStatus() as any); } catch {} }
|
async function refreshBackend() { try { setBackendStatus(await GetDBBackendStatus() as any); } catch {} }
|
||||||
// The chosen file is persisted (config.json) the moment it's picked; dbMsg
|
// The chosen file is persisted (config.json) the moment it's picked; dbMsg
|
||||||
@@ -6285,9 +6322,13 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
|
<Button variant="outline" size="sm" onClick={renameDb} title={t('db.renameTip')}><Pencil className="size-3.5" /> {t('db.rename')}</Button>
|
||||||
{/* Pushed right: these two act on the file that is already there,
|
{/* Pushed right: these two act on the file that is already there,
|
||||||
while the four on the left change WHICH file is in use. */}
|
while the four on the left change WHICH file is in use. */}
|
||||||
<Button variant="outline" size="sm" className="ml-auto" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
|
<Button variant="outline" size="sm" className="ml-auto" onClick={() => compact('settings')} disabled={compacting !== ''}>
|
||||||
|
{compacting === 'settings' ? <Loader2 className="size-3.5 animate-spin" /> : <Minimize2 className="size-3.5" />} {t('db.compact')}
|
||||||
|
</Button>
|
||||||
|
<Button variant="outline" size="sm" onClick={revealFolder}><FolderOpen className="size-3.5" /> {t('db.openFolder')}</Button>
|
||||||
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
|
{dbSettings.is_custom && <Button variant="ghost" size="sm" onClick={resetDefault}>{t('db.resetDefault')}</Button>}
|
||||||
</div>
|
</div>
|
||||||
|
{compactMsg.settings && <p className="text-[11px] text-success">{compactMsg.settings}</p>}
|
||||||
{/* The DB pointer is only read at startup, so offer the restart inline. */}
|
{/* The DB pointer is only read at startup, so offer the restart inline. */}
|
||||||
{dbMsg && (
|
{dbMsg && (
|
||||||
<div className="text-[11px] text-success space-y-1 pt-1">
|
<div className="text-[11px] text-success space-y-1 pt-1">
|
||||||
@@ -6350,8 +6391,12 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
<Button variant="outline" size="sm" onClick={newLogbook}><Plus className="size-3.5" /> {t('db.newDb')}</Button>
|
<Button variant="outline" size="sm" onClick={newLogbook}><Plus className="size-3.5" /> {t('db.newDb')}</Button>
|
||||||
<Button variant="outline" size="sm" onClick={openLogbook}><FolderOpen className="size-3.5" /> {t('db.openExisting')}</Button>
|
<Button variant="outline" size="sm" onClick={openLogbook}><FolderOpen className="size-3.5" /> {t('db.openExisting')}</Button>
|
||||||
<Button variant="outline" size="sm" onClick={renameLogbook} title={t('db.renameLogbookTip')}><Pencil className="size-3.5" /> {t('db.renameLogbook')}</Button>
|
<Button variant="outline" size="sm" onClick={renameLogbook} title={t('db.renameLogbookTip')}><Pencil className="size-3.5" /> {t('db.renameLogbook')}</Button>
|
||||||
|
<Button variant="outline" size="sm" className="ml-auto" onClick={() => compact('logbook')} disabled={compacting !== ''}>
|
||||||
|
{compacting === 'logbook' ? <Loader2 className="size-3.5 animate-spin" /> : <Minimize2 className="size-3.5" />} {t('db.compact')}
|
||||||
|
</Button>
|
||||||
{mysqlCfg.sqlite_path && <Button variant="ghost" size="sm" onClick={useLocalLogbook}>{t('db.useDefaultLogbook')}</Button>}
|
{mysqlCfg.sqlite_path && <Button variant="ghost" size="sm" onClick={useLocalLogbook}>{t('db.useDefaultLogbook')}</Button>}
|
||||||
</div>
|
</div>
|
||||||
|
{compactMsg.logbook && <p className="text-[11px] text-success">{compactMsg.logbook}</p>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
@@ -6376,8 +6421,17 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
|||||||
{t('db.testCreate')}
|
{t('db.testCreate')}
|
||||||
</Button>
|
</Button>
|
||||||
<Button size="sm" className="h-8" onClick={connectMysql}>{t('db.connectUse')}</Button>
|
<Button size="sm" className="h-8" onClick={connectMysql}>{t('db.connectUse')}</Button>
|
||||||
|
{/* Compacting a shared logbook is OPTIMIZE TABLE, and it rebuilds the
|
||||||
|
table with everyone else waiting on it — hence the warning, and
|
||||||
|
hence its place here rather than beside the connection buttons of
|
||||||
|
a file only this operator uses. */}
|
||||||
|
<Button variant="outline" size="sm" className="h-8 ml-auto" title={t('db.compactMysqlWarn')}
|
||||||
|
onClick={() => compact('logbook')} disabled={compacting !== ''}>
|
||||||
|
{compacting === 'logbook' ? <Loader2 className="size-3.5 animate-spin" /> : <Minimize2 className="size-3.5" />} {t('db.compact')}
|
||||||
|
</Button>
|
||||||
<span className="text-[11px] text-muted-foreground">{mysqlMsg}</span>
|
<span className="text-[11px] text-muted-foreground">{mysqlMsg}</span>
|
||||||
</div>
|
</div>
|
||||||
|
{compactMsg.logbook && <p className="text-[11px] text-success">{compactMsg.logbook}</p>}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useRef, useState } from 'react';
|
import { useEffect, useRef, useState } from 'react';
|
||||||
|
import { ChevronDown } from 'lucide-react';
|
||||||
import { Input } from './input';
|
import { Input } from './input';
|
||||||
import { cn } from '@/lib/utils';
|
import { cn } from '@/lib/utils';
|
||||||
|
|
||||||
@@ -7,6 +8,7 @@ import { cn } from '@/lib/utils';
|
|||||||
// can't hold a typo'd value that isn't in the list.
|
// can't hold a typo'd value that isn't in the list.
|
||||||
export function Combobox({
|
export function Combobox({
|
||||||
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
value, onChange, options, placeholder, className, allowFreeText = false, commitOnType = false,
|
||||||
|
showToggle = false,
|
||||||
}: {
|
}: {
|
||||||
value: string;
|
value: string;
|
||||||
onChange: (v: string) => void;
|
onChange: (v: string) => void;
|
||||||
@@ -18,9 +20,21 @@ export function Combobox({
|
|||||||
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
// fields read live by other actions — e.g. RST, so a CW macro sent without
|
||||||
// leaving the field uses the value just typed.
|
// leaving the field uses the value just typed.
|
||||||
commitOnType?: boolean;
|
commitOnType?: boolean;
|
||||||
|
// Draw a chevron that opens the full list on click.
|
||||||
|
//
|
||||||
|
// Without it this control is indistinguishable from a plain text box: it opens
|
||||||
|
// only on a keystroke or ArrowDown, both of which have to be known about
|
||||||
|
// first. That is fine for a field whose list is a convenience (RST), and wrong
|
||||||
|
// for one whose list is the ANSWER — the COM ports actually present on this
|
||||||
|
// machine, which nobody can be expected to recall.
|
||||||
|
showToggle?: boolean;
|
||||||
}) {
|
}) {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
const [query, setQuery] = useState('');
|
const [query, setQuery] = useState('');
|
||||||
|
// Opened by the chevron rather than by typing: the whole list is on offer, not
|
||||||
|
// the part matching what is already in the field — a box holding COM7 would
|
||||||
|
// otherwise "open" onto COM7 alone.
|
||||||
|
const [browse, setBrowse] = useState(false);
|
||||||
const ref = useRef<HTMLDivElement>(null);
|
const ref = useRef<HTMLDivElement>(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -31,20 +45,22 @@ export function Combobox({
|
|||||||
return () => document.removeEventListener('mousedown', onDoc);
|
return () => document.removeEventListener('mousedown', onDoc);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const filtered = open
|
const filtered = !open ? []
|
||||||
? options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60)
|
: browse ? options.slice(0, 60)
|
||||||
: [];
|
: options.filter((o) => o.toLowerCase().includes(query.toLowerCase())).slice(0, 60);
|
||||||
|
|
||||||
function commit(v: string) {
|
function commit(v: string) {
|
||||||
onChange(v);
|
onChange(v);
|
||||||
setQuery(v);
|
setQuery(v);
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
setBrowse(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBlur() {
|
function onBlur() {
|
||||||
// Defer so a click on an option registers first.
|
// Defer so a click on an option registers first.
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
setOpen(false);
|
setOpen(false);
|
||||||
|
setBrowse(false);
|
||||||
const trimmed = query.trim();
|
const trimmed = query.trim();
|
||||||
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
const exact = options.find((o) => o.toLowerCase() === trimmed.toLowerCase());
|
||||||
// Only fire onChange when the value actually changed — committing an
|
// Only fire onChange when the value actually changed — committing an
|
||||||
@@ -68,6 +84,7 @@ export function Combobox({
|
|||||||
const v = e.target.value;
|
const v = e.target.value;
|
||||||
setQuery(v);
|
setQuery(v);
|
||||||
setOpen(true);
|
setOpen(true);
|
||||||
|
setBrowse(false); // typing filters again
|
||||||
// Commit-on-type pushes the value live to the parent (so a CW macro sent
|
// Commit-on-type pushes the value live to the parent (so a CW macro sent
|
||||||
// without leaving the field uses what was just typed). With free text that's
|
// without leaving the field uses what was just typed). With free text that's
|
||||||
// any input; a restricted field (allowFreeText=false) commits ONLY a value
|
// any input; a restricted field (allowFreeText=false) commits ONLY a value
|
||||||
@@ -76,14 +93,34 @@ export function Combobox({
|
|||||||
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
|
if (commitOnType && (allowFreeText || options.some((o) => o.toLowerCase() === v.trim().toLowerCase()))) onChange(v);
|
||||||
}}
|
}}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
|
className={showToggle ? 'pr-7' : undefined}
|
||||||
onKeyDown={(e) => {
|
onKeyDown={(e) => {
|
||||||
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); }
|
if ((e.key === 'ArrowDown' || e.key === 'Alt') && !open) { setOpen(true); setBrowse(true); }
|
||||||
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
|
else if (e.key === 'Enter' && open && filtered.length > 0) { e.preventDefault(); commit(filtered[0]); }
|
||||||
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
|
else if (e.key === 'Escape') { setQuery(value); setOpen(false); }
|
||||||
// Tab: just let it move on; onBlur commits/closes. Options are
|
// Tab: just let it move on; onBlur commits/closes. Options are
|
||||||
// tabIndex=-1 so a single Tab leaves the field.
|
// tabIndex=-1 so a single Tab leaves the field.
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
{showToggle && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
tabIndex={-1}
|
||||||
|
aria-label="Show list"
|
||||||
|
className="absolute inset-y-0 right-0 flex w-7 items-center justify-center text-muted-foreground hover:text-foreground"
|
||||||
|
// mousedown, not click: the input's blur fires first otherwise and
|
||||||
|
// closes the list the same instant this opens it.
|
||||||
|
onMouseDown={(e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
if (open) { setOpen(false); setBrowse(false); return; }
|
||||||
|
setQuery(value);
|
||||||
|
setBrowse(true);
|
||||||
|
setOpen(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<ChevronDown className="size-3.5" />
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
{open && filtered.length > 0 && (
|
{open && filtered.length > 0 && (
|
||||||
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
|
<div className="absolute z-50 mt-1 max-h-60 w-full overflow-auto rounded-md border border-border bg-card shadow-lg text-xs">
|
||||||
{filtered.map((o) => (
|
{filtered.map((o) => (
|
||||||
|
|||||||
+10
-10
File diff suppressed because one or more lines are too long
@@ -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.26.3';
|
export const APP_VERSION = '0.26.5';
|
||||||
|
|
||||||
// Author / credits, shown in Help -> About.
|
// Author / credits, shown in Help -> About.
|
||||||
export const APP_AUTHOR = 'F4BPO';
|
export const APP_AUTHOR = 'F4BPO';
|
||||||
|
|||||||
Vendored
+2
@@ -123,6 +123,8 @@ export function CloseAutostartPrograms():Promise<void>;
|
|||||||
|
|
||||||
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
export function ClusterSpotStatuses(arg1:Array<main.SpotQuery>):Promise<Array<main.SpotStatus>>;
|
||||||
|
|
||||||
|
export function CompactDatabase(arg1:string):Promise<main.CompactResult>;
|
||||||
|
|
||||||
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
|
export function ComputeQSOAwardRefs(arg1:qso.QSO):Promise<Array<main.QSOAwardRef>>;
|
||||||
|
|
||||||
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
|
export function ComputeStationInfo(arg1:string,arg2:string):Promise<main.StationInfoComputed>;
|
||||||
|
|||||||
@@ -186,6 +186,10 @@ export function ClusterSpotStatuses(arg1) {
|
|||||||
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
|
return window['go']['main']['App']['ClusterSpotStatuses'](arg1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function CompactDatabase(arg1) {
|
||||||
|
return window['go']['main']['App']['CompactDatabase'](arg1);
|
||||||
|
}
|
||||||
|
|
||||||
export function ComputeQSOAwardRefs(arg1) {
|
export function ComputeQSOAwardRefs(arg1) {
|
||||||
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
|
return window['go']['main']['App']['ComputeQSOAwardRefs'](arg1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2295,6 +2295,24 @@ export namespace main {
|
|||||||
this.count = source["count"];
|
this.count = source["count"];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
export class CompactResult {
|
||||||
|
path: string;
|
||||||
|
backend: string;
|
||||||
|
before: number;
|
||||||
|
after: number;
|
||||||
|
|
||||||
|
static createFrom(source: any = {}) {
|
||||||
|
return new CompactResult(source);
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(source: any = {}) {
|
||||||
|
if ('string' === typeof source) source = JSON.parse(source);
|
||||||
|
this.path = source["path"];
|
||||||
|
this.backend = source["backend"];
|
||||||
|
this.before = source["before"];
|
||||||
|
this.after = source["after"];
|
||||||
|
}
|
||||||
|
}
|
||||||
export class ContestBandRow {
|
export class ContestBandRow {
|
||||||
band: string;
|
band: string;
|
||||||
count: number;
|
count: number;
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The build gate is only as good as the moments it runs at.
|
||||||
|
//
|
||||||
|
// It used to run at startup alone, on the profile active then — and a fresh
|
||||||
|
// install has NO callsign at that point. The operator typed theirs afterwards,
|
||||||
|
// so a denied call ran for the whole session and reached the telemetry, which
|
||||||
|
// reads the very same field. Every place that can make a denied callsign the
|
||||||
|
// ACTIVE one has to re-ask.
|
||||||
|
func TestCallGateRunsWhereverTheActiveCallsignChanges(t *testing.T) {
|
||||||
|
src, err := os.ReadFile("app.go")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, fn := range []string{
|
||||||
|
"func (a *App) startup(ctx context.Context) {", // launch
|
||||||
|
"func (a *App) SaveStationSettings(s StationSettings) error {", // the call is entered here
|
||||||
|
"func (a *App) SaveProfile(p profile.Profile) (profile.Profile, error) {",
|
||||||
|
"func (a *App) ActivateProfile(id int64) error {",
|
||||||
|
} {
|
||||||
|
body := funcBody(t, string(src), fn)
|
||||||
|
if !strings.Contains(body, "enforceCallGate(") {
|
||||||
|
t.Errorf("%s can change the active callsign but never re-checks the gate", fn)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The hashes are the whole mechanism: a truncated or re-cased entry silently
|
||||||
|
// matches nothing, and nothing in the running program would ever say so.
|
||||||
|
func TestDeniedCallHashesAreWellFormed(t *testing.T) {
|
||||||
|
if len(deniedCallHashes) == 0 {
|
||||||
|
t.Fatal("the deny list is empty — the gate has stopped gating")
|
||||||
|
}
|
||||||
|
for h := range deniedCallHashes {
|
||||||
|
if len(h) != 64 {
|
||||||
|
t.Errorf("hash %q is %d chars, want 64", h, len(h))
|
||||||
|
}
|
||||||
|
if h != strings.ToLower(h) {
|
||||||
|
t.Errorf("hash %q is not lower-case, so it can never match", h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A slashed call must reduce to the real one, or /P is a way round the gate.
|
||||||
|
func TestDenyBaseCall(t *testing.T) {
|
||||||
|
for in, want := range map[string]string{
|
||||||
|
"f4xyz": "F4XYZ",
|
||||||
|
" F4XYZ ": "F4XYZ",
|
||||||
|
"F4XYZ/P": "F4XYZ",
|
||||||
|
"TM/F4XYZ": "F4XYZ",
|
||||||
|
"F4XYZ/MM": "F4XYZ",
|
||||||
|
"": "",
|
||||||
|
} {
|
||||||
|
if got := denyBaseCall(in); got != want {
|
||||||
|
t.Errorf("denyBaseCall(%q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+25
-4
@@ -147,7 +147,17 @@ func NowISO() string { return time.Now().UTC().Format("2006-01-02T15:04:05.000Z"
|
|||||||
|
|
||||||
// Open opens (and creates if needed) the SQLite database at the given path,
|
// Open opens (and creates if needed) the SQLite database at the given path,
|
||||||
// enables performance PRAGMAs, and applies embedded migrations.
|
// enables performance PRAGMAs, and applies embedded migrations.
|
||||||
func Open(path string) (*sql.DB, error) {
|
//
|
||||||
|
// This is the SETTINGS database, which gets the full schema — see roles.go for
|
||||||
|
// why. Use OpenLogbook for a database that holds contacts only.
|
||||||
|
func Open(path string) (*sql.DB, error) { return open(path, RoleAll) }
|
||||||
|
|
||||||
|
// OpenLogbook opens a SQLite logbook: the qso table and nothing from the
|
||||||
|
// settings side, and any unused settings tables an earlier version left in it
|
||||||
|
// are dropped if they are empty.
|
||||||
|
func OpenLogbook(path string) (*sql.DB, error) { return open(path, RoleLogbook) }
|
||||||
|
|
||||||
|
func open(path string, role Role) (*sql.DB, error) {
|
||||||
// Escape only the two characters a path could contain that the DSN would
|
// Escape only the two characters a path could contain that the DSN would
|
||||||
// otherwise read as its query/fragment delimiters. Windows separators
|
// otherwise read as its query/fragment delimiters. Windows separators
|
||||||
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
|
// (\\ and the drive ':') are left intact — url.PathEscape would mangle them.
|
||||||
@@ -162,10 +172,12 @@ func Open(path string) (*sql.DB, error) {
|
|||||||
return nil, fmt.Errorf("ping sqlite: %w", err)
|
return nil, fmt.Errorf("ping sqlite: %w", err)
|
||||||
}
|
}
|
||||||
Dialect = "sqlite"
|
Dialect = "sqlite"
|
||||||
if err := migrate(conn, nil, path, filepath.Base(path)); err != nil {
|
label := filepath.Base(path)
|
||||||
|
if err := migrate(conn, nil, path, label, role); err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
pruneForeignTables(conn, role, label)
|
||||||
return conn, nil
|
return conn, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,7 +248,7 @@ func backupBeforeRewrite(conn *sql.DB, dbPath, migration string) {
|
|||||||
// interleaved migration runs in one log were indistinguishable — an operator
|
// interleaved migration runs in one log were indistinguishable — an operator
|
||||||
// reported "migrations are very slow" and the lines gave no way to tell one
|
// reported "migrations are very slow" and the lines gave no way to tell one
|
||||||
// database migrated three times from three databases migrated once.
|
// database migrated three times from three databases migrated once.
|
||||||
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string) error {
|
func migrate(conn *sql.DB, translate func(string) string, dbPath, label string, role Role) error {
|
||||||
// A non-nil translator means this is the MySQL connection (use the
|
// A non-nil translator means this is the MySQL connection (use the
|
||||||
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
// per-statement, FK-aware path); nil means a SQLite connection. This is
|
||||||
// determined by the caller's argument, NOT the global Dialect, so the
|
// determined by the caller's argument, NOT the global Dialect, so the
|
||||||
@@ -331,10 +343,19 @@ func migrate(conn *sql.DB, translate func(string) string, dbPath, label string)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("begin tx for %s: %w", name, err)
|
return fmt.Errorf("begin tx for %s: %w", name, err)
|
||||||
}
|
}
|
||||||
if _, err := tx.Exec(sqlText); err != nil {
|
// Statement by statement rather than one Exec of the whole file: the role
|
||||||
|
// filter works per statement, and a settings-table statement must not
|
||||||
|
// reach a logbook database (see roles.go). Still one transaction, so the
|
||||||
|
// file remains atomic.
|
||||||
|
for _, stmt := range splitStatements(sqlText) {
|
||||||
|
if !keepForRole(stmt, role) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := tx.Exec(stmt); err != nil {
|
||||||
_ = tx.Rollback()
|
_ = tx.Rollback()
|
||||||
return fmt.Errorf("apply migration %s: %w", name, err)
|
return fmt.Errorf("apply migration %s: %w", name, err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
if _, err := tx.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, name); err != nil {
|
||||||
_ = tx.Rollback()
|
_ = tx.Rollback()
|
||||||
return fmt.Errorf("record migration %s: %w", name, err)
|
return fmt.Errorf("record migration %s: %w", name, err)
|
||||||
|
|||||||
@@ -252,7 +252,7 @@ func OpenMySQL(c MySQLConfig) (*sql.DB, error) {
|
|||||||
return nil, rerr
|
return nil, rerr
|
||||||
}
|
}
|
||||||
// Then apply only the migrations it's missing.
|
// Then apply only the migrations it's missing.
|
||||||
err = migrate(conn, mysqlDDL, "", "mysql:"+name)
|
err = migrate(conn, mysqlDDL, "", "mysql:"+name, RoleLogbook)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
@@ -343,7 +343,9 @@ func applyMySQLBaseline(conn *sql.DB) error {
|
|||||||
// database. Labelled so its (fast) migration lines are not mistaken for a
|
// database. Labelled so its (fast) migration lines are not mistaken for a
|
||||||
// real database being migrated — in one operator's log this pass sat between
|
// real database being migrated — in one operator's log this pass sat between
|
||||||
// two slow MySQL runs and looked like a third database.
|
// two slow MySQL runs and looked like a third database.
|
||||||
if err := migrate(mem, nil, "", "baseline:memory"); err != nil {
|
// RoleLogbook: the baseline defines what a FRESH shared logbook gets, and a
|
||||||
|
// logbook has no business holding settings or station profiles.
|
||||||
|
if err := migrate(mem, nil, "", "baseline:memory", RoleLogbook); err != nil {
|
||||||
return fmt.Errorf("build baseline schema: %w", err)
|
return fmt.Errorf("build baseline schema: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,321 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
// Which tables belong in which database.
|
||||||
|
//
|
||||||
|
// OpsLog keeps settings and contacts apart — a settings database (settings.db /
|
||||||
|
// opslog.db) and a logbook (logbook.db, a per-profile file, or a shared MySQL).
|
||||||
|
// The SEPARATION of the data was real from the start; the SCHEMA was not: every
|
||||||
|
// target got the whole migration set, so a shared MySQL logbook grew a settings
|
||||||
|
// table and a station_profiles table that nothing ever wrote to. An operator
|
||||||
|
// inspecting the server with phpMyAdmin had no way to tell which copy was
|
||||||
|
// authoritative — a fair question, and the reason for this file.
|
||||||
|
//
|
||||||
|
// So a migration statement is now filtered by the ROLE of the database it is
|
||||||
|
// being applied to. Only two rules, and both fail safe:
|
||||||
|
//
|
||||||
|
// - RoleAll (the settings database) applies everything, exactly as before.
|
||||||
|
// It has to: a legacy single-file installation holds its QSOs there, and it
|
||||||
|
// still serves as the logbook when no separate one could be created.
|
||||||
|
// - RoleLogbook applies everything EXCEPT statements aimed at a table on the
|
||||||
|
// settings side. A table this file does not know about is kept, in both —
|
||||||
|
// an unrecognised future table behaves as it does today rather than
|
||||||
|
// silently going missing from one database.
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Role is what a database is for.
|
||||||
|
type Role int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// RoleAll applies every migration statement. The settings database.
|
||||||
|
RoleAll Role = iota
|
||||||
|
// RoleLogbook applies only what the contacts need.
|
||||||
|
RoleLogbook
|
||||||
|
)
|
||||||
|
|
||||||
|
// settingsTables are owned by the settings database. Every one of them is
|
||||||
|
// reached through the settings connection in app.go — grep NewRepo/NewStore
|
||||||
|
// there: only qso.NewRepo is given the logbook connection.
|
||||||
|
//
|
||||||
|
// Ordered children-before-parents, because pruneForeignTables drops them in
|
||||||
|
// this order and operating_antennas has a foreign key into operating_stations.
|
||||||
|
var settingsTables = []string{
|
||||||
|
"operating_antenna_bands",
|
||||||
|
"operating_antennas",
|
||||||
|
"operating_antennas_new",
|
||||||
|
"operating_stations",
|
||||||
|
"operating_stations_new",
|
||||||
|
"award_references",
|
||||||
|
"qsl_templates",
|
||||||
|
"cluster_servers",
|
||||||
|
"integrations_udp",
|
||||||
|
"callsign_cache",
|
||||||
|
"station_profiles",
|
||||||
|
"settings",
|
||||||
|
}
|
||||||
|
|
||||||
|
// keepForRole reports whether one migration statement applies to this role.
|
||||||
|
func keepForRole(stmt string, role Role) bool {
|
||||||
|
if role == RoleAll {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
t := stmtTable(stmt)
|
||||||
|
if t == "" {
|
||||||
|
return true // not a table statement (PRAGMA, or a shape we don't parse)
|
||||||
|
}
|
||||||
|
for _, s := range settingsTables {
|
||||||
|
if t == s {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// stmtTable returns the lower-cased table a statement acts on, or "".
|
||||||
|
//
|
||||||
|
// Deliberately literal: it recognises the handful of statement shapes the
|
||||||
|
// migrations actually use, and returns "" for anything else — which keeps the
|
||||||
|
// statement. Guessing would be the only way to drop something by accident.
|
||||||
|
func stmtTable(stmt string) string {
|
||||||
|
f := strings.Fields(strings.ToLower(stmt))
|
||||||
|
at := func(i int) string {
|
||||||
|
if i < len(f) {
|
||||||
|
return f[i]
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// Skip the leading keywords that carry no table name.
|
||||||
|
switch {
|
||||||
|
case at(0) == "create" || at(0) == "drop":
|
||||||
|
// CREATE [UNIQUE] INDEX <name> ON <table> …
|
||||||
|
// CREATE TABLE [IF NOT EXISTS] <table> … / DROP TABLE [IF EXISTS] <t>
|
||||||
|
//
|
||||||
|
// The "ON" search is confined to an INDEX statement on purpose: a CREATE
|
||||||
|
// TABLE body is full of "ON DELETE CASCADE", and scanning the whole
|
||||||
|
// statement for "on" once made every foreign-keyed table report itself as
|
||||||
|
// a table named "delete" — unrecognised, therefore kept, therefore created
|
||||||
|
// in a logbook that had no use for it.
|
||||||
|
if at(1) == "index" || (at(1) == "unique" && at(2) == "index") {
|
||||||
|
for i, w := range f {
|
||||||
|
if w == "on" && i+1 < len(f) {
|
||||||
|
return cleanIdent(f[i+1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i := 1
|
||||||
|
for at(i) == "unique" || at(i) == "table" || at(i) == "index" ||
|
||||||
|
at(i) == "if" || at(i) == "not" || at(i) == "exists" || at(i) == "view" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return cleanIdent(at(i))
|
||||||
|
case at(0) == "alter":
|
||||||
|
return cleanIdent(at(2)) // ALTER TABLE <table> …
|
||||||
|
case at(0) == "insert" || at(0) == "replace":
|
||||||
|
i := 1
|
||||||
|
for at(i) == "or" || at(i) == "ignore" || at(i) == "into" || at(i) == "replace" {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return cleanIdent(at(i))
|
||||||
|
case at(0) == "update":
|
||||||
|
return cleanIdent(at(1))
|
||||||
|
case at(0) == "delete":
|
||||||
|
return cleanIdent(at(2)) // DELETE FROM <table>
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// cleanIdent strips quoting and anything glued to the name — "qso(id)" from an
|
||||||
|
// index, `settings` from the MySQL translation, "qso;" from a split statement.
|
||||||
|
func cleanIdent(s string) string {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if i := strings.IndexAny(s, "(;"); i >= 0 {
|
||||||
|
s = s[:i]
|
||||||
|
}
|
||||||
|
return strings.Trim(s, "`\"'[]")
|
||||||
|
}
|
||||||
|
|
||||||
|
// pruneForeignTables removes settings tables from a logbook database that an
|
||||||
|
// earlier version created there.
|
||||||
|
//
|
||||||
|
// ONLY WHEN EMPTY, without exception. A table with rows in it is data, whatever
|
||||||
|
// this file thinks it is for: a profile pointing at a legacy combined database
|
||||||
|
// as its logbook is a real configuration, and dropping its profiles because the
|
||||||
|
// schema now says they belong elsewhere would be destroying a log-keeping
|
||||||
|
// operator's work on the strength of a tidiness rule.
|
||||||
|
//
|
||||||
|
// Best effort throughout: a logbook the user cannot drop tables in (a restricted
|
||||||
|
// MySQL grant) keeps its empty tables and works exactly as it does today.
|
||||||
|
func pruneForeignTables(conn *sql.DB, role Role, label string) {
|
||||||
|
if role != RoleLogbook || conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Once per database, recorded like a migration.
|
||||||
|
//
|
||||||
|
// The check itself is a COUNT(*) per settings table — twelve round trips,
|
||||||
|
// which is nothing locally and is paid on EVERY open of a remote MySQL
|
||||||
|
// logbook, including every profile switch. There is nothing to find after the
|
||||||
|
// first pass: the role filter means no settings table is ever created in a
|
||||||
|
// logbook again.
|
||||||
|
if _, err := conn.Exec(`INSERT INTO schema_migrations(name) VALUES(?)`, prunedMarker); err != nil {
|
||||||
|
return // already recorded (primary key), or the table is not writable
|
||||||
|
}
|
||||||
|
dropped := 0
|
||||||
|
for _, t := range settingsTables {
|
||||||
|
var n int
|
||||||
|
// A missing table errors here, which is the "nothing to do" answer.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(&n); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if n != 0 {
|
||||||
|
logf("db[%s]: keeping %s — it has %d row(s)", label, t, n)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
|
||||||
|
logf("db[%s]: could not drop unused %s: %v", label, t, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dropped++
|
||||||
|
}
|
||||||
|
if dropped > 0 {
|
||||||
|
logf("db[%s]: dropped %d unused settings table(s) — this database holds contacts only", label, dropped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// prunedMarker records, in schema_migrations, that a logbook has had its unused
|
||||||
|
// settings tables removed. Named like a migration and stored beside them because
|
||||||
|
// that is exactly what it is: a one-off schema step, and the applied set is
|
||||||
|
// already read in a single query at every open.
|
||||||
|
const prunedMarker = "_opslog_pruned_settings_tables"
|
||||||
|
|
||||||
|
// quoteIdent quotes one of OUR OWN table names for either dialect. Backticks
|
||||||
|
// work in MySQL and in SQLite alike, which is why the migrations use them.
|
||||||
|
func quoteIdent(s string) string { return "`" + s + "`" }
|
||||||
|
|
||||||
|
// DropRedundantSettingsTables removes the settings tables from a logbook
|
||||||
|
// database EVEN IF THEY HAVE ROWS.
|
||||||
|
//
|
||||||
|
// Reserved for the one case where those rows are provably a stale duplicate:
|
||||||
|
// the logbook file was seeded by VACUUM INTO from the old combined database
|
||||||
|
// (see the split at startup), so every profile and every setting in it is a
|
||||||
|
// copy of what the settings database still holds and is authoritative for.
|
||||||
|
// Nothing reads them — the settings connection is a different file entirely —
|
||||||
|
// and leaving them behind is what made the two databases look interchangeable.
|
||||||
|
//
|
||||||
|
// The caller must have established that authority. pruneForeignTables is the
|
||||||
|
// safe default for every other situation.
|
||||||
|
func DropRedundantSettingsTables(conn *sql.DB, label string) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
dropped := 0
|
||||||
|
for _, t := range settingsTables {
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(t)).Scan(new(int)); err != nil {
|
||||||
|
continue // not there: nothing to do
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE ` + quoteIdent(t)); err != nil {
|
||||||
|
logf("db[%s]: could not drop redundant %s: %v", label, t, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
dropped++
|
||||||
|
}
|
||||||
|
if dropped > 0 {
|
||||||
|
logf("db[%s]: dropped %d settings table(s) copied by the logbook split — the settings database keeps the originals", label, dropped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// EnsureQSOTable recreates the contacts table if it is missing.
|
||||||
|
//
|
||||||
|
// It exists so dropping an EMPTY qso table from the settings database is a
|
||||||
|
// reversible act. The settings database can still be pressed into service as the
|
||||||
|
// logbook — that is the fallback when no separate logbook file can be created —
|
||||||
|
// and the migrations that would have built the table are recorded as applied, so
|
||||||
|
// nothing would ever build it again. This does, from the same migrations, on
|
||||||
|
// demand.
|
||||||
|
//
|
||||||
|
// The schema is derived rather than duplicated: the migrations are replayed on a
|
||||||
|
// throwaway in-memory SQLite whose sqlite_master then holds the FINAL shape of
|
||||||
|
// the table with every ALTER-added column folded in. Same trick as the MySQL
|
||||||
|
// baseline, and for the same reason — there is no second schema to drift.
|
||||||
|
//
|
||||||
|
// SQLite only: the shared MySQL logbook is never the settings database.
|
||||||
|
func EnsureQSOTable(conn *sql.DB) error {
|
||||||
|
if conn == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(new(int)); err == nil {
|
||||||
|
return nil // already there
|
||||||
|
}
|
||||||
|
stmts, err := qsoSchemaDDL()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, st := range stmts {
|
||||||
|
if _, err := conn.Exec(st); err != nil {
|
||||||
|
return fmt.Errorf("recreate qso table: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logf("db: recreated the qso table — this database is being used as the logbook")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// qsoSchemaDDL returns the CREATE statements for the qso table and its indexes,
|
||||||
|
// in that order.
|
||||||
|
func qsoSchemaDDL() ([]string, error) {
|
||||||
|
mem, err := sql.Open("sqlite", "file:opslog_qsoschema?mode=memory&cache=shared")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("open schema sqlite: %w", err)
|
||||||
|
}
|
||||||
|
defer mem.Close()
|
||||||
|
if err := migrate(mem, nil, "", "qso-schema:memory", RoleLogbook); err != nil {
|
||||||
|
return nil, fmt.Errorf("build qso schema: %w", err)
|
||||||
|
}
|
||||||
|
rows, err := mem.Query(`SELECT type, sql FROM sqlite_master
|
||||||
|
WHERE sql IS NOT NULL AND tbl_name = 'qso'`)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var tables, indexes []string
|
||||||
|
for rows.Next() {
|
||||||
|
var typ, s string
|
||||||
|
if err := rows.Scan(&typ, &s); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if typ == "table" {
|
||||||
|
tables = append(tables, s)
|
||||||
|
} else {
|
||||||
|
indexes = append(indexes, s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(tables) == 0 {
|
||||||
|
return nil, fmt.Errorf("qso table not found in the derived schema")
|
||||||
|
}
|
||||||
|
return append(tables, indexes...), rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
|
// DropEmptyQSOTable removes the contacts table from a database that is not the
|
||||||
|
// logbook — the settings database, once its QSOs live in their own file.
|
||||||
|
//
|
||||||
|
// Only when empty, and reversible: EnsureQSOTable builds it again the moment
|
||||||
|
// this database is asked to serve as the logbook.
|
||||||
|
func DropEmptyQSOTable(conn *sql.DB, label string) {
|
||||||
|
if conn == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
return // not there: nothing to do
|
||||||
|
}
|
||||||
|
if n != 0 {
|
||||||
|
return // contacts: this table is data, whatever the schema says
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`DROP TABLE qso`); err != nil {
|
||||||
|
logf("db[%s]: could not drop the unused qso table: %v", label, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
logf("db[%s]: dropped the unused qso table — the contacts live in their own database", label)
|
||||||
|
}
|
||||||
@@ -0,0 +1,283 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestStmtTable(t *testing.T) {
|
||||||
|
cases := map[string]string{
|
||||||
|
"CREATE TABLE station_profiles (\n id INTEGER PRIMARY KEY)": "station_profiles",
|
||||||
|
"CREATE TABLE IF NOT EXISTS settings (`key` TEXT PRIMARY KEY)": "settings",
|
||||||
|
"CREATE UNIQUE INDEX idx_qso_uid ON qso(sync_uid)": "qso",
|
||||||
|
"CREATE INDEX idx_ref ON award_references (award_code)": "award_references",
|
||||||
|
"ALTER TABLE qso ADD COLUMN ant_path TEXT NOT NULL DEFAULT ''": "qso",
|
||||||
|
"ALTER TABLE `station_profiles` ADD COLUMN my_cq_zone TEXT": "station_profiles",
|
||||||
|
"INSERT INTO settings(`key`, value) VALUES('x','y')": "settings",
|
||||||
|
"INSERT OR IGNORE INTO cluster_servers(name) VALUES('dxc')": "cluster_servers",
|
||||||
|
"UPDATE qso SET callsign = UPPER(callsign)": "qso",
|
||||||
|
"DELETE FROM operating_antennas WHERE station_id IS NULL": "operating_antennas",
|
||||||
|
"DROP TABLE IF EXISTS operating_stations_new": "operating_stations_new",
|
||||||
|
"PRAGMA foreign_keys = off": "",
|
||||||
|
"": "",
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
if got := stmtTable(in); got != want {
|
||||||
|
t.Errorf("stmtTable(%.40q) = %q, want %q", in, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKeepForRole(t *testing.T) {
|
||||||
|
// The settings database takes everything, exactly as before this existed.
|
||||||
|
for _, s := range []string{"CREATE TABLE settings (a TEXT)", "CREATE TABLE qso (a TEXT)"} {
|
||||||
|
if !keepForRole(s, RoleAll) {
|
||||||
|
t.Fatalf("RoleAll dropped %q", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A logbook takes the contacts and refuses the settings side.
|
||||||
|
if !keepForRole("CREATE INDEX i ON qso(callsign)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped a qso statement")
|
||||||
|
}
|
||||||
|
if keepForRole("CREATE TABLE station_profiles (id INTEGER)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook accepted station_profiles")
|
||||||
|
}
|
||||||
|
// An unrecognised statement — a future table, a PRAGMA — is kept, so a new
|
||||||
|
// migration behaves as it does today rather than vanishing from one database.
|
||||||
|
if !keepForRole("CREATE TABLE something_new (id INTEGER)", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped an unknown table")
|
||||||
|
}
|
||||||
|
if !keepForRole("PRAGMA foreign_keys = off", RoleLogbook) {
|
||||||
|
t.Fatal("logbook dropped a PRAGMA")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// tablesIn lists the tables of an open database.
|
||||||
|
func tablesIn(t *testing.T, path string) []string {
|
||||||
|
t.Helper()
|
||||||
|
conn, err := Open(path) // RoleAll: opening must not change what is there
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []string
|
||||||
|
for rows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := rows.Scan(&n); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
out = append(out, n)
|
||||||
|
}
|
||||||
|
sort.Strings(out)
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// A logbook opened through OpenLogbook holds the contacts and nothing else.
|
||||||
|
func TestOpenLogbookSchema(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "logbook.db")
|
||||||
|
conn, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
// The one table that matters has to be there and has to be usable.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso table unusable: %v", err)
|
||||||
|
}
|
||||||
|
for _, forbidden := range settingsTables {
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM ` + quoteIdent(forbidden)).Scan(&n); err == nil {
|
||||||
|
t.Errorf("%s was created in a logbook database", forbidden)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
// Reopening as a logbook is idempotent, and the migrations already recorded
|
||||||
|
// as applied must not be re-run into a half-schema.
|
||||||
|
conn2, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("reopen: %v", err)
|
||||||
|
}
|
||||||
|
if err := conn2.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso lost on reopen: %v", err)
|
||||||
|
}
|
||||||
|
conn2.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
// An existing logbook that an older version filled with the whole schema loses
|
||||||
|
// the unused tables — and keeps any that hold rows.
|
||||||
|
func TestPruneKeepsNonEmptyTables(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "legacy.db")
|
||||||
|
conn, err := Open(path) // the old behaviour: every table everywhere
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO station_profiles(name) VALUES('Home')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
if got := tablesIn(t, path); len(got) < 10 {
|
||||||
|
t.Fatalf("expected a full legacy schema, got %v", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
var n int
|
||||||
|
// Rows are data: this one stays, whatever the schema says it is for.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM station_profiles`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("station_profiles dropped with a row in it (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
// The empty ones go.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
|
||||||
|
t.Error("empty settings table survived in a logbook")
|
||||||
|
}
|
||||||
|
// And the contacts are untouched throughout.
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil {
|
||||||
|
t.Fatalf("qso table lost: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A CREATE TABLE body is full of "ON DELETE CASCADE": the index rule must not
|
||||||
|
// read it as a table name, or the table goes unrecognised and gets created in
|
||||||
|
// every database.
|
||||||
|
func TestStmtTableForeignKeyBody(t *testing.T) {
|
||||||
|
stmt := `CREATE TABLE operating_stations (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
profile_id INTEGER NOT NULL,
|
||||||
|
FOREIGN KEY (profile_id) REFERENCES station_profiles(id) ON DELETE CASCADE
|
||||||
|
)`
|
||||||
|
if got := stmtTable(stmt); got != "operating_stations" {
|
||||||
|
t.Fatalf("got %q", got)
|
||||||
|
}
|
||||||
|
if keepForRole(stmt, RoleLogbook) {
|
||||||
|
t.Fatal("a settings table reached a logbook database")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The settings database loses its unused qso table — and gets it back, in full,
|
||||||
|
// the moment it has to serve as the logbook again.
|
||||||
|
func TestDropAndRecreateQSOTable(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "settings.db")
|
||||||
|
conn, err := Open(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
// A contact in it is data: the table must survive.
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode)
|
||||||
|
VALUES('F4BPO','2026-01-01T12:00:00Z','20m','SSB')`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
DropEmptyQSOTable(conn, "settings")
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("dropped a qso table holding a contact (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty, so it goes.
|
||||||
|
if _, err := conn.Exec(`DELETE FROM qso`); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
DropEmptyQSOTable(conn, "settings")
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err == nil {
|
||||||
|
t.Fatal("empty qso table survived")
|
||||||
|
}
|
||||||
|
|
||||||
|
// And comes back complete when this database is pressed into service as the
|
||||||
|
// logbook — a late column and an index included, not just a bare table.
|
||||||
|
if err := EnsureQSOTable(conn); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := conn.Exec(`INSERT INTO qso(callsign, qso_date, band, mode, ant_path, sync_uid)
|
||||||
|
VALUES('F1TRF','2026-01-02T13:00:00Z','40m','CW','S','uid-1')`); err != nil {
|
||||||
|
t.Fatalf("recreated qso table is incomplete: %v", err)
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("recreated table unusable (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
// Idempotent: a second call on a live table must not touch it.
|
||||||
|
if err := EnsureQSOTable(conn); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM qso`).Scan(&n); err != nil || n != 1 {
|
||||||
|
t.Fatalf("EnsureQSOTable disturbed an existing table (err=%v n=%d)", err, n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A brand-new logbook — the case of a fresh install, or the "New database"
|
||||||
|
// button — is right from the first open: the contacts and the migration ledger,
|
||||||
|
// nothing else. Pinned as an exact list so an accidentally unfiltered future
|
||||||
|
// migration shows up here rather than in an operator's phpMyAdmin.
|
||||||
|
func TestFreshLogbookHasOnlyContactTables(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "fresh.db")
|
||||||
|
conn, err := OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
rows, err := conn.Query(`SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var got []string
|
||||||
|
for rows.Next() {
|
||||||
|
var n string
|
||||||
|
if err := rows.Scan(&n); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got = append(got, n)
|
||||||
|
}
|
||||||
|
rows.Close()
|
||||||
|
conn.Close()
|
||||||
|
sort.Strings(got)
|
||||||
|
want := []string{"qso", "schema_migrations"}
|
||||||
|
if strings.Join(got, ",") != strings.Join(want, ",") {
|
||||||
|
t.Fatalf("fresh logbook holds %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The cleanup is a one-off, recorded like a migration: it must not be repeated
|
||||||
|
// at every connection. Twelve COUNT(*) round trips on a remote MySQL is a cost
|
||||||
|
// paid at every profile switch for something that can no longer be found.
|
||||||
|
func TestPruneRunsOnlyOnce(t *testing.T) {
|
||||||
|
path := filepath.Join(t.TempDir(), "once.db")
|
||||||
|
conn, err := Open(path) // full legacy schema
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path) // first open: the cleanup happens
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var n int
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err == nil {
|
||||||
|
t.Fatal("first open did not clean up")
|
||||||
|
}
|
||||||
|
// Put one back by hand. A second pass would remove it again; a cleanup that
|
||||||
|
// knows it is done leaves it alone.
|
||||||
|
if _, err := conn.Exec("CREATE TABLE `settings` (`key` TEXT PRIMARY KEY, value TEXT)"); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conn.Close()
|
||||||
|
|
||||||
|
conn, err = OpenLogbook(path)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
if err := conn.QueryRow(`SELECT COUNT(*) FROM settings`).Scan(&n); err != nil {
|
||||||
|
t.Fatal("the cleanup ran a second time — it is not recorded as done")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,6 +30,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -126,6 +127,9 @@ type Client struct {
|
|||||||
pendingDirSet bool
|
pendingDirSet bool
|
||||||
|
|
||||||
stopChan chan struct{}
|
stopChan chan struct{}
|
||||||
|
// done is closed by the poll loop on its way out, so Stop can wait for the
|
||||||
|
// serial port to be genuinely released — see Stop.
|
||||||
|
done chan struct{}
|
||||||
running bool
|
running bool
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,10 +142,20 @@ func New(tr Transport) *Client {
|
|||||||
|
|
||||||
func (c *Client) Start() error {
|
func (c *Client) Start() error {
|
||||||
c.running = true
|
c.running = true
|
||||||
|
c.done = make(chan struct{})
|
||||||
go c.pollLoop()
|
go c.pollLoop()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Stop closes the link and WAITS for the poll loop to leave.
|
||||||
|
//
|
||||||
|
// Closing the port from another goroutine does not undo an open() the loop is
|
||||||
|
// already inside: that open returns a fresh handle which the loop then stores,
|
||||||
|
// and the stopped client goes on owning the serial port. The next client — a
|
||||||
|
// settings save, a profile switch — cannot open it, and the operator sees
|
||||||
|
// "Serial port busy" with no other program running.
|
||||||
|
//
|
||||||
|
// Bounded, so a device stuck in the driver cannot freeze a settings save.
|
||||||
func (c *Client) Stop() {
|
func (c *Client) Stop() {
|
||||||
if !c.running {
|
if !c.running {
|
||||||
return
|
return
|
||||||
@@ -154,6 +168,14 @@ func (c *Client) Stop() {
|
|||||||
c.conn = nil
|
c.conn = nil
|
||||||
}
|
}
|
||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
|
if c.done == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-c.done:
|
||||||
|
case <-time.After(6 * time.Second):
|
||||||
|
log.Printf("steppir: poll loop did not exit within 6s — %s may stay busy a moment longer", c.target())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// LastSetKHz returns the frequency last commanded, or 0.
|
// LastSetKHz returns the frequency last commanded, or 0.
|
||||||
@@ -179,7 +201,14 @@ func (c *Client) open() (io.ReadWriteCloser, error) {
|
|||||||
if c.tr.COM == "" {
|
if c.tr.COM == "" {
|
||||||
return nil, fmt.Errorf("steppir: no serial port configured")
|
return nil, fmt.Errorf("steppir: no serial port configured")
|
||||||
}
|
}
|
||||||
p, err := serial.Open(c.tr.COM, &serial.Mode{BaudRate: c.tr.Baud})
|
// 8N1 spelled out rather than left to the library defaults: a controller
|
||||||
|
// that answers nothing must not have a line format that depends on them.
|
||||||
|
p, err := serial.Open(c.tr.COM, &serial.Mode{
|
||||||
|
BaudRate: c.tr.Baud,
|
||||||
|
DataBits: 8,
|
||||||
|
Parity: serial.NoParity,
|
||||||
|
StopBits: serial.OneStopBit,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -210,7 +239,7 @@ func (c *Client) noteOpenFailure(err error) {
|
|||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
switch {
|
switch {
|
||||||
case n <= openFailQuiet:
|
case n <= openFailQuiet:
|
||||||
log.Printf("steppir: cannot open %s: %v (attempt %d)", c.target(), err, n)
|
log.Printf("steppir: cannot open %s: %v%s (attempt %d)", c.target(), err, portBusyHint(c.tr.Mode, c.tr.COM, err), n)
|
||||||
case n == openFailQuiet+1:
|
case n == openFailQuiet+1:
|
||||||
log.Printf("steppir: still cannot open %s — retrying every 2 s, further attempts will not be logged until it comes back", c.target())
|
log.Printf("steppir: still cannot open %s — retrying every 2 s, further attempts will not be logged until it comes back", c.target())
|
||||||
}
|
}
|
||||||
@@ -225,6 +254,18 @@ func (c *Client) target() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) pollLoop() {
|
func (c *Client) pollLoop() {
|
||||||
|
// Signals Stop that the port is genuinely released.
|
||||||
|
defer func() {
|
||||||
|
c.connMu.Lock()
|
||||||
|
if c.conn != nil {
|
||||||
|
c.conn.Close()
|
||||||
|
c.conn = nil
|
||||||
|
}
|
||||||
|
c.connMu.Unlock()
|
||||||
|
if c.done != nil {
|
||||||
|
close(c.done)
|
||||||
|
}
|
||||||
|
}()
|
||||||
ticker := time.NewTicker(2 * time.Second)
|
ticker := time.NewTicker(2 * time.Second)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
for {
|
for {
|
||||||
@@ -632,3 +673,16 @@ func (c *Client) Retract() error {
|
|||||||
}
|
}
|
||||||
return c.writeCmd(buildSet(khz*1000, DirNormal, 'S'))
|
return c.writeCmd(buildSet(khz*1000, DirNormal, 'S'))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// portBusyHint turns "Serial port busy" into something actionable — see the
|
||||||
|
// identical note in internal/ultrabeam.
|
||||||
|
func portBusyHint(mode, com string, err error) string {
|
||||||
|
if mode != "serial" || err == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
msg := strings.ToLower(err.Error())
|
||||||
|
if !strings.Contains(msg, "busy") && !strings.Contains(msg, "access is denied") && !strings.Contains(msg, "denied") {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return " — another program already has " + com + " open (the SteppIR control window, PstRotator, a terminal). A COM port has one owner: close the other program, then OpsLog can connect."
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package ultrabeam
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Stop must not return while the poll loop is still alive: on a serial link the
|
||||||
|
// loop owns the port, and a client that outlives its Stop is what turned every
|
||||||
|
// later connection into "Serial port busy".
|
||||||
|
func TestStopWaitsForPollLoop(t *testing.T) {
|
||||||
|
// A transport that cannot connect, so the loop spends its life in open() and
|
||||||
|
// the reconnect path — the state the real fault happened in.
|
||||||
|
c := New(Transport{Mode: "tcp", Host: "127.0.0.1", Port: 1})
|
||||||
|
if err := c.Start(); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
done := c.done
|
||||||
|
time.Sleep(50 * time.Millisecond)
|
||||||
|
c.Stop()
|
||||||
|
select {
|
||||||
|
case <-done:
|
||||||
|
default:
|
||||||
|
t.Fatal("Stop returned while the poll loop was still running")
|
||||||
|
}
|
||||||
|
// Stopping twice must not panic on the closed channel.
|
||||||
|
c.Stop()
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPortBusyHint(t *testing.T) {
|
||||||
|
// The Windows driver's own words, and the ones an operator has to act on.
|
||||||
|
if h := portBusyHint("serial", "COM13", errors.New("Serial port busy")); !strings.Contains(h, "COM13") {
|
||||||
|
t.Fatalf("no hint for a busy port: %q", h)
|
||||||
|
}
|
||||||
|
if h := portBusyHint("serial", "COM13", errors.New("Access is denied.")); h == "" {
|
||||||
|
t.Fatal("no hint for access denied")
|
||||||
|
}
|
||||||
|
// A port that simply is not there is a different problem, and saying "another
|
||||||
|
// program has it" would send the operator hunting for a program that is not
|
||||||
|
// running.
|
||||||
|
if h := portBusyHint("serial", "COM13", errors.New("The system cannot find the file specified.")); h != "" {
|
||||||
|
t.Fatalf("hinted at a busy port for a missing one: %q", h)
|
||||||
|
}
|
||||||
|
if h := portBusyHint("tcp", "", errors.New("connection refused")); h != "" {
|
||||||
|
t.Fatalf("serial hint on a TCP link: %q", h)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// silentPort answers every read the way a serial port with nothing on the other
|
||||||
|
// end does: no bytes, no error. bufio turns a run of those into ErrNoProgress.
|
||||||
|
type silentPort struct{ writes int }
|
||||||
|
|
||||||
|
func (s *silentPort) Read(p []byte) (int, error) { return 0, nil }
|
||||||
|
func (s *silentPort) Write(p []byte) (int, error) { s.writes++; return len(p), nil }
|
||||||
|
func (s *silentPort) Close() error { return nil }
|
||||||
|
|
||||||
|
// A controller that never answers must fail ONCE, promptly, with a message that
|
||||||
|
// says so — not wedge the poll loop for minutes inside bufio's retry budget.
|
||||||
|
func TestSilentControllerFailsWithinTheReadTimeout(t *testing.T) {
|
||||||
|
c := New(Transport{Mode: "serial", COM: "COM_TEST", Baud: 9600})
|
||||||
|
c.conn = &silentPort{}
|
||||||
|
c.reader = bufio.NewReader(c.conn)
|
||||||
|
|
||||||
|
start := time.Now()
|
||||||
|
_, err := c.sendCommand(CMD_STATUS, nil)
|
||||||
|
elapsed := time.Since(start)
|
||||||
|
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("a silent controller reported success")
|
||||||
|
}
|
||||||
|
if elapsed > 3*ubReadTimeout {
|
||||||
|
t.Fatalf("took %s to give up — the read deadline is not bounding the exchange", elapsed.Round(time.Millisecond))
|
||||||
|
}
|
||||||
|
if !strings.Contains(err.Error(), "no reply") {
|
||||||
|
t.Fatalf("unhelpful error for a silent port: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -91,10 +92,20 @@ type Client struct {
|
|||||||
lastStatus *Status
|
lastStatus *Status
|
||||||
statusMu sync.RWMutex
|
statusMu sync.RWMutex
|
||||||
stopChan chan struct{}
|
stopChan chan struct{}
|
||||||
|
// done is closed by pollLoop as it exits, so Stop can WAIT for it. Without
|
||||||
|
// that wait the loop outlives the client that owns it, and on a serial link
|
||||||
|
// the zombie keeps the port open: every later client then fails with "Serial
|
||||||
|
// port busy" — forever, because the thing holding the port is us.
|
||||||
|
done chan struct{}
|
||||||
running bool
|
running bool
|
||||||
seqNum byte
|
seqNum byte
|
||||||
seqMu sync.Mutex
|
seqMu sync.Mutex
|
||||||
|
|
||||||
|
// First-exchange diagnostics — see armDiag.
|
||||||
|
diagMu sync.Mutex
|
||||||
|
diag bool
|
||||||
|
diagJunk []byte
|
||||||
|
|
||||||
// Optimistic pattern direction kept until the antenna's status poll reports
|
// Optimistic pattern direction kept until the antenna's status poll reports
|
||||||
// it (or it ages out) — the motors take a second or two, and a stale poll in
|
// it (or it ages out) — the motors take a second or two, and a stale poll in
|
||||||
// between would otherwise snap the UI back to the old direction.
|
// between would otherwise snap the UI back to the old direction.
|
||||||
@@ -165,7 +176,15 @@ func (c *Client) open() (io.ReadWriteCloser, error) {
|
|||||||
if c.tr.COM == "" {
|
if c.tr.COM == "" {
|
||||||
return nil, fmt.Errorf("ultrabeam: no serial port configured")
|
return nil, fmt.Errorf("ultrabeam: no serial port configured")
|
||||||
}
|
}
|
||||||
p, err := serial.Open(c.tr.COM, &serial.Mode{BaudRate: c.tr.Baud})
|
// 8N1 spelled out. The library's zero values happen to mean the same
|
||||||
|
// thing today, but a controller that answers nothing is impossible to
|
||||||
|
// diagnose with a line count that depends on a default.
|
||||||
|
p, err := serial.Open(c.tr.COM, &serial.Mode{
|
||||||
|
BaudRate: c.tr.Baud,
|
||||||
|
DataBits: 8,
|
||||||
|
Parity: serial.NoParity,
|
||||||
|
StopBits: serial.OneStopBit,
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -181,6 +200,27 @@ func (c *Client) open() (io.ReadWriteCloser, error) {
|
|||||||
return dialer.Dial("tcp", net.JoinHostPort(c.tr.Host, fmt.Sprintf("%d", c.tr.Port)))
|
return dialer.Dial("tcp", net.JoinHostPort(c.tr.Host, fmt.Sprintf("%d", c.tr.Port)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// diagNextExchange asks for the next command/reply to be dumped to the log.
|
||||||
|
//
|
||||||
|
// "It does not work" is unanswerable for a serial link, because the three
|
||||||
|
// possible causes look identical from the outside: nothing arrives (wrong port,
|
||||||
|
// dead cable, controller off), something arrives but is not our protocol (wrong
|
||||||
|
// baud), or a valid frame arrives and we misread it. One hex dump of the first
|
||||||
|
// exchange after each connect separates them, and costs two log lines per
|
||||||
|
// connection.
|
||||||
|
func (c *Client) armDiag() {
|
||||||
|
c.diagMu.Lock()
|
||||||
|
c.diag = true
|
||||||
|
c.diagJunk = c.diagJunk[:0]
|
||||||
|
c.diagMu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) diagOn() bool {
|
||||||
|
c.diagMu.Lock()
|
||||||
|
defer c.diagMu.Unlock()
|
||||||
|
return c.diag
|
||||||
|
}
|
||||||
|
|
||||||
// target names what the client is talking to, for the log.
|
// target names what the client is talking to, for the log.
|
||||||
func (c *Client) target() string {
|
func (c *Client) target() string {
|
||||||
if c.tr.Mode == "serial" {
|
if c.tr.Mode == "serial" {
|
||||||
@@ -219,10 +259,22 @@ func transientRead(err error) bool {
|
|||||||
|
|
||||||
func (c *Client) Start() error {
|
func (c *Client) Start() error {
|
||||||
c.running = true
|
c.running = true
|
||||||
|
c.done = make(chan struct{})
|
||||||
go c.pollLoop()
|
go c.pollLoop()
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Stop closes the link and WAITS for the poll loop to leave.
|
||||||
|
//
|
||||||
|
// The wait is the point. Closing the port from another goroutine does not undo
|
||||||
|
// an open() the loop is already inside: that open returns a fresh handle, the
|
||||||
|
// loop stores it, and the client that was told to stop goes on owning the serial
|
||||||
|
// port. The next client — a settings save, a profile switch — then cannot open
|
||||||
|
// it, and the operator sees "Serial port busy" with no other program running.
|
||||||
|
//
|
||||||
|
// Bounded, because a serial open can sit in the driver for a while and a stuck
|
||||||
|
// device must not freeze a settings save. If the deadline passes, the loop is
|
||||||
|
// still on its way out and the log says so.
|
||||||
func (c *Client) Stop() {
|
func (c *Client) Stop() {
|
||||||
if !c.running {
|
if !c.running {
|
||||||
return
|
return
|
||||||
@@ -236,9 +288,30 @@ func (c *Client) Stop() {
|
|||||||
c.conn = nil
|
c.conn = nil
|
||||||
}
|
}
|
||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
|
|
||||||
|
if c.done == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-c.done:
|
||||||
|
case <-time.After(6 * time.Second):
|
||||||
|
log.Printf("Ultrabeam: poll loop did not exit within 6s — %s may stay busy a moment longer", c.target())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) pollLoop() {
|
func (c *Client) pollLoop() {
|
||||||
|
// Signals Stop that the port is genuinely released.
|
||||||
|
defer func() {
|
||||||
|
c.connMu.Lock()
|
||||||
|
if c.conn != nil {
|
||||||
|
c.conn.Close()
|
||||||
|
c.conn = nil
|
||||||
|
}
|
||||||
|
c.connMu.Unlock()
|
||||||
|
if c.done != nil {
|
||||||
|
close(c.done)
|
||||||
|
}
|
||||||
|
}()
|
||||||
ticker := time.NewTicker(2 * time.Second) // Increased from 500ms to 2s
|
ticker := time.NewTicker(2 * time.Second) // Increased from 500ms to 2s
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
|
|
||||||
@@ -256,7 +329,7 @@ func (c *Client) pollLoop() {
|
|||||||
log.Printf("Ultrabeam: Not connected, attempting connection to %s...", c.target())
|
log.Printf("Ultrabeam: Not connected, attempting connection to %s...", c.target())
|
||||||
conn, err := c.open()
|
conn, err := c.open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Ultrabeam: Connection failed: %v", err)
|
log.Printf("Ultrabeam: Connection failed: %v%s", err, portBusyHint(c.tr.Mode, c.tr.COM, err))
|
||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
|
|
||||||
// Mark as disconnected
|
// Mark as disconnected
|
||||||
@@ -266,9 +339,25 @@ func (c *Client) pollLoop() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
c.conn = conn
|
c.conn = conn
|
||||||
|
// Stopped while open() was running? Let go of the port at once.
|
||||||
|
// Stop cannot interrupt an open already in flight, so without this
|
||||||
|
// the fresh handle is stored by a client that has been told to die,
|
||||||
|
// and it keeps the port — which is precisely the "Serial port busy"
|
||||||
|
// the next client then reports, forever.
|
||||||
|
select {
|
||||||
|
case <-c.stopChan:
|
||||||
|
conn.Close()
|
||||||
|
c.conn = nil // already closed; keep the deferred cleanup from closing it twice
|
||||||
|
c.connMu.Unlock()
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
}
|
||||||
c.reader = bufio.NewReader(c.conn)
|
c.reader = bufio.NewReader(c.conn)
|
||||||
pollFails = 0
|
pollFails = 0
|
||||||
log.Printf("Ultrabeam: Connected to %s", c.target())
|
log.Printf("Ultrabeam: Connected to %s", c.target())
|
||||||
|
// Dump the first exchange on this link. A connection that opens and
|
||||||
|
// then says nothing is the whole of what a serial user can see.
|
||||||
|
c.armDiag()
|
||||||
}
|
}
|
||||||
c.connMu.Unlock()
|
c.connMu.Unlock()
|
||||||
|
|
||||||
@@ -502,6 +591,10 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
|||||||
|
|
||||||
seq := c.getNextSeq()
|
seq := c.getNextSeq()
|
||||||
packet := c.buildPacket(seq, cmd, data)
|
packet := c.buildPacket(seq, cmd, data)
|
||||||
|
diag := c.diagOn()
|
||||||
|
if diag {
|
||||||
|
log.Printf("Ultrabeam: first exchange on %s — sending %d bytes: % X", c.target(), len(packet), packet)
|
||||||
|
}
|
||||||
if _, err := c.conn.Write(packet); err != nil {
|
if _, err := c.conn.Write(packet); err != nil {
|
||||||
return nil, fmt.Errorf("failed to write: %w", err)
|
return nil, fmt.Errorf("failed to write: %w", err)
|
||||||
}
|
}
|
||||||
@@ -509,6 +602,20 @@ func (c *Client) sendCommand(cmd byte, data []byte) ([]byte, error) {
|
|||||||
// Read the reply with a timeout generous enough for a remote link.
|
// Read the reply with a timeout generous enough for a remote link.
|
||||||
c.setReadTimeout(ubReadTimeout)
|
c.setReadTimeout(ubReadTimeout)
|
||||||
buffer, err := c.readPacket()
|
buffer, err := c.readPacket()
|
||||||
|
if diag {
|
||||||
|
c.diagMu.Lock()
|
||||||
|
junk := append([]byte(nil), c.diagJunk...)
|
||||||
|
c.diag = false
|
||||||
|
c.diagMu.Unlock()
|
||||||
|
switch {
|
||||||
|
case err != nil && len(junk) == 0:
|
||||||
|
log.Printf("Ultrabeam: first exchange — NOTHING came back (%v). The controller is not answering on this port. Note that the USB cable presents TWO COM ports and only the SECOND one reaches the controller (at 19200 baud on the units seen so far); also check the cable and that the controller is on.", err)
|
||||||
|
case err != nil:
|
||||||
|
log.Printf("Ultrabeam: first exchange — %d bytes came back but no frame started (% X): %v. Bytes with no frame usually mean the wrong baud rate.", len(junk), junk, err)
|
||||||
|
default:
|
||||||
|
log.Printf("Ultrabeam: first exchange — reply %d bytes: % X (%d discarded before the frame: % X)", len(buffer), buffer, len(junk), junk)
|
||||||
|
}
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -561,13 +668,53 @@ func (c *Client) drainStale() {
|
|||||||
// so a raw ETX only ever appears as the real terminator. Caller holds connMu and
|
// so a raw ETX only ever appears as the real terminator. Caller holds connMu and
|
||||||
// has set a read deadline.
|
// has set a read deadline.
|
||||||
func (c *Client) readPacket() ([]byte, error) {
|
func (c *Client) readPacket() ([]byte, error) {
|
||||||
|
// A DEADLINE for the whole frame, not a timeout per read.
|
||||||
|
//
|
||||||
|
// A silent serial port does not error: it returns (0, nil) on every read once
|
||||||
|
// its timeout expires, and bufio retries that a hundred times before giving up
|
||||||
|
// with ErrNoProgress. With a 4-second port timeout that is over six minutes of
|
||||||
|
// a poll loop frozen mid-exchange, logging nothing — which is exactly how a
|
||||||
|
// controller that never answered looked like a program that had hung. Short
|
||||||
|
// port timeouts, checked against a deadline here, turn it into one clear
|
||||||
|
// "nothing came back" after four seconds.
|
||||||
|
deadline := time.Now().Add(ubReadTimeout)
|
||||||
|
c.setReadTimeout(250 * time.Millisecond)
|
||||||
|
defer c.setReadTimeout(ubReadTimeout)
|
||||||
var buffer []byte
|
var buffer []byte
|
||||||
for {
|
for {
|
||||||
|
// A stop must not have to wait out the deadline. Without this, tearing the
|
||||||
|
// client down mid-exchange took up to four seconds — long enough for the
|
||||||
|
// replacement client to find the port still held, and for Stop to give up
|
||||||
|
// waiting and say so.
|
||||||
|
select {
|
||||||
|
case <-c.stopChan:
|
||||||
|
return nil, fmt.Errorf("stopped")
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
if time.Now().After(deadline) {
|
||||||
|
if len(buffer) == 0 {
|
||||||
|
return nil, fmt.Errorf("no reply within %s", ubReadTimeout)
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("incomplete frame within %s (% X)", ubReadTimeout, buffer)
|
||||||
|
}
|
||||||
b, err := c.reader.ReadByte()
|
b, err := c.reader.ReadByte()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
// A quiet port between bytes is normal — go.bug.st returns (0, nil) on
|
||||||
|
// its timeout, which bufio eventually reports as ErrNoProgress. Only the
|
||||||
|
// deadline above decides that the exchange has failed.
|
||||||
|
if transientRead(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
return nil, fmt.Errorf("failed to read: %w", err)
|
return nil, fmt.Errorf("failed to read: %w", err)
|
||||||
}
|
}
|
||||||
if len(buffer) == 0 && b != STX {
|
if len(buffer) == 0 && b != STX {
|
||||||
|
// Kept, briefly, for the first exchange after a connect: what gets
|
||||||
|
// discarded here IS the diagnosis when the link is misconfigured.
|
||||||
|
c.diagMu.Lock()
|
||||||
|
if c.diag && len(c.diagJunk) < 32 {
|
||||||
|
c.diagJunk = append(c.diagJunk, b)
|
||||||
|
}
|
||||||
|
c.diagMu.Unlock()
|
||||||
continue // resync to the start of a frame
|
continue // resync to the start of a frame
|
||||||
}
|
}
|
||||||
buffer = append(buffer, b)
|
buffer = append(buffer, b)
|
||||||
@@ -725,3 +872,21 @@ func (c *Client) ModifyElement(elementNum int, lengthMm int) error {
|
|||||||
_, err := c.sendCommand(CMD_MODIFY_ELEM, data)
|
_, err := c.sendCommand(CMD_MODIFY_ELEM, data)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// portBusyHint turns "Serial port busy" into something actionable.
|
||||||
|
//
|
||||||
|
// A COM port has exactly one owner. The message the driver gives back says the
|
||||||
|
// port is busy and stops there, which reads like a fault in OpsLog — and the
|
||||||
|
// program actually holding it is usually the antenna manufacturer's own control
|
||||||
|
// window, sitting open on the same desktop. Naming that is the difference
|
||||||
|
// between a bug report and a five-second fix.
|
||||||
|
func portBusyHint(mode, com string, err error) string {
|
||||||
|
if mode != "serial" || err == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
msg := strings.ToLower(err.Error())
|
||||||
|
if !strings.Contains(msg, "busy") && !strings.Contains(msg, "access is denied") && !strings.Contains(msg, "denied") {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return " — another program already has " + com + " open (the UltraBeam Controller window, PstRotator, a terminal). A COM port has one owner: close the other program, then OpsLog can connect."
|
||||||
|
}
|
||||||
|
|||||||
@@ -76,3 +76,30 @@ func TestMotorTuneKHzForBandFallsBack(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The Ultrabeam's USB link answers on 19200 and on nothing else — confirmed on
|
||||||
|
// hardware, where 9600 opened the port and returned not one byte. A speed with a
|
||||||
|
// single right answer must not be storable as anything else, whatever an older
|
||||||
|
// config or a hand-edited setting says.
|
||||||
|
func TestNormMotorBaud(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
typ, transport string
|
||||||
|
in, want int
|
||||||
|
}{
|
||||||
|
{"ultrabeam", "serial", 9600, 19200},
|
||||||
|
{"ultrabeam", "serial", 0, 19200},
|
||||||
|
{"ultrabeam", "serial", 115200, 19200},
|
||||||
|
// Over TCP the speed is the adapter's business, not ours.
|
||||||
|
{"ultrabeam", "tcp", 9600, 9600},
|
||||||
|
// The SteppIR controller really does run at several speeds.
|
||||||
|
{"steppir", "serial", 4800, 4800},
|
||||||
|
{"steppir", "serial", 19200, 19200},
|
||||||
|
// Nonsense falls back rather than reaching the driver.
|
||||||
|
{"steppir", "serial", 0, 9600},
|
||||||
|
{"steppir", "serial", 999999, 9600},
|
||||||
|
} {
|
||||||
|
if got := normMotorBaud(tc.typ, tc.transport, tc.in); got != tc.want {
|
||||||
|
t.Errorf("normMotorBaud(%q, %q, %d) = %d, want %d", tc.typ, tc.transport, tc.in, got, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+38
-1
@@ -1,6 +1,10 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
// The tracking mode decides how often a motorized antenna's elements run, so a
|
// The tracking mode decides how often a motorized antenna's elements run, so a
|
||||||
// value that fails to parse must not silently become the most aggressive
|
// value that fails to parse must not silently become the most aggressive
|
||||||
@@ -46,3 +50,36 @@ func TestBandForHzDrivesBandTracking(t *testing.T) {
|
|||||||
t.Errorf("30 m and 20 m both read %q — band mode would never re-tune between them", a)
|
t.Errorf("30 m and 20 m both read %q — band mode would never re-tune between them", a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A "Test connection" on a serial port must not open a port OpsLog already
|
||||||
|
// holds: a COM port has one owner, and the owner is the running antenna client.
|
||||||
|
// Building a second client made the two fight — one of them logging "Serial port
|
||||||
|
// busy" for the rest of the session.
|
||||||
|
func TestTestUltrabeamReusesTheLiveSerialClient(t *testing.T) {
|
||||||
|
src, err := os.ReadFile("app.go")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
body := funcBody(t, string(src), "func (a *App) TestUltrabeam(s UltrabeamSettings) error {")
|
||||||
|
if !strings.Contains(body, "a.liveMotorFor(s)") {
|
||||||
|
t.Error("TestUltrabeam builds a client without first checking whether the live one already owns that port")
|
||||||
|
}
|
||||||
|
// The check has to come BEFORE the second client is created, or it is no check.
|
||||||
|
if i, j := strings.Index(body, "a.liveMotorFor(s)"), strings.Index(body, "newMotorClient(s)"); i < 0 || j < 0 || i > j {
|
||||||
|
t.Error("the live-client check must precede newMotorClient")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// funcBody returns the source of a function, up to the closing brace in column 0.
|
||||||
|
func funcBody(t *testing.T, src, signature string) string {
|
||||||
|
t.Helper()
|
||||||
|
i := strings.Index(src, signature)
|
||||||
|
if i < 0 {
|
||||||
|
t.Fatalf("function not found: %s", signature)
|
||||||
|
}
|
||||||
|
rest := src[i:]
|
||||||
|
if j := strings.Index(rest, "\n}\n"); j >= 0 {
|
||||||
|
return rest[:j]
|
||||||
|
}
|
||||||
|
return rest
|
||||||
|
}
|
||||||
|
|||||||
+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.26.3"
|
appVersion = "0.26.5"
|
||||||
|
|
||||||
// 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.
|
||||||
|
|||||||
Reference in New Issue
Block a user