Merge branch 'upstream'

# Conflicts: # README-CN.md # README.md
yihong0618 · Oct 11, 2023 · 64e4a89 · 64e4a89
2 parents 3f5a6a1 + be1cefe
commit 64e4a89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 51 deletions.
diff --git a/.github/workflows/run_data_sync.yml b/.github/workflows/run_data_sync.yml
@@ -1,7 +1,7 @@
 name: Run Data Sync
 
 on:
-  workflow_dispatch:
+  workflow_dispatch: 
   schedule:
     - cron: '0 0 * * *'
   push:
@@ -123,7 +123,7 @@ jobs:
           # python run_page/get_garmin_secret.py ${secrets.GARMIN_CN_EMAIL} ${secrets.GARMIN_CN_PASSWORD} --is-cn
           python run_page/garmin_sync.py ${{ secrets.GARMIN_SECRET_STRING_CN }} --is-cn
         # If you only want to sync `type running` add args --only-run, default script is to sync all data (rides and runs).
-        # python run_page/garmin_sync.py ${{ secrets.GARMIN_SECRET_STING_CN }}  --only-run --is-cn
+        # python run_page/garmin_sync.py ${{ secrets.GARMIN_SECRET_STRING_CN }}  --only-run --is-cn
 
       - name: Run sync Only GPX script
         if: env.RUN_TYPE == 'only_gpx'

diff --git a/run_page/garmin_sync.py b/run_page/garmin_sync.py
@@ -5,7 +5,6 @@
 
 import argparse
 import asyncio
-import json
 import logging
 import os
 import sys
@@ -27,25 +26,20 @@
 
 TIME_OUT = httpx.Timeout(240.0, connect=360.0)
 GARMIN_COM_URL_DICT = {
-    "BASE_URL": "https://connectapi.garmin.com",
     "SSO_URL_ORIGIN": "https://sso.garmin.com",
     "SSO_URL": "https://sso.garmin.com/sso",
-    # "MODERN_URL": "https://connect.garmin.com/modern",
     "MODERN_URL": "https://connectapi.garmin.com",
     "SIGNIN_URL": "https://sso.garmin.com/sso/signin",
-    "CSS_URL": "https://static.garmincdn.com/com.garmin.connect/ui/css/gauth-custom-v1.2-min.css",
-    "UPLOAD_URL": "https://connectapi.garmin.com/upload-service/upload/.gpx",
+    "UPLOAD_URL": "https://connectapi.garmin.com/upload-service/upload/",
     "ACTIVITY_URL": "https://connectapi.garmin.com/activity-service/activity/{activity_id}",
 }
 
 GARMIN_CN_URL_DICT = {
-    "BASE_URL": "https://connectapi.garmin.cn",
     "SSO_URL_ORIGIN": "https://sso.garmin.com",
     "SSO_URL": "https://sso.garmin.cn/sso",
     "MODERN_URL": "https://connectapi.garmin.cn",
     "SIGNIN_URL": "https://sso.garmin.cn/sso/signin",
-    "CSS_URL": "https://static.garmincdn.cn/cn.garmin.connect/ui/css/gauth-custom-v1.2-min.css",
-    "UPLOAD_URL": "https://connectapi.garmin.cn/upload-service/upload/.gpx",
+    "UPLOAD_URL": "https://connectapi.garmin.cn/upload-service/upload/",
     "ACTIVITY_URL": "https://connectapi.garmin.cn/activity-service/activity/{activity_id}",
 }
 
@@ -127,39 +121,9 @@ async def download_activity(self, activity_id, file_type="gpx"):
         response.raise_for_status()
         return response.read()
 
-    async def upload_activities(self, files):
-        for file, garmin_type in files:
-            files = {"data": ("file.gpx", file)}
-            try:
-                res = await self.req.post(
-                    self.upload_url, files=files, headers={"nk": "NT"}
-                )
-            except Exception as e:
-                print(str(e))
-                # just pass for now
-                continue
-            try:
-                resp = res.json()["detailedImportResult"]
-            except Exception as e:
-                print(e)
-                raise Exception("failed to upload")
-            # change the type
-            if resp["successes"]:
-                activity_id = resp["successes"][0]["internalId"]
-                print(f"id {activity_id} uploaded...")
-                data = {"activityTypeDTO": {"typeKey": garmin_type}}
-                encoding_headers = {"Content-Type": "application/json; charset=UTF-8"}
-                r = await self.req.put(
-                    self.activity_url.format(activity_id=activity_id),
-                    data=json.dumps(data),
-                    headers=encoding_headers,
-                )
-                r.raise_for_status()
-        await self.req.aclose()
-
     async def upload_activities_original(self, datas, use_fake_garmin_device=False):
         print(
-            "start upload activities to garmin!!!, use_fake_garmin_device:",
+            "start upload activities to garmin!, use_fake_garmin_device:",
             use_fake_garmin_device,
         )
         for data in datas:
@@ -173,11 +137,11 @@ async def upload_activities_original(self, datas, use_fake_garmin_device=False):
                 file_body = wrap_device_info(f)
             else:
                 file_body = BytesIO(f.read())
-            files = {"data": (data.filename, file_body)}
+            files = {"file": (data.filename, file_body)}
 
             try:
                 res = await self.req.post(
-                    self.upload_url, files=files, headers={"nk": "NT"}
+                    self.upload_url, files=files, headers=self.headers
                 )
                 os.remove(data.filename)
                 f.close()

diff --git a/v2.0_TODO.md b/v2.0_TODO.md