diff --git a/exts/ae7q.py b/exts/ae7q.py index 490e2b4..bfcbcb6 100644 --- a/exts/ae7q.py +++ b/exts/ae7q.py @@ -36,211 +36,214 @@ class AE7QCog(commands.Cog): @_ae7q_lookup.command(name="call", aliases=["c"], category=cmn.cat.lookup) async def _ae7q_call(self, ctx: commands.Context, callsign: str): '''Look up the history of a callsign on [ae7q.com](http://ae7q.com/).''' - callsign = callsign.upper() - desc = '' - base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" - embed = cmn.embed_factory(ctx) + with ctx.typing(): + callsign = callsign.upper() + desc = '' + base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" + embed = cmn.embed_factory(ctx) - async with self.session.get(base_url + callsign) as resp: - if resp.status != 200: - embed.title = "Error in AE7Q call command" - embed.description = 'Could not load AE7Q' + async with self.session.get(base_url + callsign) as resp: + if resp.status != 200: + embed.title = "Error in AE7Q call command" + embed.description = 'Could not load AE7Q' + embed.colour = cmn.colours.bad + await ctx.send(embed=embed) + return + page = await resp.text() + + soup = BeautifulSoup(page, features="html.parser") + tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + + table = tables[0] + + # find the first table in the page, and use it to make a description + if len(table[0]) == 1: + for row in table: + desc += " ".join(row.getText().split()) + desc += '\n' + desc = desc.replace(callsign, f'`{callsign}`') + table = tables[1] + + table_headers = table[0].find_all("th") + first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None + + # catch if the wrong table was selected + if first_header is None or first_header != 'Entity Name': + embed.title = f"AE7Q History for {callsign}" embed.colour = cmn.colours.bad + embed.url = base_url + callsign + embed.description = desc + embed.description += f'\nNo records found for `{callsign}`' await ctx.send(embed=embed) return - page = await resp.text() - soup = BeautifulSoup(page, features="html.parser") - tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + table = await process_table(table[1:]) - table = tables[0] - - # find the first table in the page, and use it to make a description - if len(table[0]) == 1: - for row in table: - desc += " ".join(row.getText().split()) - desc += '\n' - desc = desc.replace(callsign, f'`{callsign}`') - table = tables[1] - - table_headers = table[0].find_all("th") - first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None - - # catch if the wrong table was selected - if first_header is None or first_header != 'Entity Name': + embed = cmn.embed_factory(ctx) embed.title = f"AE7Q History for {callsign}" - embed.colour = cmn.colours.bad + embed.colour = cmn.colours.good embed.url = base_url + callsign + + # add the first three rows of the table to the embed + for row in table[0:3]: + header = f'**{row[0]}** ({row[1]})' # **Name** (Applicant Type) + body = (f'Class: *{row[2]}*\n' + f'Region: *{row[3]}*\n' + f'Status: *{row[4]}*\n' + f'Granted: *{row[5]}*\n' + f'Effective: *{row[6]}*\n' + f'Cancelled: *{row[7]}*\n' + f'Expires: *{row[8]}*') + embed.add_field(name=header, value=body, inline=False) + + if len(table) > 3: + desc += f'\nRecords 1 to 3 of {len(table)}. See ae7q.com for more...' + embed.description = desc - embed.description += f'\nNo records found for `{callsign}`' + await ctx.send(embed=embed) - return - - table = await process_table(table[1:]) - - embed = cmn.embed_factory(ctx) - embed.title = f"AE7Q History for {callsign}" - embed.colour = cmn.colours.good - embed.url = base_url + callsign - - # add the first three rows of the table to the embed - for row in table[0:3]: - header = f'**{row[0]}** ({row[1]})' # **Name** (Applicant Type) - body = (f'Class: *{row[2]}*\n' - f'Region: *{row[3]}*\n' - f'Status: *{row[4]}*\n' - f'Granted: *{row[5]}*\n' - f'Effective: *{row[6]}*\n' - f'Cancelled: *{row[7]}*\n' - f'Expires: *{row[8]}*') - embed.add_field(name=header, value=body, inline=False) - - if len(table) > 3: - desc += f'\nRecords 1 to 3 of {len(table)}. See ae7q.com for more...' - - embed.description = desc - - await ctx.send(embed=embed) @_ae7q_lookup.command(name="trustee", aliases=["t"], category=cmn.cat.lookup) async def _ae7q_trustee(self, ctx: commands.Context, callsign: str): '''Look up the licenses for which a licensee is trustee on [ae7q.com](http://ae7q.com/).''' - callsign = callsign.upper() - desc = '' - base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" - embed = cmn.embed_factory(ctx) + with ctx.typing(): + callsign = callsign.upper() + desc = '' + base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" + embed = cmn.embed_factory(ctx) - async with self.session.get(base_url + callsign) as resp: - if resp.status != 200: - embed.title = "Error in AE7Q trustee command" - embed.description = 'Could not load AE7Q' + async with self.session.get(base_url + callsign) as resp: + if resp.status != 200: + embed.title = "Error in AE7Q trustee command" + embed.description = 'Could not load AE7Q' + embed.colour = cmn.colours.bad + await ctx.send(embed=embed) + return + page = await resp.text() + + soup = BeautifulSoup(page, features="html.parser") + tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + + try: + table = tables[2] if len(tables[0][0]) == 1 else tables[1] + except IndexError: + embed.title = f"AE7Q Trustee History for {callsign}" embed.colour = cmn.colours.bad + embed.url = base_url + callsign + embed.description = desc + embed.description += f'\nNo records found for `{callsign}`' await ctx.send(embed=embed) return - page = await resp.text() - soup = BeautifulSoup(page, features="html.parser") - tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + table_headers = table[0].find_all("th") + first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None - try: - table = tables[2] if len(tables[0][0]) == 1 else tables[1] - except IndexError: + # catch if the wrong table was selected + if first_header is None or not first_header.startswith("With"): + embed.title = f"AE7Q Trustee History for {callsign}" + embed.colour = cmn.colours.bad + embed.url = base_url + callsign + embed.description = desc + embed.description += f'\nNo records found for `{callsign}`' + await ctx.send(embed=embed) + return + + table = await process_table(table[2:]) + + embed = cmn.embed_factory(ctx) embed.title = f"AE7Q Trustee History for {callsign}" - embed.colour = cmn.colours.bad + embed.colour = cmn.colours.good embed.url = base_url + callsign + + # add the first three rows of the table to the embed + for row in table[0:3]: + header = f'**{row[0]}** ({row[3]})' # **Name** (Applicant Type) + body = (f'Name: *{row[2]}*\n' + f'Region: *{row[1]}*\n' + f'Status: *{row[4]}*\n' + f'Granted: *{row[5]}*\n' + f'Effective: *{row[6]}*\n' + f'Cancelled: *{row[7]}*\n' + f'Expires: *{row[8]}*') + embed.add_field(name=header, value=body, inline=False) + + if len(table) > 3: + desc += f'\nRecords 1 to 3 of {len(table)}. See ae7q.com for more...' + embed.description = desc - embed.description += f'\nNo records found for `{callsign}`' + await ctx.send(embed=embed) - return - - table_headers = table[0].find_all("th") - first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None - - # catch if the wrong table was selected - if first_header is None or not first_header.startswith("With"): - embed.title = f"AE7Q Trustee History for {callsign}" - embed.colour = cmn.colours.bad - embed.url = base_url + callsign - embed.description = desc - embed.description += f'\nNo records found for `{callsign}`' - await ctx.send(embed=embed) - return - - table = await process_table(table[2:]) - - embed = cmn.embed_factory(ctx) - embed.title = f"AE7Q Trustee History for {callsign}" - embed.colour = cmn.colours.good - embed.url = base_url + callsign - - # add the first three rows of the table to the embed - for row in table[0:3]: - header = f'**{row[0]}** ({row[3]})' # **Name** (Applicant Type) - body = (f'Name: *{row[2]}*\n' - f'Region: *{row[1]}*\n' - f'Status: *{row[4]}*\n' - f'Granted: *{row[5]}*\n' - f'Effective: *{row[6]}*\n' - f'Cancelled: *{row[7]}*\n' - f'Expires: *{row[8]}*') - embed.add_field(name=header, value=body, inline=False) - - if len(table) > 3: - desc += f'\nRecords 1 to 3 of {len(table)}. See ae7q.com for more...' - - embed.description = desc - - await ctx.send(embed=embed) @_ae7q_lookup.command(name="applications", aliases=["a"], category=cmn.cat.lookup) async def _ae7q_applications(self, ctx: commands.Context, callsign: str): '''Look up the application history for a callsign on [ae7q.com](http://ae7q.com/).''' """ - callsign = callsign.upper() - desc = '' - base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" - embed = cmn.embed_factory(ctx) + with ctx.typing(): + callsign = callsign.upper() + desc = '' + base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" + embed = cmn.embed_factory(ctx) - async with self.session.get(base_url + callsign) as resp: - if resp.status != 200: - embed.title = "Error in AE7Q applications command" - embed.description = 'Could not load AE7Q' + async with self.session.get(base_url + callsign) as resp: + if resp.status != 200: + embed.title = "Error in AE7Q applications command" + embed.description = 'Could not load AE7Q' + embed.colour = cmn.colours.bad + await ctx.send(embed=embed) + return + page = await resp.text() + + soup = BeautifulSoup(page, features="html.parser") + tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + + table = tables[0] + + # find the first table in the page, and use it to make a description + if len(table[0]) == 1: + for row in table: + desc += " ".join(row.getText().split()) + desc += '\n' + desc = desc.replace(callsign, f'`{callsign}`') + + # select the last table to get applications + table = tables[-1] + + table_headers = table[0].find_all("th") + first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None + + # catch if the wrong table was selected + if first_header is None or not first_header.startswith("Receipt"): + embed.title = f"AE7Q Application History for {callsign}" embed.colour = cmn.colours.bad + embed.url = base_url + callsign + embed.description = desc + embed.description += f'\nNo records found for `{callsign}`' await ctx.send(embed=embed) return - page = await resp.text() - soup = BeautifulSoup(page, features="html.parser") - tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + table = await process_table(table[1:]) - table = tables[0] - - # find the first table in the page, and use it to make a description - if len(table[0]) == 1: - for row in table: - desc += " ".join(row.getText().split()) - desc += '\n' - desc = desc.replace(callsign, f'`{callsign}`') - - # select the last table to get applications - table = tables[-1] - - table_headers = table[0].find_all("th") - first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None - - # catch if the wrong table was selected - if first_header is None or not first_header.startswith("Receipt"): + embed = cmn.embed_factory(ctx) embed.title = f"AE7Q Application History for {callsign}" - embed.colour = cmn.colours.bad + embed.colour = cmn.colours.good embed.url = base_url + callsign + + # add the first three rows of the table to the embed + for row in table[0:3]: + header = f'**{row[1]}** ({row[3]})' # **Name** (Callsign) + body = (f'Received: *{row[0]}*\n' + f'Region: *{row[2]}*\n' + f'Purpose: *{row[5]}*\n' + f'Last Action: *{row[7]}*\n' + f'Application Status: *{row[8]}*\n') + embed.add_field(name=header, value=body, inline=False) + + if len(table) > 3: + desc += f'\nRecords 1 to 3 of {len(table)}. See ae7q.com for more...' + embed.description = desc - embed.description += f'\nNo records found for `{callsign}`' + await ctx.send(embed=embed) - return - - table = await process_table(table[1:]) - - embed = cmn.embed_factory(ctx) - embed.title = f"AE7Q Application History for {callsign}" - embed.colour = cmn.colours.good - embed.url = base_url + callsign - - # add the first three rows of the table to the embed - for row in table[0:3]: - header = f'**{row[1]}** ({row[3]})' # **Name** (Callsign) - body = (f'Received: *{row[0]}*\n' - f'Region: *{row[2]}*\n' - f'Purpose: *{row[5]}*\n' - f'Last Action: *{row[7]}*\n' - f'Application Status: *{row[8]}*\n') - embed.add_field(name=header, value=body, inline=False) - - if len(table) > 3: - desc += f'\nRecords 1 to 3 of {len(table)}. See ae7q.com for more...' - - embed.description = desc - - await ctx.send(embed=embed) """ pass @@ -252,133 +255,135 @@ class AE7QCog(commands.Cog): - 2 tables: callsign history and application history - If not found: no tables """ - base_url = "http://ae7q.com/query/data/FrnHistory.php?FRN=" - embed = cmn.embed_factory(ctx) + with ctx.typing(): + base_url = "http://ae7q.com/query/data/FrnHistory.php?FRN=" + embed = cmn.embed_factory(ctx) - async with self.session.get(base_url + frn) as resp: - if resp.status != 200: - embed.title = "Error in AE7Q frn command" - embed.description = 'Could not load AE7Q' + async with self.session.get(base_url + frn) as resp: + if resp.status != 200: + embed.title = "Error in AE7Q frn command" + embed.description = 'Could not load AE7Q' + embed.colour = cmn.colours.bad + await ctx.send(embed=embed) + return + page = await resp.text() + + soup = BeautifulSoup(page, features="html.parser") + tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + + if not len(tables): + embed.title = f"AE7Q History for FRN {frn}" embed.colour = cmn.colours.bad + embed.url = base_url + frn + embed.description = f'No records found for FRN `{frn}`' await ctx.send(embed=embed) return - page = await resp.text() - soup = BeautifulSoup(page, features="html.parser") - tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + table = tables[0] - if not len(tables): + table_headers = table[0].find_all("th") + first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None + + # catch if the wrong table was selected + if first_header is None or not first_header.startswith('With Licensee'): + embed.title = f"AE7Q History for FRN {frn}" + embed.colour = cmn.colours.bad + embed.url = base_url + frn + embed.description = f'No records found for FRN `{frn}`' + await ctx.send(embed=embed) + return + + table = await process_table(table[2:]) + + embed = cmn.embed_factory(ctx) embed.title = f"AE7Q History for FRN {frn}" - embed.colour = cmn.colours.bad + embed.colour = cmn.colours.good embed.url = base_url + frn - embed.description = f'No records found for FRN `{frn}`' + + # add the first three rows of the table to the embed + for row in table[0:3]: + header = f'**{row[0]}** ({row[3]})' # **Callsign** (Applicant Type) + body = (f'Name: *{row[2]}*\n' + f'Class: *{row[4]}*\n' + f'Region: *{row[1]}*\n' + f'Status: *{row[5]}*\n' + f'Granted: *{row[6]}*\n' + f'Effective: *{row[7]}*\n' + f'Cancelled: *{row[8]}*\n' + f'Expires: *{row[9]}*') + embed.add_field(name=header, value=body, inline=False) + + if len(table) > 3: + embed.description = f'Records 1 to 3 of {len(table)}. See ae7q.com for more...' + await ctx.send(embed=embed) - return - - table = tables[0] - - table_headers = table[0].find_all("th") - first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None - - # catch if the wrong table was selected - if first_header is None or not first_header.startswith('With Licensee'): - embed.title = f"AE7Q History for FRN {frn}" - embed.colour = cmn.colours.bad - embed.url = base_url + frn - embed.description = f'No records found for FRN `{frn}`' - await ctx.send(embed=embed) - return - - table = await process_table(table[2:]) - - embed = cmn.embed_factory(ctx) - embed.title = f"AE7Q History for FRN {frn}" - embed.colour = cmn.colours.good - embed.url = base_url + frn - - # add the first three rows of the table to the embed - for row in table[0:3]: - header = f'**{row[0]}** ({row[3]})' # **Callsign** (Applicant Type) - body = (f'Name: *{row[2]}*\n' - f'Class: *{row[4]}*\n' - f'Region: *{row[1]}*\n' - f'Status: *{row[5]}*\n' - f'Granted: *{row[6]}*\n' - f'Effective: *{row[7]}*\n' - f'Cancelled: *{row[8]}*\n' - f'Expires: *{row[9]}*') - embed.add_field(name=header, value=body, inline=False) - - if len(table) > 3: - embed.description = f'Records 1 to 3 of {len(table)}. See ae7q.com for more...' - - await ctx.send(embed=embed) @_ae7q_lookup.command(name="licensee", aliases=["l"], category=cmn.cat.lookup) async def _ae7q_licensee(self, ctx: commands.Context, licensee_id: str): '''Look up the history of a licensee ID on [ae7q.com](http://ae7q.com/).''' - licensee_id = licensee_id.upper() - base_url = "http://ae7q.com/query/data/LicenseeIdHistory.php?ID=" - embed = cmn.embed_factory(ctx) + with ctx.typing(): + licensee_id = licensee_id.upper() + base_url = "http://ae7q.com/query/data/LicenseeIdHistory.php?ID=" + embed = cmn.embed_factory(ctx) - async with self.session.get(base_url + licensee_id) as resp: - if resp.status != 200: - embed.title = "Error in AE7Q licensee command" - embed.description = 'Could not load AE7Q' + async with self.session.get(base_url + licensee_id) as resp: + if resp.status != 200: + embed.title = "Error in AE7Q licensee command" + embed.description = 'Could not load AE7Q' + embed.colour = cmn.colours.bad + await ctx.send(embed=embed) + return + page = await resp.text() + + soup = BeautifulSoup(page, features="html.parser") + tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + + if not len(tables): + embed.title = f"AE7Q History for Licensee {licensee_id}" embed.colour = cmn.colours.bad + embed.url = base_url + licensee_id + embed.description = f'No records found for Licensee `{licensee_id}`' await ctx.send(embed=embed) return - page = await resp.text() - soup = BeautifulSoup(page, features="html.parser") - tables = [[row for row in table.find_all("tr")] for table in soup.select("table.Database")] + table = tables[0] - if not len(tables): + table_headers = table[0].find_all("th") + first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None + + # catch if the wrong table was selected + if first_header is None or not first_header.startswith('With FCC'): + embed.title = f"AE7Q History for Licensee {licensee_id}" + embed.colour = cmn.colours.bad + embed.url = base_url + licensee_id + embed.description = f'No records found for Licensee `{licensee_id}`' + await ctx.send(embed=embed) + return + + table = await process_table(table[2:]) + + embed = cmn.embed_factory(ctx) embed.title = f"AE7Q History for Licensee {licensee_id}" - embed.colour = cmn.colours.bad + embed.colour = cmn.colours.good embed.url = base_url + licensee_id - embed.description = f'No records found for Licensee `{licensee_id}`' + + # add the first three rows of the table to the embed + for row in table[0:3]: + header = f'**{row[0]}** ({row[3]})' # **Callsign** (Applicant Type) + body = (f'Name: *{row[2]}*\n' + f'Class: *{row[4]}*\n' + f'Region: *{row[1]}*\n' + f'Status: *{row[5]}*\n' + f'Granted: *{row[6]}*\n' + f'Effective: *{row[7]}*\n' + f'Cancelled: *{row[8]}*\n' + f'Expires: *{row[9]}*') + embed.add_field(name=header, value=body, inline=False) + + if len(table) > 3: + embed.description = f'Records 1 to 3 of {len(table)}. See ae7q.com for more...' + await ctx.send(embed=embed) - return - - table = tables[0] - - table_headers = table[0].find_all("th") - first_header = ''.join(table_headers[0].strings) if len(table_headers) > 0 else None - - # catch if the wrong table was selected - if first_header is None or not first_header.startswith('With FCC'): - embed.title = f"AE7Q History for Licensee {licensee_id}" - embed.colour = cmn.colours.bad - embed.url = base_url + licensee_id - embed.description = f'No records found for Licensee `{licensee_id}`' - await ctx.send(embed=embed) - return - - table = await process_table(table[2:]) - - embed = cmn.embed_factory(ctx) - embed.title = f"AE7Q History for Licensee {licensee_id}" - embed.colour = cmn.colours.good - embed.url = base_url + licensee_id - - # add the first three rows of the table to the embed - for row in table[0:3]: - header = f'**{row[0]}** ({row[3]})' # **Callsign** (Applicant Type) - body = (f'Name: *{row[2]}*\n' - f'Class: *{row[4]}*\n' - f'Region: *{row[1]}*\n' - f'Status: *{row[5]}*\n' - f'Granted: *{row[6]}*\n' - f'Effective: *{row[7]}*\n' - f'Cancelled: *{row[8]}*\n' - f'Expires: *{row[9]}*') - embed.add_field(name=header, value=body, inline=False) - - if len(table) > 3: - embed.description = f'Records 1 to 3 of {len(table)}. See ae7q.com for more...' - - await ctx.send(embed=embed) async def process_table(table: list):