diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index bcb27787..f2a1c65e 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -47,6 +47,8 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False): filename = fileobj.name except AttributeError: filename = fileobj[6:] + if testing: + print 'Attribute Error', filename # test if file exists and is not empty @@ -54,12 +56,20 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False): with open('media/'+filename,'r') as fop: line = fop.readline() except IOError: + if testing: + print 'IOError',filename,'media/'+filename return 0 + if testing: + print 'Creating workout from email' + workoutid = [ make_new_workout_from_email(rower, filename, title,testing=testing) ] + if testing: + print 'Workout id = {workoutid}'.format(workoutid=workoutid) + if workoutid[0]: link = settings.SITE_URL+reverse( rower.defaultlandingpage, @@ -185,6 +195,9 @@ class Command(BaseCommand): ) else: # move attachment and make workout + if testing: + print name + print attachment.document workoutid = processattachment( rower, attachment.document, name, uploadoptions, testing=testing diff --git a/rowers/polarstuff.py b/rowers/polarstuff.py index 6d5d804a..3bad578a 100644 --- a/rowers/polarstuff.py +++ b/rowers/polarstuff.py @@ -16,6 +16,7 @@ from math import sin,cos,atan2,sqrt import os,sys import gzip import base64 +import yaml # Django from django.shortcuts import render_to_response @@ -154,6 +155,14 @@ def get_polar_workouts(user): if response.status_code == 201: workoutsbox = Mailbox.objects.filter(name='workouts')[0] + uploadoptions = { + 'makeprivate':False, + } + + bodyyaml = yaml.safe_dump( + uploadoptions, + default_flow_style=False + ) transactionid = response.json()['transaction-id'] url = baseurl+'/users/{userid}/exercise-transactions/{transactionid}'.format( @@ -180,11 +189,12 @@ def get_polar_workouts(user): msg = Message(mailbox=workoutsbox, from_header=user.email, - subject = 'Import from Polar Flow') + subject = 'Import from Polar Flow', + body=bodyyaml) msg.save() - a = MessageAttachment(message=msg,document=filename) + a = MessageAttachment(message=msg,document=filename[6:]) a.save() exercise_dict['filename'] = filename