FreeDV
/
FreeDATA
mirror of https://github.com/DJ2LS/FreeDATA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better formating for the gui regarding wavelog

pull/915/head
LA3QMA 2025-03-17 08:37:41 +01:00
parent 0e8e71b45e
commit b97c972bc2
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
freedata_gui/src/js/eventHandler.js
View File

@ -159,7 +159,7 @@ export function eventDispatcher(data) {
const message = `
<div>
<strong>${i18next.t('Wavelog posted')}:</strong>
<span class="badge bg-success">${data.endpoint}</span>
<span class="badge bg-success">${data.message}</span>
<div class="mt-2">
<span class="badge bg-secondary">${i18next.t('Wavelog posted')}</span>
</div>
@ -169,7 +169,7 @@ export function eventDispatcher(data) {
} else {
const message = `
<div>
<strong>${i18next.t('Wavelog post failed')}:</strong>
<strong>${i18next.t('Wavelog error')}:</strong>
<span class="badge bg-danger">${data.message}</span>
<div class="mt-2">
<span class="badge bg-secondary">${i18next.t('Wavelog post failed')}</span>

1
freedata_server/event_manager.py
View File

@ -251,6 +251,7 @@ class EventManager:
Args:
type (str): The type of logging endpoint (e.g., "file", "websocket").
status (any): The status of the logging operation.
message (str): The message to be displayed
"""
self.broadcast({"type": "message-logging", "endpoint": type, "status": status, "message": message})

15
freedata_server/wavelog_api_logger.py
View File

@ -1,6 +1,7 @@
import requests
import threading
import structlog
import re
def send_wavelog_qso_data(config, event_manager, wavelog_data):
@ -43,11 +44,18 @@ def send_wavelog_qso_data(config, event_manager, wavelog_data):
}
def send_api():
print(wavelog_data)
try:
response = requests.post(url, headers=headers, json=data)
response.raise_for_status() # Raise an error for bad status codes
log.info(f"[CHAT] Wavelog API: {wavelog_data}")
event_manager.freedata_logging(type="wavelog", status=True, message=f"QSO added")
callsign_start = wavelog_data.find(f">") + 1
callsign_end = wavelog_data.find(f"<QSO_DATE", callsign_start)
call_value = wavelog_data[callsign_start:callsign_end]
event_manager.freedata_logging(type="wavelog", status=True, message=f"QSO with {call_value} added to log")
except requests.exceptions.RequestException as e:
log.warning(f"[WAVELOG ADIF API EXCEPTION]: {e}")
#FIXME format the output to get the actual error
@ -64,6 +72,11 @@ def send_wavelog_qso_data(config, event_manager, wavelog_data):
error_third_line, _, last_part = second_part.partition(("(Caused by NewConnectionError('"))
error_formated = f"{error_first_line}<br>{error_second_line}<br>{error_third_line}<br>{last_part.rstrip("'))")}"
elif error_text.startswith("400 Client Error:"):
#TODO maybe use https://github.com/wavelog/wavelog/wiki/API#apilogbook_check_callsign
#to check for duplicate in log then format a proper error message.
#if its not in the log return a regular 400 client error
error_formated = f"400 Client Error: duplicate log?"
else:
error_formated = f"{e}"