ldooks/dragon-bot
ldooks/dragon-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing corona herror handling

Browse Source
This commit is contained in:
Luke Robles 2020-03-26 14:17:56 -07:00
parent 9301b11160
commit c1176d804c
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/corona.py
View File

@ -14,7 +14,6 @@ def get_csv():
if not os.path.exists(local_csv): if not os.path.exists(local_csv):
print("no local csv found, downloading latest") print("no local csv found, downloading latest")
# url = "https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_daily_reports/%s.csv" % date
r = requests.get(download_url, allow_redirects=True) r = requests.get(download_url, allow_redirects=True)
open(local_csv, 'wb').write(r.content) open(local_csv, 'wb').write(r.content)
@ -23,12 +22,18 @@ def get_csv():
def sum_numbers(state): def sum_numbers(state):
series = read_csv(get_csv(), header=0, parse_dates=[0], index_col=0, squeeze=True) series = read_csv(get_csv(), header=0, parse_dates=[0], index_col=0, squeeze=True)
sums = series.loc[series['Province_State'] == state].sum() last_updated = series['Last_Update'].iloc[0]
state_query = series.loc[series['Province_State'] == state]
if state_query.empty:
embed = discord.Embed(description="No results found for %s.\n\nPlease enter a valid US state" % state, color=0x428bca, type="rich")
embed.set_author(name="CSSE at Johns Hopkins University", icon_url='https://avatars2.githubusercontent.com/u/60674295')
return embed
sums = state_query.sum()
confirmed = sums['Confirmed'] confirmed = sums['Confirmed']
deaths = sums['Deaths'] deaths = sums['Deaths']
recovered = sums['Recovered'] recovered = sums['Recovered']
embed = discord.Embed(description="Most recent Corona stats for %s" % state, color=0x428bca, type="rich") embed = discord.Embed(description="Most recent Corona stats for %s\nUpdated once a day\n(Last update was %s)" % (state, last_updated), color=0x428bca, type="rich")
embed.set_author(name="CSSE at Johns Hopkins University", icon_url='https://avatars2.githubusercontent.com/u/60674295') embed.set_author(name="CSSE at Johns Hopkins University", icon_url='https://avatars2.githubusercontent.com/u/60674295')
embed.add_field(name='Confirmed Cases', value=confirmed) embed.add_field(name='Confirmed Cases', value=confirmed)
embed.add_field(name='Recovered Cases', value=recovered) embed.add_field(name='Recovered Cases', value=recovered)
@ -38,7 +43,9 @@ def sum_numbers(state):
def parse_message(message): def parse_message(message):
try: try:
state = string.capwords(' '.join(message.split()[1:])) state = string.capwords(' '.join(message.lstrip('!corona').split()))
if not state:
state = 'California'
except IndexError: except IndexError:
state = 'California' state = 'California'
return sum_numbers(state) return sum_numbers(state)

6
app/help_methods.py
View File

@ -33,6 +33,10 @@ def get_help_message(method):
'Admin use only. Deletes dragon bot\'s messages from the channel', 'Admin use only. Deletes dragon bot\'s messages from the channel',
'Usage: !cleanup' 'Usage: !cleanup'
], ],
'corona': [
'Pulls the latest corona virus stats per state from Johns Hopkins data',
'Usage: !corona <some US state>\neg: !corona Colorado'
],
'decide': [ 'decide': [
'Dragon-bot will help make the tough decisions for you', 'Dragon-bot will help make the tough decisions for you',
' If there is only one option, it will give you a yes or no', ' If there is only one option, it will give you a yes or no',
@ -162,7 +166,7 @@ def get_help_message(method):
def get_help_embed(client): def get_help_embed(client):
categories = { categories = {
'fun': ['clap', 'redanda', 'birb', 'youtube', 'dog', 'excuse', 'greentext', 'lewd', 'message', 'meme', 'homepage', 'pout', 'roll', 'smug', 'quake', 'wink',], 'fun': ['clap', 'redanda', 'birb', 'youtube', 'dog', 'excuse', 'greentext', 'lewd', 'message', 'meme', 'homepage', 'pout', 'roll', 'smug', 'quake', 'wink',],
'util': ['8ball', 'decide', 'info', 'icon', 'wallpaper', 'weather', 'stock', 'tts', 'issue'], 'util': ['corona', '8ball', 'decide', 'info', 'icon', 'wallpaper', 'weather', 'stock', 'tts', 'issue'],
'users': ['help', 'invite', 'purge', 'roles', 'source', 'minecraft'], 'users': ['help', 'invite', 'purge', 'roles', 'source', 'minecraft'],
'admin': ['emoji', 'cleanup'] 'admin': ['emoji', 'cleanup']
} }