refactoring

rowers/views/workoutviews.py

@@ -4905,59 +4905,24 @@ def workout_upload_api(request):
         message = {'status':'false','message':'could not find file'}
         return JSONResponse(status=400,data=message)
 
-    try:
-        stravaid = post_data['stravaid']
-    except KeyError:
-        stravaid = ''
+    # sync related IDs
+    stravaid = post_data.get('stravaid','')
+    c2id = post_data.get('c2id','')
+    nkid = post_data.get('nkid','')
+    rp3id = post_data.get('nkid','')
+    garminid = post_data.get('garminid',0)
 
-    try:
-        c2id = post_data['c2id']
-    except KeyError:
-        c2id = ''
+    startdatetime = post_data.get('startdatetime','')
+    oarlockfirmware = post_data.get('oarlockfirmware',None)
+    inboard = post_data.get('inboard',None)
+    oarlength = post_data.get('oarlength',None)
+    useImpeller = post_data.get('useImpeller',False)
 
-    try:
-        nkid = post_data['nkid']
-    except KeyError:
-        nkid = ''
+    totalDistance = post_data.get('totalDistance',None)
+    elapsedTime = post_data.get('elapsedTime',None)
+    summary = post_data.get('summary',None)
 
 
-    try:
-        rp3id = post_data['rp3id']
-    except KeyError:
-        rp3id = ''
-
-
-    try:
-        garminid = post_data['garminid']
-    except KeyError:
-        garminid = 0
-
-    try:
-        startdatetime = post_data['startdatetime']
-    except KeyError:
-        startdatetime = ''
-
-    try:
-        oarlockfirmware = post_data['oarlockfirmware']
-    except:
-        oarlockfirmware = None
-
-    try:
-        inboard = post_data['inboard']
-    except:
-        inboard = None
-
-    try:
-        oarlength = post_data['oarlength']
-    except:
-        oarlength = None
-
-
-    try:
-        useImpeller = post_data['useImpeller']
-    except:
-        useImpeller = False
-
     r = None
     if form.is_valid():
         t = form.cleaned_data['title']
@@ -5056,36 +5021,23 @@ def workout_upload_api(request):
             plottype = r.staticchartonupload
             res, jobid = uploads.make_plot(r,w,f1,f2,plottype,t)
 
-        try:
-            oarlength = post_data['oarlength']
-            inboard = post_data['inboard']
+        if inboard:
             w.inboard = inboard
+            w.save()
+        if oarlength:
             w.oarlength = oarlength
             w.save()
-        except KeyError:
-            pass
 
-        try:
-            totalDistance = post_data['totalDistance']
+        if totalDistance:
             w.distance = totalDistance
             w.save()
-        except KeyError:
-            pass
 
-        try:
-            elapsedTime = post_data['elapsedTime']
+        if elapsedTime:
             w.duration = totaltime_sec_to_string(elapsedTime)
-        except KeyError:
-            pass
 
-
-
-        try:
-            summary = post_data['summary']
+        if summary:
             w.summary = summary
             w.save()
-        except KeyError:
-            pass
 
         uploads.do_sync(w,post_data,quick=True)