Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2007479da6 | ||
|
|
4ba5569ca8 | ||
|
|
dc0b00b474 | ||
|
|
2695747db6 | ||
|
|
eba54344b0 | ||
|
|
93879a0ce1 | ||
|
|
8fccfa29b1 | ||
|
|
784d809290 | ||
|
|
700b688fc0 | ||
|
|
03598cfaff | ||
|
|
ed517eb8d3 | ||
|
|
1cfba19ed2 | ||
|
|
b18f5c491e | ||
|
|
741364bf99 | ||
|
|
d0f06d9670 | ||
|
|
8e49d37cbd | ||
|
|
b2382a6135 | ||
|
|
f8fb57210f | ||
|
|
8762131248 |
@@ -78,6 +78,7 @@ import (
|
||||
const (
|
||||
keyQRZUser = "lookup.qrz.user"
|
||||
keyQRZPassword = "lookup.qrz.password"
|
||||
keyQRZNickname = "lookup.qrz.prefer_nickname" // "1" → QRZ <nickname> over first+last name
|
||||
keyHQUser = "lookup.hamqth.user"
|
||||
keyHQPassword = "lookup.hamqth.password"
|
||||
keyCacheTTL = "lookup.cache.ttl_days"
|
||||
@@ -232,11 +233,11 @@ const (
|
||||
keyUltrabeamEnabled = "ultrabeam.enabled"
|
||||
keyUltrabeamHost = "ultrabeam.host"
|
||||
keyUltrabeamPort = "ultrabeam.port"
|
||||
keyUltrabeamFollow = "ultrabeam.follow" // "1" → re-tune to the rig frequency
|
||||
keyUltrabeamStep = "ultrabeam.step_khz" // re-tune hysteresis: 25 | 50 | 100 kHz
|
||||
keyMotorTrackMode = "motor.track_mode" // "always" | "step" | "band"
|
||||
keyMotorBandFreqs = "motor.band_freqs" // per-band tune frequency: "40m=7100,20m=14150"
|
||||
keyChaseNewGrids = "cluster.chase_grids" // "1" → persist learnt locators across restarts
|
||||
keyUltrabeamFollow = "ultrabeam.follow" // "1" → re-tune to the rig frequency
|
||||
keyUltrabeamStep = "ultrabeam.step_khz" // re-tune hysteresis: 25 | 50 | 100 kHz
|
||||
keyMotorTrackMode = "motor.track_mode" // "always" | "step" | "band"
|
||||
keyMotorBandFreqs = "motor.band_freqs" // per-band tune frequency: "40m=7100,20m=14150"
|
||||
keyChaseNewGrids = "cluster.chase_grids" // "1" → persist learnt locators across restarts
|
||||
keyRowColors = "appearance.row_colors"
|
||||
keyMotorType = "ultrabeam.type" // "ultrabeam" | "steppir" (default ultrabeam)
|
||||
keyMotorTransport = "ultrabeam.transport" // "tcp" | "serial" (default tcp)
|
||||
@@ -298,6 +299,7 @@ const (
|
||||
keyClusterAutoConnect = "cluster.auto_connect" // open every enabled server at app start
|
||||
keyClusterSelfSpot = "cluster.self_spot" // "1" → announce ourselves on the cluster as we log
|
||||
keyClusterSelfSpotMin = "cluster.self_spot_minutes" // shortest gap between two self-spots
|
||||
keyClusterSpotTTL = "cluster.spot_ttl_min" // drop spots older than this; 0 = keep them
|
||||
|
||||
keyScpEnabled = "scp.enabled" // Super Check Partial / N+1 suggestions on
|
||||
|
||||
@@ -352,6 +354,7 @@ const (
|
||||
keyExtHRDLogCode = "extsvc.hrdlog.code" // HRDLog account upload code
|
||||
keyExtHRDLogAutoUpload = "extsvc.hrdlog.auto_upload"
|
||||
keyExtHRDLogUploadMode = "extsvc.hrdlog.upload_mode"
|
||||
keyExtHRDLogOnAir = "extsvc.hrdlog.on_air" // publish frequency/mode/rig live on hrdlog.net
|
||||
|
||||
keyExtEQSLUsername = "extsvc.eqsl.username"
|
||||
keyExtEQSLPassword = "extsvc.eqsl.password"
|
||||
@@ -563,7 +566,11 @@ type LookupSettings struct {
|
||||
Primary string `json:"primary"`
|
||||
Failsafe string `json:"failsafe"`
|
||||
DownloadImages bool `json:"download_images"` // show QRZ profile pictures in the UI
|
||||
CacheTTLDays int `json:"cache_ttl_days"`
|
||||
// QRZPreferNickname logs the name an operator goes BY rather than their
|
||||
// registered first+last. QRZ only: HamQTH's <nick> already serves that role
|
||||
// there, so the option would be a second switch for a behaviour it has.
|
||||
QRZPreferNickname bool `json:"qrz_prefer_nickname"`
|
||||
CacheTTLDays int `json:"cache_ttl_days"`
|
||||
}
|
||||
|
||||
// App is the application context bound to the Wails runtime.
|
||||
@@ -1399,8 +1406,9 @@ func (a *App) startup(ctx context.Context) {
|
||||
// Anonymous usage heartbeat (once/day) so we can gauge active users. No-op
|
||||
// when disabled in Preferences or until the PostHog key is configured.
|
||||
go a.sendTelemetryHeartbeat()
|
||||
go a.liveStatusLoop() // multi-op: heartbeat current activity to shared MySQL
|
||||
go a.chatLoop() // multi-op: poll the shared chat + heartbeat presence
|
||||
go a.liveStatusLoop() // multi-op: heartbeat current activity to shared MySQL
|
||||
go a.chatLoop() // multi-op: poll the shared chat + heartbeat presence
|
||||
go a.hrdlogOnAirLoop() // publish frequency/mode/rig on hrdlog.net when enabled
|
||||
// Locator store BEFORE the feed: the feed asks whether it exists to decide
|
||||
// which bands to subscribe to.
|
||||
a.startGridCache()
|
||||
@@ -2595,7 +2603,7 @@ func (a *App) reloadLookupProviders() {
|
||||
return
|
||||
}
|
||||
m, err := a.settings.GetMany(a.ctx,
|
||||
keyQRZUser, keyQRZPassword, keyHQUser, keyHQPassword,
|
||||
keyQRZUser, keyQRZPassword, keyQRZNickname, keyHQUser, keyHQPassword,
|
||||
keyCacheTTL, keyLookupPrimary, keyLookupFailsafe)
|
||||
if err != nil {
|
||||
fmt.Println("OpsLog: settings load error:", err)
|
||||
@@ -2609,7 +2617,9 @@ func (a *App) reloadLookupProviders() {
|
||||
switch name {
|
||||
case "qrz":
|
||||
if m[keyQRZUser] != "" && m[keyQRZPassword] != "" {
|
||||
return lookup.NewQRZ(m[keyQRZUser], m[keyQRZPassword])
|
||||
p := lookup.NewQRZ(m[keyQRZUser], m[keyQRZPassword])
|
||||
p.PreferNickname = m[keyQRZNickname] == "1"
|
||||
return p
|
||||
}
|
||||
case "hamqth":
|
||||
if m[keyHQUser] != "" && m[keyHQPassword] != "" {
|
||||
@@ -7197,7 +7207,7 @@ func (a *App) GetLookupSettings() (LookupSettings, error) {
|
||||
}
|
||||
m, err := a.settings.GetMany(a.ctx,
|
||||
keyQRZUser, keyQRZPassword, keyHQUser, keyHQPassword,
|
||||
keyCacheTTL, keyLookupPrimary, keyLookupFailsafe, keyLookupImages)
|
||||
keyCacheTTL, keyLookupPrimary, keyLookupFailsafe, keyLookupImages, keyQRZNickname)
|
||||
if err != nil {
|
||||
return LookupSettings{}, err
|
||||
}
|
||||
@@ -7206,14 +7216,15 @@ func (a *App) GetLookupSettings() (LookupSettings, error) {
|
||||
ttl = 30
|
||||
}
|
||||
return LookupSettings{
|
||||
QRZUser: m[keyQRZUser],
|
||||
QRZPassword: m[keyQRZPassword],
|
||||
HamQTHUser: m[keyHQUser],
|
||||
HamQTHPassword: m[keyHQPassword],
|
||||
Primary: m[keyLookupPrimary],
|
||||
Failsafe: m[keyLookupFailsafe],
|
||||
DownloadImages: m[keyLookupImages] == "1",
|
||||
CacheTTLDays: ttl,
|
||||
QRZUser: m[keyQRZUser],
|
||||
QRZPassword: m[keyQRZPassword],
|
||||
HamQTHUser: m[keyHQUser],
|
||||
HamQTHPassword: m[keyHQPassword],
|
||||
Primary: m[keyLookupPrimary],
|
||||
Failsafe: m[keyLookupFailsafe],
|
||||
DownloadImages: m[keyLookupImages] == "1",
|
||||
QRZPreferNickname: m[keyQRZNickname] == "1",
|
||||
CacheTTLDays: ttl,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -7239,6 +7250,7 @@ func (a *App) SaveLookupSettings(s LookupSettings) error {
|
||||
keyLookupPrimary: s.Primary,
|
||||
keyLookupFailsafe: s.Failsafe,
|
||||
keyLookupImages: boolStr(s.DownloadImages),
|
||||
keyQRZNickname: boolStr(s.QRZPreferNickname),
|
||||
} {
|
||||
if err := a.settings.Set(a.ctx, k, v); err != nil {
|
||||
return err
|
||||
@@ -9902,7 +9914,7 @@ func (a *App) loadExternalServices() extsvc.ExternalServices {
|
||||
keyExtLoTWUploadFlag, keyExtLoTWUploadFlags, keyExtLoTWWriteLog,
|
||||
keyExtLoTWAutoUpload, keyExtLoTWUploadMode,
|
||||
keyExtLoTWUsername, keyExtLoTWWebPassword,
|
||||
keyExtHRDLogCallsign, keyExtHRDLogCode, keyExtHRDLogAutoUpload, keyExtHRDLogUploadMode,
|
||||
keyExtHRDLogCallsign, keyExtHRDLogCode, keyExtHRDLogAutoUpload, keyExtHRDLogUploadMode, keyExtHRDLogOnAir,
|
||||
keyExtEQSLUsername, keyExtEQSLPassword, keyExtEQSLQTHNick, keyExtEQSLAutoUpload, keyExtEQSLUploadMode,
|
||||
keyExtCloudlogURL, keyExtCloudlogAPIKey, keyExtCloudlogStationID,
|
||||
keyExtCloudlogAutoUpload, keyExtCloudlogUploadMode, keyExtDeleteRemote)
|
||||
@@ -9956,6 +9968,7 @@ func (a *App) loadExternalServices() extsvc.ExternalServices {
|
||||
Code: m[keyExtHRDLogCode],
|
||||
AutoUpload: m[keyExtHRDLogAutoUpload] == "1",
|
||||
UploadMode: extsvc.UploadMode(m[keyExtHRDLogUploadMode]),
|
||||
OnAir: m[keyExtHRDLogOnAir] == "1",
|
||||
}
|
||||
// Default the HRDLog callsign to the active profile's call when unset.
|
||||
if out.HRDLog.Callsign == "" && a.profiles != nil {
|
||||
@@ -10085,6 +10098,7 @@ func (a *App) SaveExternalServices(cfg extsvc.ExternalServices) error {
|
||||
keyExtHRDLogCode: strings.TrimSpace(cfg.HRDLog.Code),
|
||||
keyExtHRDLogAutoUpload: hlAuto,
|
||||
keyExtHRDLogUploadMode: hlMode,
|
||||
keyExtHRDLogOnAir: boolStr(cfg.HRDLog.OnAir),
|
||||
|
||||
keyExtEQSLUsername: strings.ToUpper(strings.TrimSpace(cfg.EQSL.Username)),
|
||||
keyExtEQSLPassword: cfg.EQSL.Password,
|
||||
@@ -14821,14 +14835,14 @@ func (a steppirAdapter) Status() motorStatus {
|
||||
// is kept (bindings + frontend) though it now covers SteppIR too.
|
||||
type UltrabeamSettings struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
Type string `json:"type"` // "ultrabeam" | "steppir"
|
||||
Transport string `json:"transport"` // "tcp" | "serial"
|
||||
Host string `json:"host"` // tcp
|
||||
Port int `json:"port"` // tcp
|
||||
COM string `json:"com"` // serial device
|
||||
Baud int `json:"baud"` // serial baud
|
||||
Follow bool `json:"follow"` // re-tune the antenna to the rig's frequency
|
||||
StepKHz int `json:"step_khz"` // re-tune only when the freq moved this far (25/50/100)
|
||||
Type string `json:"type"` // "ultrabeam" | "steppir"
|
||||
Transport string `json:"transport"` // "tcp" | "serial"
|
||||
Host string `json:"host"` // tcp
|
||||
Port int `json:"port"` // tcp
|
||||
COM string `json:"com"` // serial device
|
||||
Baud int `json:"baud"` // serial baud
|
||||
Follow bool `json:"follow"` // re-tune the antenna to the rig's frequency
|
||||
StepKHz int `json:"step_khz"` // re-tune only when the freq moved this far (25/50/100)
|
||||
// When the follow loop is allowed to move the motors. The three choices the
|
||||
// SteppIR's own controller software offers, because operators arrive with
|
||||
// that mental model:
|
||||
@@ -17438,6 +17452,16 @@ func (a *App) ClusterSpotStatuses(spots []SpotQuery) []SpotStatus {
|
||||
if a.dxcc == nil {
|
||||
continue
|
||||
}
|
||||
// Say WHY a maritime/aeronautical mobile has no entity, rather than
|
||||
// leaving the column blank — blank is what an unresolved spot looks like,
|
||||
// and the two mean opposite things: one is "we don't know yet", this is
|
||||
// "there is nothing to know, the station is at sea". Display only: the
|
||||
// QSO's own Country stays empty, because it is a DXCC entity name and
|
||||
// there is none.
|
||||
if dxcc.IsMobileNoEntity(q.Call) {
|
||||
out[i].Country = "Maritime mobile — no DXCC"
|
||||
continue
|
||||
}
|
||||
m, ok := a.dxcc.Lookup(q.Call)
|
||||
if !ok || m.Entity == nil {
|
||||
continue
|
||||
@@ -17728,3 +17752,61 @@ func (a *App) SetKenwoodKeySpeed(wpm int) error {
|
||||
}
|
||||
return a.cat.KenwoodDo(func(k cat.KenwoodController) error { return k.SetKeySpeed(wpm) })
|
||||
}
|
||||
|
||||
// spotTTLMax bounds the setting. Twelve hours is far past any operational use
|
||||
// and exists only so a mistyped value cannot mean "never".
|
||||
const spotTTLMax = 720
|
||||
|
||||
// GetSpotTTLMinutes returns how long a spot stays in the list, in minutes.
|
||||
// 0 means spots are kept until the count cap pushes them out, which is what
|
||||
// OpsLog always did.
|
||||
func (a *App) GetSpotTTLMinutes() int {
|
||||
n, _ := strconv.Atoi(a.settingOr(keyClusterSpotTTL, ""))
|
||||
if n < 0 {
|
||||
return 0
|
||||
}
|
||||
if n > spotTTLMax {
|
||||
return spotTTLMax
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
// SetSpotTTLMinutes sets it. Clamped here as well as in the UI: the value
|
||||
// shapes what an operator sees on the band map, and a stale or bypassed
|
||||
// frontend must not be able to widen it past the ceiling.
|
||||
func (a *App) SetSpotTTLMinutes(min int) error {
|
||||
if min < 0 {
|
||||
min = 0
|
||||
}
|
||||
if min > spotTTLMax {
|
||||
min = spotTTLMax
|
||||
}
|
||||
a.setSetting(keyClusterSpotTTL, strconv.Itoa(min))
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetCompactHeight resizes the compact window to fit its content.
|
||||
//
|
||||
// The height used to be a constant "tuned so the compact entry strip fits in a
|
||||
// single row". Constants tuned against a layout stop being true the moment the
|
||||
// layout changes, and this one outlived a strip that had since lost a row —
|
||||
// leaving a band of empty window under the fields. The frontend measures what
|
||||
// it actually rendered and says so.
|
||||
//
|
||||
// Ignored unless compact is on, so nothing can shrink the normal window.
|
||||
func (a *App) SetCompactHeight(h int) {
|
||||
if a.ctx == nil || !a.compact {
|
||||
return
|
||||
}
|
||||
// Bounded: a measurement of zero (a layout not yet painted) must not collapse
|
||||
// the window to nothing, and no strip is ever 600px tall.
|
||||
if h < 80 || h > 600 {
|
||||
return
|
||||
}
|
||||
w, _ := wruntime.WindowGetSize(a.ctx)
|
||||
if w <= 0 {
|
||||
w = compactW
|
||||
}
|
||||
wruntime.WindowSetMinSize(a.ctx, 900, h)
|
||||
wruntime.WindowSetSize(a.ctx, w, h)
|
||||
}
|
||||
|
||||
@@ -1,4 +1,30 @@
|
||||
[
|
||||
{
|
||||
"version": "0.25.0",
|
||||
"date": "",
|
||||
"en": [
|
||||
"Cluster: \"Hide worked\" no longer hides a spot that is a new prefix, county, grid or park in an entity already worked.",
|
||||
"DX Cluster: a spot lifetime can be set — 5, 10, 15 minutes or your own value — after which spots leave the list and the band maps.",
|
||||
"Call lookup: QRZ.com now fills Name with the first name only, and optionally with the operator nickname instead.",
|
||||
"Entry form: a narrower left column, State beside the locator, and a new line with County, CQ, ITU and DXCC.",
|
||||
"Station Control: the short and long path headings are repeated under the compass, at a readable size and clickable.",
|
||||
"Compact mode: the window now fits the entry strip instead of leaving a band of empty space below it.",
|
||||
"HRDLog: an ON AIR option publishes your live frequency, mode and rig on hrdlog.net.",
|
||||
"ADIF: the county is exported as STATE,COUNTY as the standard requires, and a county imported that way now fills the state too.",
|
||||
"A /MM or /AM callsign no longer resolves to a country — RI1FJL/MM read as Franz Josef Land while the expedition was still sailing there."
|
||||
],
|
||||
"fr": [
|
||||
"Cluster : « Masquer les contactés » ne masque plus un spot qui est un nouveau préfixe, comté, carré ou parc dans une contrée déjà faite.",
|
||||
"Cluster DX : on peut fixer une durée de vie des spots — 5, 10, 15 minutes ou une valeur libre — au-delà de laquelle ils quittent la liste et les band maps.",
|
||||
"Recherche d indicatif : QRZ.com remplit désormais Nom avec le seul prénom, et au choix avec le surnom de l opérateur.",
|
||||
"Saisie : colonne de gauche plus étroite, État à côté du locator, et une nouvelle ligne Comté, CQ, ITU et DXCC.",
|
||||
"Contrôle station : les azimuts court et long chemin sont repris sous la boussole, lisibles et cliquables.",
|
||||
"Mode compact : la fenêtre épouse la bande de saisie au lieu de laisser une bande vide en dessous.",
|
||||
"HRDLog : une option ON AIR publie ta fréquence, ton mode et ta radio en direct sur hrdlog.net.",
|
||||
"ADIF : le comté est exporté sous la forme ÉTAT,COMTÉ comme l exige le standard, et un comté importé ainsi remplit aussi l état.",
|
||||
"Un indicatif en /MM ou /AM ne se résout plus en pays — RI1FJL/MM affichait Franz Josef Land alors que l expédition faisait encore route."
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.24.9",
|
||||
"date": "",
|
||||
|
||||
+132
-10
@@ -16,7 +16,7 @@ import {
|
||||
GetStartupStatus, CheckForUpdate, DownloadAndApplyUpdate, GetLiveStations, GetWhatsNew, GetChangelog,
|
||||
SMTPConfigured, SendLogToDeveloper,
|
||||
WorkedBefore,
|
||||
SetCompactMode,
|
||||
SetCompactMode, SetCompactHeight,
|
||||
GetCATState, SetCATFrequency, SetCATMode, SwitchCATRig, FlexApplyBandAntenna, FlexApplyBandPower,
|
||||
GetSecretStatus, UnlockSecrets,
|
||||
RefreshCtyDat, DownloadAllReferenceLists,
|
||||
@@ -90,8 +90,8 @@ import { ExportFieldsDialog } from '@/components/ExportFieldsDialog';
|
||||
import { ShutdownProgress } from '@/components/ShutdownProgress';
|
||||
import { ClusterGrid } from '@/components/ClusterGrid';
|
||||
import { cleanSpotter, inferSpotMode, spotModeCategory, spotStatusKey } from '@/lib/spot';
|
||||
import { applySpotDisplay, readSpotDisplayOptions, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||
import { GetRowColors } from '../wailsjs/go/main/App';
|
||||
import { applySpotDisplay, readSpotDisplayOptions, spotIsWorked, SPOT_DISPLAY_OPTIONS_EXPOSED } from '@/lib/spotDisplay';
|
||||
import { GetRowColors, GetSpotTTLMinutes, IsNewUSCounty } from '../wailsjs/go/main/App';
|
||||
import { WorkedBeforeGrid } from '@/components/WorkedBeforeGrid';
|
||||
import { NetControlPanel } from '@/components/NetControlPanel';
|
||||
import { ContestPanel, CONTEST_DEFAULT, type ContestSession } from '@/components/ContestPanel';
|
||||
@@ -529,6 +529,28 @@ export default function App() {
|
||||
setCompact(next);
|
||||
SetCompactMode(next);
|
||||
}
|
||||
// Fit the compact window to what was actually rendered.
|
||||
//
|
||||
// The height was a constant "tuned so the compact entry strip fits in a single
|
||||
// row". A constant tuned against a layout stops being true the moment the
|
||||
// layout changes, and this one outlived a strip that had since lost a row —
|
||||
// leaving a band of empty window under the fields. Measure instead.
|
||||
const compactRootRef = useRef<HTMLDivElement | null>(null);
|
||||
useEffect(() => {
|
||||
if (!compact) return;
|
||||
const fit = () => {
|
||||
const el = compactRootRef.current;
|
||||
if (!el) return;
|
||||
// Rounded, so a sub-pixel reflow cannot start a resize loop.
|
||||
// + the compact topbar, which is a fixed h-8 (32px), + a couple of pixels
|
||||
// for the border so the strip is never clipped by one row of anti-aliasing.
|
||||
SetCompactHeight(Math.round(el.getBoundingClientRect().height) + 32 + 2);
|
||||
};
|
||||
const id = window.setTimeout(fit, 60); // let the strip paint first
|
||||
const ro = new ResizeObserver(fit);
|
||||
if (compactRootRef.current) ro.observe(compactRootRef.current);
|
||||
return () => { window.clearTimeout(id); ro.disconnect(); };
|
||||
}, [compact]);
|
||||
|
||||
// CAT — receives live rig state via Wails events.
|
||||
const [catState, setCatState] = useState<CATState>({ enabled: false, connected: false } as any);
|
||||
@@ -1928,6 +1950,31 @@ export default function App() {
|
||||
// settings dialog closes, which is the only place it changes.
|
||||
const [rowColors, setRowColors] = useState<any>(null);
|
||||
useEffect(() => { GetRowColors().then(setRowColors).catch(() => {}); }, [showSettings]);
|
||||
// Spot lifetime (Settings → DX Cluster). Spots are actually REMOVED rather
|
||||
// than filtered at render: the cluster list, every band map and the counts all
|
||||
// read the same array, so pruning it once is what makes the setting mean the
|
||||
// same thing everywhere — and it gives the memory back.
|
||||
const [spotTTLMin, setSpotTTLMin] = useState(0);
|
||||
useEffect(() => { GetSpotTTLMinutes().then(setSpotTTLMin).catch(() => {}); }, [showSettings]);
|
||||
useEffect(() => {
|
||||
if (spotTTLMin <= 0) return; // 0 = keep until the count cap pushes them out
|
||||
const sweep = () => {
|
||||
const cutoff = Date.now() - spotTTLMin * 60_000;
|
||||
setSpots((arr) => {
|
||||
const kept = arr.filter((sp) => {
|
||||
const t = Date.parse((sp as any).received_at ?? '');
|
||||
return isNaN(t) || t >= cutoff; // an unparseable stamp is never a reason to drop a spot
|
||||
});
|
||||
return kept.length === arr.length ? arr : kept;
|
||||
});
|
||||
};
|
||||
sweep();
|
||||
// Half a minute: fine enough that a 5-minute setting is honoured closely,
|
||||
// coarse enough to be invisible next to the spot stream itself.
|
||||
const id = window.setInterval(sweep, 30_000);
|
||||
return () => window.clearInterval(id);
|
||||
}, [spotTTLMin]);
|
||||
|
||||
const qsosWithAwards = useMemo(
|
||||
() => (qsos as any[]).map((q) => ({ ...q, award_refs: parseAwardRefs(q.award_refs) })),
|
||||
[qsos],
|
||||
@@ -4414,6 +4461,67 @@ export default function App() {
|
||||
onBlur={() => setQth(titleCase)} />
|
||||
</div>
|
||||
);
|
||||
// State sits between QTH and the locator: it is part of the same "where is
|
||||
// this station" reading, and it is what several awards key off (WAS, the US
|
||||
// county work). Narrow — it holds two or three characters.
|
||||
const stateBlock = (
|
||||
<div className="flex flex-col w-[70px] shrink-0"><Label className="mb-1 h-3.5">{t('field.state')}</Label>
|
||||
<Input value={details.state ?? ''} className="font-mono"
|
||||
onChange={(e) => setDetails((d) => ({ ...d, state: e.target.value.toUpperCase() }))} />
|
||||
</div>
|
||||
);
|
||||
// County beside State: the lookup fills QTH, State, County and the locator
|
||||
// together, and they are read together. Wider than State because a county name
|
||||
// is a name — "St. Tammany Parish", not a code.
|
||||
// The row Comment/Note freed by moving onto one line: county, zones and the
|
||||
// ADIF entity number. All four are filled by the lookup and were previously
|
||||
// only visible after opening a tab — which is the wrong place for values an
|
||||
// operator wants to SEE are right before pressing Log.
|
||||
//
|
||||
// A numeric field stores undefined when cleared, not 0: zero is a real DXCC
|
||||
// number for "no entity" and a real answer for a zone, so an empty box must
|
||||
// stay empty rather than assert something.
|
||||
// NEW badge on the county — the same answer the Details tab gives, moved to
|
||||
// where the county is now typed. Debounced: this field is typed into as well
|
||||
// as filled by the lookup, and the check hits the database.
|
||||
const [entryNewCounty, setEntryNewCounty] = useState(false);
|
||||
useEffect(() => {
|
||||
const cnty = (details.cnty ?? '').trim();
|
||||
if (!cnty) { setEntryNewCounty(false); return; }
|
||||
let alive = true;
|
||||
const id = window.setTimeout(async () => {
|
||||
try {
|
||||
const isNew = await IsNewUSCounty(details.state ?? '', cnty);
|
||||
if (alive) setEntryNewCounty(!!isNew);
|
||||
} catch { if (alive) setEntryNewCounty(false); }
|
||||
}, 300);
|
||||
return () => { alive = false; window.clearTimeout(id); };
|
||||
}, [details.state, details.cnty]);
|
||||
|
||||
const num = (v: string): number | undefined => {
|
||||
const s = v.replace(/[^0-9]/g, '');
|
||||
return s === '' ? undefined : parseInt(s, 10);
|
||||
};
|
||||
const geoDetailRow = (
|
||||
<div className="flex gap-4 items-end">
|
||||
<div className="flex flex-col flex-1 min-w-0"><Label className="mb-1 h-3.5">{t('field.cnty')}</Label>
|
||||
<Input value={details.cnty ?? ''}
|
||||
onChange={(e) => setDetails((d) => ({ ...d, cnty: e.target.value }))} />
|
||||
</div>
|
||||
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.cqz')}</Label>
|
||||
<Input value={details.cqz ?? ''} className="font-mono"
|
||||
onChange={(e) => setDetails((d) => ({ ...d, cqz: num(e.target.value) }))} />
|
||||
</div>
|
||||
<div className="flex flex-col w-[64px] shrink-0"><Label className="mb-1 h-3.5">{t('field.ituz')}</Label>
|
||||
<Input value={details.ituz ?? ''} className="font-mono"
|
||||
onChange={(e) => setDetails((d) => ({ ...d, ituz: num(e.target.value) }))} />
|
||||
</div>
|
||||
<div className="flex flex-col w-[72px] shrink-0"><Label className="mb-1 h-3.5">{t('field.dxcc')}</Label>
|
||||
<Input value={details.dxcc ?? ''} className="font-mono"
|
||||
onChange={(e) => setDetails((d) => ({ ...d, dxcc: num(e.target.value) }))} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
const gridBlock = (
|
||||
<div className="flex flex-col w-[76px] shrink-0"><Label className="mb-1 h-3.5">{t('field.grid')}</Label>
|
||||
<Input value={grid} placeholder="JN05" className="font-mono" onChange={(e) => { setGrid(e.target.value); markEdited('grid'); }} />
|
||||
@@ -4780,7 +4888,16 @@ export default function App() {
|
||||
const k = spotStatusKey(s.dx_call, s.band ?? '', s.comment ?? '', s.freq_hz);
|
||||
const e = spotStatus[k];
|
||||
if (!e) return false;
|
||||
if (e.worked_call || e.status === 'worked') return false;
|
||||
// A spot that is NEW for something is not "worked", whatever the entity
|
||||
// says. The extra markers are orthogonal to the entity status — the same
|
||||
// rule the band map already states — so a new prefix, county, grid or
|
||||
// park in an entity worked years ago is exactly what an operator is
|
||||
// hunting, and hiding it is the opposite of what was asked.
|
||||
//
|
||||
// Reported on BH2SWB and 4X9AA: both flagged NEW PFX, neither ever
|
||||
// worked, both vanished the moment "hide worked" went on.
|
||||
const isNew = !!(e.new_pota || e.new_county || e.new_pfx || e.new_grid);
|
||||
if (!isNew && (e.worked_call || e.status === 'worked')) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -5797,7 +5914,7 @@ export default function App() {
|
||||
Enter from any <input> inside the strip logs the QSO. Radix Selects
|
||||
render as <button> elements and are ignored by this handler — they
|
||||
keep their own keyboard behaviour. */}
|
||||
<div className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
|
||||
<div ref={compactRootRef} className={cn(!compact && 'flex gap-2.5 items-stretch px-2.5 pt-2.5 shrink-0')}>
|
||||
<section
|
||||
className={cn('bg-card shadow-sm border-border',
|
||||
compact
|
||||
@@ -5852,25 +5969,30 @@ export default function App() {
|
||||
to be pushed outside the entry panel and clipped. Wrapping drops
|
||||
it to its own line instead, which stays readable. */}
|
||||
<div className="flex gap-4 items-end flex-wrap">
|
||||
<div className="flex flex-col w-[300px] shrink-0"><Label className="mb-1 h-3.5">Name</Label>
|
||||
<div className="flex flex-col w-[230px] shrink-0"><Label className="mb-1 h-3.5">{t('field.name')}</Label>
|
||||
<Input value={name} onChange={(e) => { setName(e.target.value); markEdited('name'); }}
|
||||
onBlur={() => setName(titleCase)} />
|
||||
</div>
|
||||
{qthBlock}
|
||||
{stateBlock}
|
||||
{gridBlock}
|
||||
</div>
|
||||
|
||||
{/* Row 3: tight left detail column (Band/Mode/Country) and
|
||||
single-line Comment/Note on the right. */}
|
||||
Comment/Note SIDE BY SIDE on the right — one line each was a lot
|
||||
of vertical space for two fields that are usually short. */}
|
||||
<div className="flex gap-4 items-start">
|
||||
<div className="flex flex-col gap-1.5 w-[300px] shrink-0">
|
||||
<div className="flex flex-col gap-1.5 w-[230px] shrink-0">
|
||||
{bandRow}
|
||||
{modeRow}
|
||||
{countryRow}
|
||||
</div>
|
||||
<div className="flex flex-col gap-1.5 flex-1 min-w-0">
|
||||
{commentLine}
|
||||
{noteLine}
|
||||
{geoDetailRow}
|
||||
<div className="flex gap-4">
|
||||
<div className="flex-1 min-w-0">{commentLine}</div>
|
||||
<div className="flex-1 min-w-0">{noteLine}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -128,7 +128,9 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center justify-center p-2 min-h-0">
|
||||
{/* flex-col: the readout goes BELOW the dial. This wrapper was a row, so a
|
||||
sibling of the <svg> landed beside it. */}
|
||||
<div className="flex flex-col items-center justify-center p-2 min-h-0">
|
||||
<svg
|
||||
viewBox={`0 0 ${SIZE} ${SIZE}`}
|
||||
className={onGoto ? 'cursor-pointer select-none' : 'select-none'}
|
||||
@@ -188,6 +190,31 @@ export function RotorCompass({ bearing, headings, boomHeading, pattern, centerLa
|
||||
); })}
|
||||
<circle cx={C} cy={C} r={3.5} fill="#15803d" stroke="#fff" strokeWidth={1} />
|
||||
</svg>
|
||||
|
||||
{/* Short and long path to the DX, in figures.
|
||||
The bezel already carries the short path as a red marker, but a
|
||||
marker is a direction, not a number — the same pair sits in the
|
||||
status bar at 10px and operators reported not being able to read it.
|
||||
Here because it belongs to the compass: every place that draws one
|
||||
gets the readout, instead of each caller inventing its own.
|
||||
Clickable when the caller can turn, like the status bar's. */}
|
||||
<div className="flex gap-1.5 mt-2 font-mono w-full">
|
||||
{([['SP', bearing ?? null], ['LP', bearing == null ? null : (bearing + 180) % 360]] as const).map(([lbl, az]) => (
|
||||
<button key={lbl} type="button" disabled={az == null || !onGoto}
|
||||
onClick={() => { if (az != null && onGoto) onGoto(Math.round(az)); }}
|
||||
title={az == null ? '' : `${lbl} ${Math.round(az)}°`}
|
||||
className={
|
||||
'flex-1 rounded-md border py-1 text-xs font-semibold tabular-nums transition-colors ' +
|
||||
(az == null
|
||||
? 'border-border text-muted-foreground/50 cursor-not-allowed'
|
||||
: onGoto
|
||||
? 'border-info-border text-info-muted-foreground hover:bg-info-muted cursor-pointer'
|
||||
: 'border-border text-muted-foreground cursor-default')
|
||||
}>
|
||||
{lbl} {az == null ? '—' : `${Math.round(az)}°`}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
);
|
||||
|
||||
@@ -52,7 +52,7 @@ import {
|
||||
GetADIFMonitor, SaveADIFMonitor, PickADIFMonitorFile,
|
||||
GetRelayAuto, SaveRelayAuto, GetStationDevices,
|
||||
GetAwardDefs, GetTrackedAwards, SaveTrackedAwards,
|
||||
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetGridCacheStatus,
|
||||
GetBandOpenSettings, SaveBandOpenSettings, GetPSKReporterStatus, GetChaseNewGrids, SetChaseNewGrids, GetGridCacheStatus, GetSpotTTLMinutes, SetSpotTTLMinutes,
|
||||
} from '../../wailsjs/go/main/App';
|
||||
import type { profile as profileModels } from '../../wailsjs/go/models';
|
||||
import type { LookupSettingsForm, StationSettingsForm, ListsSettingsForm, ModePresetForm } from '@/types';
|
||||
@@ -1224,6 +1224,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
hamqth_user: '', hamqth_password: '',
|
||||
primary: '', failsafe: '',
|
||||
download_images: false,
|
||||
qrz_prefer_nickname: false,
|
||||
cache_ttl_days: 30,
|
||||
});
|
||||
// Per-provider Test state — keeps the success/error feedback adjacent
|
||||
@@ -1441,13 +1442,15 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
tqsl_path: string; station_location: string; key_password: string;
|
||||
upload_flags: string[]; write_log: boolean;
|
||||
auto_upload: boolean; upload_mode: string;
|
||||
// HRDLog only: publish the live frequency/mode/rig on hrdlog.net.
|
||||
on_air?: boolean;
|
||||
};
|
||||
type ExternalServices = { qrz: ExtServiceCfg; clublog: ExtServiceCfg; lotw: ExtServiceCfg; hrdlog: ExtServiceCfg; eqsl: ExtServiceCfg; cloudlog: ExtServiceCfg; delete_remote?: boolean };
|
||||
const emptyExtCfg = (): ExtServiceCfg => ({
|
||||
api_key: '', url: '', station_id: '', email: '', username: '', password: '', callsign: '', code: '', qth_nickname: '',
|
||||
force_station_callsign: '', tqsl_path: '', station_location: '', key_password: '',
|
||||
upload_flags: ['N', 'R'], write_log: false,
|
||||
auto_upload: false, upload_mode: 'immediate',
|
||||
auto_upload: false, upload_mode: 'immediate', on_air: false,
|
||||
});
|
||||
const [extSvc, setExtSvc] = useState<ExternalServices>({
|
||||
qrz: emptyExtCfg(), clublog: emptyExtCfg(), lotw: emptyExtCfg(), hrdlog: emptyExtCfg(), eqsl: emptyExtCfg(), cloudlog: emptyExtCfg(), delete_remote: false,
|
||||
@@ -1556,6 +1559,8 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
// feed up or down — so the write has to go where those live.
|
||||
const [bandOpen, setBandOpen] = useState<any>({ enabled: false, bands: [], available: [] });
|
||||
const [chaseGrids, setChaseGrids] = useState(false);
|
||||
const [spotTTL, setSpotTTL] = useState(0);
|
||||
const [spotTTLText, setSpotTTLText] = useState('0');
|
||||
const [gridStat, setGridStat] = useState<any>(null);
|
||||
const [pskrStatus, setPskrStatus] = useState<any>(null);
|
||||
const saveBandOpen = async (next: any) => {
|
||||
@@ -1566,6 +1571,7 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
(async () => {
|
||||
try { setBandOpen(await GetBandOpenSettings()); } catch { /* defaults stand */ }
|
||||
try { setChaseGrids(await GetChaseNewGrids()); } catch { /* defaults stand */ }
|
||||
try { const n = await GetSpotTTLMinutes(); setSpotTTL(n); setSpotTTLText(String(n)); } catch { /* defaults stand */ }
|
||||
})();
|
||||
// Poll the feed while the panel is open: a live count is the only thing that
|
||||
// distinguishes "connected" from "connected and receiving nothing".
|
||||
@@ -2309,6 +2315,23 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
</span>
|
||||
</span>
|
||||
</label>
|
||||
|
||||
{/* QRZ only. HamQTH's <nick> already fills the Name field with the
|
||||
on-air name, so the same switch there would toggle a behaviour it
|
||||
has no way to turn off. */}
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer mt-3">
|
||||
<Checkbox
|
||||
checked={!!(lookup as any).qrz_prefer_nickname}
|
||||
onCheckedChange={(c) => setLookup((s) => ({ ...s, qrz_prefer_nickname: !!c } as any))}
|
||||
className="mt-0.5"
|
||||
/>
|
||||
<span>
|
||||
{t('lk.qrzNickname')}
|
||||
<span className="block text-xs text-muted-foreground mt-0.5">
|
||||
{t('lk.qrzNicknameHint')}
|
||||
</span>
|
||||
</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div className="mt-6 pt-4 border-t border-border">
|
||||
@@ -4237,6 +4260,35 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
{/* Grid chasing. Here rather than in the filter panel because it is set
|
||||
up once: it decides whether locators learnt from decodes are KEPT
|
||||
across restarts, not what the list shows right now. */}
|
||||
{/* Spot lifetime. Applies to the cluster list AND every band map: the
|
||||
spots are removed from the shared list rather than hidden, so the
|
||||
setting cannot mean one thing in one view and another elsewhere. */}
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<div className="flex items-center gap-3 flex-wrap">
|
||||
<span className="text-sm">{t('clu.spotTtl')}</span>
|
||||
<div className="inline-flex rounded-md border border-border overflow-hidden text-xs">
|
||||
{[0, 5, 10, 15, 30, 60].map((v) => (
|
||||
<button key={v} type="button"
|
||||
onClick={() => { setSpotTTL(v); setSpotTTLText(String(v)); SetSpotTTLMinutes(v).catch(() => {}); }}
|
||||
className={cn('px-2.5 py-1.5 font-medium', spotTTL === v ? 'bg-primary text-primary-foreground' : 'text-muted-foreground hover:bg-muted')}>
|
||||
{v === 0 ? t('clu.spotTtlNever') : `${v}′`}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
{/* Raw text in local state: binding the input straight to the
|
||||
clamped number makes an empty field impossible to type into. */}
|
||||
<Input className="h-8 w-20" value={spotTTLText}
|
||||
onChange={(e) => {
|
||||
const raw = e.target.value.replace(/[^0-9]/g, '');
|
||||
setSpotTTLText(raw);
|
||||
const n = Math.min(720, parseInt(raw, 10) || 0);
|
||||
setSpotTTL(n);
|
||||
SetSpotTTLMinutes(n).catch(() => {});
|
||||
}} />
|
||||
<span className="text-xs text-muted-foreground">{t('clu.spotTtlHint')}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="border-t border-border/60 pt-3 space-y-2">
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox checked={chaseGrids} className="mt-0.5"
|
||||
@@ -4969,6 +5021,20 @@ export function SettingsModal({ onClose, onSaved, initialSection, onMainPaneChan
|
||||
{t('es.autoUpload')}
|
||||
</label>
|
||||
|
||||
{/* ON AIR is a live status, not an upload: it needs the rig
|
||||
readable, not a QSO. Its own switch beside the upload one
|
||||
rather than folded into it. */}
|
||||
<label className="flex items-start gap-2 text-sm cursor-pointer">
|
||||
<Checkbox className="mt-0.5"
|
||||
checked={!!(hrdlog as any).on_air}
|
||||
onCheckedChange={(c) => setHrdlog({ on_air: !!c } as any)}
|
||||
/>
|
||||
<span>
|
||||
{t('es.hrdOnAir')}
|
||||
<span className="block text-xs text-muted-foreground mt-0.5">{t('es.hrdOnAirHint')}</span>
|
||||
</span>
|
||||
</label>
|
||||
|
||||
<div className="grid grid-cols-[170px_1fr] gap-3 items-center">
|
||||
<Label className="text-sm">{t('es.uploadTiming')}</Label>
|
||||
<Select
|
||||
|
||||
@@ -77,6 +77,8 @@ function RotatorWidget({ hd, refetch, centerLat, centerLon, bearing, t }: Rotato
|
||||
title={hd.ok ? t('station.online') : t('station.rotatorNoRead')} />
|
||||
</div>
|
||||
<div className="p-3 flex gap-4 items-start">
|
||||
{/* The SP/LP readout lives INSIDE RotorCompass, so every compass in the
|
||||
app carries it rather than each caller drawing its own. */}
|
||||
<RotorCompass
|
||||
bearing={bearing ?? null}
|
||||
headings={hd.ok ? [hd.azimuth] : []}
|
||||
|
||||
@@ -54,7 +54,7 @@ const en: Dict = {
|
||||
'tab.main': 'Main', 'main.splitTip': 'Drag to resize the panes — double-click to even them out', 'tab.recent': 'Recent QSOs', 'tab.cluster': 'Cluster', 'tab.worked': 'Worked before',
|
||||
'tab.awards': 'Awards', 'tab.bandmap': 'Band Map', 'tab.contest': 'Contest', 'tab.net': 'Net',
|
||||
// Entry form
|
||||
'field.callsign': 'Callsign', 'field.name': 'Name', 'field.qth': 'QTH', 'field.grid': 'Grid',
|
||||
'field.callsign': 'Callsign', 'field.name': 'Name', 'field.qth': 'QTH', 'field.state': 'State', 'field.cnty': 'County', 'field.cqz': 'CQ', 'field.ituz': 'ITU', 'field.dxcc': 'DXCC', 'field.grid': 'Grid',
|
||||
'field.band': 'Band', 'field.mode': 'Mode', 'field.country': 'Country', 'field.comment': 'Comment',
|
||||
'field.note': 'Note', 'field.rstTx': 'RST tx', 'field.rstRx': 'RST rx',
|
||||
'field.txFreq': 'TX Freq (MHz)', 'field.freqTuneHint': 'Type a frequency and press Enter to tune the radio here.', 'field.freq': 'Freq (MHz)', 'field.rxFreq': 'RX Freq (MHz)', 'field.rxBand': 'RX Band',
|
||||
@@ -155,7 +155,7 @@ const en: Dict = {
|
||||
'uscty.backfillIntro': 'Resolve county (and grid) for US QSOs already in your log that are missing them. Existing values are kept — only blanks are filled.',
|
||||
'uscty.backfillRun': 'Fill missing counties',
|
||||
'uscty.backfillDone': '{s} US QSOs scanned · {c} counties, {g} grids filled.',
|
||||
'station.title': 'Station Control', 'station.rotator': 'Rotator', 'station.rotatorNoRead': 'No heading read', 'station.bands': 'Bands', 'station.nudgeUp': 'Up {n} kHz', 'station.nudgeDown': 'Down {n} kHz', 'station.trackOn': 'Tracking on', 'station.trackOff': 'Tracking off', 'station.trackStepTip': 'Re-tune only when the rig has moved this far', 'station.trackModeTip': 'When the antenna is allowed to re-tune', 'station.trackAlways': 'Every frequency change', 'station.trackStep': 'Past a step', 'station.trackBand': 'Band change only', 'station.trackAlwaysTip': 'Follow every frequency change. Best resonance, but the motors run constantly — and on a SteppIR every move blocks transmit while the elements travel.', 'station.trackStepTipMode': 'Re-tune only once the rig has moved further than the step. Follows a QSY, ignores tuning around.', 'station.trackBandTip': 'Re-tune only when the band changes. The motors move a few times a day and are left alone within a band.', 'station.pattern': 'Pattern', 'station.bi': 'Bi', 'station.retract': 'Retract elements', 'station.moving': 'MOVING', 'station.elements': 'Elements (mm)', 'station.read': 'Read', 'station.readLengths': 'Read current element lengths from the controller', 'station.noLengths': 'Lengths unknown — click Read to fetch them from the controller.', 'station.element': 'Element', 'station.reflector': 'Reflector', 'station.driven': 'Driven', 'station.director': 'Dir', 'station.set': 'Set', 'station.elementsHint': 'Each press lengthens/shortens the element by 2 mm (like the physical console). Verify which element responds on your antenna.', 'station.setExactLen': 'Click to type the exact current length (fixes the baseline if the auto-read is off).', 'station.atMax': 'Controller refused — the element is likely at its maximum length for this band, so it can\'t extend further.', 'station.go': 'Go', 'station.stop': 'Stop', 'station.dragHint': 'Drag the grip handle on the left of a panel to move it. Pick a column count to lay them out in a grid.', 'station.dragMove': 'Drag to move this panel', 'station.colsAuto': 'Auto', 'station.addDevice': 'Add device', 'station.editDevice': 'Edit device', 'station.empty': 'No relay boards yet. Add a WebSwitch 1216H or a KMTronic 8-relay board to control your station power and accessories.', 'station.online': 'Online', 'station.offline': 'Offline', 'station.edit': 'Edit', 'station.delete': 'Delete', 'station.relay': 'Relay', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': 'Device type', 'station.name': 'Name', 'station.host': 'Host / IP', 'station.hostHint': 'LAN IP for local use. To reach the board from OUTSIDE, put a full URL here — e.g. https://relay.yourdomain.com — pointing at a reverse proxy (Nginx Proxy Manager…) that fronts the board’s HTTP port.', 'station.user': 'Username', 'station.pass': 'Password', 'station.optional': 'optional', 'station.ftdiSerial': 'FTDI serial number', 'station.detect': 'Detect', 'station.ftdiHint': 'The Denkovi board is driven via FTDI bit-bang (not the COM port). Pick its serial (e.g. DAE0006K). Needs the FTDI D2XX driver installed.', 'station.channels': 'Relays', 'station.comPort': 'COM port', 'station.noPorts': 'No ports found', 'station.usbRelayHint': 'Cheap USB-serial relay boards (CH340/LCUS) using the A0 command protocol. If yours does not switch, tell me its model / command set.', 'station.labels': 'Relay labels', 'station.cancel': 'Cancel', 'station.save': 'Save', 'station.test': 'Test connection', 'station.testOk': 'Connected — {n} relays', 'station.testFail': 'Not connected', 'station.detectNone': 'No FTDI board found — check the cable and that the D2XX driver is installed.', 'station.detectFound': '{n} board(s) detected.',
|
||||
'station.title': 'Station Control', 'station.rotator': 'Rotator', 'station.rotateTo': 'Rotate to {az}°', 'station.rotatorNoRead': 'No heading read', 'station.bands': 'Bands', 'station.nudgeUp': 'Up {n} kHz', 'station.nudgeDown': 'Down {n} kHz', 'station.trackOn': 'Tracking on', 'station.trackOff': 'Tracking off', 'station.trackStepTip': 'Re-tune only when the rig has moved this far', 'station.trackModeTip': 'When the antenna is allowed to re-tune', 'station.trackAlways': 'Every frequency change', 'station.trackStep': 'Past a step', 'station.trackBand': 'Band change only', 'station.trackAlwaysTip': 'Follow every frequency change. Best resonance, but the motors run constantly — and on a SteppIR every move blocks transmit while the elements travel.', 'station.trackStepTipMode': 'Re-tune only once the rig has moved further than the step. Follows a QSY, ignores tuning around.', 'station.trackBandTip': 'Re-tune only when the band changes. The motors move a few times a day and are left alone within a band.', 'station.pattern': 'Pattern', 'station.bi': 'Bi', 'station.retract': 'Retract elements', 'station.moving': 'MOVING', 'station.elements': 'Elements (mm)', 'station.read': 'Read', 'station.readLengths': 'Read current element lengths from the controller', 'station.noLengths': 'Lengths unknown — click Read to fetch them from the controller.', 'station.element': 'Element', 'station.reflector': 'Reflector', 'station.driven': 'Driven', 'station.director': 'Dir', 'station.set': 'Set', 'station.elementsHint': 'Each press lengthens/shortens the element by 2 mm (like the physical console). Verify which element responds on your antenna.', 'station.setExactLen': 'Click to type the exact current length (fixes the baseline if the auto-read is off).', 'station.atMax': 'Controller refused — the element is likely at its maximum length for this band, so it can\'t extend further.', 'station.go': 'Go', 'station.stop': 'Stop', 'station.dragHint': 'Drag the grip handle on the left of a panel to move it. Pick a column count to lay them out in a grid.', 'station.dragMove': 'Drag to move this panel', 'station.colsAuto': 'Auto', 'station.addDevice': 'Add device', 'station.editDevice': 'Edit device', 'station.empty': 'No relay boards yet. Add a WebSwitch 1216H or a KMTronic 8-relay board to control your station power and accessories.', 'station.online': 'Online', 'station.offline': 'Offline', 'station.edit': 'Edit', 'station.delete': 'Delete', 'station.relay': 'Relay', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': 'Device type', 'station.name': 'Name', 'station.host': 'Host / IP', 'station.hostHint': 'LAN IP for local use. To reach the board from OUTSIDE, put a full URL here — e.g. https://relay.yourdomain.com — pointing at a reverse proxy (Nginx Proxy Manager…) that fronts the board’s HTTP port.', 'station.user': 'Username', 'station.pass': 'Password', 'station.optional': 'optional', 'station.ftdiSerial': 'FTDI serial number', 'station.detect': 'Detect', 'station.ftdiHint': 'The Denkovi board is driven via FTDI bit-bang (not the COM port). Pick its serial (e.g. DAE0006K). Needs the FTDI D2XX driver installed.', 'station.channels': 'Relays', 'station.comPort': 'COM port', 'station.noPorts': 'No ports found', 'station.usbRelayHint': 'Cheap USB-serial relay boards (CH340/LCUS) using the A0 command protocol. If yours does not switch, tell me its model / command set.', 'station.labels': 'Relay labels', 'station.cancel': 'Cancel', 'station.save': 'Save', 'station.test': 'Test connection', 'station.testOk': 'Connected — {n} relays', 'station.testFail': 'Not connected', 'station.detectNone': 'No FTDI board found — check the cable and that the D2XX driver is installed.', 'station.detectFound': '{n} board(s) detected.',
|
||||
'awards.followHint': 'Awards shown in the Awards tab. Leave the right side empty to show them all.', 'awards.available': 'All awards', 'awards.followed': 'Followed', 'awards.search': 'Filter…', 'awards.addAll': 'Add all', 'awards.clear': 'Clear', 'awards.allTracked': 'All awards are followed.', 'awards.noneFollowed': 'Nothing followed yet — the Awards tab shows all.',
|
||||
'sec.awards': 'Awards', 'sec.cat': 'CAT interface', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'CW Keyer',
|
||||
'sec.antenna': 'Ultrabeam / Steppir', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplifier', 'sec.flex': 'FlexRadio', 'sec.audio': 'Audio devices',
|
||||
@@ -243,7 +243,7 @@ const en: Dict = {
|
||||
'lk.provider': 'Provider', 'lk.primary': 'Primary', 'lk.failsafe': 'Failsafe', 'lk.user': 'User', 'lk.password': 'Password', 'lk.result': 'Result',
|
||||
'lk.testing': 'Testing…', 'lk.test': 'Test', 'lk.testTitle': "Run a sample lookup against the active profile's callsign to verify credentials",
|
||||
'lk.failsafeNote': 'Failsafe is consulted only when the Primary returns no match or errors. Set both to none (uncheck) during contests to skip the network entirely.',
|
||||
'lk.display': 'Display', 'lk.showPics': 'Show QRZ profile pictures',
|
||||
'lk.display': 'Display', 'lk.qrzNickname': 'QRZ.com: use the nickname as the name', 'lk.qrzNicknameHint': 'Logs the name the operator goes by on the air rather than their registered first and last name. Falls back to the full name when no nickname is published. QRZ.com only — HamQTH already does this.', 'lk.showPics': 'Show QRZ profile pictures',
|
||||
'lk.showPicsHint': 'Display the photo from QRZ.com next to the worked-before matrix. May noticeably slow lookups during busy contest days; turn off if you operate fast.',
|
||||
'lk.cache': 'Cache', 'lk.cacheHint': "Successful lookups are cached locally so the same callsign isn't fetched twice. TTL controls how long before a fresh query is made.",
|
||||
'lk.ttl': 'TTL (days)', 'lk.clearing': 'Clearing…', 'lk.clearCache': 'Clear cache now',
|
||||
@@ -270,7 +270,7 @@ const en: Dict = {
|
||||
'clu.muteWorkedHint': '(they stay in the list, just quiet — leaves the colour for what is left to do)',
|
||||
'clu.slotHighlight': 'Colour the stations not worked on this band and mode',
|
||||
'clu.slotHighlightHint': '(by callsign, whatever the entity status says)',
|
||||
'bo.open': 'open', 'bo.liveTip': '{band} is open — {n} stations, ~{km} km, {sector}{season}. Click for the band map.', 'bo.enable': 'Watch for band openings', 'bo.enableHint': '(10, 12, 6, 4 and 2 m. Switching this on adds the two RBN nodes and subscribes to the PSK Reporter feed — the detection needs far more ears than a cluster can give it.)', 'bo.feedUp': 'PSK Reporter feed up — {n} decodes seen', 'bo.feedDown': 'PSK Reporter feed down — needs your station grid, and a moment to connect', 'clu.chaseGrids': 'Chase new grids', 'clu.chaseGridsHint': '(learns locators from your own WSJT-X decodes AND from PSK Reporter, and keeps them in their own database so the cluster shows them from the first second)', 'clu.chaseGridsStat': '{n} locators known — {p} waiting to be written', 'clu.workedSameSlot': 'Already worked only on the same slot',
|
||||
'bo.open': 'open', 'bo.liveTip': '{band} is open — {n} stations, ~{km} km, {sector}{season}. Click for the band map.', 'bo.enable': 'Watch for band openings', 'bo.enableHint': '(10, 12, 6, 4 and 2 m. Switching this on adds the two RBN nodes and subscribes to the PSK Reporter feed — the detection needs far more ears than a cluster can give it.)', 'bo.feedUp': 'PSK Reporter feed up — {n} decodes seen', 'bo.feedDown': 'PSK Reporter feed down — needs your station grid, and a moment to connect', 'clu.spotTtl': 'Spot lifetime', 'clu.spotTtlNever': 'Keep', 'clu.spotTtlHint': 'minutes — spots older than this are removed from the list and the band maps. 0 keeps them.', 'clu.chaseGrids': 'Chase new grids', 'clu.chaseGridsHint': '(learns locators from your own WSJT-X decodes AND from PSK Reporter, and keeps them in their own database so the cluster shows them from the first second)', 'clu.chaseGridsStat': '{n} locators known — {p} waiting to be written', 'clu.workedSameSlot': 'Already worked only on the same slot',
|
||||
'clu.workedSameSlotHint': '— a spot shows "worked" only if you worked that call on the SAME band and mode, not just anywhere. Combines with digital-mode grouping (Settings → General): with it on, a call worked on 20m FT8 also counts as worked for a 20m FT4 spot; with it off, FT8 and FT4 are separate slots.',
|
||||
// Backup panel
|
||||
'bk.hintMysql': 'On close (once/day) OpsLog snapshots the local SQLite (config) AND exports the shared MySQL log to ADIF — opslog-log-<date>.adi — so your contacts are protected even though they live on the server. Rotation keeps the last N of each.',
|
||||
@@ -304,7 +304,7 @@ const en: Dict = {
|
||||
// External-services placeholders + HRDLOG / eQSL / LoTW / POTA tabs
|
||||
'es.qrzApiPh': 'QRZ.com logbook API key (XXXX-XXXX-XXXX-XXXX)', 'es.forceCallPh': 'e.g. F4BPO — optional', 'es.callDefaultPh': "defaults to the active profile's callsign",
|
||||
'es.clubEmailPh': 'your Club Log account email', 'es.clubPwPh': 'Club Log account password',
|
||||
'es.stationCall': 'Station callsign', 'es.uploadCode': 'Upload code', 'es.hrdCodePh': 'HRDLog account → My Account → Upload code', 'es.hrdHint': 'Find the upload code on HRDLog.net under My Account. It authorises uploads for this callsign.',
|
||||
'es.stationCall': 'Station callsign', 'es.uploadCode': 'Upload code', 'es.hrdCodePh': 'HRDLog account → My Account → Upload code', 'es.hrdOnAir': 'Announce ON AIR on hrdlog.net', 'es.hrdOnAirHint': 'Publishes your live frequency, mode and rig on the site while the radio is readable, refreshed every two minutes. Needs the callsign and upload code above.', 'es.hrdHint': 'Find the upload code on HRDLog.net under My Account. It authorises uploads for this callsign.',
|
||||
'es.usernameCall': 'Username (callsign)', 'es.eqslUserPh': 'your eQSL.cc login (callsign)', 'es.eqslPwPh': 'eQSL.cc account password', 'es.qthNick': 'QTH nickname', 'es.qthNickPh': 'optional — required only if your eQSL account has several QTHs', 'es.eqslHint': 'The QTH nickname tells eQSL which location profile to file the QSO under. Leave blank if you have only one.',
|
||||
'es.lotwUser': 'LoTW user', 'es.lotwUserPh': 'LoTW website login (for downloading confirmations)', 'es.lotwPw': 'LoTW password', 'es.lotwPwPh': 'LoTW website password', 'es.tqslPath': 'TQSL path', 'es.stationLoc': 'Station location', 'es.pickLoc': '— pick a TQSL location —', 'es.noLoc': 'No TQSL locations found', 'es.reloadLoc': 'Reload locations from TQSL', 'es.lotwForcePh': "e.g. F4BPO/P — leave blank to use the QSO's own call", 'es.lotwForceHint': 'Overrides STATION_CALLSIGN at sign time so one certificate can sign several calls (F4BPO, F4BPO/P, TM2Q). Pick the matching Station Location above.', 'es.keyPw': 'Key password', 'es.keyPwPh': 'only if your certificate key has a password', 'es.considerUnsent': 'Consider as unsent', 'es.flagN': 'No (N)', 'es.flagR': 'Requested (R)', 'es.lotwUnsentHint': "At app close, every QSO whose LoTW sent status is one of these is signed and uploaded in one TQSL batch — including QSOs imported from an ADIF. Uploaded QSOs become Y and won't be re-sent. Must include your default sent status from Confirmations.", 'es.lotwAutoClose': 'Automatic upload on application close', 'es.lotwWriteLog': 'Write TQSL diagnostic log (-t)',
|
||||
'es.potaHint': 'Update your QSOs with the park reference from your pota.app hunter log. Paste your session token: log in at pota.app, open the browser DevTools → Network tab, click any api.pota.app request, and copy the full Authorization header value. The token expires after a while — re-copy it if the sync fails.', 'es.sessionToken': 'Session token', 'es.saving': 'Saving…', 'es.saveToken': 'Save token', 'es.potaThen': 'Then run the sync from the QSL Manager tab → service POTA hunter log (you can see and fix unmatched QSOs there).',
|
||||
@@ -482,7 +482,7 @@ const fr: Dict = {
|
||||
'profileScope.saved': 'Enregistré pour le profil', 'profileScope.switch': "— change de profil pour éditer une autre identité.",
|
||||
'tab.main': 'Principal', 'main.splitTip': 'Faites glisser pour redimensionner les volets — double-clic pour les égaliser', 'tab.recent': 'QSO récents', 'tab.cluster': 'Cluster', 'tab.worked': 'Déjà contacté',
|
||||
'tab.awards': 'Diplômes', 'tab.bandmap': 'Carte de bande', 'tab.contest': 'Contest', 'tab.net': 'NET',
|
||||
'field.callsign': 'Indicatif', 'field.name': 'Nom', 'field.qth': 'QTH', 'field.grid': 'Locator',
|
||||
'field.callsign': 'Indicatif', 'field.name': 'Nom', 'field.qth': 'QTH', 'field.state': 'État', 'field.cnty': 'Comté', 'field.cqz': 'CQ', 'field.ituz': 'ITU', 'field.dxcc': 'DXCC', 'field.grid': 'Locator',
|
||||
'field.band': 'Bande', 'field.mode': 'Mode', 'field.country': 'Pays', 'field.comment': 'Commentaire',
|
||||
'field.note': 'Note', 'field.rstTx': 'RST tx', 'field.rstRx': 'RST rx',
|
||||
'field.txFreq': 'Fréq TX (MHz)', 'field.freqTuneHint': 'Tape une fréquence et appuie sur Entrée pour y accorder la radio.', 'field.freq': 'Fréq (MHz)', 'field.rxFreq': 'Fréq RX (MHz)', 'field.rxBand': 'Bande RX',
|
||||
@@ -582,7 +582,7 @@ const fr: Dict = {
|
||||
'uscty.backfillIntro': "Résout le comté (et le locator) pour les QSO US déjà dans ton log qui n'en ont pas. Les valeurs existantes sont conservées — seuls les vides sont remplis.",
|
||||
'uscty.backfillRun': 'Remplir les comtés manquants',
|
||||
'uscty.backfillDone': '{s} QSO US analysés · {c} comtés, {g} locators remplis.',
|
||||
'station.title': 'Contrôle station', 'station.rotator': 'Rotator', 'station.rotatorNoRead': 'Azimut non lu', 'station.bands': 'Bandes', 'station.nudgeUp': 'Monter de {n} kHz', 'station.nudgeDown': 'Descendre de {n} kHz', 'station.trackOn': 'Suivi actif', 'station.trackOff': 'Suivi inactif', 'station.trackStepTip': 'Ne réaccorder que si le rig a bougé d au moins ça', 'station.trackModeTip': "Quand l'antenne a le droit de se réaccorder", 'station.trackAlways': 'À chaque changement', 'station.trackStep': 'Au-delà d un pas', 'station.trackBand': 'Changement de bande', 'station.trackAlwaysTip': "Suivre chaque changement de fréquence. Résonance idéale, mais les moteurs tournent en permanence — et sur une SteppIR chaque déplacement bloque l'émission le temps du mouvement.", 'station.trackStepTipMode': "Ne réaccorder qu'une fois le rig sorti du pas. Suit un QSY, ignore la recherche autour.", 'station.trackBandTip': "Ne réaccorder qu'au changement de bande. Les moteurs bougent quelques fois par jour et restent tranquilles dans une bande.", 'station.pattern': 'Diagramme', 'station.bi': 'Bi', 'station.retract': 'Rétracter les éléments', 'station.moving': 'EN MOUVEMENT', 'station.elements': 'Éléments (mm)', 'station.read': 'Lire', 'station.readLengths': 'Lire les longueurs actuelles depuis le contrôleur', 'station.noLengths': 'Longueurs inconnues — clique sur Lire pour les récupérer depuis le contrôleur.', 'station.element': 'Élément', 'station.reflector': 'Réflecteur', 'station.driven': 'Radiateur', 'station.director': 'Dir', 'station.set': 'Régler', 'station.elementsHint': "Chaque appui allonge/raccourcit l'élément de 2 mm (comme le pupitre). Vérifie quel élément répond sur ton antenne.", 'station.setExactLen': "Clique pour taper la longueur actuelle exacte (recale la base si la lecture auto est fausse).", 'station.atMax': "Refusé par le contrôleur — l'élément est probablement en butée (longueur max pour cette bande), il ne peut plus s'allonger.", 'station.go': 'Aller', 'station.stop': 'Stop', 'station.dragHint': 'Glisse la poignée à gauche d un panneau pour le déplacer. Choisis un nombre de colonnes pour la disposition.', 'station.dragMove': 'Glisser pour déplacer ce panneau', 'station.colsAuto': 'Auto', 'station.addDevice': 'Ajouter un appareil', 'station.editDevice': "Modifier l'appareil", 'station.empty': "Aucune carte relais. Ajoute un WebSwitch 1216H ou une carte KMTronic 8 relais pour piloter l'alimentation et les accessoires de ta station.", 'station.online': 'En ligne', 'station.offline': 'Hors ligne', 'station.edit': 'Modifier', 'station.delete': 'Supprimer', 'station.relay': 'Relais', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': "Type d'appareil", 'station.name': 'Nom', 'station.host': 'Hôte / IP', 'station.hostHint': "IP du LAN en local. Pour joindre la carte depuis L'EXTÉRIEUR, saisis une URL complète ici — ex. https://relais.tondomaine.com — pointant vers un reverse proxy (Nginx Proxy Manager…) qui expose le port HTTP de la carte.", 'station.user': "Nom d'utilisateur", 'station.pass': 'Mot de passe', 'station.optional': 'optionnel', 'station.ftdiSerial': 'Numéro de série FTDI', 'station.detect': 'Détecter', 'station.ftdiHint': "La carte Denkovi se pilote en FTDI bit-bang (pas via le port COM). Choisis son numéro de série (ex. DAE0006K). Nécessite le driver FTDI D2XX installé.", 'station.channels': 'Relais', 'station.comPort': 'Port COM', 'station.noPorts': 'Aucun port', 'station.usbRelayHint': "Cartes USB-série bon marché (CH340/LCUS) protocole A0. Si la tienne ne commute pas, donne-moi le modèle / jeu de commandes.", 'station.labels': 'Libellés des relais', 'station.cancel': 'Annuler', 'station.save': 'Enregistrer', 'station.test': 'Tester la connexion', 'station.testOk': 'Connecté — {n} relais', 'station.testFail': 'Non connecté', 'station.detectNone': 'Aucune carte FTDI trouvée — vérifie le câble et que le driver D2XX est installé.', 'station.detectFound': '{n} carte(s) détectée(s).',
|
||||
'station.title': 'Contrôle station', 'station.rotator': 'Rotator', 'station.rotateTo': 'Tourner vers {az}°', 'station.rotatorNoRead': 'Azimut non lu', 'station.bands': 'Bandes', 'station.nudgeUp': 'Monter de {n} kHz', 'station.nudgeDown': 'Descendre de {n} kHz', 'station.trackOn': 'Suivi actif', 'station.trackOff': 'Suivi inactif', 'station.trackStepTip': 'Ne réaccorder que si le rig a bougé d au moins ça', 'station.trackModeTip': "Quand l'antenne a le droit de se réaccorder", 'station.trackAlways': 'À chaque changement', 'station.trackStep': 'Au-delà d un pas', 'station.trackBand': 'Changement de bande', 'station.trackAlwaysTip': "Suivre chaque changement de fréquence. Résonance idéale, mais les moteurs tournent en permanence — et sur une SteppIR chaque déplacement bloque l'émission le temps du mouvement.", 'station.trackStepTipMode': "Ne réaccorder qu'une fois le rig sorti du pas. Suit un QSY, ignore la recherche autour.", 'station.trackBandTip': "Ne réaccorder qu'au changement de bande. Les moteurs bougent quelques fois par jour et restent tranquilles dans une bande.", 'station.pattern': 'Diagramme', 'station.bi': 'Bi', 'station.retract': 'Rétracter les éléments', 'station.moving': 'EN MOUVEMENT', 'station.elements': 'Éléments (mm)', 'station.read': 'Lire', 'station.readLengths': 'Lire les longueurs actuelles depuis le contrôleur', 'station.noLengths': 'Longueurs inconnues — clique sur Lire pour les récupérer depuis le contrôleur.', 'station.element': 'Élément', 'station.reflector': 'Réflecteur', 'station.driven': 'Radiateur', 'station.director': 'Dir', 'station.set': 'Régler', 'station.elementsHint': "Chaque appui allonge/raccourcit l'élément de 2 mm (comme le pupitre). Vérifie quel élément répond sur ton antenne.", 'station.setExactLen': "Clique pour taper la longueur actuelle exacte (recale la base si la lecture auto est fausse).", 'station.atMax': "Refusé par le contrôleur — l'élément est probablement en butée (longueur max pour cette bande), il ne peut plus s'allonger.", 'station.go': 'Aller', 'station.stop': 'Stop', 'station.dragHint': 'Glisse la poignée à gauche d un panneau pour le déplacer. Choisis un nombre de colonnes pour la disposition.', 'station.dragMove': 'Glisser pour déplacer ce panneau', 'station.colsAuto': 'Auto', 'station.addDevice': 'Ajouter un appareil', 'station.editDevice': "Modifier l'appareil", 'station.empty': "Aucune carte relais. Ajoute un WebSwitch 1216H ou une carte KMTronic 8 relais pour piloter l'alimentation et les accessoires de ta station.", 'station.online': 'En ligne', 'station.offline': 'Hors ligne', 'station.edit': 'Modifier', 'station.delete': 'Supprimer', 'station.relay': 'Relais', 'station.on': 'ON', 'station.off': 'OFF', 'station.type': "Type d'appareil", 'station.name': 'Nom', 'station.host': 'Hôte / IP', 'station.hostHint': "IP du LAN en local. Pour joindre la carte depuis L'EXTÉRIEUR, saisis une URL complète ici — ex. https://relais.tondomaine.com — pointant vers un reverse proxy (Nginx Proxy Manager…) qui expose le port HTTP de la carte.", 'station.user': "Nom d'utilisateur", 'station.pass': 'Mot de passe', 'station.optional': 'optionnel', 'station.ftdiSerial': 'Numéro de série FTDI', 'station.detect': 'Détecter', 'station.ftdiHint': "La carte Denkovi se pilote en FTDI bit-bang (pas via le port COM). Choisis son numéro de série (ex. DAE0006K). Nécessite le driver FTDI D2XX installé.", 'station.channels': 'Relais', 'station.comPort': 'Port COM', 'station.noPorts': 'Aucun port', 'station.usbRelayHint': "Cartes USB-série bon marché (CH340/LCUS) protocole A0. Si la tienne ne commute pas, donne-moi le modèle / jeu de commandes.", 'station.labels': 'Libellés des relais', 'station.cancel': 'Annuler', 'station.save': 'Enregistrer', 'station.test': 'Tester la connexion', 'station.testOk': 'Connecté — {n} relais', 'station.testFail': 'Non connecté', 'station.detectNone': 'Aucune carte FTDI trouvée — vérifie le câble et que le driver D2XX est installé.', 'station.detectFound': '{n} carte(s) détectée(s).',
|
||||
'awards.followHint': 'Diplômes affichés dans l’onglet Awards. Laisse la colonne de droite vide pour tous les afficher.', 'awards.available': 'Tous les diplômes', 'awards.followed': 'Suivis', 'awards.search': 'Filtrer…', 'awards.addAll': 'Tout ajouter', 'awards.clear': 'Vider', 'awards.allTracked': 'Tous les diplômes sont suivis.', 'awards.noneFollowed': 'Aucun pour l’instant — l’onglet Awards les montre tous.',
|
||||
'sec.awards': 'Diplômes', 'sec.cat': 'Interface CAT', 'sec.rotator': 'Rotator', 'sec.winkeyer': 'Manipulateur CW',
|
||||
'sec.antenna': 'Antenne motorisée', 'sec.antgenius': 'Antenna Genius', 'sec.tunergenius': 'Tuner Genius', 'sec.pgxl': 'Amplificateur', 'sec.flex': 'FlexRadio', 'sec.audio': 'Périphériques audio',
|
||||
@@ -666,7 +666,7 @@ const fr: Dict = {
|
||||
'lk.provider': 'Fournisseur', 'lk.primary': 'Principal', 'lk.failsafe': 'Secours', 'lk.user': 'Utilisateur', 'lk.password': 'Mot de passe', 'lk.result': 'Résultat',
|
||||
'lk.testing': 'Test…', 'lk.test': 'Test', 'lk.testTitle': "Lance une recherche test sur l'indicatif du profil actif pour vérifier les identifiants",
|
||||
'lk.failsafeNote': 'Le Secours n\'est consulté que si le Principal ne trouve rien ou échoue. Décoche les deux en contest pour éviter tout accès réseau.',
|
||||
'lk.display': 'Affichage', 'lk.showPics': 'Afficher les photos de profil QRZ',
|
||||
'lk.display': 'Affichage', 'lk.qrzNickname': 'QRZ.com : utiliser le surnom comme nom', 'lk.qrzNicknameHint': "Enregistre le nom sous lequel l'opérateur se présente à l'air plutôt que ses prénom et nom déclarés. Retombe sur le nom complet si aucun surnom n'est publié. QRZ.com uniquement — HamQTH le fait déjà.", 'lk.showPics': 'Afficher les photos de profil QRZ',
|
||||
'lk.showPicsHint': 'Affiche la photo de QRZ.com à côté de la matrice « déjà contacté ». Peut ralentir les recherches en contest ; désactive si tu opères vite.',
|
||||
'lk.cache': 'Cache', 'lk.cacheHint': "Les recherches réussies sont mises en cache localement pour ne pas re-interroger le même indicatif. Le TTL contrôle la durée avant une nouvelle requête.",
|
||||
'lk.ttl': 'TTL (jours)', 'lk.clearing': 'Effacement…', 'lk.clearCache': 'Vider le cache',
|
||||
@@ -720,7 +720,7 @@ const fr: Dict = {
|
||||
// Placeholders services externes + onglets HRDLOG / eQSL / LoTW / POTA
|
||||
'es.qrzApiPh': 'Clé API du logbook QRZ.com (XXXX-XXXX-XXXX-XXXX)', 'es.forceCallPh': 'p. ex. F4BPO — optionnel', 'es.callDefaultPh': "par défaut : l'indicatif du profil actif",
|
||||
'es.clubEmailPh': 'e-mail de ton compte Club Log', 'es.clubPwPh': 'mot de passe du compte Club Log',
|
||||
'es.stationCall': 'Indicatif de station', 'es.uploadCode': "Code d'upload", 'es.hrdCodePh': 'Compte HRDLog → My Account → Upload code', 'es.hrdHint': "Trouve le code d'upload sur HRDLog.net dans « My Account ». Il autorise les envois pour cet indicatif.",
|
||||
'es.stationCall': 'Indicatif de station', 'es.uploadCode': "Code d'upload", 'es.hrdCodePh': 'Compte HRDLog → My Account → Upload code', 'es.hrdOnAir': 'Annoncer ON AIR sur hrdlog.net', 'es.hrdOnAirHint': "Publie sur le site ta fréquence, ton mode et ta radio en direct tant que le poste est lisible, rafraîchi toutes les deux minutes. Nécessite l'indicatif et le code d'upload ci-dessus.", 'es.hrdHint': "Trouve le code d'upload sur HRDLog.net dans « My Account ». Il autorise les envois pour cet indicatif.",
|
||||
'es.usernameCall': 'Identifiant (indicatif)', 'es.eqslUserPh': 'ton identifiant eQSL.cc (indicatif)', 'es.eqslPwPh': 'mot de passe du compte eQSL.cc', 'es.qthNick': 'Surnom QTH', 'es.qthNickPh': 'optionnel — requis seulement si ton compte eQSL a plusieurs QTH', 'es.eqslHint': "Le surnom QTH indique à eQSL sous quel profil de lieu classer le QSO. Laisse vide si tu n'en as qu'un.",
|
||||
'es.lotwUser': 'Utilisateur LoTW', 'es.lotwUserPh': 'identifiant du site LoTW (pour télécharger les confirmations)', 'es.lotwPw': 'Mot de passe LoTW', 'es.lotwPwPh': 'mot de passe du site LoTW', 'es.tqslPath': 'Chemin TQSL', 'es.stationLoc': 'Station location', 'es.pickLoc': '— choisir une Station Location TQSL —', 'es.noLoc': 'Aucune Station Location TQSL trouvée', 'es.reloadLoc': 'Recharger les locations depuis TQSL', 'es.lotwForcePh': "p. ex. F4BPO/P — laisse vide pour utiliser l'indicatif du QSO", 'es.lotwForceHint': "Remplace STATION_CALLSIGN à la signature pour qu'un même certificat signe plusieurs indicatifs (F4BPO, F4BPO/P, TM2Q). Choisis la Station Location correspondante ci-dessus.", 'es.keyPw': 'Mot de passe de la clé', 'es.keyPwPh': 'seulement si la clé de ton certificat a un mot de passe', 'es.considerUnsent': 'Considérer comme non envoyé', 'es.flagN': 'Non (N)', 'es.flagR': 'Demandé (R)', 'es.lotwUnsentHint': "À la fermeture, chaque QSO dont le statut LoTW « envoyé » est l'un de ceux-ci est signé et envoyé dans un même lot TQSL — y compris les QSO importés depuis un ADIF. Les QSO envoyés passent à Y et ne sont pas renvoyés. Doit inclure ton statut « envoyé » par défaut défini dans Confirmations.", 'es.lotwAutoClose': "Envoi automatique à la fermeture de l'application", 'es.lotwWriteLog': 'Écrire le journal de diagnostic TQSL (-t)',
|
||||
'es.potaHint': "Met à jour tes QSO avec la référence du parc depuis ton carnet chasseur pota.app. Colle ton jeton de session : connecte-toi sur pota.app, ouvre les DevTools du navigateur → onglet Network, clique sur une requête api.pota.app, et copie toute la valeur de l'en-tête Authorization. Le jeton expire au bout d'un moment — recopie-le si la synchro échoue.", 'es.sessionToken': 'Jeton de session', 'es.saving': 'Enregistrement…', 'es.saveToken': 'Enregistrer le jeton', 'es.potaThen': "Puis lance la synchro depuis l'onglet Gestionnaire QSL → service POTA hunter log (tu peux y voir et corriger les QSO non appariés).",
|
||||
|
||||
@@ -74,3 +74,16 @@ export function applySpotDisplay<T extends Entry>(s: T, o: SpotDisplayOptions):
|
||||
}
|
||||
return e;
|
||||
}
|
||||
|
||||
// spotIsWorked answers "does this spot bring me nothing?", which is what the
|
||||
// "hide worked" filter is really asking.
|
||||
//
|
||||
// The extra markers are ORTHOGONAL to the entity status — a spot can be a worked
|
||||
// entity AND a new park, prefix, county or grid — so they win. Without that, a
|
||||
// new prefix in an entity worked years ago vanished the moment the filter went
|
||||
// on, which is the opposite of what an operator hunting prefixes wants.
|
||||
export function spotIsWorked(e: Entry): boolean {
|
||||
if (!e) return false;
|
||||
if (e.new_pota || e.new_county || e.new_pfx || e.new_grid) return false;
|
||||
return !!e.worked_call || e.status === 'worked';
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// Single source of truth for the app version shown in the UI (header + About).
|
||||
// Bump this on a release (the release script updates it alongside telemetry.go).
|
||||
export const APP_VERSION = '0.24.9';
|
||||
export const APP_VERSION = '0.25.0';
|
||||
|
||||
// Author / credits, shown in Help -> About.
|
||||
export const APP_AUTHOR = 'F4BPO';
|
||||
|
||||
Vendored
+6
@@ -506,6 +506,8 @@ export function GetSlotStats():Promise<qso.SlotStats>;
|
||||
|
||||
export function GetSolarData():Promise<solar.Data>;
|
||||
|
||||
export function GetSpotTTLMinutes():Promise<number>;
|
||||
|
||||
export function GetStartupStatus():Promise<main.StartupStatus>;
|
||||
|
||||
export function GetStationDevices():Promise<Array<main.StationDevice>>;
|
||||
@@ -986,6 +988,8 @@ export function SetClublogMostWantedEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetClusterAutoConnect(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetCompactHeight(arg1:number):Promise<void>;
|
||||
|
||||
export function SetCompactMode(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetDVKLabel(arg1:number,arg2:string):Promise<void>;
|
||||
@@ -1000,6 +1004,8 @@ export function SetPassphrase(arg1:string):Promise<void>;
|
||||
|
||||
export function SetScpEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetSpotTTLMinutes(arg1:number):Promise<void>;
|
||||
|
||||
export function SetTelemetryEnabled(arg1:boolean):Promise<void>;
|
||||
|
||||
export function SetUIPref(arg1:string,arg2:string):Promise<void>;
|
||||
|
||||
@@ -954,6 +954,10 @@ export function GetSolarData() {
|
||||
return window['go']['main']['App']['GetSolarData']();
|
||||
}
|
||||
|
||||
export function GetSpotTTLMinutes() {
|
||||
return window['go']['main']['App']['GetSpotTTLMinutes']();
|
||||
}
|
||||
|
||||
export function GetStartupStatus() {
|
||||
return window['go']['main']['App']['GetStartupStatus']();
|
||||
}
|
||||
@@ -1914,6 +1918,10 @@ export function SetClusterAutoConnect(arg1) {
|
||||
return window['go']['main']['App']['SetClusterAutoConnect'](arg1);
|
||||
}
|
||||
|
||||
export function SetCompactHeight(arg1) {
|
||||
return window['go']['main']['App']['SetCompactHeight'](arg1);
|
||||
}
|
||||
|
||||
export function SetCompactMode(arg1) {
|
||||
return window['go']['main']['App']['SetCompactMode'](arg1);
|
||||
}
|
||||
@@ -1942,6 +1950,10 @@ export function SetScpEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetScpEnabled'](arg1);
|
||||
}
|
||||
|
||||
export function SetSpotTTLMinutes(arg1) {
|
||||
return window['go']['main']['App']['SetSpotTTLMinutes'](arg1);
|
||||
}
|
||||
|
||||
export function SetTelemetryEnabled(arg1) {
|
||||
return window['go']['main']['App']['SetTelemetryEnabled'](arg1);
|
||||
}
|
||||
|
||||
@@ -1331,6 +1331,7 @@ export namespace extsvc {
|
||||
upload_flags: string[];
|
||||
write_log: boolean;
|
||||
auto_upload: boolean;
|
||||
on_air: boolean;
|
||||
upload_mode: string;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
@@ -1355,6 +1356,7 @@ export namespace extsvc {
|
||||
this.upload_flags = source["upload_flags"];
|
||||
this.write_log = source["write_log"];
|
||||
this.auto_upload = source["auto_upload"];
|
||||
this.on_air = source["on_air"];
|
||||
this.upload_mode = source["upload_mode"];
|
||||
}
|
||||
}
|
||||
@@ -2541,6 +2543,7 @@ export namespace main {
|
||||
primary: string;
|
||||
failsafe: string;
|
||||
download_images: boolean;
|
||||
qrz_prefer_nickname: boolean;
|
||||
cache_ttl_days: number;
|
||||
|
||||
static createFrom(source: any = {}) {
|
||||
@@ -2556,6 +2559,7 @@ export namespace main {
|
||||
this.primary = source["primary"];
|
||||
this.failsafe = source["failsafe"];
|
||||
this.download_images = source["download_images"];
|
||||
this.qrz_prefer_nickname = source["qrz_prefer_nickname"];
|
||||
this.cache_ttl_days = source["cache_ttl_days"];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
package main
|
||||
|
||||
// HRDLog "ON AIR" — publishing the live frequency, mode and rig on hrdlog.net,
|
||||
// so the site shows "F4BPO is on air 14,074,000 FT8 IC-7300" while the station
|
||||
// is operating.
|
||||
//
|
||||
// The endpoint and its field names come from HRDLog's own library
|
||||
// (github.com/iw1qlh/HRDLOG-net-library), not from reading someone's traffic.
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"hamlog/internal/applog"
|
||||
"hamlog/internal/extsvc"
|
||||
)
|
||||
|
||||
// onAirEvery is how often the status is refreshed. HRDLog drops a station from
|
||||
// the on-air list when it stops hearing from it, so this is a heartbeat, not a
|
||||
// change notification.
|
||||
const onAirEvery = 2 * time.Minute
|
||||
|
||||
// hrdlogOnAirLoop publishes while the option is on and the rig is readable.
|
||||
func (a *App) hrdlogOnAirLoop() {
|
||||
defer func() { _ = recover() }() // never crash the app from a status broadcast
|
||||
t := time.NewTicker(onAirEvery)
|
||||
defer t.Stop()
|
||||
for range t.C {
|
||||
a.publishHRDLogOnAir()
|
||||
}
|
||||
}
|
||||
|
||||
// publishHRDLogOnAir sends one update. Silent when switched off, unconfigured,
|
||||
// or when the rig has nothing to report — an announcement with no frequency
|
||||
// would say the operator is on air on 0 Hz.
|
||||
func (a *App) publishHRDLogOnAir() {
|
||||
cfg := a.loadExternalServices().HRDLog
|
||||
if !cfg.OnAir || strings.TrimSpace(cfg.Callsign) == "" || strings.TrimSpace(cfg.Code) == "" {
|
||||
return
|
||||
}
|
||||
if a.cat == nil {
|
||||
return
|
||||
}
|
||||
st := a.cat.State()
|
||||
if !st.Connected || st.FreqHz <= 0 {
|
||||
return
|
||||
}
|
||||
// The rig NAME as the operator knows it — that string is what the site
|
||||
// displays. The active profile's MyRig first, since it is what every QSO is
|
||||
// stamped with; the CAT backend's own model only when the profile has none.
|
||||
radio := ""
|
||||
if a.profiles != nil {
|
||||
if pr, err := a.profiles.Active(a.ctx); err == nil {
|
||||
radio = strings.TrimSpace(pr.MyRig)
|
||||
}
|
||||
}
|
||||
if radio == "" {
|
||||
radio = strings.TrimSpace(st.Rig)
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
|
||||
defer cancel()
|
||||
msg, err := extsvc.SendHRDLogOnAir(ctx, nil, cfg.Callsign, cfg.Code, st.FreqHz, st.Mode, radio)
|
||||
if err != nil {
|
||||
// Logged, never surfaced: this is a broadcast the operator did not ask
|
||||
// for at this instant, and a toast every two minutes on a flaky link
|
||||
// would be worse than the missing status.
|
||||
applog.Printf("hrdlog on-air: %v (%s)", err, msg)
|
||||
return
|
||||
}
|
||||
applog.Printf("hrdlog on-air: %s %.3f MHz %s (%s) — %s",
|
||||
cfg.Callsign, float64(st.FreqHz)/1e6, st.Mode, radio, msg)
|
||||
}
|
||||
@@ -19,8 +19,8 @@ func TestCharCountLengthRepair(t *testing.T) {
|
||||
},
|
||||
{
|
||||
name: "cyrillic",
|
||||
wantQTH: "Дзержинск", // 9 chars / 18 bytes, declared 9
|
||||
wantName: "Александр Чайка", // 15 chars / 29 bytes, declared 15
|
||||
wantQTH: "Дзержинск", // 9 chars / 18 bytes, declared 9
|
||||
wantName: "Александр Чайка", // 15 chars / 29 bytes, declared 15
|
||||
adi: "<EOH>\n<CALL:6>UA3TFS<NAME:15>Александр Чайка<QTH:9>Дзержинск<EOR>\n",
|
||||
},
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package adif
|
||||
|
||||
import "testing"
|
||||
|
||||
// ADIF defines CNTY as "STATE,COUNTY" — "GA,BARROW". OpsLog exported the bare
|
||||
// county, which a receiving logger cannot resolve: county names repeat across
|
||||
// states, and there is a Washington County in thirty of them.
|
||||
func TestADIFCountyFormat(t *testing.T) {
|
||||
for _, tc := range []struct{ state, county, want string }{
|
||||
{"GA", "BARROW", "GA,BARROW"},
|
||||
{"ga", "Barrow", "GA,Barrow"}, // the state is a code, upper-cased; the name is not touched
|
||||
{"", "BARROW", "BARROW"}, // no state known: a bare name beats nothing
|
||||
{"GA", "", ""}, // no county: nothing to write
|
||||
{"GA", "GA,BARROW", "GA,BARROW"}, // already formatted — never double the prefix
|
||||
{" GA ", " BARROW ", "GA,BARROW"},
|
||||
} {
|
||||
if got := adifCounty(tc.state, tc.county); got != tc.want {
|
||||
t.Errorf("adifCounty(%q, %q) = %q, want %q", tc.state, tc.county, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// And the mirror: a file from a logger that follows the standard must fill both
|
||||
// columns, while a file carrying the bare county still imports unchanged.
|
||||
func TestSplitADIFCounty(t *testing.T) {
|
||||
for _, tc := range []struct{ in, county, state string }{
|
||||
{"GA,BARROW", "BARROW", "GA"},
|
||||
{"ga, Barrow", "Barrow", "GA"},
|
||||
{"BARROW", "BARROW", ""}, // the old OpsLog form, and many other loggers
|
||||
{"", "", ""},
|
||||
{" ", "", ""},
|
||||
} {
|
||||
c, s := splitADIFCounty(tc.in)
|
||||
if c != tc.county || s != tc.state {
|
||||
t.Errorf("splitADIFCounty(%q) = (%q, %q), want (%q, %q)", tc.in, c, s, tc.county, tc.state)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Round trip: what OpsLog writes, OpsLog reads back to the same two values.
|
||||
func TestCountyRoundTrip(t *testing.T) {
|
||||
c, s := splitADIFCounty(adifCounty("GA", "BARROW"))
|
||||
if c != "BARROW" || s != "GA" {
|
||||
t.Errorf("round trip gave (%q, %q), want (BARROW, GA)", c, s)
|
||||
}
|
||||
}
|
||||
+29
-7
@@ -15,9 +15,9 @@ import (
|
||||
|
||||
// ExportResult summarises an ADIF export for the UI.
|
||||
type ExportResult struct {
|
||||
Path string `json:"path"`
|
||||
Count int `json:"count"`
|
||||
SizeKB int64 `json:"size_kb"`
|
||||
Path string `json:"path"`
|
||||
Count int `json:"count"`
|
||||
SizeKB int64 `json:"size_kb"`
|
||||
}
|
||||
|
||||
// Exporter streams every QSO in a repo to an ADIF (.adi) file.
|
||||
@@ -221,7 +221,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
||||
w("VUCC_GRIDS", q.VUCCGrids)
|
||||
w("COUNTRY", q.Country)
|
||||
w("STATE", q.State)
|
||||
w("CNTY", q.County)
|
||||
w("CNTY", adifCounty(q.State, q.County))
|
||||
wi("DXCC", q.DXCC)
|
||||
w("CONT", q.Continent)
|
||||
wi("CQZ", q.CQZ)
|
||||
@@ -285,7 +285,7 @@ func writeRecord(bw *bufio.Writer, q qso.QSO, includeApp bool, allow map[string]
|
||||
w("MY_GRIDSQUARE_EXT", q.MyGridExt)
|
||||
w("MY_COUNTRY", q.MyCountry)
|
||||
w("MY_STATE", q.MyState)
|
||||
w("MY_CNTY", q.MyCounty)
|
||||
w("MY_CNTY", adifCounty(q.MyState, q.MyCounty))
|
||||
w("MY_IOTA", q.MyIOTA)
|
||||
w("MY_SOTA_REF", q.MySOTARef)
|
||||
w("MY_POTA_REF", q.MyPOTARef)
|
||||
@@ -391,10 +391,10 @@ var parentMode = map[string]string{
|
||||
"ISCAT": "MFSK", "Q65": "MFSK", "FST4": "MFSK", "FST4W": "MFSK",
|
||||
"MFSK16": "MFSK", "MFSK32": "MFSK", "MFSK64": "MFSK", "MFSK128": "MFSK",
|
||||
"OLIVIA": "MFSK",
|
||||
"PSK31": "PSK", "PSK63": "PSK", "PSK125": "PSK", "PSK250": "PSK", "PSK500": "PSK",
|
||||
"PSK31": "PSK", "PSK63": "PSK", "PSK125": "PSK", "PSK250": "PSK", "PSK500": "PSK",
|
||||
"QPSK31": "PSK", "QPSK63": "PSK", "QPSK125": "PSK", "QPSK250": "PSK", "QPSK500": "PSK",
|
||||
"FREEDV": "DIGITALVOICE",
|
||||
"VARA": "DYNAMIC", "VARA HF": "DYNAMIC", "VARA FM": "DYNAMIC", "VARAC": "DYNAMIC",
|
||||
"VARA": "DYNAMIC", "VARA HF": "DYNAMIC", "VARA FM": "DYNAMIC", "VARAC": "DYNAMIC",
|
||||
"THOR4": "THOR", "THOR8": "THOR", "THOR16": "THOR", "THOR32": "THOR",
|
||||
"DOMINOF": "DOMINO", "DOMINOEX": "DOMINO",
|
||||
"HELL80": "HELL", "FMHELL": "HELL",
|
||||
@@ -413,3 +413,25 @@ func modeForExport(mode, submode string) (string, string) {
|
||||
}
|
||||
return mode, ""
|
||||
}
|
||||
|
||||
// adifCounty renders CNTY the way ADIF specifies: "STATE,COUNTY", e.g.
|
||||
// "GA,BARROW".
|
||||
//
|
||||
// OpsLog stores the two apart, and exported only the county — which a receiving
|
||||
// logger cannot resolve, since county names repeat across states (there is a
|
||||
// Washington County in thirty of them). The award engine here was never
|
||||
// affected because it reads the columns, not the ADIF; the damage was to
|
||||
// everyone we send a file to.
|
||||
//
|
||||
// The county alone is still written when no state is known: a bare name is
|
||||
// worth more than nothing, and inventing a prefix would be worse than either.
|
||||
// A county that ALREADY carries a comma is passed through — it has been
|
||||
// formatted once, and doubling the prefix would corrupt it.
|
||||
func adifCounty(state, county string) string {
|
||||
c := strings.TrimSpace(county)
|
||||
s := strings.TrimSpace(state)
|
||||
if c == "" || s == "" || strings.Contains(c, ",") {
|
||||
return c
|
||||
}
|
||||
return strings.ToUpper(s) + "," + c
|
||||
}
|
||||
|
||||
+13
-13
@@ -16,23 +16,23 @@ import "strings"
|
||||
type FieldKind string
|
||||
|
||||
const (
|
||||
KindText FieldKind = "text" // String / IntlString / MultilineString
|
||||
KindNumber FieldKind = "number" // Number / PositiveInteger
|
||||
KindDate FieldKind = "date" // ADIF Date (YYYYMMDD)
|
||||
KindTime FieldKind = "time" // ADIF Time (HHMMSS / HHMM)
|
||||
KindBool FieldKind = "boolean" // Boolean (Y/N)
|
||||
KindEnum FieldKind = "enum" // Enumeration
|
||||
KindLoc FieldKind = "location" // Location (e.g. "N048 09.000")
|
||||
KindText FieldKind = "text" // String / IntlString / MultilineString
|
||||
KindNumber FieldKind = "number" // Number / PositiveInteger
|
||||
KindDate FieldKind = "date" // ADIF Date (YYYYMMDD)
|
||||
KindTime FieldKind = "time" // ADIF Time (HHMMSS / HHMM)
|
||||
KindBool FieldKind = "boolean" // Boolean (Y/N)
|
||||
KindEnum FieldKind = "enum" // Enumeration
|
||||
KindLoc FieldKind = "location" // Location (e.g. "N048 09.000")
|
||||
)
|
||||
|
||||
// FieldDef describes one ADIF QSO field.
|
||||
type FieldDef struct {
|
||||
Name string `json:"name"` // canonical uppercase ADIF tag
|
||||
Kind FieldKind `json:"kind"` // editor widget hint
|
||||
Category string `json:"category"` // grouping for the UI
|
||||
Promoted bool `json:"promoted"` // has a dedicated QSO column
|
||||
Deprecated bool `json:"deprecated"` // import-only per the spec
|
||||
Intl bool `json:"intl"` // *_INTL UTF-8 variant
|
||||
Name string `json:"name"` // canonical uppercase ADIF tag
|
||||
Kind FieldKind `json:"kind"` // editor widget hint
|
||||
Category string `json:"category"` // grouping for the UI
|
||||
Promoted bool `json:"promoted"` // has a dedicated QSO column
|
||||
Deprecated bool `json:"deprecated"` // import-only per the spec
|
||||
Intl bool `json:"intl"` // *_INTL UTF-8 variant
|
||||
}
|
||||
|
||||
// adifVersion is the ADIF spec version OpsLog targets for import/export.
|
||||
|
||||
+29
-2
@@ -428,7 +428,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
||||
q.VUCCGrids = strings.ToUpper(rec["vucc_grids"])
|
||||
q.Country = rec["country"]
|
||||
q.State = strings.ToUpper(rec["state"])
|
||||
q.County = rec["cnty"]
|
||||
q.County, _ = splitADIFCounty(rec["cnty"])
|
||||
if st := rec["state"]; strings.TrimSpace(st) == "" {
|
||||
if _, fromCnty := splitADIFCounty(rec["cnty"]); fromCnty != "" {
|
||||
q.State = fromCnty
|
||||
}
|
||||
}
|
||||
if v, ok := parseInt(rec["dxcc"]); ok {
|
||||
q.DXCC = &v
|
||||
}
|
||||
@@ -515,7 +520,12 @@ func recordToQSO(rec Record) (qso.QSO, bool) {
|
||||
q.MyGridExt = strings.ToUpper(rec["my_gridsquare_ext"])
|
||||
q.MyCountry = rec["my_country"]
|
||||
q.MyState = strings.ToUpper(rec["my_state"])
|
||||
q.MyCounty = rec["my_cnty"]
|
||||
q.MyCounty, _ = splitADIFCounty(rec["my_cnty"])
|
||||
if st := rec["my_state"]; strings.TrimSpace(st) == "" {
|
||||
if _, fromCnty := splitADIFCounty(rec["my_cnty"]); fromCnty != "" {
|
||||
q.MyState = fromCnty
|
||||
}
|
||||
}
|
||||
q.MyIOTA = strings.ToUpper(rec["my_iota"])
|
||||
q.MySOTARef = strings.ToUpper(rec["my_sota_ref"])
|
||||
q.MyPOTARef = strings.ToUpper(rec["my_pota_ref"])
|
||||
@@ -698,3 +708,20 @@ var promotableSubmodes = map[string]bool{
|
||||
func submodeSubsumesParent(submode string) bool {
|
||||
return promotableSubmodes[submode]
|
||||
}
|
||||
|
||||
// splitADIFCounty reads CNTY, which ADIF defines as "STATE,COUNTY".
|
||||
//
|
||||
// Returns the county on its own plus the state the field carried, so an import
|
||||
// from a logger that follows the standard fills BOTH columns here. Files that
|
||||
// write the bare county — as OpsLog itself used to — still import unchanged.
|
||||
//
|
||||
// The state from the field never overrides an explicit STATE tag: STATE is the
|
||||
// dedicated field and the more specific statement. It only fills a blank.
|
||||
func splitADIFCounty(cnty string) (county, state string) {
|
||||
cnty = strings.TrimSpace(cnty)
|
||||
i := strings.Index(cnty, ",")
|
||||
if i < 0 {
|
||||
return cnty, ""
|
||||
}
|
||||
return strings.TrimSpace(cnty[i+1:]), strings.ToUpper(strings.TrimSpace(cnty[:i]))
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ func TestPromotedFieldsRoundTrip(t *testing.T) {
|
||||
in := qso.QSO{
|
||||
Callsign: "EA8ABC", Band: "20m", Mode: "SSB",
|
||||
QSODate: time.Date(2026, 6, 6, 12, 0, 0, 0, time.UTC),
|
||||
SIG: "POTA", SIGInfo: "US-0001", MySIG: "WWFF", MySIGInfo: "ONFF-0001",
|
||||
SIG: "POTA", SIGInfo: "US-0001", MySIG: "WWFF", MySIGInfo: "ONFF-0001",
|
||||
WWFFRef: "ONFF-0001", MyWWFFRef: "F-FFF-0001",
|
||||
Distance: &dist, RXPower: &rxp, AIndex: &a,
|
||||
SKCC: "12345S", FISTS: "999", TenTen: "55555",
|
||||
|
||||
@@ -132,6 +132,18 @@ func (db *DB) Entities() []*Entity {
|
||||
func (db *DB) Lookup(callsign string) (Match, bool) {
|
||||
db.mu.RLock()
|
||||
defer db.mu.RUnlock()
|
||||
// Maritime and aeronautical mobile belong to NO entity, and that is not a
|
||||
// technicality — the station is at sea or in the air. RI1FJL/MM resolved to
|
||||
// Franz Josef Land while the expedition was still on its way there, telling
|
||||
// the operator they had worked an entity they had not.
|
||||
//
|
||||
// The previous choice was deliberate ("the log should still show the
|
||||
// operator's country") and it is wrong for exactly that reason: a home
|
||||
// country here is not extra information, it is a false claim about where the
|
||||
// contact happened.
|
||||
if IsMobileNoEntity(callsign) {
|
||||
return Match{}, false
|
||||
}
|
||||
call := normalizeCallsign(callsign)
|
||||
if call == "" {
|
||||
return Match{}, false
|
||||
@@ -364,3 +376,22 @@ func replaceAreaDigit(call string, d byte) string {
|
||||
}
|
||||
return call
|
||||
}
|
||||
|
||||
// IsMobileNoEntity reports a callsign DXCC assigns to no entity: a TRAILING
|
||||
// /MM (maritime mobile) or /AM (aeronautical mobile).
|
||||
//
|
||||
// Trailing only. A LEADING "MM" is the Scotland prefix and "AM" is Spain, so
|
||||
// MM0ABC and AM5X are ordinary calls — treating those as entity-less would be a
|
||||
// far larger error than the one this fixes.
|
||||
func IsMobileNoEntity(callsign string) bool {
|
||||
s := strings.ToUpper(strings.TrimSpace(callsign))
|
||||
i := strings.LastIndex(s, "/")
|
||||
if i < 0 {
|
||||
return false
|
||||
}
|
||||
switch s[i+1:] {
|
||||
case "MM", "AM":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
+338
-338
@@ -4,348 +4,348 @@ package dxcc
|
||||
// numbers. Generated by joining cty.dat to the authoritative ARRL/ADIF entity
|
||||
// list (k0swe/dxcc-json) by primary prefix + canonical name. 344 entities.
|
||||
var dxccByName = map[string]int{
|
||||
"afghanistan": 3,
|
||||
"agalega & st. brandon": 4,
|
||||
"aland islands": 5,
|
||||
"alaska": 6,
|
||||
"albania": 7,
|
||||
"algeria": 400,
|
||||
"american samoa": 9,
|
||||
"afghanistan": 3,
|
||||
"agalega & st. brandon": 4,
|
||||
"aland islands": 5,
|
||||
"alaska": 6,
|
||||
"albania": 7,
|
||||
"algeria": 400,
|
||||
"american samoa": 9,
|
||||
"amsterdam & st. paul is.": 10,
|
||||
"andaman & nicobar is.": 11,
|
||||
"andorra": 203,
|
||||
"angola": 401,
|
||||
"anguilla": 12,
|
||||
"annobon island": 195,
|
||||
"antarctica": 13,
|
||||
"antigua & barbuda": 94,
|
||||
"argentina": 100,
|
||||
"armenia": 14,
|
||||
"aruba": 91,
|
||||
"ascension island": 205,
|
||||
"asiatic russia": 15,
|
||||
"asiatic turkey": 390,
|
||||
"austral islands": 508,
|
||||
"australia": 150,
|
||||
"austria": 206,
|
||||
"aves island": 17,
|
||||
"azerbaijan": 18,
|
||||
"azores": 149,
|
||||
"bahamas": 60,
|
||||
"bahrain": 304,
|
||||
"baker & howland islands": 20,
|
||||
"balearic islands": 21,
|
||||
"banaba island": 490,
|
||||
"bangladesh": 305,
|
||||
"barbados": 62,
|
||||
"bear island": 259,
|
||||
"belarus": 27,
|
||||
"belgium": 209,
|
||||
"belize": 66,
|
||||
"benin": 416,
|
||||
"bermuda": 64,
|
||||
"bhutan": 306,
|
||||
"bolivia": 104,
|
||||
"bonaire": 520,
|
||||
"bosnia-herzegovina": 501,
|
||||
"botswana": 402,
|
||||
"bouvet": 24,
|
||||
"brazil": 108,
|
||||
"british virgin islands": 65,
|
||||
"brunei darussalam": 345,
|
||||
"bulgaria": 212,
|
||||
"burkina faso": 480,
|
||||
"burundi": 404,
|
||||
"cambodia": 312,
|
||||
"cameroon": 406,
|
||||
"canada": 1,
|
||||
"canary islands": 29,
|
||||
"cape verde": 409,
|
||||
"cayman islands": 69,
|
||||
"andaman & nicobar is.": 11,
|
||||
"andorra": 203,
|
||||
"angola": 401,
|
||||
"anguilla": 12,
|
||||
"annobon island": 195,
|
||||
"antarctica": 13,
|
||||
"antigua & barbuda": 94,
|
||||
"argentina": 100,
|
||||
"armenia": 14,
|
||||
"aruba": 91,
|
||||
"ascension island": 205,
|
||||
"asiatic russia": 15,
|
||||
"asiatic turkey": 390,
|
||||
"austral islands": 508,
|
||||
"australia": 150,
|
||||
"austria": 206,
|
||||
"aves island": 17,
|
||||
"azerbaijan": 18,
|
||||
"azores": 149,
|
||||
"bahamas": 60,
|
||||
"bahrain": 304,
|
||||
"baker & howland islands": 20,
|
||||
"balearic islands": 21,
|
||||
"banaba island": 490,
|
||||
"bangladesh": 305,
|
||||
"barbados": 62,
|
||||
"bear island": 259,
|
||||
"belarus": 27,
|
||||
"belgium": 209,
|
||||
"belize": 66,
|
||||
"benin": 416,
|
||||
"bermuda": 64,
|
||||
"bhutan": 306,
|
||||
"bolivia": 104,
|
||||
"bonaire": 520,
|
||||
"bosnia-herzegovina": 501,
|
||||
"botswana": 402,
|
||||
"bouvet": 24,
|
||||
"brazil": 108,
|
||||
"british virgin islands": 65,
|
||||
"brunei darussalam": 345,
|
||||
"bulgaria": 212,
|
||||
"burkina faso": 480,
|
||||
"burundi": 404,
|
||||
"cambodia": 312,
|
||||
"cameroon": 406,
|
||||
"canada": 1,
|
||||
"canary islands": 29,
|
||||
"cape verde": 409,
|
||||
"cayman islands": 69,
|
||||
"central african republic": 408,
|
||||
"central kiribati": 31,
|
||||
"ceuta & melilla": 32,
|
||||
"chad": 410,
|
||||
"chagos islands": 33,
|
||||
"chatham islands": 34,
|
||||
"chesterfield islands": 512,
|
||||
"chile": 112,
|
||||
"china": 318,
|
||||
"christmas island": 35,
|
||||
"clipperton island": 36,
|
||||
"cocos (keeling) islands": 38,
|
||||
"cocos island": 37,
|
||||
"colombia": 116,
|
||||
"comoros": 411,
|
||||
"conway reef": 489,
|
||||
"corsica": 214,
|
||||
"costa rica": 308,
|
||||
"cote d'ivoire": 428,
|
||||
"crete": 40,
|
||||
"croatia": 497,
|
||||
"crozet island": 41,
|
||||
"cuba": 70,
|
||||
"curacao": 517,
|
||||
"cyprus": 215,
|
||||
"czech republic": 503,
|
||||
"dem. rep. of the congo": 414,
|
||||
"denmark": 221,
|
||||
"desecheo island": 43,
|
||||
"djibouti": 382,
|
||||
"dodecanese": 45,
|
||||
"dominica": 95,
|
||||
"dominican republic": 72,
|
||||
"dpr of korea": 344,
|
||||
"ducie island": 513,
|
||||
"east malaysia": 46,
|
||||
"easter island": 47,
|
||||
"eastern kiribati": 48,
|
||||
"ecuador": 120,
|
||||
"egypt": 478,
|
||||
"el salvador": 74,
|
||||
"england": 223,
|
||||
"equatorial guinea": 49,
|
||||
"eritrea": 51,
|
||||
"estonia": 52,
|
||||
"ethiopia": 53,
|
||||
"european russia": 54,
|
||||
"european turkey": 390,
|
||||
"falkland islands": 141,
|
||||
"faroe islands": 222,
|
||||
"fed. rep. of germany": 230,
|
||||
"fernando de noronha": 56,
|
||||
"fiji": 176,
|
||||
"finland": 224,
|
||||
"france": 227,
|
||||
"franz josef land": 61,
|
||||
"french guiana": 63,
|
||||
"french polynesia": 175,
|
||||
"gabon": 420,
|
||||
"galapagos islands": 71,
|
||||
"georgia": 75,
|
||||
"ghana": 424,
|
||||
"gibraltar": 233,
|
||||
"glorioso islands": 99,
|
||||
"greece": 236,
|
||||
"greenland": 237,
|
||||
"grenada": 77,
|
||||
"guadeloupe": 79,
|
||||
"guam": 103,
|
||||
"guantanamo bay": 105,
|
||||
"guatemala": 76,
|
||||
"guernsey": 106,
|
||||
"guinea": 107,
|
||||
"guinea-bissau": 109,
|
||||
"guyana": 129,
|
||||
"haiti": 78,
|
||||
"hawaii": 110,
|
||||
"heard island": 111,
|
||||
"honduras": 80,
|
||||
"hong kong": 321,
|
||||
"hungary": 239,
|
||||
"iceland": 242,
|
||||
"india": 324,
|
||||
"indonesia": 327,
|
||||
"iran": 330,
|
||||
"iraq": 333,
|
||||
"ireland": 245,
|
||||
"isle of man": 114,
|
||||
"israel": 336,
|
||||
"italy": 248,
|
||||
"itu hq": 117,
|
||||
"jamaica": 82,
|
||||
"jan mayen": 118,
|
||||
"japan": 339,
|
||||
"jersey": 122,
|
||||
"johnston island": 123,
|
||||
"jordan": 342,
|
||||
"juan de nova, europa": 124,
|
||||
"juan fernandez islands": 125,
|
||||
"kaliningrad": 126,
|
||||
"kazakhstan": 130,
|
||||
"kenya": 430,
|
||||
"kerguelen islands": 131,
|
||||
"kermadec islands": 133,
|
||||
"kingdom of eswatini": 468,
|
||||
"kure island": 138,
|
||||
"kuwait": 348,
|
||||
"kyrgyzstan": 135,
|
||||
"lakshadweep islands": 142,
|
||||
"laos": 143,
|
||||
"latvia": 145,
|
||||
"lebanon": 354,
|
||||
"lesotho": 432,
|
||||
"liberia": 434,
|
||||
"libya": 436,
|
||||
"liechtenstein": 251,
|
||||
"lithuania": 146,
|
||||
"lord howe island": 147,
|
||||
"luxembourg": 254,
|
||||
"macao": 152,
|
||||
"macquarie island": 153,
|
||||
"madagascar": 438,
|
||||
"madeira islands": 256,
|
||||
"malawi": 440,
|
||||
"maldives": 159,
|
||||
"mali": 442,
|
||||
"malpelo island": 161,
|
||||
"malta": 257,
|
||||
"mariana islands": 166,
|
||||
"market reef": 167,
|
||||
"marquesas islands": 509,
|
||||
"marshall islands": 168,
|
||||
"martinique": 84,
|
||||
"mauritania": 444,
|
||||
"mauritius": 165,
|
||||
"mayotte": 169,
|
||||
"mellish reef": 171,
|
||||
"mexico": 50,
|
||||
"micronesia": 173,
|
||||
"midway island": 174,
|
||||
"minami torishima": 177,
|
||||
"moldova": 179,
|
||||
"monaco": 260,
|
||||
"mongolia": 363,
|
||||
"montenegro": 514,
|
||||
"montserrat": 96,
|
||||
"morocco": 446,
|
||||
"mount athos": 180,
|
||||
"mozambique": 181,
|
||||
"myanmar": 309,
|
||||
"n.z. subantarctic is.": 16,
|
||||
"namibia": 464,
|
||||
"nauru": 157,
|
||||
"navassa island": 182,
|
||||
"nepal": 369,
|
||||
"netherlands": 263,
|
||||
"new caledonia": 162,
|
||||
"new zealand": 170,
|
||||
"nicaragua": 86,
|
||||
"niger": 187,
|
||||
"nigeria": 450,
|
||||
"niue": 188,
|
||||
"norfolk island": 189,
|
||||
"north cook islands": 191,
|
||||
"north macedonia": 502,
|
||||
"northern ireland": 265,
|
||||
"norway": 266,
|
||||
"ogasawara": 192,
|
||||
"oman": 370,
|
||||
"pakistan": 372,
|
||||
"palau": 22,
|
||||
"palestine": 510,
|
||||
"central kiribati": 31,
|
||||
"ceuta & melilla": 32,
|
||||
"chad": 410,
|
||||
"chagos islands": 33,
|
||||
"chatham islands": 34,
|
||||
"chesterfield islands": 512,
|
||||
"chile": 112,
|
||||
"china": 318,
|
||||
"christmas island": 35,
|
||||
"clipperton island": 36,
|
||||
"cocos (keeling) islands": 38,
|
||||
"cocos island": 37,
|
||||
"colombia": 116,
|
||||
"comoros": 411,
|
||||
"conway reef": 489,
|
||||
"corsica": 214,
|
||||
"costa rica": 308,
|
||||
"cote d'ivoire": 428,
|
||||
"crete": 40,
|
||||
"croatia": 497,
|
||||
"crozet island": 41,
|
||||
"cuba": 70,
|
||||
"curacao": 517,
|
||||
"cyprus": 215,
|
||||
"czech republic": 503,
|
||||
"dem. rep. of the congo": 414,
|
||||
"denmark": 221,
|
||||
"desecheo island": 43,
|
||||
"djibouti": 382,
|
||||
"dodecanese": 45,
|
||||
"dominica": 95,
|
||||
"dominican republic": 72,
|
||||
"dpr of korea": 344,
|
||||
"ducie island": 513,
|
||||
"east malaysia": 46,
|
||||
"easter island": 47,
|
||||
"eastern kiribati": 48,
|
||||
"ecuador": 120,
|
||||
"egypt": 478,
|
||||
"el salvador": 74,
|
||||
"england": 223,
|
||||
"equatorial guinea": 49,
|
||||
"eritrea": 51,
|
||||
"estonia": 52,
|
||||
"ethiopia": 53,
|
||||
"european russia": 54,
|
||||
"european turkey": 390,
|
||||
"falkland islands": 141,
|
||||
"faroe islands": 222,
|
||||
"fed. rep. of germany": 230,
|
||||
"fernando de noronha": 56,
|
||||
"fiji": 176,
|
||||
"finland": 224,
|
||||
"france": 227,
|
||||
"franz josef land": 61,
|
||||
"french guiana": 63,
|
||||
"french polynesia": 175,
|
||||
"gabon": 420,
|
||||
"galapagos islands": 71,
|
||||
"georgia": 75,
|
||||
"ghana": 424,
|
||||
"gibraltar": 233,
|
||||
"glorioso islands": 99,
|
||||
"greece": 236,
|
||||
"greenland": 237,
|
||||
"grenada": 77,
|
||||
"guadeloupe": 79,
|
||||
"guam": 103,
|
||||
"guantanamo bay": 105,
|
||||
"guatemala": 76,
|
||||
"guernsey": 106,
|
||||
"guinea": 107,
|
||||
"guinea-bissau": 109,
|
||||
"guyana": 129,
|
||||
"haiti": 78,
|
||||
"hawaii": 110,
|
||||
"heard island": 111,
|
||||
"honduras": 80,
|
||||
"hong kong": 321,
|
||||
"hungary": 239,
|
||||
"iceland": 242,
|
||||
"india": 324,
|
||||
"indonesia": 327,
|
||||
"iran": 330,
|
||||
"iraq": 333,
|
||||
"ireland": 245,
|
||||
"isle of man": 114,
|
||||
"israel": 336,
|
||||
"italy": 248,
|
||||
"itu hq": 117,
|
||||
"jamaica": 82,
|
||||
"jan mayen": 118,
|
||||
"japan": 339,
|
||||
"jersey": 122,
|
||||
"johnston island": 123,
|
||||
"jordan": 342,
|
||||
"juan de nova, europa": 124,
|
||||
"juan fernandez islands": 125,
|
||||
"kaliningrad": 126,
|
||||
"kazakhstan": 130,
|
||||
"kenya": 430,
|
||||
"kerguelen islands": 131,
|
||||
"kermadec islands": 133,
|
||||
"kingdom of eswatini": 468,
|
||||
"kure island": 138,
|
||||
"kuwait": 348,
|
||||
"kyrgyzstan": 135,
|
||||
"lakshadweep islands": 142,
|
||||
"laos": 143,
|
||||
"latvia": 145,
|
||||
"lebanon": 354,
|
||||
"lesotho": 432,
|
||||
"liberia": 434,
|
||||
"libya": 436,
|
||||
"liechtenstein": 251,
|
||||
"lithuania": 146,
|
||||
"lord howe island": 147,
|
||||
"luxembourg": 254,
|
||||
"macao": 152,
|
||||
"macquarie island": 153,
|
||||
"madagascar": 438,
|
||||
"madeira islands": 256,
|
||||
"malawi": 440,
|
||||
"maldives": 159,
|
||||
"mali": 442,
|
||||
"malpelo island": 161,
|
||||
"malta": 257,
|
||||
"mariana islands": 166,
|
||||
"market reef": 167,
|
||||
"marquesas islands": 509,
|
||||
"marshall islands": 168,
|
||||
"martinique": 84,
|
||||
"mauritania": 444,
|
||||
"mauritius": 165,
|
||||
"mayotte": 169,
|
||||
"mellish reef": 171,
|
||||
"mexico": 50,
|
||||
"micronesia": 173,
|
||||
"midway island": 174,
|
||||
"minami torishima": 177,
|
||||
"moldova": 179,
|
||||
"monaco": 260,
|
||||
"mongolia": 363,
|
||||
"montenegro": 514,
|
||||
"montserrat": 96,
|
||||
"morocco": 446,
|
||||
"mount athos": 180,
|
||||
"mozambique": 181,
|
||||
"myanmar": 309,
|
||||
"n.z. subantarctic is.": 16,
|
||||
"namibia": 464,
|
||||
"nauru": 157,
|
||||
"navassa island": 182,
|
||||
"nepal": 369,
|
||||
"netherlands": 263,
|
||||
"new caledonia": 162,
|
||||
"new zealand": 170,
|
||||
"nicaragua": 86,
|
||||
"niger": 187,
|
||||
"nigeria": 450,
|
||||
"niue": 188,
|
||||
"norfolk island": 189,
|
||||
"north cook islands": 191,
|
||||
"north macedonia": 502,
|
||||
"northern ireland": 265,
|
||||
"norway": 266,
|
||||
"ogasawara": 192,
|
||||
"oman": 370,
|
||||
"pakistan": 372,
|
||||
"palau": 22,
|
||||
"palestine": 510,
|
||||
"palmyra & jarvis islands": 197,
|
||||
"panama": 88,
|
||||
"papua new guinea": 163,
|
||||
"paraguay": 132,
|
||||
"peru": 136,
|
||||
"peter 1 island": 199,
|
||||
"philippines": 375,
|
||||
"pitcairn island": 172,
|
||||
"poland": 269,
|
||||
"portugal": 272,
|
||||
"pr. edward & marion is.": 201,
|
||||
"pratas island": 505,
|
||||
"puerto rico": 202,
|
||||
"qatar": 376,
|
||||
"republic of korea": 137,
|
||||
"republic of kosovo": 522,
|
||||
"republic of south sudan": 521,
|
||||
"republic of the congo": 412,
|
||||
"reunion island": 453,
|
||||
"revillagigedo": 204,
|
||||
"rodriguez island": 207,
|
||||
"romania": 275,
|
||||
"rotuma island": 460,
|
||||
"rwanda": 454,
|
||||
"saba & st. eustatius": 519,
|
||||
"sable island": 211,
|
||||
"samoa": 190,
|
||||
"panama": 88,
|
||||
"papua new guinea": 163,
|
||||
"paraguay": 132,
|
||||
"peru": 136,
|
||||
"peter 1 island": 199,
|
||||
"philippines": 375,
|
||||
"pitcairn island": 172,
|
||||
"poland": 269,
|
||||
"portugal": 272,
|
||||
"pr. edward & marion is.": 201,
|
||||
"pratas island": 505,
|
||||
"puerto rico": 202,
|
||||
"qatar": 376,
|
||||
"republic of korea": 137,
|
||||
"republic of kosovo": 522,
|
||||
"republic of south sudan": 521,
|
||||
"republic of the congo": 412,
|
||||
"reunion island": 453,
|
||||
"revillagigedo": 204,
|
||||
"rodriguez island": 207,
|
||||
"romania": 275,
|
||||
"rotuma island": 460,
|
||||
"rwanda": 454,
|
||||
"saba & st. eustatius": 519,
|
||||
"sable island": 211,
|
||||
"samoa": 190,
|
||||
"san andres & providencia": 216,
|
||||
"san felix & san ambrosio": 217,
|
||||
"san marino": 278,
|
||||
"sao tome & principe": 219,
|
||||
"sardinia": 225,
|
||||
"saudi arabia": 378,
|
||||
"scarborough reef": 506,
|
||||
"scotland": 279,
|
||||
"senegal": 456,
|
||||
"serbia": 296,
|
||||
"seychelles": 379,
|
||||
"shetland islands": 279,
|
||||
"sierra leone": 458,
|
||||
"singapore": 381,
|
||||
"sint maarten": 518,
|
||||
"slovak republic": 504,
|
||||
"slovenia": 499,
|
||||
"solomon islands": 185,
|
||||
"somalia": 232,
|
||||
"south africa": 462,
|
||||
"south cook islands": 234,
|
||||
"south georgia island": 235,
|
||||
"south orkney islands": 238,
|
||||
"south sandwich islands": 240,
|
||||
"south shetland islands": 241,
|
||||
"sov mil order of malta": 246,
|
||||
"spain": 281,
|
||||
"spratly islands": 247,
|
||||
"sri lanka": 315,
|
||||
"st. barthelemy": 516,
|
||||
"st. helena": 250,
|
||||
"st. kitts & nevis": 249,
|
||||
"st. lucia": 97,
|
||||
"st. martin": 213,
|
||||
"st. paul island": 252,
|
||||
"st. peter & st. paul": 253,
|
||||
"st. pierre & miquelon": 277,
|
||||
"st. vincent": 98,
|
||||
"sudan": 466,
|
||||
"suriname": 140,
|
||||
"svalbard": 259,
|
||||
"swains island": 515,
|
||||
"sweden": 284,
|
||||
"switzerland": 287,
|
||||
"syria": 384,
|
||||
"taiwan": 386,
|
||||
"tajikistan": 262,
|
||||
"tanzania": 470,
|
||||
"temotu province": 507,
|
||||
"thailand": 387,
|
||||
"the gambia": 422,
|
||||
"timor - leste": 511,
|
||||
"togo": 483,
|
||||
"tokelau islands": 270,
|
||||
"tonga": 160,
|
||||
"trindade & martim vaz": 273,
|
||||
"trinidad & tobago": 90,
|
||||
"san marino": 278,
|
||||
"sao tome & principe": 219,
|
||||
"sardinia": 225,
|
||||
"saudi arabia": 378,
|
||||
"scarborough reef": 506,
|
||||
"scotland": 279,
|
||||
"senegal": 456,
|
||||
"serbia": 296,
|
||||
"seychelles": 379,
|
||||
"shetland islands": 279,
|
||||
"sierra leone": 458,
|
||||
"singapore": 381,
|
||||
"sint maarten": 518,
|
||||
"slovak republic": 504,
|
||||
"slovenia": 499,
|
||||
"solomon islands": 185,
|
||||
"somalia": 232,
|
||||
"south africa": 462,
|
||||
"south cook islands": 234,
|
||||
"south georgia island": 235,
|
||||
"south orkney islands": 238,
|
||||
"south sandwich islands": 240,
|
||||
"south shetland islands": 241,
|
||||
"sov mil order of malta": 246,
|
||||
"spain": 281,
|
||||
"spratly islands": 247,
|
||||
"sri lanka": 315,
|
||||
"st. barthelemy": 516,
|
||||
"st. helena": 250,
|
||||
"st. kitts & nevis": 249,
|
||||
"st. lucia": 97,
|
||||
"st. martin": 213,
|
||||
"st. paul island": 252,
|
||||
"st. peter & st. paul": 253,
|
||||
"st. pierre & miquelon": 277,
|
||||
"st. vincent": 98,
|
||||
"sudan": 466,
|
||||
"suriname": 140,
|
||||
"svalbard": 259,
|
||||
"swains island": 515,
|
||||
"sweden": 284,
|
||||
"switzerland": 287,
|
||||
"syria": 384,
|
||||
"taiwan": 386,
|
||||
"tajikistan": 262,
|
||||
"tanzania": 470,
|
||||
"temotu province": 507,
|
||||
"thailand": 387,
|
||||
"the gambia": 422,
|
||||
"timor - leste": 511,
|
||||
"togo": 483,
|
||||
"tokelau islands": 270,
|
||||
"tonga": 160,
|
||||
"trindade & martim vaz": 273,
|
||||
"trinidad & tobago": 90,
|
||||
"tristan da cunha & gough": 274,
|
||||
"tromelin island": 276,
|
||||
"tunisia": 474,
|
||||
"turkmenistan": 280,
|
||||
"turks & caicos islands": 89,
|
||||
"tuvalu": 282,
|
||||
"uganda": 286,
|
||||
"uk base areas on cyprus": 283,
|
||||
"ukraine": 288,
|
||||
"united arab emirates": 391,
|
||||
"united nations hq": 289,
|
||||
"united states": 291,
|
||||
"uruguay": 144,
|
||||
"us virgin islands": 285,
|
||||
"uzbekistan": 292,
|
||||
"vanuatu": 158,
|
||||
"vatican city": 295,
|
||||
"venezuela": 148,
|
||||
"vienna intl ctr": 206,
|
||||
"vietnam": 293,
|
||||
"wake island": 297,
|
||||
"wales": 294,
|
||||
"wallis & futuna islands": 298,
|
||||
"west malaysia": 299, // hand-fixed: generation joined it to 155 by mistake (9M2 = ADIF 299)
|
||||
"western kiribati": 301,
|
||||
"western sahara": 302,
|
||||
"willis island": 303,
|
||||
"yemen": 492,
|
||||
"zambia": 482,
|
||||
"zimbabwe": 452,
|
||||
"tromelin island": 276,
|
||||
"tunisia": 474,
|
||||
"turkmenistan": 280,
|
||||
"turks & caicos islands": 89,
|
||||
"tuvalu": 282,
|
||||
"uganda": 286,
|
||||
"uk base areas on cyprus": 283,
|
||||
"ukraine": 288,
|
||||
"united arab emirates": 391,
|
||||
"united nations hq": 289,
|
||||
"united states": 291,
|
||||
"uruguay": 144,
|
||||
"us virgin islands": 285,
|
||||
"uzbekistan": 292,
|
||||
"vanuatu": 158,
|
||||
"vatican city": 295,
|
||||
"venezuela": 148,
|
||||
"vienna intl ctr": 206,
|
||||
"vietnam": 293,
|
||||
"wake island": 297,
|
||||
"wales": 294,
|
||||
"wallis & futuna islands": 298,
|
||||
"west malaysia": 299, // hand-fixed: generation joined it to 155 by mistake (9M2 = ADIF 299)
|
||||
"western kiribati": 301,
|
||||
"western sahara": 302,
|
||||
"willis island": 303,
|
||||
"yemen": 492,
|
||||
"zambia": 482,
|
||||
"zimbabwe": 452,
|
||||
}
|
||||
|
||||
+21
-21
@@ -178,9 +178,9 @@ Sicily: 15: 28: EU: 37.50: -14.00: -1.0: *IT9:
|
||||
t.Fatalf("load: %v", err)
|
||||
}
|
||||
cases := map[string]string{
|
||||
"IW9EZO": "Italy", // Sicily (*IT9) → Italy
|
||||
"IW9EZO": "Italy", // Sicily (*IT9) → Italy
|
||||
"IT9CLY": "Italy",
|
||||
"IG9A": "Italy", // African Italy (*IG9) → Italy
|
||||
"IG9A": "Italy", // African Italy (*IG9) → Italy
|
||||
"IK0ABC": "Italy",
|
||||
"IS0XYZ": "Sardinia", // real DXCC entity — must stay Sardinia
|
||||
"IM0ABC": "Sardinia",
|
||||
@@ -210,25 +210,25 @@ Sicily: 15: 28: EU: 37.50: -14.00: -1.0: *IT9:
|
||||
|
||||
func TestNormalize(t *testing.T) {
|
||||
cases := map[string]string{
|
||||
"F4BPO": "F4BPO",
|
||||
"f4bpo": "F4BPO",
|
||||
" F4BPO ": "F4BPO",
|
||||
"F4BPO/P": "F4BPO",
|
||||
"F4BPO/MM": "F4BPO", // maritime mobile → strip, keep home entity for the log
|
||||
"F4BPO/AM": "F4BPO", // aeronautical mobile → strip, keep home entity for the log
|
||||
"F4BPO/M": "F4BPO", // plain mobile keeps the home entity
|
||||
"F4BPO/5": "F5BPO", // "/5" re-homes to call area 5
|
||||
"HD5MW/8": "HD8MW", // "/8" → Galápagos call area (HD8)
|
||||
"7X2ARA/4": "7X4ARA", // "/4" changes the AREA digit (2→4), NOT the 7 of the 7X prefix (was wrongly 4X2ARA = Israel)
|
||||
"3A2ABC/6": "3A6ABC", // digit-first prefix 3A: area digit is the 2, not the 3
|
||||
"4X1AB/2": "4X2AB", // 4X (Israel) area 1→2, keep the leading 4
|
||||
"DL/F4BPO": "DL",
|
||||
"MM/KA9P": "MM", // leading MM = Scotland operating prefix
|
||||
"MM/LY3X/P": "MM",
|
||||
"F4BPO/W6": "W6",
|
||||
"VK9/F4BPO": "VK9",
|
||||
"4U1UN/B": "4U1UN", // trailing /B = beacon → strip, keep the base call
|
||||
"B/F4BPO": "B", // leading B = China operating prefix, NOT a beacon
|
||||
"F4BPO": "F4BPO",
|
||||
"f4bpo": "F4BPO",
|
||||
" F4BPO ": "F4BPO",
|
||||
"F4BPO/P": "F4BPO",
|
||||
"F4BPO/MM": "F4BPO", // maritime mobile → strip, keep home entity for the log
|
||||
"F4BPO/AM": "F4BPO", // aeronautical mobile → strip, keep home entity for the log
|
||||
"F4BPO/M": "F4BPO", // plain mobile keeps the home entity
|
||||
"F4BPO/5": "F5BPO", // "/5" re-homes to call area 5
|
||||
"HD5MW/8": "HD8MW", // "/8" → Galápagos call area (HD8)
|
||||
"7X2ARA/4": "7X4ARA", // "/4" changes the AREA digit (2→4), NOT the 7 of the 7X prefix (was wrongly 4X2ARA = Israel)
|
||||
"3A2ABC/6": "3A6ABC", // digit-first prefix 3A: area digit is the 2, not the 3
|
||||
"4X1AB/2": "4X2AB", // 4X (Israel) area 1→2, keep the leading 4
|
||||
"DL/F4BPO": "DL",
|
||||
"MM/KA9P": "MM", // leading MM = Scotland operating prefix
|
||||
"MM/LY3X/P": "MM",
|
||||
"F4BPO/W6": "W6",
|
||||
"VK9/F4BPO": "VK9",
|
||||
"4U1UN/B": "4U1UN", // trailing /B = beacon → strip, keep the base call
|
||||
"B/F4BPO": "B", // leading B = China operating prefix, NOT a beacon
|
||||
}
|
||||
for in, want := range cases {
|
||||
if got := normalizeCallsign(in); got != want {
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
package dxcc
|
||||
|
||||
import "testing"
|
||||
|
||||
// /MM and /AM belong to NO DXCC entity: the station is at sea or in the air.
|
||||
//
|
||||
// This is not a technicality. RI1FJL/MM resolved to Franz Josef Land while the
|
||||
// expedition was still sailing there, which told the operator they had worked
|
||||
// an entity they had not.
|
||||
func TestMobileNoEntity(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
call string
|
||||
want bool
|
||||
}{
|
||||
{"RI1FJL/MM", true},
|
||||
{"YB1SCY/AM", true},
|
||||
{"ri1fjl/mm", true},
|
||||
{" RI1FJL/MM ", true},
|
||||
// A LEADING MM is Scotland and AM is Spain. Treating those as
|
||||
// entity-less would be a far larger error than the one this fixes.
|
||||
{"MM0ABC", false},
|
||||
{"AM5X", false},
|
||||
{"MM/F4BPO", false},
|
||||
{"AM/DL1ABC", false},
|
||||
// Other suffixes keep their entity — a portable station is still ashore.
|
||||
{"F4BPO/P", false},
|
||||
{"F4BPO/M", false},
|
||||
{"4U1UN/B", false},
|
||||
{"F4BPO", false},
|
||||
// Only the LAST element counts: RI1FJL/MM/P is still maritime, and a
|
||||
// call whose /MM is not final is not.
|
||||
{"RI1FJL/MM/P", false},
|
||||
{"", false},
|
||||
} {
|
||||
if got := IsMobileNoEntity(tc.call); got != tc.want {
|
||||
t.Errorf("IsMobileNoEntity(%q) = %v, want %v", tc.call, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
+27
-1
@@ -4,6 +4,7 @@ package email
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/wneessen/go-mail"
|
||||
@@ -85,7 +86,32 @@ func SendFiles(cfg Config, to, subject, body string, attachPaths []string) error
|
||||
return fmt.Errorf("smtp client: %w", err)
|
||||
}
|
||||
if err := client.DialAndSend(m); err != nil {
|
||||
return fmt.Errorf("send: %w", err)
|
||||
return fmt.Errorf("send via %s:%d (%s, %s): %w",
|
||||
cfg.Host, cfg.Port, cfg.Encryption, describeSize(attachPaths), err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// describeSize reports what was attached, in bytes.
|
||||
//
|
||||
// "An existing connection was forcibly closed" during DATA is the same message
|
||||
// whether the server refused the size, hit a quota, or simply dropped the
|
||||
// socket — and the first of those is the only one the operator can act on
|
||||
// directly. Naming the size rules it in or out without a second attempt.
|
||||
func describeSize(paths []string) string {
|
||||
var total int64
|
||||
n := 0
|
||||
for _, p := range paths {
|
||||
if p == "" {
|
||||
continue
|
||||
}
|
||||
if fi, err := os.Stat(p); err == nil {
|
||||
total += fi.Size()
|
||||
n++
|
||||
}
|
||||
}
|
||||
if n == 0 {
|
||||
return "no attachment"
|
||||
}
|
||||
return fmt.Sprintf("%d attachment(s), %d KB", n, (total+1023)/1024)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
package email
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// "An existing connection was forcibly closed" during DATA reads the same
|
||||
// whether the server refused the SIZE, hit a quota, or just dropped the socket
|
||||
// — and only the first is something the operator can act on. Naming the size in
|
||||
// the error rules it in or out without a second attempt.
|
||||
func TestDescribeSize(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
a := filepath.Join(dir, "card.jpg")
|
||||
if err := os.WriteFile(a, make([]byte, 2048), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if got := describeSize(nil); got != "no attachment" {
|
||||
t.Errorf("no attachment = %q", got)
|
||||
}
|
||||
if got := describeSize([]string{""}); got != "no attachment" {
|
||||
t.Errorf("blank path = %q, want it ignored", got)
|
||||
}
|
||||
if got := describeSize([]string{a}); got != "1 attachment(s), 2 KB" {
|
||||
t.Errorf("one file = %q", got)
|
||||
}
|
||||
// A path that does not exist must not be counted — the mail library skips it,
|
||||
// so reporting it would describe a message that was never sent.
|
||||
if got := describeSize([]string{a, filepath.Join(dir, "gone.jpg")}); got != "1 attachment(s), 2 KB" {
|
||||
t.Errorf("missing file counted: %q", got)
|
||||
}
|
||||
}
|
||||
+19
-17
@@ -65,23 +65,25 @@ const (
|
||||
// AutoUpload + UploadMode are common to all (timing is per-service, so the
|
||||
// user can run e.g. Club Log immediate and QRZ delayed).
|
||||
type ServiceConfig struct {
|
||||
APIKey string `json:"api_key"`
|
||||
URL string `json:"url"` // Cloudlog/Wavelog: base URL of the user's own instance
|
||||
StationID string `json:"station_id"` // Cloudlog/Wavelog: station profile (location) id
|
||||
Email string `json:"email"` // Club Log account email
|
||||
Username string `json:"username"` // LoTW website login (for confirmation download)
|
||||
Password string `json:"password"` // Club Log account / LoTW website password
|
||||
Callsign string `json:"callsign"` // Club Log / HRDLog logbook (owner) callsign
|
||||
Code string `json:"code"` // HRDLog: account upload code
|
||||
QTHNickname string `json:"qth_nickname"` // eQSL: QTH nickname (when the account has several)
|
||||
ForceStationCallsign string `json:"force_station_callsign"` // QRZ + LoTW: override STATION_CALLSIGN
|
||||
TQSLPath string `json:"tqsl_path"` // LoTW: path to tqsl.exe
|
||||
StationLocation string `json:"station_location"` // LoTW: TQSL Station Location name
|
||||
KeyPassword string `json:"key_password"` // LoTW: certificate private-key password (optional)
|
||||
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
|
||||
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
|
||||
AutoUpload bool `json:"auto_upload"`
|
||||
UploadMode UploadMode `json:"upload_mode"`
|
||||
APIKey string `json:"api_key"`
|
||||
URL string `json:"url"` // Cloudlog/Wavelog: base URL of the user's own instance
|
||||
StationID string `json:"station_id"` // Cloudlog/Wavelog: station profile (location) id
|
||||
Email string `json:"email"` // Club Log account email
|
||||
Username string `json:"username"` // LoTW website login (for confirmation download)
|
||||
Password string `json:"password"` // Club Log account / LoTW website password
|
||||
Callsign string `json:"callsign"` // Club Log / HRDLog logbook (owner) callsign
|
||||
Code string `json:"code"` // HRDLog: account upload code
|
||||
QTHNickname string `json:"qth_nickname"` // eQSL: QTH nickname (when the account has several)
|
||||
ForceStationCallsign string `json:"force_station_callsign"` // QRZ + LoTW: override STATION_CALLSIGN
|
||||
TQSLPath string `json:"tqsl_path"` // LoTW: path to tqsl.exe
|
||||
StationLocation string `json:"station_location"` // LoTW: TQSL Station Location name
|
||||
KeyPassword string `json:"key_password"` // LoTW: certificate private-key password (optional)
|
||||
UploadFlags []string `json:"upload_flags"` // LoTW: set of lotw_sent values that mean "ready to upload" — any of "N"/"R"
|
||||
WriteLog bool `json:"write_log"` // LoTW: pass -t to write a TQSL diagnostic log
|
||||
AutoUpload bool `json:"auto_upload"`
|
||||
// OnAir: HRDLog only — publish the live frequency, mode and rig on the site.
|
||||
OnAir bool `json:"on_air"`
|
||||
UploadMode UploadMode `json:"upload_mode"`
|
||||
}
|
||||
|
||||
// normalised returns the config with whitespace trimmed and a valid upload
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
@@ -143,3 +144,59 @@ func TestHRDLog(ctx context.Context, client *http.Client, cfg ServiceConfig) (st
|
||||
}
|
||||
return fmt.Sprintf("Credentials accepted — %s", callsign), nil
|
||||
}
|
||||
|
||||
// hrdlogOnAirURL is HRDLog's live-status endpoint — what puts "F4BPO is on air
|
||||
// 14,074,000 FM IC-7300" on the site's front page.
|
||||
//
|
||||
// Endpoint and field names taken from HRDLog's own library (github.com/iw1qlh/
|
||||
// HRDLOG-net-library, HrdProtocol.SendOnAirAsync), not from guesswork: it posts
|
||||
// Frequency in Hz, Mode, Radio, Callsign, Code and App.
|
||||
//
|
||||
// HTTPS where that library uses plain HTTP. The upload code is a credential and
|
||||
// has no business crossing the network in clear; the sibling NewEntry endpoint
|
||||
// on the same host already serves TLS.
|
||||
const hrdlogOnAirURL = "https://robot.hrdlog.net/OnAir.aspx"
|
||||
|
||||
// SendHRDLogOnAir publishes the current frequency, mode and rig.
|
||||
//
|
||||
// Deliberately fire-and-forget in spirit: it is a status broadcast, so a
|
||||
// failure is logged and never surfaced as an error the operator must clear —
|
||||
// but the message is returned so the caller can log WHAT the site said rather
|
||||
// than only that something went wrong.
|
||||
func SendHRDLogOnAir(ctx context.Context, client *http.Client, callsign, code string, freqHz int64, mode, radio string) (string, error) {
|
||||
callsign = strings.ToUpper(strings.TrimSpace(callsign))
|
||||
code = strings.TrimSpace(code)
|
||||
if callsign == "" || code == "" {
|
||||
return "", fmt.Errorf("hrdlog: callsign and upload code required")
|
||||
}
|
||||
if freqHz <= 0 {
|
||||
return "", fmt.Errorf("hrdlog: no frequency to announce")
|
||||
}
|
||||
form := url.Values{}
|
||||
form.Set("Callsign", callsign)
|
||||
form.Set("Code", code)
|
||||
form.Set("App", hrdlogApp)
|
||||
form.Set("Frequency", strconv.FormatInt(freqHz, 10))
|
||||
form.Set("Mode", strings.TrimSpace(mode))
|
||||
form.Set("Radio", strings.TrimSpace(radio))
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, hrdlogOnAirURL, strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("hrdlog on-air: build request: %w", err)
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
if client == nil {
|
||||
client = &http.Client{Timeout: 15 * time.Second}
|
||||
}
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("hrdlog on-air: %w", err)
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
body, _ := io.ReadAll(io.LimitReader(resp.Body, 32*1024))
|
||||
msg := strings.TrimSpace(string(body))
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return msg, fmt.Errorf("hrdlog on-air: http %d", resp.StatusCode)
|
||||
}
|
||||
return msg, nil
|
||||
}
|
||||
|
||||
+18
-18
@@ -21,29 +21,29 @@ var ErrNotFound = errors.New("callsign not found")
|
||||
|
||||
// Result is the normalized lookup output regardless of provider.
|
||||
type Result struct {
|
||||
Callsign string `json:"callsign"`
|
||||
Name string `json:"name,omitempty"`
|
||||
QTH string `json:"qth,omitempty"`
|
||||
Address string `json:"address,omitempty"`
|
||||
State string `json:"state,omitempty"`
|
||||
County string `json:"cnty,omitempty"`
|
||||
Country string `json:"country,omitempty"`
|
||||
Grid string `json:"grid,omitempty"`
|
||||
Lat float64 `json:"lat,omitempty"`
|
||||
Lon float64 `json:"lon,omitempty"`
|
||||
DXCC int `json:"dxcc,omitempty"`
|
||||
CQZ int `json:"cqz,omitempty"`
|
||||
ITUZ int `json:"ituz,omitempty"`
|
||||
Continent string `json:"cont,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
QSLVia string `json:"qsl_via,omitempty"`
|
||||
Callsign string `json:"callsign"`
|
||||
Name string `json:"name,omitempty"`
|
||||
QTH string `json:"qth,omitempty"`
|
||||
Address string `json:"address,omitempty"`
|
||||
State string `json:"state,omitempty"`
|
||||
County string `json:"cnty,omitempty"`
|
||||
Country string `json:"country,omitempty"`
|
||||
Grid string `json:"grid,omitempty"`
|
||||
Lat float64 `json:"lat,omitempty"`
|
||||
Lon float64 `json:"lon,omitempty"`
|
||||
DXCC int `json:"dxcc,omitempty"`
|
||||
CQZ int `json:"cqz,omitempty"`
|
||||
ITUZ int `json:"ituz,omitempty"`
|
||||
Continent string `json:"cont,omitempty"`
|
||||
Email string `json:"email,omitempty"`
|
||||
QSLVia string `json:"qsl_via,omitempty"`
|
||||
// Web is the operator's own site. The QSO table has had a `web` column all
|
||||
// along and nothing ever filled it, because no provider mapping read the
|
||||
// field.
|
||||
Web string `json:"web,omitempty"`
|
||||
// Zip is the postal code. HamQTH and QRZ both send one.
|
||||
Zip string `json:"zip,omitempty"`
|
||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
||||
Zip string `json:"zip,omitempty"`
|
||||
ImageURL string `json:"image_url,omitempty"` // profile picture URL
|
||||
Source string `json:"source"` // "qrz", "hamqth", or "cache"
|
||||
FetchedAt time.Time `json:"fetched_at"`
|
||||
}
|
||||
|
||||
@@ -4,14 +4,14 @@ import "testing"
|
||||
|
||||
func TestTitleCase(t *testing.T) {
|
||||
cases := map[string]string{
|
||||
"NOEL CHENAVARD": "Noel Chenavard",
|
||||
"VETRAZ-MONTHOUX": "Vetraz-Monthoux",
|
||||
"o'brien": "O'Brien",
|
||||
"NOEL CHENAVARD": "Noel Chenavard",
|
||||
"VETRAZ-MONTHOUX": "Vetraz-Monthoux",
|
||||
"o'brien": "O'Brien",
|
||||
"866 ROUTE DES VOIRONS": "866 Route Des Voirons",
|
||||
"PARIS": "Paris",
|
||||
"": "",
|
||||
" saint-étienne ": "Saint-Étienne",
|
||||
"JOHN": "John",
|
||||
"PARIS": "Paris",
|
||||
"": "",
|
||||
" saint-étienne ": "Saint-Étienne",
|
||||
"JOHN": "John",
|
||||
}
|
||||
for in, want := range cases {
|
||||
if got := titleCase(in); got != want {
|
||||
|
||||
+35
-16
@@ -21,8 +21,14 @@ type QRZ struct {
|
||||
|
||||
HTTP *http.Client
|
||||
|
||||
mu sync.Mutex
|
||||
session string
|
||||
// PreferNickname takes QRZ's <nickname> over the composed first+last name
|
||||
// when the operator has published one. It is the name they go BY on the air,
|
||||
// which is what belongs in a log — HamQTH's <nick> is already used that way,
|
||||
// and this brings QRZ into line for operators who want it.
|
||||
PreferNickname bool
|
||||
|
||||
mu sync.Mutex
|
||||
session string
|
||||
loggedAt time.Time
|
||||
}
|
||||
|
||||
@@ -117,7 +123,7 @@ func (q *QRZ) fetch(ctx context.Context, sessionKey, callsign string) (Result, e
|
||||
}
|
||||
r := Result{
|
||||
Callsign: strings.ToUpper(c.Call),
|
||||
Name: joinName(c.FName, c.Name),
|
||||
Name: qrzName(q.PreferNickname, c.Nickname, c.FName, c.Name),
|
||||
QTH: c.Addr2,
|
||||
Address: composeQRZAddress(c.Addr1, c.Addr2, c.Zip, c.Country),
|
||||
State: strings.ToUpper(c.State),
|
||||
@@ -169,6 +175,7 @@ type qrzSession struct {
|
||||
type qrzCallsign struct {
|
||||
Call string `xml:"call"`
|
||||
FName string `xml:"fname"`
|
||||
Nickname string `xml:"nickname"` // the name the operator goes by on the air
|
||||
Name string `xml:"name"`
|
||||
Addr1 string `xml:"addr1"`
|
||||
Addr2 string `xml:"addr2"`
|
||||
@@ -213,19 +220,6 @@ func composeQRZAddress(addr1, addr2, zip, country string) string {
|
||||
return strings.Join(parts, ", ")
|
||||
}
|
||||
|
||||
func joinName(first, last string) string {
|
||||
first = strings.TrimSpace(first)
|
||||
last = strings.TrimSpace(last)
|
||||
switch {
|
||||
case first != "" && last != "":
|
||||
return first + " " + last
|
||||
case first != "":
|
||||
return first
|
||||
default:
|
||||
return last
|
||||
}
|
||||
}
|
||||
|
||||
func firstNonEmpty(s ...string) string {
|
||||
for _, v := range s {
|
||||
v = strings.TrimSpace(v)
|
||||
@@ -235,3 +229,28 @@ func firstNonEmpty(s ...string) string {
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// qrzName picks what goes in the log's Name field.
|
||||
//
|
||||
// The FIRST name only. A log greets an operator, it does not address an
|
||||
// envelope: "Robert" is what goes out on the air, and "Robert Smith" filled the
|
||||
// field with something no one would ever send. The surname stays available in
|
||||
// the record; it simply is not the name of the contact.
|
||||
//
|
||||
// The nickname is taken ahead of it when the operator asked for that AND QRZ
|
||||
// has one — a blank nickname must never blank the name, which is the whole
|
||||
// reason this is a fallback rather than a swap.
|
||||
//
|
||||
// The surname is the last resort: a record with no first name at all is better
|
||||
// answered with a surname than with nothing.
|
||||
func qrzName(preferNickname bool, nickname, fname, name string) string {
|
||||
if preferNickname {
|
||||
if n := strings.TrimSpace(nickname); n != "" {
|
||||
return n
|
||||
}
|
||||
}
|
||||
if f := strings.TrimSpace(fname); f != "" {
|
||||
return f
|
||||
}
|
||||
return strings.TrimSpace(name)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package lookup
|
||||
|
||||
import "testing"
|
||||
|
||||
// What goes in a log's Name field is the FIRST name. A log greets an operator;
|
||||
// it does not address an envelope. "Robert Smith" filled the field with
|
||||
// something no one would ever send on the air.
|
||||
//
|
||||
// The nickname wins ahead of it when asked for — but a published nickname is
|
||||
// optional, so an empty one must fall through rather than blank the name. That
|
||||
// is the whole difference between a fallback and a swap.
|
||||
func TestQRZName(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
prefer bool
|
||||
nickname, fname, last string
|
||||
want string
|
||||
}{
|
||||
{"first name only, never the surname", false, "Bob", "Robert", "Smith", "Robert"},
|
||||
{"nickname when asked for", true, "Bob", "Robert", "Smith", "Bob"},
|
||||
{"no nickname published falls back to the FIRST name", true, "", "Robert", "Smith", "Robert"},
|
||||
{"a blank nickname is not a nickname", true, " ", "Robert", "Smith", "Robert"},
|
||||
{"option off ignores the nickname", false, "Bob", "Robert", "Smith", "Robert"},
|
||||
{"surname is the last resort, not the default", true, "", "", "Smith", "Smith"},
|
||||
{"nothing published at all", false, "", "", "", ""},
|
||||
{"nickname alone", true, "Bob", "", "", "Bob"},
|
||||
} {
|
||||
if got := qrzName(tc.prefer, tc.nickname, tc.fname, tc.last); got != tc.want {
|
||||
t.Errorf("%s: qrzName(%v, %q, %q, %q) = %q, want %q",
|
||||
tc.name, tc.prefer, tc.nickname, tc.fname, tc.last, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
const (
|
||||
// appVersion is stamped on every heartbeat (and could feed the About box).
|
||||
appVersion = "0.24.9"
|
||||
appVersion = "0.25.0"
|
||||
|
||||
// posthogHost is the PostHog ingestion endpoint. EU cloud by default; change
|
||||
// to https://us.i.posthog.com for a US project.
|
||||
|
||||
Reference in New Issue
Block a user