diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py index 16751f82..3c4050a5 100644 --- a/rowers/sporttracksstuff.py +++ b/rowers/sporttracksstuff.py @@ -218,7 +218,7 @@ def createsporttracksworkoutdata(w): def getidfromresponse(response): t = response.json() uri = t['uris'][0] - regex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivity/(\d+)$' + regex = '.*?sporttracks\.mobi\/api\/v2\/fitnessActivities/(\d+)\.json$' m = re.compile(regex).match(uri).group(1) id = int(m) diff --git a/rowers/tests.py b/rowers/tests.py index a1f35397..a7a0a0e4 100644 --- a/rowers/tests.py +++ b/rowers/tests.py @@ -300,7 +300,7 @@ def mocked_requests(*args, **kwargs): if stuploadtester.match(args[0]): json_data = { "uris": [ - "https://api.sporttracks.mobi/api/v2/fitnessActivity/123456" + "https://api.sporttracks.mobi/api/v2/fitnessActivities/123456.json" ] } return MockResponse(json_data, 200) diff --git a/rowers/views.py b/rowers/views.py index 9b364b1f..f75fc317 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -1816,8 +1816,7 @@ def workout_sporttracks_upload_view(request,id=0): r = w.user try: - res = sporttracks_open(r.user) - thetoken = res[0] + thetoken = sporttracks_open(r.user) except NoTokenError: return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")