diff --git a/lib/microwaveprop/radio/adif_import.ex b/lib/microwaveprop/radio/adif_import.ex index fb5b0cc9..936a566a 100644 --- a/lib/microwaveprop/radio/adif_import.ex +++ b/lib/microwaveprop/radio/adif_import.ex @@ -69,12 +69,20 @@ defmodule Microwaveprop.Radio.AdifImport do # -- ADIF parser ----------------------------------------------------------- + # Header-only ADIF tags that never appear inside QSO records + @header_only_tags ~w(ADIF_VER PROGRAMID PROGRAMVERSION CREATED_TIMESTAMP) + defp parse_adif(string) do # Strip header if present (everything before ) body = case Regex.run(~r//i, string, return: :index) do - [{pos, len}] -> String.slice(string, (pos + len)..-1//1) - nil -> string + [{pos, len}] -> + String.slice(string, (pos + len)..-1//1) + + nil -> + # No — strip header-only tags (ADIF_VER, PROGRAMID, etc.) + # and any preceding plain text so they don't leak into the first record. + strip_header_tags(string) end # Split on to get individual records @@ -89,7 +97,8 @@ defmodule Microwaveprop.Radio.AdifImport do |> Regex.scan(record_string, return: :index) |> Enum.reduce(%{}, fn indices, acc -> [{tag_start, _tag_len}, {name_start, name_len}, {size_start, size_len} | _] = indices - name = record_string |> String.slice(name_start, name_len) |> String.upcase() + raw_name = record_string |> String.slice(name_start, name_len) |> String.upcase() + name = strip_app_prefix(raw_name) size = record_string |> String.slice(size_start, size_len) |> String.to_integer() # Value starts right after the closing > @@ -98,17 +107,43 @@ defmodule Microwaveprop.Radio.AdifImport do value_offset = tag_start + (tag_text |> String.split(">", parts: 2) |> List.first() |> byte_size()) + 1 value = String.slice(record_string, value_offset, size) - Map.put(acc, name, value) + # Standard ADIF fields take precedence over app-defined ones + if raw_name != name and Map.has_key?(acc, name) do + acc + else + Map.put(acc, name, value) + end end) end + # Strip APP_PROGRAMNAME_ prefix so app-defined fields resolve to standard names. + # e.g. APP_N1MM_MYGRID → MYGRID, APP_LOGGER32_CALL → CALL + defp strip_app_prefix("APP_" <> rest) do + case String.split(rest, "_", parts: 2) do + [_program, field] -> field + _ -> "APP_" <> rest + end + end + + defp strip_app_prefix(name), do: name + + # Strip known header-only tags and any plain text before the first record tag. + defp strip_header_tags(string) do + Enum.reduce(@header_only_tags, string, fn tag, acc -> + Regex.replace(~r/<#{tag}:\d+(?::[^>]*)?>.*?(?=<)/is, acc, "") + end) + end + + defp normalize_grid(nil), do: nil + defp normalize_grid(g), do: g |> String.trim() |> String.upcase() + # -- row building ---------------------------------------------------------- defp build_row({fields, row_num}, submitter_email) do station1 = fields["STATION_CALLSIGN"] || fields["OPERATOR"] station2 = fields["CALL"] - grid1 = fields["MY_GRIDSQUARE"] - grid2 = fields["GRIDSQUARE"] + grid1 = normalize_grid(fields["MY_GRIDSQUARE"]) + grid2 = normalize_grid(fields["GRIDSQUARE"]) mode = fields["MODE"] band = resolve_band(fields) timestamp = parse_adif_datetime(fields["QSO_DATE"], fields["TIME_ON"]) diff --git a/lib/microwaveprop_web/live/about_live.ex b/lib/microwaveprop_web/live/about_live.ex index aeb738b6..0fa49d0e 100644 --- a/lib/microwaveprop_web/live/about_live.ex +++ b/lib/microwaveprop_web/live/about_live.ex @@ -39,7 +39,7 @@ defmodule MicrowavepropWeb.AboutLive do band, based on real atmospheric conditions and what we've learned from the contacts you and everyone else have already made.

-
+ @@ -170,7 +200,7 @@ defmodule MicrowavepropWeb.AboutLive do
-
+