Added patch_requests_no_verify_ssl for testing. Presumably fixed ST.m…

…obi lap upload when no moving time was available, their test site is acting up...

sync_worker.py

@@ -1,5 +1,5 @@
 from tapiriik.sync import Sync
-from tapiriik.sync.requests_lib import patch_requests_with_default_timeout
+from tapiriik.requests_lib import patch_requests_with_default_timeout
 from tapiriik.database import db
 import time
 import datetime

tapiriik/sync/requests_lib.py → tapiriik/requests_lib.py

@@ -8,4 +8,12 @@ def new_request(*args, **kwargs):
 		if "timeout" not in kwargs:
 			kwargs["timeout"] = timeout
 		return old_request(*args, **kwargs)
+	requests.Session.request = new_request
+
+def patch_requests_no_verify_ssl():
+	import requests
+	old_request = requests.Session.request
+	def new_request(*args, **kwargs):
+		kwargs.update({"verify": False})
+		return old_request(*args, **kwargs)
 	requests.Session.request = new_request

tapiriik/services/GarminConnect/garminconnect.py

@@ -224,8 +224,7 @@ def mapStat(gcKey, statKey, type, useSourceUnits=False):
 
                 activity.CalculateUID()
                 activity.ServiceData = {"ActivityID": act["activityId"]}
-                if "b7e" not in activity.UID:
-                    continue
+
                 activities.append(activity)
             logger.debug("Finished page " + str(page) + " of " + str(res["search"]["totalPages"]))
             if not exhaustive or int(res["search"]["totalPages"]) == page:

tapiriik/services/SportTracks/sporttracks.py

@@ -386,11 +386,10 @@ def _mapStat(dict, key, val, naturalValue=False):
             if val is not None:
                 if naturalValue:
                     val = round(val)
-                print("Mapping %s=%s" % (key, val))
                 dict[key] = val
-        _mapStat(activityData, "clock_duration", (activity.EndTime - activity.StartTime).total_seconds())
-        _mapStat(activityData, "duration", activity.Stats.MovingTime.Value.total_seconds() if activity.Stats.MovingTime.Value is not None else None)
-        _mapStat(activityData, "total_distance", activity.Stats.Distance.asUnits(ActivityStatisticUnit.Meters).Value)
+        _mapStat(activityData, "clock_duration", (activity.EndTime - activity.StartTime).total_seconds()) # Required too.
+        _mapStat(activityData, "duration", activity.Stats.MovingTime.Value.total_seconds() if activity.Stats.MovingTime.Value is not None else (lap.EndTime - lap.StartTime).total_seconds()) # This field is required for laps to be created.
+        _mapStat(activityData, "total_distance", activity.Stats.Distance.asUnits(ActivityStatisticUnit.Meters).Value) # Possibly required? But rather useless without.
         _mapStat(activityData, "calories", activity.Stats.Energy.asUnits(ActivityStatisticUnit.Kilojoules).Value, naturalValue=True)
         _mapStat(activityData, "elevation_gain", activity.Stats.Elevation.Gain)
         _mapStat(activityData, "elevation_loss", activity.Stats.Elevation.Loss)
@@ -423,7 +422,6 @@ def _mapStat(dict, key, val, naturalValue=False):
 
             activityData["laps"].append(lapinfo)
 
-        print("Lap data %s" % activityData["laps"])
         if not activity.Stationary:
             timer_stops = []
             timer_stopped_at = None

tapiriik/settings.py

@@ -194,7 +194,7 @@
 # Diagnostics auth, None = no auth
 DIAG_AUTH_TOTP_SECRET = DIAG_AUTH_PASSWORD = None
 
-SPORTTRACKS_OPENFIT_ENDPOINT = "http://sporttracks.mobi/openfitapi/api"
+SPORTTRACKS_OPENFIT_ENDPOINT = "https://sporttracks.mobi/openfitapi/api"
 
 EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
 EMAIL_FILE_PATH = './sent_emails'