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

Refactored ADIF locale and added it to both udp and wavelog

pull/915/head
LA3QMA 2025-03-17 14:58:37 +01:00
parent 9373c10823
commit 73c00be95c
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,14 +154,14 @@ export function eventDispatcher(data) {
return; return;
case "message-logging": case "message-logging":
if (data.endpoint === "wavelog") { if (data.endpoint === "wavelog" || data.endpoint === "udp") {
if (data.status === true) { if (data.status === true) {
const message = ` const message = `
<div> <div>
<strong>${i18next.t('popups.wavelogposted')}:</strong> <strong>${i18next.t('popups.adiflog_header')}:</strong>
<span class="badge bg-success">${i18next.t('popups.wavelogqsowith')}${data.message}${i18next.t('popups.wavelogqsoadded')}</span> <span class="badge bg-success">${i18next.t('popups.adiflog_text1')}${data.message}${i18next.t('popups.adiflog_text2')}</span>
<div class="mt-2"> <div class="mt-2">
<span class="badge bg-secondary">${i18next.t('popups.wavelogposted')}</span> <span class="badge bg-secondary">${data.endpoint} ${i18next.t('popups.adiflog_header')}</span>
</div> </div>
</div> </div>
`; `;
@ -169,10 +169,10 @@ export function eventDispatcher(data) {
} else { } else {
const message = ` const message = `
<div> <div>
<strong>${i18next.t('popups.wavelogerror')}:</strong> <strong>${i18next.t('popups.adiflog_header')}:</strong>
<span class="badge bg-danger">${data.message}</span> <span class="badge bg-danger">${data.message}</span>
<div class="mt-2"> <div class="mt-2">
<span class="badge bg-secondary">${i18next.t('popups.wavelogerror')}</span> <span class="badge bg-secondary">${data.endpoint} ${i18next.t('popups.adiflog_error')}</span>
</div> </div>
</div> </div>
`; `;

8
freedata_gui/src/locales/en_English.json
View File

@ -34,10 +34,10 @@
"transmissionfailedwith": "Transmission FAILED with", "transmissionfailedwith": "Transmission FAILED with",
"confirmingtransmissionwith": "Confirming transmission with", "confirmingtransmissionwith": "Confirming transmission with",
"receivedbytes": "Received Bytes", "receivedbytes": "Received Bytes",
"wavelogposted": "Wavelog API", "adiflog_header": "ADIF",
"wavelogqsowith": "QSO with", "adiflog_text1": "QSO with",
"wavelogqsoadded": "added to the log.", "adiflog_text2": "added to the log.",
"wavelogerror": "Wavelog failed" "adiflog_error": "ADIF export error"
}, },
"navbar": { "navbar": {
"frequency_help": "What's the frequency, Kenneth?", "frequency_help": "What's the frequency, Kenneth?",

8
freedata_gui/src/locales/no_Norsk.json
View File

@ -34,10 +34,10 @@
"transmissionfailedwith": "Overføring MISLYKKET med", "transmissionfailedwith": "Overføring MISLYKKET med",
"confirmingtransmissionwith": "Bekrefter overføring med", "confirmingtransmissionwith": "Bekrefter overføring med",
"receivedbytes": "Mottatte bytes", "receivedbytes": "Mottatte bytes",
"wavelogposted": "Wavelog API", "adiflog_header": "ADIF",
"wavelogqsowith": "QSO med", "adiflog_text1": "QSO med",
"wavelogqsoadded": "lagt til i loggen.", "adiflog_text2": "lagt til i loggen.",
"wavelogerror": "Wavelog feilet" "adiflog_error": "ADIF export feilet"
}, },
"navbar": { "navbar": {
"frequency_help": "Hva er frekvensen, Kenneth?", "frequency_help": "Hva er frekvensen, Kenneth?",

13
freedata_server/adif_udp_logger.py
View File

@ -25,16 +25,23 @@ def send_adif_qso_data(config, event_manager, adif_data):
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Set a timeout of 3 seconds to avoid blocking indefinitely # Set a timeout of 3 seconds to avoid blocking indefinitely
sock.settimeout(3) sock.settimeout(3)
callsign_start = adif_data.find(f">") + 1
callsign_end = adif_data.find(f"<QSO_DATE", callsign_start)
call_value = adif_data[callsign_start:callsign_end]
try: try:
sock.sendto(adif_data.encode('utf-8'), (adif_log_host, adif_log_port)) sock.sendto(adif_data.encode('utf-8'), (adif_log_host, adif_log_port))
log.info(f"[CHAT] ADIF QSO data sent to: {adif_log_host}:{adif_log_port}") log.info(f"[CHAT] ADIF QSO data sent to: {adif_log_host}:{adif_log_port}")
event_manager.freedata_logging(type="udp", status=True) event_manager.freedata_logging(type="udp", status=True, message=f" {call_value} ")
except socket.timeout: except socket.timeout:
log.info(f"[CHAT] Timeout occurred sending ADIF data to {adif_log_host}:{adif_log_port}") log.info(f"[CHAT] Timeout occurred sending ADIF data to {adif_log_host}:{adif_log_port}")
event_manager.freedata_logging(type="udp", status=False) event_manager.freedata_logging(type="udp", status=True, message=f" {call_value} ")
except Exception as e: except Exception as e:
log.info(f"[CHAT] Error sending ADIF data: {e}") log.info(f"[CHAT] Error sending ADIF data: {e}")
event_manager.freedata_logging(type="udp", status=False) event_manager.freedata_logging(type="udp", status=True, message=f" {call_value} ")
finally: finally:
sock.close() sock.close()

1
freedata_server/wavelog_api_logger.py
View File

@ -52,7 +52,6 @@ def send_wavelog_qso_data(config, event_manager, wavelog_data):
callsign_end = wavelog_data.find(f"<QSO_DATE", callsign_start) callsign_end = wavelog_data.find(f"<QSO_DATE", callsign_start)
call_value = wavelog_data[callsign_start:callsign_end] 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")
event_manager.freedata_logging(type="wavelog", status=True, message=f" {call_value} ") event_manager.freedata_logging(type="wavelog", status=True, message=f" {call_value} ")
except Exception as e: except Exception as e: