miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2024-11-21 23:45:16 -05:00
Code Issues Actions Projects Releases Wiki Activity

exts/callsign: simplify stringification, fix data validation

Browse Source
This commit is contained in:
classabbyamp 2023-01-01 16:30:14 -05:00 committed by classabbyamp
parent 1b0b244f99
commit 1650cd50dc
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
exts/callsign.py
View File

@ -12,6 +12,7 @@ from typing import Dict
import aiohttp
from callsignlookuptools import QrzAsyncClient, CallsignLookupError, CallsignData
from callsignlookuptools.common.dataclasses import Trustee
from discord.ext import commands
@ -73,11 +74,11 @@ class QRZCog(commands.Cog):
embed.title = f"QRZ Data for {data.callsign}"
embed.colour = cmn.colours.good
embed.url = data.url
if data.image is not None:
if data.image is not None and data.image.url is not None:
embed.set_thumbnail(url=data.image.url)
for title, val in qrz_process_info(data).items():
if val:
if val is not None and (val := str(val)):
embed.add_field(name=title, value=val, inline=True)
await ctx.send(embed=embed)
@ -93,30 +94,35 @@ def qrz_process_info(data: CallsignData) -> Dict:
else:
name = nm
else:
name = str(data.name)
name = data.name
else:
name = None
qsl = dict()
if data.qsl is not None:
qsl = {
"eQSL?": data.qsl.eqsl.name.title(),
"Paper QSL?": data.qsl.mail.name.title(),
"LotW?": data.qsl.lotw.name.title(),
"QSL Info": data.qsl.info,
}
return {
"Name": name,
"Country": data.address.country if data.address is not None else None,
"Address": str(data.address),
"Grid Square": str(data.grid),
"Address": data.address,
"Grid Square": data.grid,
"County": data.county,
"CQ Zone": str(data.cq_zone),
"ITU Zone": str(data.itu_zone),
"CQ Zone": data.cq_zone,
"ITU Zone": data.itu_zone,
"IOTA Designator": data.iota,
"Expires": f"{data.expire_date:%Y-%m-%d}" if data.expire_date is not None else None,
"Aliases": ", ".join(data.aliases) if data.aliases else None,
"Previous Callsign": data.prev_call,
"License Class": str(data.lic_class),
"Trustee": str(data.trustee),
"eQSL?": data.qsl.eqsl.name.title() if data.qsl is not None else None,
"Paper QSL?": data.qsl.mail.name.title() if data.qsl is not None else None,
"LotW?": data.qsl.lotw.name.title() if data.qsl is not None else None,
"QSL Info": str(data.qsl.info) if data.qsl is not None else None,
"Born": f"{data.born:%Y-%m-%d}" if data.born is not None else None
}
"License Class": data.lic_class,
"Trustee": data.trustee if data.trustee is not None and data.trustee != Trustee(None, None) else None,
"Born": data.born,
} | qsl
def setup(bot):