first attempt on c2

rowers/uploads.py

@@ -1,9 +1,10 @@
 from rowers.mytypes import workouttypes, boattypes, otwtypes, workoutsources, workouttypes_ordered
-import rowers.c2stuff as c2stuff
+
 from rowers.rower_rules import is_promember
 import rowers.tpstuff as tpstuff
 import rowers.sporttracksstuff as sporttracksstuff
 import rowers.stravastuff as stravastuff
+from rowers.integrations import *
 from rowers.utils import (
     geo_distance, serialize_list, deserialize_list, uniqify,
     str2bool, range_to_color_hex, absolute, myqueue, NoTokenError
@@ -199,9 +200,9 @@ def do_sync(w, options, quick=False):
 
     if do_c2_export:  # pragma: no cover
         dologging('c2_log.log','Exporting workout to C2 for user {user}'.format(user=w.user.user.id))
+        c2_integration = C2Integration(w.user.user)
         try:
-            message, id = c2stuff.workout_c2_upload(
-                w.user.user, w, asynchron=True)
+            id = c2_integration.workout_export(w)
             dologging('c2_log.log','C2 upload succeeded')
         except NoTokenError:
             id = 0