Merge branch 'zoffline:master' into master

README.md

@@ -354,7 +354,7 @@ To enable support for multiple users perform the steps below:
 
 * Create a file ``enable_bots.txt`` inside the ``storage`` folder to load ghosts as bots, they will keep riding around regardless of the route you are riding.
 * Optionally, ``enable_bots.txt`` can contain a multiplier value (be careful, if the resulting number of bots is too high, it may cause performance issues or not work at all).
-* Names, nationalities and equipment can be customized by creating a file ``bot.txt`` inside the ``storage`` folder. The scripts ``get_pro_names.py`` and ``get_strava_names.py`` can be used to populate this file.
+* Names, nationalities and equipment can be customized by creating a file ``bot.txt`` inside the ``storage`` folder. The script ``get_pro_names.py`` can be used to populate this file.
 * If you want some random bots, check [this repository](https://github.com/oldnapalm/zoffline-bots).
 
 #### RoboPacers (formerly known as Pace Partners)

zwift_offline.py

@@ -2239,17 +2239,21 @@ def garmin_upload(player_id, activity):
         except Exception as exc:
             logger.warning("Failed to read %s. Skipping Garmin upload attempt: %s" % (garmin_credentials, repr(exc)))
             return
-    garmin_domain = '%s/garmin_domain.txt' % STORAGE_DIR
-    if os.path.exists(garmin_domain):
+    domain = 'garmin.com'
+    domain_file = '%s/garmin_domain.txt' % STORAGE_DIR
+    if os.path.exists(domain_file):
         try:
-            with open(garmin_domain) as f:
-                garth.configure(domain=f.readline().rstrip('\r\n'))
+            with open(domain_file) as f:
+                domain = f.readline().rstrip('\r\n')
+            garth.configure(domain=domain)
         except Exception as exc:
-            logger.warning("Failed to read %s: %s" % (garmin_domain, repr(exc)))
+            logger.warning("Failed to read %s: %s" % (domain_file, repr(exc)))
     tokens_dir = '%s/garth' % profile_dir
     try:
         garth.resume(tokens_dir)
-        garth.client.username
+        if garth.client.oauth2_token.expired:
+            garth.client.refresh_oauth2()
+            garth.save(tokens_dir)
     except:
         try:
             garth.login(username, password)
@@ -2258,7 +2262,9 @@ def garmin_upload(player_id, activity):
             logger.warning("Garmin login failed: %s" % repr(exc))
             return
     try:
-        garth.client.post("connectapi", "/upload-service/upload", api=True, files={"file": (activity.fit_filename, BytesIO(activity.fit))})
+        requests.post('https://connectapi.%s/upload-service/upload' % domain,
+            files={"file": (activity.fit_filename, BytesIO(activity.fit))},
+            headers={'authorization': str(garth.client.oauth2_token)})
     except Exception as exc:
         logger.warning("Garmin upload failed. No internet? %s" % repr(exc))