Fixing corona function to ACTUALLY get the most recent csvs

This commit is contained in:
Luke Robles 2021-03-18 11:10:53 -07:00
parent 99ff37c1a2
commit 3142d64171
2 changed files with 15 additions and 7 deletions

View File

@ -6,24 +6,32 @@ import os
import pandas as pd
import requests
import string
import datetime
def get_csv():
git_url = 'https://api.github.com/repos/CSSEGISandData/COVID-19/contents/csse_covid_19_data/csse_covid_19_daily_reports'
git_blob = requests.get(git_url).json()
most_recent = git_blob[-2]
today = datetime.datetime.utcnow().date()
todays_date = today.strftime('%m-%d-%Y')
yesterday = today - datetime.timedelta(days=1)
yesterdays_date = yesterday.strftime('%m-%d-%Y')
most_recent = next(filter(lambda x: yesterdays_date in x['name'], git_blob))
file_name = most_recent['name']
download_url = most_recent['download_url']
most_recent_csv = "/app/%s" % file_name
most_recent_csv = "./%s" % file_name
if not os.path.exists(most_recent_csv):
print("no local csv found, downloading %s" % file_name)
r = requests.get(download_url, allow_redirects=True)
open(most_recent_csv, 'wb').write(r.content)
yesterday = git_blob[-3]
yesterday_filename = yesterday['name']
yesterday_url = yesterday['download_url']
yesterday_csv = "/app/%s" % yesterday_filename
two_days_ago = today - datetime.timedelta(days=2)
two_days_ago_date = two_days_ago.strftime('%m-%d-%Y')
yesterday_object = next(filter(lambda x: two_days_ago_date in x['name'], git_blob))
yesterday_filename = yesterday_object['name']
yesterday_url = yesterday_object['download_url']
yesterday_csv = "./%s" % yesterday_filename
if not os.path.exists(yesterday_csv):
print("no local csv found, downloading %s" % yesterday_filename)

View File

@ -6,4 +6,4 @@ printf "[+] Done\n"
printf "\n[-] Running dragon bot in test mode\n"
docker build -f ./Dockerfile-test-env -t dragon-bot-test . || exit
docker run -ti -v /mnt/freenas/docker_storage/syncthing/appdata/config/Sync/dale:/tmp/dale -v $(pwd)/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=test -e token="MzQ1MjkwMTI5OTQ4Mjc4Nzg0.DG5IBw._9umb82PrL22bPe7GjmHClU-NtU" dragon-bot-test sh
docker run -ti -v $(pwd)/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=test -e token="MzQ1MjkwMTI5OTQ4Mjc4Nzg0.DG5IBw._9umb82PrL22bPe7GjmHClU-NtU" dragon-bot-test sh