From d83de61d29cb826182d6f280aedbf701aaaeaaa5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 12 Jul 2020 16:47:11 +0200 Subject: [PATCH] added better user opening --- .gitignore | 1 + rowers/stravastuff.py | 1 + rowers/tasks.py | 9 ++++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 18f9b11d..52e2a00e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ testcert.crt testcert.key garminlog.log +strava_webhooks.log # Compiled python modules. *.pyc diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 7c38e7f2..18b12720 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -326,6 +326,7 @@ def create_async_workout(alldata,user,stravaid,debug=False): from rowers.utils import get_strava_stream def async_get_workout(user,stravaid): + token = strava_open(user) csvfilename = 'media/{code}_{stravaid}.csv'.format(code=uuid4().hex[:16],stravaid=stravaid) job = myqueue(queue, fetch_strava_workout, diff --git a/rowers/tasks.py b/rowers/tasks.py index 72a2bd32..b9bb51a6 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -2721,6 +2721,10 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu 'Content-Type': 'application/json', 'resolution': 'medium',} url = "https://www.strava.com/api/v3/activities/"+str(stravaid) + response = requests.get(url,headers=headers) + if response.status_code != 200: + print(response,response.json()) + return 0 workoutsummary = requests.get(url,headers=headers).json() try: startdatetime = workoutsummary['start_date'] @@ -2738,7 +2742,10 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu if t is not None: nr_rows = len(t) else: - duration = int(workoutsummary['elapsed_time']) + try: + duration = int(workoutsummary['elapsed_time']) + except KeyError: + duration = 0 t = pd.Series(range(duration+1)) nr_rows = len(t)