From 5bc38fac97a89a24516f479bb6fb7cc98ead0553 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Thu, 13 Jun 2024 21:57:59 -0400 Subject: [PATCH] Minor fixes. --- htdocs/css/openwebrx.css | 3 ++- owrx/toolbox.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index bfc36360..0c20a372 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -1611,7 +1611,8 @@ img.openwebrx-mirror-img #openwebrx-panel-digimodes[data-mode="fax"] #openwebrx-digimode-select-channel, #openwebrx-panel-digimodes[data-mode="ism"] #openwebrx-digimode-select-channel, #openwebrx-panel-digimodes[data-mode="selcall"] #openwebrx-digimode-select-channel, -#openwebrx-panel-digimodes[data-mode="zvei"] #openwebrx-digimode-select-channel +#openwebrx-panel-digimodes[data-mode="zvei"] #openwebrx-digimode-select-channel, +#openwebrx-panel-digimodes[data-mode="eas"] #openwebrx-digimode-select-channel { display: none; } diff --git a/owrx/toolbox.py b/owrx/toolbox.py index 1cb93c4d..350d7a6a 100644 --- a/owrx/toolbox.py +++ b/owrx/toolbox.py @@ -396,15 +396,21 @@ class EasParser(TextParser): out += [s, d["msg"], ""] spot = { "mode": "EAS", - "freq": self.frequency, "timestamp": round(time.timestamp() * 1000), "message": d["msg"], "raw": s, **d } + # Remove stuff we do not need + del spot["msg"] + # Convert start and end times to UTC spot["start_time"] = spot["start_time"].astimezone(timezone.utc).isoformat() spot["end_time"] = spot["end_time"].astimezone(timezone.utc).isoformat() - del spot["msg"] + # Add frequency, if known + if self.frequency: + spot["freq"] = self.frequency + # Report received message ReportingEngine.getSharedInstance().spot(spot) + # Return received message as text return "\n".join(out)