From 87f6eeafe1bbdee59e1c6216e23f93b4d744f71c Mon Sep 17 00:00:00 2001
From: oldnapalm <38410858+oldnapalm@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:17:50 -0300
Subject: [PATCH] Fix upload_activity

---
 scripts/upload_activity.py | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/scripts/upload_activity.py b/scripts/upload_activity.py
index 511a905..3cf518b 100644
--- a/scripts/upload_activity.py
+++ b/scripts/upload_activity.py
@@ -87,6 +87,34 @@ def post_credentials(session, username, password):
         sys.exit()
 
 
+def create_activity(session, access_token, activity):
+    try:
+        response = session.post(
+            url="https://us-or-rly101.zwift.com/api/profiles/%s/activities" % activity.player_id,
+            headers={
+                "Content-Type": "application/x-protobuf-lite",
+                "Accept": "application/json",
+                "Connection": "keep-alive",
+                "Host": "us-or-rly101.zwift.com",
+                "User-Agent": "Zwift/115 CFNetwork/758.0.2 Darwin/15.0.0",
+                "Authorization": "Bearer %s" % access_token,
+                "Accept-Language": "en-us",
+            },
+            data=activity.SerializeToString(),
+            verify=args.verifyCert,
+        )
+
+        if args.verbose:
+            print('Response HTTP Status Code: {status_code}'.format(
+                status_code=response.status_code))
+
+        json_dict = json.loads(response.content)
+        return json_dict["id"]
+
+    except requests.exceptions.RequestException as e:
+        print('HTTP Request failed: %s' % e)
+
+
 def upload_activity(session, access_token, activity):
     try:
         response = session.put(
@@ -108,7 +136,8 @@ def upload_activity(session, access_token, activity):
             print('Response HTTP Status Code: {status_code}'.format(
                 status_code=response.status_code))
 
-        return response.content
+        json_dict = json.loads(response.content)
+        return json_dict["id"]
 
     except requests.exceptions.RequestException as e:
         print('HTTP Request failed: %s' % e)
@@ -226,6 +255,11 @@ def main(argv):
     session = requests.session()
     access_token, refresh_token = login(session, username, password)
     activity.player_id = get_player_id(session, access_token)
+    new_activity = activity_pb2.Activity()
+    new_activity.CopyFrom(activity)
+    new_activity.ClearField('id')
+    new_activity.ClearField('fit')
+    activity.id = create_activity(session, access_token, new_activity)
     ret = upload_activity(session, access_token, activity)
     print(ret)
     logout(session, refresh_token)