miaowware/qrm2
1
0
Fork 0
mirror of https://github.com/miaowware/qrm2.git synced 2024-11-19 06:31:54 -05:00
Code Issues Actions Projects Releases Wiki Activity

(NOT FUNCTIONAL) small change to async

Browse Source
This commit is contained in:
Abigail Gold 2019-10-16 17:45:11 -04:00
parent 907065e718
commit 288160eb32
No known key found for this signature in database
GPG Key ID: 80A676456AB6B045
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cogs/qrzcog.py
View File

@ -23,13 +23,13 @@ class QRZCog(commands.Cog):
try: try:
with open('data/qrz_session') as qrz_file: with open('data/qrz_session') as qrz_file:
self.key = qrz_file.readline().strip() self.key = qrz_file.readline().strip()
qrz_test_session(self.key) await qrz_test_session(self.key)
except FileNotFoundError: except FileNotFoundError:
self.key = qrz_login(self.gs.keys.qrz_user, self.gs.keys.qrz_pass) self.key = await qrz_login(self.gs.keys.qrz_user, self.gs.keys.qrz_pass)
with open('data/qrz_session', 'w') as qrz_file: with open('data/qrz_session', 'w') as qrz_file:
qrz_file.write(self.key) qrz_file.write(self.key)
except ConnectionError: except ConnectionError:
self.key = qrz_login(self.gs.keys.qrz_user, self.gs.keys.qrz_pass) self.key = await qrz_login(self.gs.keys.qrz_user, self.gs.keys.qrz_pass)
with open('data/qrz_session', 'w') as qrz_file: with open('data/qrz_session', 'w') as qrz_file:
qrz_file.write(self.key) qrz_file.write(self.key)
@ -55,11 +55,14 @@ class QRZCog(commands.Cog):
resp_xml = await resp.text() resp_xml = await resp.text()
xml_soup = BeautifulSoup(resp_xml, "xml") xml_soup = BeautifulSoup(resp_xml, "xml")
print(xml_soup)
resp_data = {tag.name: tag.contents[0] for tag in xml_soup.select('QRZDatabase Callsign *')} resp_data = {tag.name: tag.contents[0] for tag in xml_soup.select('QRZDatabase Callsign *')}
resp_session = {tag.name: tag.contents[0] for tag in xml_soup.select('QRZDatabase Session *')} resp_session = {tag.name: tag.contents[0] for tag in xml_soup.select('QRZDatabase Session *')}
if 'Error' in resp_session: if 'Error' in resp_session:
if 'Session Timeout' in resp_session['Error']:
self.key = await qrz_login(self.gs.keys.qrz_user, self.gs.keys.qrz_pass)
with open('data/qrz_session', 'w') as qrz_file:
qrz_file.write(self.key)
raise ValueError(resp_session['Error']) raise ValueError(resp_session['Error'])
embed = discord.Embed(title=f"QRZ Data for {resp_data['call']}", embed = discord.Embed(title=f"QRZ Data for {resp_data['call']}",