mckero/Look4Sat-BA7OPF
1
0 Fork 0
mirror of https://github.com/atsunatsu/Look4Sat.git synced 2026-10-07 21:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lotw): order-independent ADIF parsing — roamed/work grids dropped by sequential PROP_MODE gate

Browse Source 
parseConfirmedGrids and parseRoamedGrids gated grid fields on propMode == SAT
at the moment the field line was read. LoTW emits ADIF fields alphabetically
(GRIDSQUARE/MY_GRIDSQUARE before PROP_MODE), so the gate was never satisfied
on real reports: the worked set AND the roamed set silently came back empty.
Both parsers now buffer the record and decide at <EOR>, matching the proven
parseConfirmedGridQsos pattern. Regression tests cover the alphabetical order.
This commit is contained in:
atsunatsu committed 2026-09-11 23:47:08 +08:00
1 parent 1ffb5ed9e8
commit 08a5c8c460
2 files changed
+73 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/data/src/main/java/com/rtbishop/look4sat/core/data/repository/LoTWRepository.kt
+36 -22
View File
@@ -264,9 +264,6 @@ class LoTWRepository : ILoTWRepository {
}
internal fun parseConfirmedGrids(body: String): Set<String>? {
// LoTW answers with ADIF text; on bad credentials it returns a short error page
// containing "password=?" or an <eoh>-less block. Treat anything without a header
// marker as failure so the caller can show a sensible message.
// LoTW answers with ADIF text; on bad credentials it returns a short error
// page without an <eoh> header terminator. Real reports always carry <eoh>
// (LoTW writes it lowercase). Match case-insensitively to be safe.
@@ -277,25 +274,34 @@ class LoTWRepository : ILoTWRepository {
// QSOs omit it. Grid fields (GRIDSQUARE / VUCC_GRIDS) must only be
// collected for records whose PROP_MODE is SAT, otherwise the map mixes
// in terrestrial contacts.
//
// Buffered per-record pattern (same as parseConfirmedGridQsos): field order
// is NOT reliable — ADIF producers (incl. LoTW) emit fields alphabetically,
// so <GRIDSQUARE> (G) arrives BEFORE <PROP_MODE> (P) within a record. A
// sequential gate ("only add while propMode == SAT") silently drops every
// grid on real reports. Buffer the record and decide at <EOR> instead.
var propMode: String? = null
var pendingGrids = mutableListOf<String>()
for (raw in body.lineSequence()) {
val line = raw.trim()
when {
line.equals("<EOR>", ignoreCase = true) -> propMode = null
line.equals("<EOR>", ignoreCase = true) -> {
if (propMode == "SAT") grids.addAll(pendingGrids)
propMode = null
pendingGrids = mutableListOf()
}
line.startsWith("<PROP_MODE:") -> {
propMode = line.substringAfter('>').substringBefore("E<").trim().uppercase()
propMode = adifValue(line).uppercase()
}
line.startsWith("<GRIDSQUARE:") || line.startsWith("<VUCC_GRIDS:") -> {
if (propMode == "SAT") {
// VUCC_GRIDS holds a comma-separated PAIR of grids
// ("EN52en,EN53fa") for contacts spanning two squares —
// split on ',' and take the 4-char field of each, or the
// second grid is silently dropped.
val value = line.substringAfter('>').substringBefore("E<")
value.split(',').forEach { grid ->
val field = grid.trim().uppercase()
if (field.length >= 4) grids.add(field.take(4))
}
// VUCC_GRIDS holds a comma-separated PAIR of grids
// ("EN52en,EN53fa") for contacts spanning two squares —
// split on ',' and take the 4-char field of each, or the
// second grid is silently dropped.
val value = adifValue(line)
value.split(',').forEach { grid ->
val field = grid.trim().uppercase()
if (field.length >= 4) pendingGrids.add(field.take(4))
}
}
}
@@ -314,22 +320,30 @@ class LoTWRepository : ILoTWRepository {
internal fun parseRoamedGrids(body: String): Set<String>? {
if (!body.contains("<eoh>", ignoreCase = true)) return null
val grids = mutableSetOf<String>()
// Buffered per-record pattern (same as parseConfirmedGridQsos): field
// order is NOT reliable — ADIF producers (incl. LoTW) emit fields
// alphabetically, so <MY_GRIDSQUARE> (M) arrives BEFORE <PROP_MODE> (P)
// within a record. A sequential gate ("only add while propMode == SAT")
// would silently drop every own grid on real reports; buffer the record
// and decide at <EOR> instead.
var propMode: String? = null
var myGrid: String? = null
for (raw in body.lineSequence()) {
val line = raw.trim()
when {
line.equals("<EOR>", ignoreCase = true) -> propMode = null
line.equals("<EOR>", ignoreCase = true) -> {
if (propMode == "SAT" && myGrid != null) grids.add(myGrid)
propMode = null
myGrid = null
}
line.startsWith("<PROP_MODE:") -> {
propMode = line.substringAfter('>').substringBefore("E<").trim().uppercase()
propMode = adifValue(line).uppercase()
}
line.startsWith("<MY_GRIDSQUARE:") -> {
// MY_GRIDSQUARE must not be mistaken for GRIDSQUARE (the
// opposite station's grid) — only own-station grids count.
if (propMode == "SAT") {
val value = line.substringAfter('>').substringBefore("E<")
val field = value.trim().uppercase()
if (field.length >= 4) grids.add(field.take(4))
}
val value = adifValue(line)
if (value.length >= 4) myGrid = value.take(4)
}
}
}