sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v2.42'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-04 22:16:49 +02:00
parent 315c8c26db 027353338d
commit 4ba34cf84e
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/models.py
View File

@@ -199,9 +199,9 @@ class Rower(models.Model):
underarmourtokenexpirydate = models.DateTimeField(blank=True,null=True) underarmourtokenexpirydate = models.DateTimeField(blank=True,null=True)
underarmourrefreshtoken = models.CharField(default='',max_length=200, underarmourrefreshtoken = models.CharField(default='',max_length=200,
blank=True,null=True) blank=True,null=True)
tptoken = models.CharField(default='',max_length=200,blank=True,null=True) tptoken = models.CharField(default='',max_length=1000,blank=True,null=True)
tptokenexpirydate = models.DateTimeField(blank=True,null=True) tptokenexpirydate = models.DateTimeField(blank=True,null=True)
tprefreshtoken = models.CharField(default='',max_length=200, tprefreshtoken = models.CharField(default='',max_length=1000,
blank=True,null=True) blank=True,null=True)
stravatoken = models.CharField(default='',max_length=200,blank=True,null=True) stravatoken = models.CharField(default='',max_length=200,blank=True,null=True)

20
rowers/tpstuff.py
View File

@@ -18,7 +18,7 @@ import os,sys
import urllib import urllib
import base64 import base64
from io import BytesIO from io import BytesIO
from time import strftime
# Django # Django
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect, HttpResponse,JsonResponse from django.http import HttpResponseRedirect, HttpResponse,JsonResponse
@@ -238,6 +238,7 @@ def uploadactivity(access_token,filename,description='',
data = json.dumps(data), data = json.dumps(data),
headers=headers) headers=headers)
print resp.status_code
if resp.status_code != 200: if resp.status_code != 200:
if settings.DEBUG: if settings.DEBUG:
print resp.status_code print resp.status_code
@@ -245,10 +246,23 @@ def uploadactivity(access_token,filename,description='',
print "" print ""
print headers print headers
print "" print ""
with open("media/tperrors.log","a") as errorlog:
errorlog.write(str(resp.status_code))
errorlog.write("\r\n")
print "noot"
timestr = strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+"\r\n")
errorlog.write("\r\n")
errorlog.write(str(resp.reason))
errorlog.write("\r\n")
try:
errorlog.write(str(resp.json()))
except:
pass
errorlog.write("\r\n")
return 0,resp.reason,resp.status_code,headers return 0,resp.reason,resp.status_code,headers
else: else:
print headers print resp.json()
print json.dumps(headers)
return resp.json()[0]["Id"],"ok",200,"" return resp.json()[0]["Id"],"ok",200,""
return 0 return 0