diff --git a/Dockerfile b/Dockerfile index 03ecb130..7310803a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.6-buster AS builder +FROM python:3.6-buster RUN apt-get update && apt-get install -y gcc python-pip ADD app/requirements.txt /requirements.txt RUN pip install -U pip && pip install -r requirements.txt diff --git a/Dockerfile-test-env b/Dockerfile-test-env index 50743738..47c9bf53 100644 --- a/Dockerfile-test-env +++ b/Dockerfile-test-env @@ -1,4 +1,4 @@ -FROM python:3.6-buster AS builder +FROM python:3.6-buster RUN apt-get update && apt-get install -y gcc python-pip ADD app/requirements.txt /requirements.txt RUN pip install -U pip pylint && pip install -r requirements.txt diff --git a/app/corona.py b/app/corona.py index 0e0004ca..92ff5da4 100644 --- a/app/corona.py +++ b/app/corona.py @@ -20,17 +20,24 @@ def get_csv(): return local_csv -def sum_numbers(): +def sum_numbers(state): series = read_csv(get_csv(), header=0, parse_dates=[0], index_col=0, squeeze=True) - california = series.loc[series['Province_State'] == 'California'].sum() - confirmed = california['Confirmed'] - deaths = california['Deaths'] - recovered = california['Recovered'] + sums = series.loc[series['Province_State'] == state].sum() + confirmed = sums['Confirmed'] + deaths = sums['Deaths'] + recovered = sums['Recovered'] - embed = discord.Embed(description='Most recent Corona stats for California', color=0x428bca, type="rich") + embed = discord.Embed(description="Most recent Corona stats for %s" % state, color=0x428bca, type="rich") 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='Recovered Cases', value=recovered) embed.add_field(name='Deaths', value=deaths) embed.add_field(name='Source', value='https://github.com/CSSEGISandData/COVID-19') - return embed \ No newline at end of file + return embed + +def parse_message(message): + try: + state = message.split()[1].capitalize() + except IndexError: + state = 'California' + return sum_numbers(state) \ No newline at end of file diff --git a/app/dragon-bot.py b/app/dragon-bot.py index 51280730..4bb53d5a 100644 --- a/app/dragon-bot.py +++ b/app/dragon-bot.py @@ -162,7 +162,7 @@ async def on_message(message): if message.content.startswith('!corona'): await client.send_message( message.channel, - embed=corona.sum_numbers() + embed=corona.parse_message(message.content) ) if message.content.startswith('!decide'):