miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2025-07-30 20:02:26 -04:00
Code Issues Actions Projects Releases Wiki Activity

add error message, retry on session timeout

Browse Source
This commit is contained in:
Abigail Gold 2019-10-20 14:44:29 -04:00
parent f5ec8f0d8b
commit 02433947b6
No known key found for this signature in database
GPG Key ID: 80A676456AB6B045
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cogs/qrzcog.py
View File

@ -41,17 +41,29 @@ class QRZCog(commands.Cog):
raise ConnectionError(f'Unable to connect to QRZ (HTTP Error {resp.status})') raise ConnectionError(f'Unable to connect to QRZ (HTTP Error {resp.status})')
resp_xml = etree.parse(BytesIO(await resp.read())).getroot() resp_xml = etree.parse(BytesIO(await resp.read())).getroot()
resp_xml_data = resp_xml.xpath('/x:QRZDatabase/x:Callsign',
namespaces={'x':'http://xmldata.qrz.com'})
resp_data = {el.tag.split('}')[1]: el.text for el in resp_xml_data[0].getiterator()}
resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session', resp_xml_session = resp_xml.xpath('/x:QRZDatabase/x:Session',
namespaces={'x':'http://xmldata.qrz.com'}) namespaces={'x': 'http://xmldata.qrz.com'})
resp_session = {el.tag.split('}')[1]: el.text for el in resp_xml_session[0].getiterator()} resp_session = {el.tag.split('}')[1]: el.text for el in resp_xml_session[0].getiterator()}
if 'Error' in resp_session: if 'Error' in resp_session:
if 'Session Timeout' in resp_session['Error']: if 'Session Timeout' in resp_session['Error']:
await self.get_session() await self.get_session()
await self._qrz_lookup(ctx, call)
return
if 'Not found' in resp_session['Error']:
embed = discord.Embed(title=f"QRZ Data for {call.upper()}",
colour=self.gs.colours.bad,
description='No data found!',
timestamp=datetime.utcnow())
embed.set_footer(text=ctx.author.name,
icon_url=str(ctx.author.avatar_url))
await ctx.send(embed=embed)
return
raise ValueError(resp_session['Error']) raise ValueError(resp_session['Error'])
resp_xml_data = resp_xml.xpath('/x:QRZDatabase/x:Callsign',
namespaces={'x':'http://xmldata.qrz.com'})
resp_data = {el.tag.split('}')[1]: el.text for el in resp_xml_data[0].getiterator()}
embed = discord.Embed(title=f"QRZ Data for {resp_data['call']}", embed = discord.Embed(title=f"QRZ Data for {resp_data['call']}",
colour=self.gs.colours.good, colour=self.gs.colours.good,
url=f'http://www.qrz.com/db/{resp_data["call"]}', url=f'http://www.qrz.com/db/{resp_data["call"]}',