odie/qrzlogger
1
0
Fork 0
mirror of https://codeberg.org/mclemens/qrzlogger.git synced 2025-01-08 19:46:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

added frequency plus automatic population of this field in dependency of the band

Browse Source
This commit is contained in:
Michael Clemens 2021-05-22 00:05:23 +02:00
parent 4dad3d2d2f
commit f39867b7d7
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
qrzlogger.py
View File

@ -83,6 +83,22 @@ else:
tablecol = style.RESET tablecol = style.RESET
logocol = style.RESET logocol = style.RESET
bandfreqs = {
'160m' : '1.850',
'80m' : '3.700',
'60m' : '5.355',
'40m' : '7.100',
'30m' : '10.130',
'20m' : '14.200',
'17m' : '18.130',
'15m' : '21.200',
'12m' : '24.950',
'10m' : '28.500',
'6m' : '50.150',
'2m' : '145.500',
'70cm' : '432.300'
}
# Generate a session for QRZ.com's xml service with # Generate a session for QRZ.com's xml service with
# the help of the QRZ.com username and password # the help of the QRZ.com username and password
@ -91,14 +107,18 @@ def get_session():
global session_key global session_key
xml_auth_url = '''https://xmldata.QRZ.com/xml/current/?username={0}&password={1}'''.format( xml_auth_url = '''https://xmldata.QRZ.com/xml/current/?username={0}&password={1}'''.format(
config['qrzlogger']['qrz_user'],config['qrzlogger']['qrz_pass']) config['qrzlogger']['qrz_user'],config['qrzlogger']['qrz_pass'])
session = requests.Session() try:
session.verify = bool(os.getenv('SSL_VERIFY', True)) session = requests.Session()
r = session.get(xml_auth_url) session.verify = bool(os.getenv('SSL_VERIFY', True))
if r.status_code == 200: r = session.get(xml_auth_url)
raw_session = xmltodict.parse(r.content) if r.status_code == 200:
session_key = raw_session.get('QRZDatabase').get('Session').get('Key') raw_session = xmltodict.parse(r.content)
if session_key: session_key = raw_session.get('QRZDatabase').get('Session').get('Key')
return True if session_key:
return True
except:
pass
return False return False
@ -214,6 +234,7 @@ def queryQSOData(qso):
qso_date = dt_now.strftime("%Y%m%d") qso_date = dt_now.strftime("%Y%m%d")
time_on = dt_now.strftime("%H%M") time_on = dt_now.strftime("%H%M")
band = config['qrzlogger']['band'] band = config['qrzlogger']['band']
freq = ""
mode = config['qrzlogger']['mode'] mode = config['qrzlogger']['mode']
rst_rcvd = config['qrzlogger']['rst_rcvd'] rst_rcvd = config['qrzlogger']['rst_rcvd']
rst_sent = config['qrzlogger']['rst_sent'] rst_sent = config['qrzlogger']['rst_sent']
@ -227,6 +248,7 @@ def queryQSOData(qso):
"qso_date" : ["QSO Date",qso_date], "qso_date" : ["QSO Date",qso_date],
"time_on": ["QSO Time", time_on], "time_on": ["QSO Time", time_on],
"band": ["Band", band], "band": ["Band", band],
"freq": ["Frequency", freq],
"mode": ["Mode", mode], "mode": ["Mode", mode],
"rst_rcvd": ["RST Received", rst_rcvd], "rst_rcvd": ["RST Received", rst_rcvd],
"rst_sent": ["RST Sent", rst_sent], "rst_sent": ["RST Sent", rst_sent],
@ -249,7 +271,12 @@ def queryQSOData(qso):
return None return None
if inp != "": if inp != "":
questions[q][1] = inp questions[q][1] = inp
# check if we are asking for the band
if q == "band":
# check if the band is in the bandfreqs dictionary
if questions[q][1] in bandfreqs:
# populate the frequency with a common freq of this band
questions['freq'][1] = bandfreqs[questions[q][1]]
return questions return questions