getting intervals_import working

rowers/nkimportutils.py

@@ -106,7 +106,6 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
     boattype = "1x"
 
     uploadoptions = {
-        'secret': UPLOAD_SERVICE_SECRET,
         'user': userid,
         'file': csvfilename,
         'title': title,
@@ -128,26 +127,14 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
     dologging('nklog.log',json.dumps(uploadoptions))
     dologging('metrics.log','NK ID {nkid}'.format(nkid=nkid))
 
-    session = requests.session()
-    newHeaders = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-    session.headers.update(newHeaders)
-
-    response = session.post(UPLOAD_SERVICE_URL, json=uploadoptions)
+    response = upload_handler(uploadoptions, csvfilename)
     
-    if response.status_code != 200:  # pragma: no cover
+    if response["status"] == "progressing":  # pragma: no cover
         return 0, response.text
+    else:
+        dologging('nklog.log','Upload response: {resp}'.format(resp=json.dumps(response)))
 
-    try:
-        workoutid = response.json()['id']
-    except KeyError:  # pragma: no cover
-        workoutid = 0
-
-    # dologging('nklog.log','Workout ID {id}'.format(id=workoutid))
-
-    # evt update workout summary
-
-    # return
-    return workoutid, ""
+    return 0, response
 
 
 def get_nk_intervalstats(workoutdata, strokedata):